Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[gl2ps] Fix download, revise patch and fixup (#49103)

This commit is contained in:
Kai Pastor 2025-12-27 03:13:19 +01:00 committed by GitHub
parent e17b05d895
commit c93431c51b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 47 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ports/gl2ps/portfile.cmake
View File

@ -1,10 +1,11 @@
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.onelab.info
OUT_SOURCE_PATH SOURCE_PATH
REPO gl2ps/gl2ps
REF gl2ps_1_4_2
SHA512 cb4abd79f6790e229a0b05a6d12e4bd4d24885c89c4cb8644e49b0459361565c5c5379b53d85f59eeaba16144d3288dbd06c90f55a739f0928a788224ccb8085
HEAD_REF master
vcpkg_download_distfile(ARCHIVE
URLS "https://geuz.org/gl2ps/src/gl2ps-${VERSION}.tgz"
FILENAME "gl2ps-${VERSION}.tgz"
SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
separate-static-dynamic-build.patch
)
@ -12,13 +13,25 @@ vcpkg_from_gitlab(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
-DCMAKE_POLICY_DEFAULT_CMP0057=NEW
-DVCPKG_LOCK_FIND_PACKAGE_GLUT=OFF
-DVCPKG_LOCK_FIND_PACKAGE_LATEX=OFF
-DVCPKG_LOCK_FIND_PACKAGE_OpenGL=ON
)
vcpkg_cmake_install()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gl2ps.h" "defined\(GL2PSDLL\)" "(1)")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gl2ps.h" "defined(HAVE_ZLIB)" "(1)")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gl2ps.h" "defined(HAVE_LIBPNG)" "(1)")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/doc"
)
vcpkg_install_copyright(
FILE_LIST
"${SOURCE_PATH}/README.txt"

202
ports/gl2ps/separate-static-dynamic-build.patch
View File

@ -1,208 +1,38 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0001c4f..36ec0f7 100644
index 0001c4f..e5e1d00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,33 +1,41 @@
# GL2PS, an OpenGL to PostScript Printing Library
# Copyright (C) 1999-2017 C. Geuzaine
+
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of either:
+
#
# a) the GNU Library General Public License as published by the Free
# Software Foundation, either version 2 of the License, or (at your
# option) any later version; or
+
#
# b) the GL2PS License as published by Christophe Geuzaine, either
# version 2 of the License, or (at your option) any later version.
+
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either
# the GNU Library General Public License or the GL2PS License for
# more details.
+
#
# You should have received a copy of the GNU Library General Public
# License along with this library in the file named "COPYING.LGPL";
# if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
# Cambridge, MA 02139, USA.
+
#
# You should have received a copy of the GL2PS License with this
# library in the file named "COPYING.GL2PS"; if not, I will be glad
# to provide one.
+
#
# For the latest info about gl2ps and a full list of contributors,
# see http://www.geuz.org/gl2ps/.
+
#
# Please report all bugs and problems to <gl2ps@geuz.org>.
@@ -59,7 +67,7 @@ set(GL2PS_VERSION "${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}")
set(GL2PS_VERSION "${GL2PS_VERSION}.${GL2PS_PATCH_VERSION}${GL2PS_EXTRA_VERSION}")
execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE DATE
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT DATE)
set(DATE "unknown")
endif()
@@ -138,30 +146,30 @@ if(APPLE)
endif()
@@ -139,19 +139,15 @@ if(APPLE)
endif()
-if(OPENGL_FOUND)
if(OPENGL_FOUND)
- add_library(lib STATIC gl2ps.c gl2ps.h)
- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
-
- add_library(shared SHARED gl2ps.c gl2ps.h)
- target_link_libraries(shared ${EXTERNAL_LIBRARIES})
- set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps
- VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
- SOVERSION ${GL2PS_MAJOR_VERSION})
+ add_library(gl2ps gl2ps.c gl2ps.h)
+ target_link_libraries(gl2ps ${EXTERNAL_LIBRARIES})
+ set_target_properties(gl2ps PROPERTIES
VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
SOVERSION ${GL2PS_MAJOR_VERSION})
- if(WIN32 OR CYGWIN)
- set_target_properties(shared PROPERTIES
- COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
- endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+ target_compile_definitions(gl2ps PRIVATE -DGL2PSDLL -DGL2PSDLL_EXPORTS)
endif()
- install(TARGETS lib shared RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX})
+add_library(gl2ps gl2ps.c gl2ps.h)
+target_link_libraries(gl2ps ${EXTERNAL_LIBRARIES})
+set_target_properties(gl2ps PROPERTIES
+ VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
+SOVERSION ${GL2PS_MAJOR_VERSION})
+
+if(BUILD_SHARED_LIBS)
+ target_compile_definitions(gl2ps PRIVATE -DGL2PSDLL -DGL2PSDLL_EXPORTS)
+ install(TARGETS gl2ps RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
endif()
+install(
+ TARGETS gl2ps
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
+
if(WIN32)
- set(GL2PS_DOC .)
+ set(GL2PS_DOC share/gl2ps/docs)
@@ -161,6 +157,7 @@ if(WIN32)
else()
set(GL2PS_DOC share/doc/gl2ps)
endif()
+set(GL2PS_DOC share/doc)
+if(NOT DISABLE_INSTALL_HEADERS)
install(FILES gl2ps.h DESTINATION include)
install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
@@ -169,30 +177,36 @@ install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
-if(GLUT_FOUND)
- add_executable(gl2psTest WIN32 gl2psTest.c)
- target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
- add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
- target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
endif()
-find_package(LATEX)
-if(PDFLATEX_COMPILER)
- add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
- COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
- COMMAND ${CMAKE_COMMAND} -E copy gl2ps.pdf ${CMAKE_SOURCE_DIR})
- add_custom_target(pdf ALL DEPENDS gl2ps.pdf)
- install(FILES gl2ps.pdf DESTINATION ${GL2PS_DOC})
- find_program(TTH tth)
- if(TTH)
- add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_SOURCE_DIR}/gl2ps.tex ${CMAKE_BINARY_DIR}/gl2ps.tex
- COMMAND ${TTH} ARGS -w1 gl2ps.tex)
- add_custom_target(html DEPENDS gl2ps.html)
- endif()
+if(BUILD_TESTS)
+
+ if(GLUT_FOUND)
+ add_executable(gl2psTest gl2psTest.c)
+ target_link_libraries(gl2psTest gl2ps ${EXTERNAL_LIBRARIES})
+ add_executable(gl2psTestSimple gl2psTestSimple.c)
+ target_link_libraries(gl2psTestSimple gl2ps ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
+
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+ add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
+ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
+ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
+ COMMAND ${PDFLATEX_COMPILER} ARGS ${CMAKE_SOURCE_DIR}/gl2ps.tex
+ COMMAND ${CMAKE_COMMAND} -E copy gl2ps.pdf ${CMAKE_SOURCE_DIR})
+ add_custom_target(pdf ALL DEPENDS gl2ps.pdf)
+ install(FILES gl2ps.pdf DESTINATION ${GL2PS_DOC})
+ find_program(TTH tth)
+ if(TTH)
+ add_custom_command(OUTPUT gl2ps.html DEPENDS gl2ps.tex gl2ps.pdf
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_SOURCE_DIR}/gl2ps.tex ${CMAKE_BINARY_DIR}/gl2ps.tex
+ COMMAND ${TTH} ARGS -w1 gl2ps.tex)
+ add_custom_target(html DEPENDS gl2ps.html)
+ endif(TTH)
+ endif(PDFLATEX_COMPILER)
+
endif()
set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
@@ -201,27 +215,22 @@ set(CPACK_PACKAGE_VERSION_MINOR ${GL2PS_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${GL2PS_PATCH_VERSION})
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README.txt)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
- "An OpenGL to PostScript (and PDF, and SVG...) printing library")
-if(GL2PS_EXTRA_VERSION MATCHES "-git.*") # so that we'll overwrite the archives
- set(CPACK_PACKAGE_FILE_NAME gl2ps-git-${GL2PS_OS})
- set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-git)
-else()
+ "An OpenGL to PostScript (and PDF, and SVG...) printing library")
set(CPACK_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION}-${GL2PS_OS})
- set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION})
-endif()
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "gl2ps")
-set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING.LGPL)
-set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.txt)
-set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt)
-set(CPACK_PACKAGE_EXECUTABLE "gl2ps;gl2ps")
-set(CPACK_STRIP_FILES TRUE)
-set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_SOURCE_IGNORE_FILES "TODO.txt" "${CMAKE_BINARY_DIR}" "/CVS/"
- "/.svn" "/.git" "~$" "DS_Store$" "/tmp/" "/bin/" "/lib/")
-if(WIN32)
- set(CPACK_GENERATOR ZIP)
-else()
- set(CPACK_GENERATOR TGZ)
-endif()
-
-include(CPack)
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "gl2ps")
+ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING.LGPL)
+ set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README.txt)
+ set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.txt)
+ set(CPACK_PACKAGE_EXECUTABLE "gl2ps;gl2ps")
+ set(CPACK_STRIP_FILES TRUE)
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME gl2ps-${GL2PS_VERSION}-source)
+ set(CPACK_SOURCE_GENERATOR TGZ)
+ set(CPACK_SOURCE_IGNORE_FILES "TODO.txt" "${CMAKE_BINARY_DIR}" "/CVS/"
+ "/.svn" "~$" "DS_Store$" "/tmp/" "/bin/" "/lib/")
+ if(WIN32)
+ set(CPACK_GENERATOR ZIP)
+ else(WIN32)
+ set(CPACK_GENERATOR TGZ)
+ endif(WIN32)
+
+ # include(CPack)

2
ports/gl2ps/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "gl2ps",
"version": "1.4.2",
"port-version": 4,
"port-version": 5,
"description": "OpenGL to PostScript Printing Library",
"homepage": "https://gitlab.onelab.info/gl2ps/gl2ps",
"supports": "!android",

2
versions/baseline.json
View File

@ -3334,7 +3334,7 @@
},
"gl2ps": {
"baseline": "1.4.2",
"port-version": 4
"port-version": 5
},
"gl3w": {
"baseline": "2018-05-31",

5
versions/g-/gl2ps.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "51e4c4e828efb0b32efd657df71929bb9ba521d5",
"version": "1.4.2",
"port-version": 5
},
{
"git-tree": "1f0cdea5ea747e24f3a5fba076e645e1292a832f",
"version": "1.4.2",