[forge] 01/08: cherry-picked 'd20aaeae Consistent definition of USE_SYSTEM flags for glbinding, glm and freetype' into 'patched'

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository forge.

commit e95248e474798b86210f4c367f986ce9e0a5955b
Merge: b4658c5 b8e7216
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 4 11:32:37 2017 +0000

    cherry-picked 'd20aaeae Consistent definition of USE_SYSTEM flags for glbinding, glm and freetype' into 'patched'

 CMakeLists.txt                                     |  5 --
 debian/.git-dpm                                    |  4 +-
 ...definition-of-USE_SYSTEM-flags-for-glbind.patch | 72 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 src/backend/opengl/CMakeLists.txt                  | 25 +++-----
 5 files changed, 83 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 9df7683,0000000..fb3b5e2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9d545fd0f27ad2f403e2d1e2c55268cabf64f45d
- 9d545fd0f27ad2f403e2d1e2c55268cabf64f45d
++b8e7216e694ee86983f6a8760b7fffa592aed4c0
++b8e7216e694ee86983f6a8760b7fffa592aed4c0
 +d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
 +d3ade76f38b23a7f20f2df9a4cf01cc59a7bb40f
 +forge_0.9.2.orig.tar.gz
 +dfea07522a1c8fb622b83fd2bcfe5924f73bd90c
 +735452
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
index 0000000,0000000..a5af25c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch
@@@ -1,0 -1,0 +1,72 @@@
++From b8e7216e694ee86983f6a8760b7fffa592aed4c0 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Wed, 28 Dec 2016 17:06:02 +0000
++Subject: Consistent definition of USE_SYSTEM flags for glbinding, glm and
++ freetype
++
++---
++ CMakeLists.txt                    |  5 -----
++ src/backend/opengl/CMakeLists.txt | 25 ++++++++-----------------
++ 2 files changed, 8 insertions(+), 22 deletions(-)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index c3ef45f..1c0c591 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -11,11 +11,6 @@ SET_PROPERTY(CACHE USE_WINDOW_TOOLKIT PROPERTY STRINGS "glfw3" "sdl2")
++ OPTION(BUILD_DOCUMENTATION "Build Documentation" OFF)
++ OPTION(BUILD_EXAMPLES "Build Examples" ON)
++ 
++-OPTION(USE_LOCAL_GLM "Download and use local GLM" OFF)
++-OPTION(USE_LOCAL_FREETYPE "Download and use local freetype" OFF)
++-MARK_AS_ADVANCED(USE_LOCAL_GLM)
++-MARK_AS_ADVANCED(USE_LOCAL_FREETYPE)
++-
++ # Set a default build type if none was specified
++ IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
++     SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
++diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt
++index 1dd851d..fb570ba 100755
++--- a/src/backend/opengl/CMakeLists.txt
+++++ b/src/backend/opengl/CMakeLists.txt
++@@ -1,9 +1,4 @@
++ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
++-# Prior to GLM 0.9.7.0, the package is found by the FindGLM.cmake module.
++-# This was removed with GLM 0.9.7.0, instead a glm-config.cmake configuration
++-# file is provided. Therefore, both FIND_PACKAGE calls are necessary.
++-FIND_PACKAGE(GLM QUIET)
++-FIND_PACKAGE(glm QUIET)
++ 
++ OPTION(USE_SYSTEM_GLBINDING "Use system glbinding" OFF)
++ IF(USE_SYSTEM_GLBINDING)
++@@ -17,22 +12,18 @@ ENDIF(USE_SYSTEM_GLBINDING)
++ 
++ INCLUDE(GLSLtoH)
++ 
++-IF((NOT glm_FOUND AND NOT GLM_FOUND) OR (${USE_LOCAL_GLM}))
++-  SET(USE_LOCAL_GLM ON)
++-  MESSAGE(STATUS "Downloading GLM headers.")
++-  INCLUDE(build_glm)
+++OPTION(USE_SYSTEM_GLM "Use the system GLM library" OFF)
+++IF(USE_SYSTEM_GLM)
+++  FIND_PACKAGE(glm REQUIRED)
++ ELSE()
++-  MESSAGE(STATUS "Using System GLM")
+++  INCLUDE(build_glm)
++ ENDIF()
++ 
++-FIND_PACKAGE(Freetype QUIET)
++-
++-IF(NOT FREETYPE_FOUND OR ${USE_LOCAL_FREETYPE})
++-  SET(USE_LOCAL_FREETYPE ON)
++-  MESSAGE(STATUS "Downloading and building Freetype libraries.")
++-  INCLUDE(build_freetype)
+++OPTION(USE_SYSTEM_FREETYPE "Use the system Freetype library" OFF)
+++IF(USE_SYSTEM_FREETYPE)
+++  FIND_PACKAGE(Freetype REQUIRED)
++ ELSE()
++-  MESSAGE(STATUS "Using System FreeType2")
+++  INCLUDE(build_freetype)
++ ENDIF()
++ 
++ IF(UNIX)
diff --cc debian/patches/series
index ff8bed8,0000000..59bad9e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Use-system-MathJax.patch
 +0002-No-version-queries-with-Git.patch
++0003-Consistent-definition-of-USE_SYSTEM-flags-for-glbind.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/forge.git