r15410 - in packages/trunk/supertuxkart/debian: . patches patches/irrlicht

Vincent Cheng vcheng at moszumanska.debian.org
Wed May 13 08:15:09 UTC 2015 

Author: vcheng
Date: 2015-05-13 08:15:08 +0000 (Wed, 13 May 2015)
New Revision: 15410

Removed:
   packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
   packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff
   packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff
   packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff
   packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
   packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
   packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: refresh patches


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/changelog	2015-05-13 08:15:08 UTC (rev 15410)
@@ -2,16 +2,18 @@
 
   * Team upload.
 
-  [ Christoph Egger ]
-  * remove myself from uploaders
-
   [ Vincent Cheng ]
   * New upstream release.
+    - Drop fix_desktop_file.patch, applied upstream.
+    - Refresh remaining patches.
   * Update my email address.
   * Bump Standards version to 3.9.6, no changes required.
 
- -- Vincent Cheng <vcheng at debian.org>  Tue, 28 Apr 2015 15:54:15 -0700
+  [ Christoph Egger ]
+  * remove myself from uploaders
 
+ -- Vincent Cheng <vcheng at debian.org>  Wed, 13 May 2015 00:32:20 -0700
+
 supertuxkart (0.8.1-2) unstable; urgency=medium
 
   * Disable support for wiimote input devices on !linux (since

Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2015-05-13 08:15:08 UTC (rev 15410)
@@ -1,43 +1,36 @@
 Description: Build supertuxkart against system enet instead of embedded copy
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2012-12-28
+Last-Update: 2015-05-13
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -40,10 +40,6 @@
+@@ -60,9 +60,9 @@
  add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
  include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
  
 -# Build the ENet UDP network library
 -add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
 -include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
--
- # Build the irrlicht library
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
- include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
-@@ -107,6 +103,10 @@
- find_package(CURL REQUIRED)
- include_directories(${CURL_INCLUDE_DIRS})
- 
 +# ENet
 +find_package(ENet REQUIRED)
 +include_directories(${ENET_INCLUDE_DIR})
-+
- # Fribidi
- if(USE_FRIBIDI)
-     find_package(Fribidi)
-@@ -225,9 +225,9 @@
+ 
+ # Build glew library
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+@@ -307,11 +307,11 @@
      bulletdynamics
      bulletcollision
      bulletmath
 -    enet
+     glew
      stkirrlicht
+     angelscript
      ${CURL_LIBRARIES}
 +    ${ENET_LIBRARIES}
      ${OGGVORBIS_LIBRARIES}
-     ${IRRLICHT_XF86VM_LIBRARY}
      ${OPENAL_LIBRARY}
+     ${OPENGL_LIBRARIES}
 --- /dev/null
 +++ b/cmake/FindENet.cmake
 @@ -0,0 +1,22 @@

Deleted: packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/fix_desktop_file.patch	2015-05-13 08:15:08 UTC (rev 15410)
@@ -1,28 +0,0 @@
-Description: Fix various issues found in desktop menu entry file
- - Fix issue found by desktop-file-validate (deprecated Encoding key)
- - Make translations less specific to localization. See Debian BTS #667640
- - Original .desktop file in past STK versions on Debian had extra fields in
-   Categories, which ended up showing STK's menu entry in multiple locations;
-   remove these extra fields. See LP: #709987
-Forwarded: http://sourceforge.net/apps/trac/supertuxkart/ticket/632
-           http://sourceforge.net/apps/trac/supertuxkart/ticket/841
-Bug-Debian: http://bugs.debian.org/667640
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/709987
-Last-Update: 2012-12-28
-
---- a/data/supertuxkart_desktop.template
-+++ b/data/supertuxkart_desktop.template
-@@ -2,10 +2,10 @@
- Name=SuperTuxKart
- Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
- GenericName=A kart racing game
--GenericName[de_DE]=Ein Kart-Rennspiel
--GenericName[fr_FR]=Un jeu de karting
-+GenericName[de]=Ein Kart-Rennspiel
-+GenericName[fr]=Un jeu de karting
- GenericName[gl]=Xogo de carreiras con karts
--GenericName[ro_RO]=Un joc de curse cu carturi
-+GenericName[ro]=Un joc de curse cu carturi
- Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
- Terminal=false
- StartupNotify=false

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2015-05-13 08:15:08 UTC (rev 15410)
@@ -34,7 +34,7 @@
  #endif
  #define _IRR_POSIX_API_
  #define _IRR_COMPILE_WITH_X11_DEVICE_
-@@ -778,11 +782,7 @@
+@@ -404,11 +408,7 @@
  	#undef _IRR_WCHAR_FILESYSTEM
  #endif
  

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff	2015-05-13 08:15:08 UTC (rev 15410)
@@ -8,7 +8,7 @@
 +++ b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
 @@ -13,9 +13,11 @@
  #include <unistd.h>
- #ifndef _IRR_SOLARIS_PLATFORM_
+ #if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
  #include <sys/types.h>
 +#if !defined(__gnu_hurd__)
  #include <sys/sysctl.h>

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff	2015-05-13 08:15:08 UTC (rev 15410)
@@ -5,84 +5,12 @@
 
 Signed-off-by: Christoph Egger <debian at christoph-egger.org
 
---- a/lib/irrlicht/include/IrrCompileConfig.h
-+++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -238,6 +238,17 @@
- #undef _IRR_WCHAR_FILESYSTEM
- #endif
- 
-+//! Define _IRR_COMPILE_WITH_ZLIB_ to enable compiling the engine using zlib.
-+/** This enables the engine to read from compressed .zip archives. If you
-+disable this feature, the engine can still read archives, but only uncompressed
-+ones. */
-+#define _IRR_COMPILE_WITH_ZLIB_
-+
-+//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
-+/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
-+	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-+#undef _IRR_USE_NON_SYSTEM_ZLIB_
-+
- //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
- /** This enables the engine to read jpeg images. If you comment this out,
- the engine will no longer read .jpeg images. */
-@@ -249,10 +260,7 @@
- //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
--#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
--#endif
- 
- //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
- /** This enables the engine to read png images. If you comment this out,
-@@ -265,10 +273,7 @@
- //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
- 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_LIB_PNG_
--#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
--#endif
- 
- //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
- /** If _IRR_D3D_NO_SHADER_DEBUGGING is undefined in IrrCompileConfig.h,
-@@ -602,10 +607,7 @@
- /** If this is commented out, Irrlicht will try to compile using the zlib
- installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
- defined. */
--#define _IRR_USE_NON_SYSTEM_ZLIB_
--#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
- #undef _IRR_USE_NON_SYSTEM_ZLIB_
--#endif
- //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
- //#define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
- #ifdef NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_
-@@ -623,18 +625,12 @@
- /** If this is commented out, Irrlicht will try to compile using the bzlib
- installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
- defined. */
--#define _IRR_USE_NON_SYSTEM_BZLIB_
--#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
- #undef _IRR_USE_NON_SYSTEM_BZLIB_
--#endif
- //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
- /** LZMA is a very efficient compression code, known from 7zip. Irrlicht
- currently only supports zip archives, though. */
--//#define _IRR_COMPILE_WITH_LZMA_
--#ifdef NO_IRR_COMPILE_WITH_LZMA_
- #undef _IRR_COMPILE_WITH_LZMA_
- #endif
--#endif
- 
- //! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
- #define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
 +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
-@@ -22,7 +22,7 @@
- #define GLX_GLXEXT_LEGACY 1
+@@ -23,7 +23,7 @@
  #include <GL/glx.h>
  #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
 -#include "glxext.h"
 +#include <GL/glxext.h>
  #endif
@@ -90,38 +18,44 @@
  
 --- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
 +++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,7 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
 @@ -36,7 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -49,7 +49,7 @@
- 	#define NO_SDL_GLEXT
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 		#define GL_GLEXT_LEGACY 1
-@@ -61,9 +61,9 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -50,7 +50,7 @@
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
+         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 		#define GL_GLEXT_LEGACY 1
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
  	#include <GL/gl.h>
- 	#include <GL/glx.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 -	#include "glext.h"
 +	#include <GL/glext.h>
- 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
--	#include "glxext.h"
-+	#include <GL/glxext.h>
- 	#endif
- #endif
- 
---- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
 @@ -25,7 +25,7 @@
  	#include <GL/gl.h>
  #endif

Modified: packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2015-05-13 08:15:08 UTC (rev 15410)
@@ -1,22 +1,19 @@
 Description: Link against system copies of zlib/libpng/libjpeg/bzip2
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2012-12-29
+Last-Update: 2015-05-13
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -231,7 +231,13 @@
+@@ -315,6 +315,11 @@
      ${OGGVORBIS_LIBRARIES}
-     ${IRRLICHT_XF86VM_LIBRARY}
      ${OPENAL_LIBRARY}
--    ${OPENGL_LIBRARIES})
-+    ${OPENGL_LIBRARIES}
+     ${OPENGL_LIBRARIES}
 +    X11
 +    z
 +    png
 +    jpeg
 +    bz2
-+)
+     )
  
- if(APPLE)
-     # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
+ if(UNIX AND NOT APPLE)

Modified: packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2015-05-13 08:15:08 UTC (rev 15410)
@@ -9,128 +9,29 @@
  in debian/rules (e.g. in the clean target).
 Forwarded: no
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2013-12-19
+Last-Update: 2015-05-13
 
 --- a/lib/irrlicht/CMakeLists.txt
 +++ b/lib/irrlicht/CMakeLists.txt
-@@ -1,10 +1,6 @@
- # CMakeLists.txt for Irrlicht in STK
+@@ -2,11 +2,7 @@
+ find_package(PNG REQUIRED)
+ find_package(JPEG REQUIRED)
  
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/
--                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/jpeglib
--                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/libpng
--                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/zlib
--                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/bzip2)
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
+-                    "${JPEG_INCLUDE_DIR}"
+-                    "${PNG_INCLUDE_DIRS}"
+-                    "${ZLIB_INCLUDE_DIR}"
+-                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
  
- if(APPLE)
-     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/MacOSX ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht)
-@@ -650,108 +646,6 @@
- include/IBoneSceneNode.h
- include/IShaderConstantSetCallBack.h
- include/ITexture.h
--
--
--source/Irrlicht/zlib/infback.c
--source/Irrlicht/zlib/deflate.c
--source/Irrlicht/zlib/zutil.c
--source/Irrlicht/zlib/crc32.c
--source/Irrlicht/zlib/gzread.c
--source/Irrlicht/zlib/inffast.c
--source/Irrlicht/zlib/uncompr.c
--source/Irrlicht/zlib/inftrees.c
--source/Irrlicht/zlib/inflate.c
--source/Irrlicht/zlib/compress.c
--source/Irrlicht/zlib/adler32.c
--source/Irrlicht/zlib/gzwrite.c
--source/Irrlicht/zlib/trees.c
--source/Irrlicht/zlib/gzlib.c
--source/Irrlicht/zlib/gzclose.c
--source/Irrlicht/zlib/inffixed.h
--source/Irrlicht/zlib/inffast.h
--source/Irrlicht/zlib/zconf.h
--source/Irrlicht/zlib/zutil.h
--source/Irrlicht/zlib/inftrees.h
--source/Irrlicht/zlib/deflate.h
--source/Irrlicht/zlib/zlib.h
--source/Irrlicht/zlib/inflate.h
--source/Irrlicht/zlib/trees.h
--source/Irrlicht/zlib/gzguts.h
--source/Irrlicht/zlib/crc32.h
--
--
--source/Irrlicht/jpeglib/jaricom.c
--source/Irrlicht/jpeglib/jcapimin.c
--source/Irrlicht/jpeglib/jcapistd.c
--source/Irrlicht/jpeglib/jcarith.c
--source/Irrlicht/jpeglib/jccoefct.c
--source/Irrlicht/jpeglib/jccolor.c
--source/Irrlicht/jpeglib/jcdctmgr.c
--source/Irrlicht/jpeglib/jchuff.c
--source/Irrlicht/jpeglib/jcinit.c
--source/Irrlicht/jpeglib/jcmainct.c
--source/Irrlicht/jpeglib/jcmarker.c
--source/Irrlicht/jpeglib/jcmaster.c
--source/Irrlicht/jpeglib/jcomapi.c
--source/Irrlicht/jpeglib/jcparam.c
--source/Irrlicht/jpeglib/jcprepct.c
--source/Irrlicht/jpeglib/jcsample.c
--source/Irrlicht/jpeglib/jctrans.c
--source/Irrlicht/jpeglib/jdapimin.c
--source/Irrlicht/jpeglib/jdapistd.c
--source/Irrlicht/jpeglib/jdarith.c
--source/Irrlicht/jpeglib/jdatadst.c
--source/Irrlicht/jpeglib/jdatasrc.c
--source/Irrlicht/jpeglib/jdcoefct.c
--source/Irrlicht/jpeglib/jdcolor.c
--source/Irrlicht/jpeglib/jddctmgr.c
--source/Irrlicht/jpeglib/jdhuff.c
--source/Irrlicht/jpeglib/jdinput.c
--source/Irrlicht/jpeglib/jdmainct.c
--source/Irrlicht/jpeglib/jdmarker.c
--source/Irrlicht/jpeglib/jdmaster.c
--source/Irrlicht/jpeglib/jdmerge.c
--source/Irrlicht/jpeglib/jdpostct.c
--source/Irrlicht/jpeglib/jdsample.c
--source/Irrlicht/jpeglib/jdtrans.c
--source/Irrlicht/jpeglib/jerror.c
--source/Irrlicht/jpeglib/jfdctflt.c
--source/Irrlicht/jpeglib/jfdctfst.c
--source/Irrlicht/jpeglib/jfdctint.c
--source/Irrlicht/jpeglib/jidctflt.c
--source/Irrlicht/jpeglib/jidctfst.c
--source/Irrlicht/jpeglib/jidctint.c
--source/Irrlicht/jpeglib/jmemmgr.c
--source/Irrlicht/jpeglib/jmemnobs.c
--source/Irrlicht/jpeglib/jquant1.c
--source/Irrlicht/jpeglib/jquant2.c
--source/Irrlicht/jpeglib/jutils.c
--
--
--source/Irrlicht/libpng/pngwutil.c
--source/Irrlicht/libpng/pngget.c
--source/Irrlicht/libpng/pngrtran.c
--source/Irrlicht/libpng/pngrutil.c
--source/Irrlicht/libpng/pngerror.c
--source/Irrlicht/libpng/pngset.c
--source/Irrlicht/libpng/pngtest.c
--source/Irrlicht/libpng/pngmem.c
--source/Irrlicht/libpng/pngpread.c
--source/Irrlicht/libpng/png.c
--source/Irrlicht/libpng/pngread.c
--source/Irrlicht/libpng/pngwio.c
--source/Irrlicht/libpng/pngtrans.c
--source/Irrlicht/libpng/pngwrite.c
--source/Irrlicht/libpng/pngwtran.c
--source/Irrlicht/libpng/example.c
--source/Irrlicht/libpng/pngrio.c
--source/Irrlicht/libpng/png.h
--source/Irrlicht/libpng/pngdebug.h
--source/Irrlicht/libpng/pngconf.h
--source/Irrlicht/libpng/pngpriv.h
--source/Irrlicht/libpng/pnginfo.h
--source/Irrlicht/libpng/pnglibconf.h
--source/Irrlicht/libpng/pngstruct.h
- )
+ find_package(OpenGL REQUIRED)
+ include_directories(${OPENGL_INCLUDE_DIR})
+@@ -502,7 +498,7 @@
+ endif()
  
- if(APPLE)
+ add_library(stkirrlicht ${IRRLICHT_SOURCES})
+-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
++target_link_libraries(stkirrlicht png jpeg z)
+ 
+ 
+ 

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2015-05-13 07:18:02 UTC (rev 15409)
+++ packages/trunk/supertuxkart/debian/patches/series	2015-05-13 08:15:08 UTC (rev 15410)
@@ -1,6 +1,5 @@
 build_against_system_enet.patch
 link_against_system_libs.patch
-fix_desktop_file.patch
 remove_irrlicht_embedded_libs.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff

More information about the Pkg-games-commits mailing list