r13933 - in packages/trunk/supertuxkart/debian: . patches

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-12-30 01:25:20 +0000 (Sun, 30 Dec 2012)
New Revision: 13933

Added:
   packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/series
   packages/trunk/supertuxkart/debian/rules
Log:
supertuxkart: Add patch to link against system libs


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2012-12-29 23:15:34 UTC (rev 13932)
+++ packages/trunk/supertuxkart/debian/changelog	2012-12-30 01:25:20 UTC (rev 13933)
@@ -4,6 +4,8 @@
     - Use embedded/forked copy of irrlicht; refer to debian/README.source for
       details. Also import patches used in Debian's irrlicht source package.
     - Remove build-depends on libirrlicht-dev.
+    - Add build-depends on zlib1g-dev, libbz2-dev, libpng-dev, libjpeg-dev,
+      mesa-common-dev.
     - Remove backport_cmake.patch and build_with_irrlicht_1.8.patch; applied
       upstream.
     - Refresh remaining patches.

Added: packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2012-12-30 01:25:20 UTC (rev 13933)
@@ -0,0 +1,22 @@
+Description: Link against system copies of zlib/libpng/libjpeg/bzip2
+Forwarded: not-yet
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Last-Update: 2012-12-29
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,7 +196,13 @@
+     ${IRRLICHT_LIBRARY}
+     ${IRRLICHT_XF86VM_LIBRARY}
+     ${OPENAL_LIBRARY}
+-    ${OPENGL_LIBRARIES})
++    ${OPENGL_LIBRARIES}
++    X11
++    z
++    png
++    jpeg
++    bz2
++)
+ 
+ if(USE_FRIBIDI)
+     target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES})

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2012-12-29 23:15:34 UTC (rev 13932)
+++ packages/trunk/supertuxkart/debian/patches/series	2012-12-30 01:25:20 UTC (rev 13933)
@@ -1,4 +1,5 @@
 build_against_system_enet.patch
+link_against_system_libs.patch
 fix_desktop_file.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff

Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules	2012-12-29 23:15:34 UTC (rev 13932)
+++ packages/trunk/supertuxkart/debian/rules	2012-12-30 01:25:20 UTC (rev 13933)
@@ -25,7 +25,7 @@
 	docbook-to-man debian/supertuxkart.sgml > debian/supertuxkart.6
 	
 	# Build embedded irrlicht
-	NDEBUG=1 $(MAKE) -C lib/irrlicht/source/Irrlicht
+	NDEBUG=1 $(MAKE) -C lib/irrlicht/source/Irrlicht staticlib
 	
 	dh_auto_build