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

[Vincent Cheng]

Author: vcheng
Date: 2016-07-08 06:56:20 +0000 (Fri, 08 Jul 2016)
New Revision: 15833

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/link_against_system_libs.patch
   packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
Log:
supertuxkart: refresh patches


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/changelog	2016-07-08 06:56:20 UTC (rev 15833)
@@ -4,6 +4,7 @@
     - Fix FTBFS with gcc 6. (Closes: #811724)
     - Drop patches fix_angelscript_build_on_non-x86_arches.patch and
       srgb_workaround.patch; applied upstream.
+    - Refresh remaining patches.
 
  -- Vincent Cheng <vcheng at debian.org>  Thu, 07 Jul 2016 23:40:10 -0700
 

Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch	2016-07-08 06:56:20 UTC (rev 15833)
@@ -1,11 +1,11 @@
 Description: Build supertuxkart against system enet instead of embedded copy
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2015-05-13
+Last-Update: 2016-07-17
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -62,9 +62,9 @@
+@@ -63,9 +63,9 @@
  add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
  include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
  
@@ -17,8 +17,8 @@
 +include_directories(${ENET_INCLUDE_DIR})
  
  # Build glew library
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-@@ -331,11 +331,11 @@
+ add_definitions(-DGLEW_NO_GLU)
+@@ -342,11 +342,11 @@
      bulletdynamics
      bulletcollision
      bulletmath

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2016-07-08 06:56:20 UTC (rev 15833)
@@ -23,18 +23,18 @@
 
 --- a/lib/irrlicht/include/IrrCompileConfig.h
 +++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -100,6 +100,10 @@
- #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
+@@ -101,6 +101,10 @@
  #ifndef _IRR_SOLARIS_PLATFORM_
+ #if !defined(__linux__) && !defined(__FreeBSD__)
  #define _IRR_LINUX_PLATFORM_
 +#include <endian.h>
 + #if __BYTE_ORDER == __BIG_ENDIAN
 +  #define __BIG_ENDIAN__
 + #endif
  #endif
+ #endif
  #define _IRR_POSIX_API_
- #define _IRR_COMPILE_WITH_X11_DEVICE_
-@@ -404,11 +408,7 @@
+@@ -406,11 +410,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	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff	2016-07-08 06:56:20 UTC (rev 15833)
@@ -6,9 +6,9 @@
 
 --- a/lib/irrlicht/source/Irrlicht/COSOperator.cpp
 +++ b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
-@@ -13,9 +13,11 @@
- #include <unistd.h>
+@@ -14,9 +14,11 @@
  #if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
+ #include <sys/param.h>
  #include <sys/types.h>
 +#if !defined(__gnu_hurd__)
  #include <sys/sysctl.h>

Modified: packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch	2016-07-08 06:56:20 UTC (rev 15833)
@@ -1,14 +1,14 @@
 Description: Link against system copies of zlib/libpng/libjpeg/bzip2
 Forwarded: not-yet
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2015-05-13
+Last-Update: 2016-07-17
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -339,6 +339,11 @@
-     ${OGGVORBIS_LIBRARIES}
+@@ -351,6 +351,11 @@
      ${OPENAL_LIBRARY}
      ${OPENGL_LIBRARIES}
+     ${FREETYPE_LIBRARIES}
 +    X11
 +    z
 +    png

Modified: packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2016-07-08 06:48:52 UTC (rev 15832)
+++ packages/trunk/supertuxkart/debian/patches/remove_irrlicht_embedded_libs.patch	2016-07-08 06:56:20 UTC (rev 15833)
@@ -7,7 +7,7 @@
  in debian/rules (e.g. in the clean target).
 Forwarded: no
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2015-05-13
+Last-Update: 2016-07-07
 
 --- a/lib/irrlicht/CMakeLists.txt
 +++ b/lib/irrlicht/CMakeLists.txt
@@ -24,12 +24,12 @@
  
  find_package(OpenGL REQUIRED)
  include_directories(${OPENGL_INCLUDE_DIR})
-@@ -502,7 +498,7 @@
+@@ -508,7 +504,7 @@
  endif()
  
- add_library(stkirrlicht ${IRRLICHT_SOURCES})
+ add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
 -target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
 +target_link_libraries(stkirrlicht png jpeg z)
  
- 
- 
+ if(WIN32)
+     target_link_libraries(stkirrlicht imm32)