mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 11:33:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libqglviewer] update to 2.7.2 (#9186)

Browse Source 
* [libqglviewer] update to 2.7.2

* [libqglviewer] Remove patch double quotes
This commit is contained in:
Alvin 2019-12-21 04:23:09 +08:00 committed by dan-shaw
parent ea6dba0cd9
commit 0548f8a50c
4 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libqglviewer/CONTROL
View File

@ -1,4 +1,4 @@
Source: libqglviewer Source: libqglviewer
Version: 2.7.0-2 Version: 2.7.2
Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers. Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
Build-Depends: qt5-base Build-Depends: qt5-base

13
ports/libqglviewer/QGLViewer_remove_shared.patch
View File

@ -1,13 +0,0 @@
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
index f9afe8089..63f74736e 100644
--- a/QGLViewer/QGLViewer.pro
+++ b/QGLViewer/QGLViewer.pro
@@ -7,7 +7,7 @@
TEMPLATE = lib
TARGET = QGLViewer
VERSION = 2.7.0
-CONFIG *= qt opengl warn_on shared thread create_prl rtti no_keywords
+CONFIG *= qt opengl warn_on thread create_prl rtti no_keywords
QGL_HEADERS = \
qglviewer.h \

22
ports/libqglviewer/macosx.patch
View File

@ -1,22 +0,0 @@
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
index 702925cb6..fc3cb7118 100644
--- a/QGLViewer/QGLViewer.pro
+++ b/QGLViewer/QGLViewer.pro
@@ -214,7 +214,7 @@ macx|darwin-g++ {
include.files *= qglviewer.icns
# Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
- QMAKE_MAC_SDK = macosx10.12
+ #QMAKE_MAC_SDK = macosx10.12
lib_bundle {
FRAMEWORK_HEADERS.version = Versions
@@ -224,7 +224,7 @@ macx|darwin-g++ {
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
# So that the path QGLViewer/*.h exists
- QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
+ #QMAKE_POST_LINK=cd $$DESTDIR/QGLViewer.framework/Headers && (test -L QGLViewer || ln -s . QGLViewer)
# Specific paths for the installation of the framework.
!isEmpty( LIB_DIR ) {

9
ports/libqglviewer/portfile.cmake
View File

@ -3,12 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO GillesDebunne/libQGLViewer REPO GillesDebunne/libQGLViewer
REF 781d914c003466b342b45d19266a9613fc0e7e0e REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2
SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5 SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8
HEAD_REF master HEAD_REF master
PATCHES "use-default-config-on-all-platforms.patch" PATCHES
"QGLViewer_remove_shared.patch" use-default-config-on-all-platforms.patch
"macosx.patch"
) )
vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro) vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro)