commit: 339e7b510690ca270d5ae495fdc71510dddeb3ce
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Sep 21 19:27:10 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 14:21:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=339e7b51
media-libs/glbinding: update to latest
also drop old version as checksum fails
and it no longer compiles
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
.../files/glbinding-2.1.1-CMakeLists.patch | 19 ---------
.../files/glbinding-3.1.0_p1-CMakeLists.patch | 41 ++++++++++++++++++++
.../glbinding-3.1.0_p1-source_CMakeLists.patch | 12 ++++++
media-libs/glbinding/glbinding-2.1.1.ebuild | 36 -----------------
media-libs/glbinding/glbinding-3.1.0_p1.ebuild | 45 ++++++++++++++++++++++
media-libs/glbinding/metadata.xml | 26 +++++++------
6 files changed, 113 insertions(+), 66 deletions(-)
diff --git a/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch
b/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch
deleted file mode 100644
index 8c4b50577..000000000
--- a/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -159,16 +159,8 @@ add_subdirectory(deploy)
- # Deployment (global project files)
- #
-
--# Install version file
--install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT}
COMPONENT runtime)
--
- # Install cmake find script for the project
- install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT}
COMPONENT dev)
-
--# Install the project meta files
--install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--install(FILES LICENSE DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--install(FILES README.md DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--
- # Install runtime data
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA}
COMPONENT examples_data)
diff --git a/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch
b/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch
new file mode 100644
index 000000000..7486939e7
--- /dev/null
+++ b/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45f9981..2c71349 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -143,8 +143,8 @@ if(UNIX AND SYSTEM_DIR_INSTALL)
+ set(INSTALL_EXAMPLES "share/${project}") #
/usr/[local]/share/<project>
+ set(INSTALL_DATA "share/${project}") #
/usr/[local]/share/<project>
+ set(INSTALL_BIN "bin") # /usr/[local]/bin
+- set(INSTALL_SHARED "lib") # /usr/[local]/lib
+- set(INSTALL_LIB "lib") # /usr/[local]/lib
++ set(INSTALL_SHARED "${CMAKE_INSTALL_LIBDIR}") #
/usr/[local]/lib
++ set(INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") #
/usr/[local]/lib
+ set(INSTALL_INCLUDE "include") # /usr/[local]/include
+ set(INSTALL_DOC "share/doc/${project}") #
/usr/[local]/share/doc/<project>
+ set(INSTALL_SHORTCUTS "share/applications") #
/usr/[local]/share/applications
+@@ -157,8 +157,8 @@ else()
+ set(INSTALL_EXAMPLES ".") # ./
+ set(INSTALL_DATA ".") # ./
+ set(INSTALL_BIN ".") # ./
+- set(INSTALL_SHARED "lib") # ./lib
+- set(INSTALL_LIB "lib") # ./lib
++ set(INSTALL_SHARED "${CMAKE_INSTALL_LIBDIR}") #
./lib
++ set(INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") #
./lib
+ set(INSTALL_INCLUDE "include") # ./include
+ set(INSTALL_DOC "doc") # ./doc
+ set(INSTALL_SHORTCUTS "misc") # ./misc
+@@ -210,3 +210,14 @@ install(FILES README.md DESTINATION ${INSTALL_ROOT}
COMPONENT runtime)
+ if (TARGET cubescape OR TARGET cubescape-log OR TARGET cubescape-qt)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA}
COMPONENT examples_data)
+ endif()
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type ${CMAKE_BUILD_TYPE}
++Install path ${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C ${CMAKE_C_FLAGS}
++C++ ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable ${CMAKE_EXE_LINKER_FLAGS}
++Module ${CMAKE_MODULE_LINKER_FLAGS}
++Shared ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git
a/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch
b/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch
new file mode 100644
index 000000000..88d11dc3a
--- /dev/null
+++ b/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch
@@ -0,0 +1,12 @@
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 757217b..19da804 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -13,7 +13,6 @@ configure_file(version.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_N
+
+ # 3rdParties
+ set(IDE_FOLDER "3rdparty")
+-add_subdirectory("3rdparty/KHR")
+
+ # Libraries
+ set(IDE_FOLDER "")
diff --git a/media-libs/glbinding/glbinding-2.1.1.ebuild
b/media-libs/glbinding/glbinding-2.1.1.ebuild
deleted file mode 100644
index 408093fb5..000000000
--- a/media-libs/glbinding/glbinding-2.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Cross-platform C++ binding for the OpenGL API"
-HOMEPAGE="https://github.com/cginternals/glbinding";
-SRC_URI="https://github.com/cginternals/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
- >=media-libs/glfw-3.1.1
- "
-DEPEND="${RDEPEND}
- >=dev-util/cmake-3.2.2
- "
-
-PATCHES=(
- "${FILESDIR}/${P}"-CMakeLists.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DOPTION_BUILD_TESTS=OFF
- -DOPTION_BUILD_GPU_TESTS=OFF
- -DOPTION_BUILD_DOCS=OFF
- -DOPTION_BUILD_EXAMPLES=OFF
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/glbinding/glbinding-3.1.0_p1.ebuild
b/media-libs/glbinding/glbinding-3.1.0_p1.ebuild
new file mode 100644
index 000000000..9999b537f
--- /dev/null
+++ b/media-libs/glbinding/glbinding-3.1.0_p1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Cross-platform C++ binding for the OpenGL API"
+HOMEPAGE="https://github.com/cginternals/glbinding";
+COMMIT="55634e35bd8d8bf58cb36f6ed81af0a0f0939973"
+SRC_URI="https://github.com/cginternals/glbinding/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ media-libs/glfw
+ media-libs/libglvnd
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-vcs/git
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}"-CMakeLists.patch
+ "${FILESDIR}/${P}"-source_CMakeLists.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DOPTION_SELF_CONTAINED=OFF
+ -DOPTION_BUILD_TESTS=OFF
+ -DOPTION_BUILD_DOCS=OFF
+ -DOPTION_BUILD_EXAMPLES=OFF
+ -DOPTION_BUILD_WITH_BOOST_THREAD=OFF
+ -DOPTION_BUILD_CHECK=OFF
+ -DOPTION_BUILD_OWN_KHR_HEADERS=OFF
+ -DOPTION_BUILD_WITH_LTO=OFF
+ )
+ cmake_src_configure
+}
diff --git a/media-libs/glbinding/metadata.xml
b/media-libs/glbinding/metadata.xml
index 7e15e92be..706402ab4 100644
--- a/media-libs/glbinding/metadata.xml
+++ b/media-libs/glbinding/metadata.xml
@@ -5,22 +5,26 @@
<email>[email protected]</email>
<name>Marius Brehler</name>
</maintainer>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Aisha Tammy</name>
+ </maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Gentoo Science Project</name>
</maintainer>
<longdescription>
-glbinding leverages modern C++11 features like enum classes,
-lambdas, and variadic templates, instead of relying on macros; all
-OpenGL symbols are real functions and variables. It provides
-type-safe parameters, per feature API header, lazy function
-resolution, multi-context and multi-thread support, global and local
-function callbacks, meta information about the generated OpenGL
-binding and the OpenGL runtime, as well as tools and examples for
-quick-starting your projects. Based on the OpenGL API specification
-(gl.xml) glbinding is generated using python scripts and templates
-that can be easily adapted to fit custom needs.
-</longdescription>
+ glbinding leverages modern C++11 features like enum classes,
+ lambdas, and variadic templates, instead of relying on macros;
all
+ OpenGL symbols are real functions and variables. It provides
+ type-safe parameters, per feature API header, lazy function
+ resolution, multi-context and multi-thread support, global and
local
+ function callbacks, meta information about the generated OpenGL
+ binding and the OpenGL runtime, as well as tools and examples
for
+ quick-starting your projects. Based on the OpenGL API
specification
+ (gl.xml) glbinding is generated using python scripts and
templates
+ that can be easily adapted to fit custom needs.
+ </longdescription>
<upstream>
<remote-id type="github">cginternals/glbinding</remote-id>
</upstream>
