This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository openjk.
commit 72842e89ea5ae8eab23182a4a849de8d9c39c771 Author: Simon McVittie <[email protected]> Date: Tue Dec 30 19:56:43 2014 +0000 Don't link to a bunch of unnecessary X11 libraries --- ...renderer-and-clients-to-a-bunch-of-unnece.patch | 65 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 66 insertions(+) diff --git a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch new file mode 100644 index 0000000..7a1adc7 --- /dev/null +++ b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch @@ -0,0 +1,65 @@ +From: Simon McVittie <[email protected]> +Date: Tue, 30 Dec 2014 19:56:25 +0000 +Subject: Don't link renderer and clients to a bunch of unnecessary X11 + libraries + +They only directly use libGL. +--- + code/CMakeLists.txt | 2 +- + code/rd-vanilla/CMakeLists.txt | 2 +- + codemp/CMakeLists.txt | 2 +- + codemp/rd-vanilla/CMakeLists.txt | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index ac30195..5a24f15 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -30,7 +30,7 @@ if(BuildSPEngine OR BuildJK2SPEngine) + # OpenGL + find_package(OpenGL REQUIRED) + set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${OPENGL_INCLUDE_DIR}) +- set(SPEngineLibraries ${SPEngineLibraries} ${OPENGL_LIBRARIES}) ++ set(SPEngineLibraries ${SPEngineLibraries} ${OPENGL_gl_LIBRARY}) + endif() + + # OpenAL (is optionally included for Windows) +diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt +index 09c498f..710da5b 100644 +--- a/code/rd-vanilla/CMakeLists.txt ++++ b/code/rd-vanilla/CMakeLists.txt +@@ -192,7 +192,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla) + if(NOT WIN32) + find_package(OpenGL REQUIRED) + set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR}) +- set(SPRDVanillaRendererLibraries ${SPRDVanillaRendererLibraries} ${OPENGL_LIBRARIES}) ++ set(SPRDVanillaRendererLibraries ${SPRDVanillaRendererLibraries} ${OPENGL_gl_LIBRARY}) + + set(SDL2_BUILDING_LIBRARY ON) # don't want main() in Renderer + find_package(SDL2 REQUIRED) +diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt +index d6175e0..e5b7064 100644 +--- a/codemp/CMakeLists.txt ++++ b/codemp/CMakeLists.txt +@@ -360,7 +360,7 @@ if(BuildMPEngine) + # OpenGL + find_package(OpenGL REQUIRED) + set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${OPENGL_INCLUDE_DIR}) +- set(MPEngineLibraries ${MPEngineLibraries} ${OPENGL_LIBRARIES}) ++ set(MPEngineLibraries ${MPEngineLibraries} ${OPENGL_gl_LIBRARY}) + endif() + + # OpenAL (is optionally included for Windows) +diff --git a/codemp/rd-vanilla/CMakeLists.txt b/codemp/rd-vanilla/CMakeLists.txt +index 1b05ba0..a16d18d 100644 +--- a/codemp/rd-vanilla/CMakeLists.txt ++++ b/codemp/rd-vanilla/CMakeLists.txt +@@ -160,7 +160,7 @@ endif() + if(NOT WIN32) + find_package(OpenGL REQUIRED) + set(MPVanillaRendererIncludeDirectories ${MPVanillaRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR}) +- set(MPVanillaRendererLibraries ${MPVanillaRendererLibraries} ${OPENGL_LIBRARIES}) ++ set(MPVanillaRendererLibraries ${MPVanillaRendererLibraries} ${OPENGL_gl_LIBRARY}) + + set(SDL2_BUILDING_LIBRARY ON) # don't want main() in Renderer + find_package(SDL2 REQUIRED) diff --git a/debian/patches/series b/debian/patches/series index 1b55d2b..e811ac2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ Only-require-glext.h-on-Windows.patch g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch Allow-using-an-external-libjpeg-turbo-or-libjpeg8.patch Use-system-zlib-headers-if-we-re-using-system-zlib.patch +Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
