From 3ca1a7cc52c8d28ed401192a012555d1570f25c7 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Wed, 14 Mar 2018 21:36:11 +0900 Subject: [PATCH] glbinding-2.1.4 (untested) --- glbinding/README | 62 +++++++++++++------ ...2.cygport => glbinding-2.1.4-1bl1.cygport} | 0 ...c.patch => glbinding-2.1.4-1bl1.src.patch} | 36 +++++------ 3 files changed, 61 insertions(+), 37 deletions(-) rename glbinding/{glbinding-2.1.3-1bl2.cygport => glbinding-2.1.4-1bl1.cygport} (100%) rename glbinding/{glbinding-2.1.3-1bl2.src.patch => glbinding-2.1.4-1bl1.src.patch} (69%) diff --git a/glbinding/README b/glbinding/README index 69866f36b..dbe678832 100644 --- a/glbinding/README +++ b/glbinding/README @@ -11,47 +11,47 @@ glbinding is generated using python scripts and templates that can be easily adapted to fit custom needs. Runtime requirements: - cygwin-2.8.2-1 - libgcc1-5.4.0-1 - libGL1-17.1.5-1 - libglbinding-devel-2.1.3-1bl2 - libglbinding2-2.1.3-1bl2 + cygwin-2.10.0-1 + libgcc1-6.4.0-5 + libGL1-17.3.5-1 + libglbinding-devel-2.1.4-1bl1 + libglbinding2-2.1.4-1bl1 libglfw3-3.2.1-1bl1 - libstdc++6-5.4.0-1 + libstdc++6-6.4.0-5 pkg-config-0.29.1-1 Build requirements: (besides corresponding -devel packages) autoconf-13-1 - automake-9-1 - binutils-2.25-4 + automake-10-1 + binutils-2.29-1 cmake-3.6.2-1 - cygport-0.24.1-1 - gcc-core-5.4.0-1 - gcc-g++-5.4.0-1 + cygport-0.31.0-1 + gcc-core-6.4.0-5 + gcc-g++-6.4.0-5 make-4.2.1-2 - python-2.7.13-1 + python-2.7.14-1 Canonical website: https://github.com/cginternals/glbinding Canonical download: - https://github.com/cginternals/glbinding/archive/v2.1.3.tar.gz + https://github.com/cginternals/glbinding/archive/v2.1.4.tar.gz ------------------------------------------- Build instructions: - 1. unpack glbinding-2.1.3-X-src.tar.xz + 1. unpack glbinding-2.1.4-X-src.tar.xz 2. if you use setup to install this src package, it will be unpacked under /usr/src automatically % cd /usr/src - % cygport ./glbinding-2.1.3-X.cygport all + % cygport ./glbinding-2.1.4-X.cygport all This will create: - /usr/src/glbinding-2.1.3-X-src.tar.xz - /usr/src/glbinding-2.1.3-X.tar.xz - /usr/src/libglbinding2-2.1.3-X.tar.xz - /usr/src/libglbinding-devel-2.1.3-X.tar.xz + /usr/src/glbinding-2.1.4-X-src.tar.xz + /usr/src/glbinding-2.1.4-X.tar.xz + /usr/src/libglbinding2-2.1.4-X.tar.xz + /usr/src/libglbinding-devel-2.1.4-X.tar.xz ------------------------------------------- @@ -408,6 +408,27 @@ Files included in the binary package: /usr/include/glbinding/gl45ext/gl.h /usr/include/glbinding/gl45ext/types.h /usr/include/glbinding/gl45ext/values.h + /usr/include/glbinding/gl46/bitfield.h + /usr/include/glbinding/gl46/boolean.h + /usr/include/glbinding/gl46/enum.h + /usr/include/glbinding/gl46/functions.h + /usr/include/glbinding/gl46/gl.h + /usr/include/glbinding/gl46/types.h + /usr/include/glbinding/gl46/values.h + /usr/include/glbinding/gl46core/bitfield.h + /usr/include/glbinding/gl46core/boolean.h + /usr/include/glbinding/gl46core/enum.h + /usr/include/glbinding/gl46core/functions.h + /usr/include/glbinding/gl46core/gl.h + /usr/include/glbinding/gl46core/types.h + /usr/include/glbinding/gl46core/values.h + /usr/include/glbinding/gl46ext/bitfield.h + /usr/include/glbinding/gl46ext/boolean.h + /usr/include/glbinding/gl46ext/enum.h + /usr/include/glbinding/gl46ext/functions.h + /usr/include/glbinding/gl46ext/gl.h + /usr/include/glbinding/gl46ext/types.h + /usr/include/glbinding/gl46ext/values.h /usr/include/glbinding/glbinding-version.h /usr/include/glbinding/glbinding_api.h /usr/include/glbinding/glbinding_export.h @@ -424,6 +445,9 @@ Files included in the binary package: Port Notes: +----- version 2.1.4-1bl1 ----- +Version bump. + ----- version 2.1.3-1bl2 ----- Fix glbinding-config.cmake diff --git a/glbinding/glbinding-2.1.3-1bl2.cygport b/glbinding/glbinding-2.1.4-1bl1.cygport similarity index 100% rename from glbinding/glbinding-2.1.3-1bl2.cygport rename to glbinding/glbinding-2.1.4-1bl1.cygport diff --git a/glbinding/glbinding-2.1.3-1bl2.src.patch b/glbinding/glbinding-2.1.4-1bl1.src.patch similarity index 69% rename from glbinding/glbinding-2.1.3-1bl2.src.patch rename to glbinding/glbinding-2.1.4-1bl1.src.patch index ee5270afa..c41d12cf0 100644 --- a/glbinding/glbinding-2.1.3-1bl2.src.patch +++ b/glbinding/glbinding-2.1.4-1bl1.src.patch @@ -1,6 +1,6 @@ ---- origsrc/glbinding-2.1.3/CMakeLists.txt 2017-05-05 17:29:21.000000000 +0900 -+++ src/glbinding-2.1.3/CMakeLists.txt 2017-08-13 10:23:00.542125600 +0900 -@@ -128,7 +128,11 @@ endif() +--- origsrc/glbinding-2.1.4/CMakeLists.txt 2018-02-23 05:53:56.000000000 +0900 ++++ src/glbinding-2.1.4/CMakeLists.txt 2018-03-14 21:10:58.858551300 +0900 +@@ -136,7 +136,11 @@ endif() if(UNIX AND SYSTEM_DIR_INSTALL) # Install into the system (/usr/bin or /usr/local/bin) set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ set(INSTALL_DATA "share/${project}") # /usr/[local]/share/ set(INSTALL_BIN "bin") # /usr/[local]/bin -@@ -182,6 +186,9 @@ add_subdirectory(deploy) +@@ -190,6 +194,9 @@ add_subdirectory(deploy) # # Deployment (global project files) # @@ -23,7 +23,7 @@ # Install version file install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime) -@@ -198,3 +205,12 @@ install(FILES README.md DESTINATION ${IN +@@ -206,3 +213,12 @@ install(FILES README.md DESTINATION ${IN if (TARGET cubescape OR TARGET cubescape-log OR TARGET cubescape-qt) install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT examples_data) endif() @@ -36,8 +36,8 @@ +SET(includedir ${CMAKE_INSTALL_PREFIX}/include) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/glbinding.pc.in ${CMAKE_BINARY_DIR}/glbinding.pc @ONLY) +INSTALL(FILES ${CMAKE_BINARY_DIR}/glbinding.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ---- origsrc/glbinding-2.1.3/glbinding-config.cmake 2017-05-05 17:29:21.000000000 +0900 -+++ src/glbinding-2.1.3/glbinding-config.cmake 2017-08-13 10:23:19.964000000 +0900 +--- origsrc/glbinding-2.1.4/glbinding-config.cmake 2018-02-23 05:53:56.000000000 +0900 ++++ src/glbinding-2.1.4/glbinding-config.cmake 2018-03-14 21:10:58.858551300 +0900 @@ -25,7 +25,7 @@ macro(find_modules PREFIX) if(TARGET ${module_name}) set(MODULE_FOUND TRUE) @@ -47,8 +47,8 @@ endif() endforeach(module_name) endmacro() ---- origsrc/glbinding-2.1.3/glbinding.pc.in 1970-01-01 09:00:00.000000000 +0900 -+++ src/glbinding-2.1.3/glbinding.pc.in 2017-08-13 10:23:00.542125600 +0900 +--- origsrc/glbinding-2.1.4/glbinding.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/glbinding-2.1.4/glbinding.pc.in 2018-03-14 21:10:58.874343800 +0900 @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -60,9 +60,9 @@ +Version: @META_VERSION@ +Libs: -L${libdir} -lglbinding +Cflags: -I${includedir} ---- origsrc/glbinding-2.1.3/source/glbinding/CMakeLists.txt 2017-05-05 17:29:21.000000000 +0900 -+++ src/glbinding-2.1.3/source/glbinding/CMakeLists.txt 2017-08-13 10:23:00.573566800 +0900 -@@ -350,8 +350,16 @@ install(DIRECTORY +--- origsrc/glbinding-2.1.4/source/glbinding/CMakeLists.txt 2018-02-23 05:53:56.000000000 +0900 ++++ src/glbinding-2.1.4/source/glbinding/CMakeLists.txt 2018-03-14 21:10:58.874343800 +0900 +@@ -369,8 +369,16 @@ install(DIRECTORY ) # CMake config @@ -80,8 +80,8 @@ ) +endif() \ No newline at end of file ---- origsrc/glbinding-2.1.3/source/tests/CMakeLists.txt 2017-05-05 17:29:21.000000000 +0900 -+++ src/glbinding-2.1.3/source/tests/CMakeLists.txt 2017-08-13 10:23:00.573566800 +0900 +--- origsrc/glbinding-2.1.4/source/tests/CMakeLists.txt 2018-02-23 05:53:56.000000000 +0900 ++++ src/glbinding-2.1.4/source/tests/CMakeLists.txt 2018-03-14 21:10:58.889674500 +0900 @@ -52,7 +52,9 @@ set(gtest_disable_pthreads OFF CACH set(gtest_force_shared_crt ON CACHE BOOL "") set(gtest_hide_internal_symbols OFF CACHE BOOL "") @@ -93,10 +93,10 @@ # Create interface library to link against gmock add_library(gmock-dev INTERFACE) ---- origsrc/glbinding-2.1.3/source/tests/glbinding-test/CMakeLists.txt 2017-05-05 17:29:21.000000000 +0900 -+++ src/glbinding-2.1.3/source/tests/glbinding-test/CMakeLists.txt 2017-08-13 10:23:00.573566800 +0900 -@@ -90,6 +90,7 @@ target_link_libraries(${target} - ${GLFW_LIBRARIES} +--- origsrc/glbinding-2.1.4/source/tests/glbinding-test/CMakeLists.txt 2018-02-23 05:53:56.000000000 +0900 ++++ src/glbinding-2.1.4/source/tests/glbinding-test/CMakeLists.txt 2018-03-14 21:10:58.889674500 +0900 +@@ -83,6 +83,7 @@ target_link_libraries(${target} + glfw ${META_PROJECT_NAME}::glbinding gmock-dev + gtest