[openjk] 01/15: Drop patch to avoid direct libX11 dependency, no longer needed with CMake 3.2

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 39cd86b221f227c7a70f15fe4a2b40ec923ae6a7
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 27 23:13:48 2015 +0100

    Drop patch to avoid direct libX11 dependency, no longer needed with CMake 3.2
---
 debian/changelog                                   |  7 +++
 ...renderer-and-clients-to-a-bunch-of-unnece.patch | 57 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a965ade..26116a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjk (0~20150524+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Drop patch to avoid direct libX11 dependency, no longer needed
+    with CMake 3.2
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 27 Jul 2015 23:12:50 +0100
+
 openjk (0~20150524+dfsg1-1) experimental; urgency=low
 
   * New upstream snapshot
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
deleted file mode 100644
index ce6d33f..0000000
--- a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 30 Dec 2014 19:56:25 +0000
-Subject: Don't link renderer and clients to a bunch of unnecessary X11
- libraries
-
-OPENGL_gl_LIBRARY is libGL itself, whereas OPENGL_LIBRARIES also
-contains the libraries on which libGL depends (e.g. X11 libraries
-on Linux). Modern Unix systems don't require explicitly linking to
-indirect dependencies, and OpenJK doesn't directly use anything
-beyond libGL itself.
-
-Forwarded: no, I'm not 100% sure that this is portable beyond GNU/Linux
----
- code/rd-vanilla/CMakeLists.txt   | 2 +-
- codemp/CMakeLists.txt            | 2 +-
- codemp/rd-vanilla/CMakeLists.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 5cd7c34..53b9c02 100644
---- a/code/rd-vanilla/CMakeLists.txt
-+++ b/code/rd-vanilla/CMakeLists.txt
-@@ -195,7 +195,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
- 
- 	find_package(OpenGL REQUIRED)
- 	set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR})
--	set(SPRDVanillaRendererLibraries ${SPRDVanillaRendererLibraries} ${OPENGL_LIBRARIES})
-+	set(SPRDVanillaRendererLibraries ${SPRDVanillaRendererLibraries} ${OPENGL_gl_LIBRARY})
- 
- 	set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OpenJKLibDir})
- 	
-diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
-index b031541..d1137d3 100644
---- a/codemp/CMakeLists.txt
-+++ b/codemp/CMakeLists.txt
-@@ -367,7 +367,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 d0f959c..474aa81 100644
---- a/codemp/rd-vanilla/CMakeLists.txt
-+++ b/codemp/rd-vanilla/CMakeLists.txt
-@@ -180,7 +180,7 @@ endif()
- 
- find_package(OpenGL REQUIRED)
- set(MPVanillaRendererIncludeDirectories ${MPVanillaRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR})
--set(MPVanillaRendererLibraries ${MPVanillaRendererLibraries} ${OPENGL_LIBRARIES})
-+set(MPVanillaRendererLibraries ${MPVanillaRendererLibraries} ${OPENGL_gl_LIBRARY})
- 
- set(MPVanillaRendererIncludeDirectories ${MPVanillaRendererIncludeDirectories} ${OpenJKLibDir})
- add_library(${MPVanillaRenderer} SHARED ${MPVanillaRendererFiles})
diff --git a/debian/patches/series b/debian/patches/series
index 10a2262..ebc409c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
 g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
 Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.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