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

Vincent Cheng vcheng at moszumanska.debian.org
Mon Dec 18 05:18:03 UTC 2017 

Author: vcheng
Date: 2017-12-18 05:18:03 +0000 (Mon, 18 Dec 2017)
New Revision: 16074

Removed:
   packages/trunk/supertuxkart/debian/patches/irrlicht/link-against-needed-libs.diff
Modified:
   packages/trunk/supertuxkart/debian/changelog
   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/series
Log:
supertuxkart: refresh patches again


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/changelog	2017-12-18 05:18:03 UTC (rev 16074)
@@ -4,7 +4,8 @@
     - Fix segfault in MusicInformation::isPlaying. (Closes: #873670)
     - Fix credits for Boom-boom-boom song. (Closes: #848001)
     - Remove obsolete patches: replace-fonts-ubuntu-with-cantarell.patch,
-      update_boom_boom_boom_license.patch.
+      update_boom_boom_boom_license.patch, fix_angelscript_ftbfs.patch,
+      irrlicht/link-against-needed-libs.diff.
     - Refresh remaining patches.
   * Bump Standards version to 4.1.2.
     - Change priority of debug package from extra to optional.

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/arch-support.diff	2017-12-18 05:18:03 UTC (rev 16074)
@@ -23,18 +23,18 @@
 
 --- a/lib/irrlicht/include/IrrCompileConfig.h
 +++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -101,6 +101,10 @@
+@@ -109,6 +109,10 @@
+ #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) && !defined(_IRR_ANDROID_PLATFORM_)
  #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_
-@@ -406,11 +410,7 @@
+ #define _IRR_COMPILE_WITH_X11_DEVICE_
+@@ -460,11 +464,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	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/fix-hurd-ftbfs.diff	2017-12-18 05:18:03 UTC (rev 16074)
@@ -2,19 +2,20 @@
  sys/sysctl.h is not implemented on hurd, so don't include it if we're
  building Irrlicht on hurd.
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 05-29-2012
+Last-Update: 12-17-2017
 
 --- a/lib/irrlicht/source/Irrlicht/COSOperator.cpp
 +++ b/lib/irrlicht/source/Irrlicht/COSOperator.cpp
-@@ -14,9 +14,11 @@
- #if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
- #include <sys/param.h>
- #include <sys/types.h>
+@@ -17,10 +17,12 @@
+ #ifdef ANDROID
+ #include <linux/sysctl.h>
+ #else
 +#if !defined(__gnu_hurd__)
  #include <sys/sysctl.h>
  #endif
  #endif
+ #endif
 +#endif
  
- #if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
- #include "CIrrDeviceLinux.h"
+ #include <cassert>
+ 

Deleted: packages/trunk/supertuxkart/debian/patches/irrlicht/link-against-needed-libs.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/link-against-needed-libs.diff	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/link-against-needed-libs.diff	2017-12-18 05:18:03 UTC (rev 16074)
@@ -1,24 +0,0 @@
-From: Christoph Egger <Christoph.Egger at gmx.de>
-Subject: [PATCH] debian/link-against-needed-libs
-
-There are quite some libraries irrlicht needs but does not link
-against. This patch makes irrlicht link correctly against all the
-needed libraries.
-
-Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
-
----
- lib/irrlicht/source/Irrlicht/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/lib/irrlicht/source/Irrlicht/Makefile
-+++ b/lib/irrlicht/source/Irrlicht/Makefile
-@@ -88,7 +88,7 @@
- LIB_PATH = ../../lib/$(SYSTEM)
- INSTALL_DIR = /usr/local/lib
- sharedlib install: SHARED_LIB = libIrrlicht.so
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-+staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
- 
- #OSX specific options

Modified: packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff
===================================================================
--- packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/patches/irrlicht/use-system-libs.diff	2017-12-18 05:18:03 UTC (rev 16074)
@@ -5,10 +5,10 @@
 
 Signed-off-by: Christoph Egger <debian at christoph-egger.org
 
---- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
-+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
-@@ -23,7 +23,7 @@
- #include <GL/glx.h>
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+@@ -33,7 +33,7 @@
+ #include <GL/gl.h>
  #ifdef _IRR_OPENGL_USE_EXTPOINTER_
  #define GLX_GLXEXT_PROTOTYPES
 -#include "glxext.h"
@@ -65,41 +65,3 @@
  #endif
  #endif
  
---- a/lib/irrlicht/source/Irrlicht/Makefile
-+++ b/lib/irrlicht/source/Irrlicht/Makefile
-@@ -43,7 +43,7 @@
- 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
- IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
- IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
--IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
-+IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
- ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
-@@ -56,14 +56,14 @@
- EXTRAOBJ =
- LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
- 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
--	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
--	$(BZIP2OBJ) $(EXTRAOBJ)
-+	$(IRRGUIOBJ) $(LIBAESGM) \
-+	$(EXTRAOBJ)
- 
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include # -Izlib -Ijpeglib -Ilibpng
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
-+CXXFLAGS += -Wall -pipe -fno-exceptions -fstrict-aliasing
- ifndef NDEBUG
- CXXFLAGS += -g -D_DEBUG
- else
-@@ -154,6 +154,7 @@
- 	mkdir -p $(INSTALL_DIR)/../include/irrlicht
- 	cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
- 	cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
-+	cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR)
- 	cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
- 	cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
- #	ldconfig -n $(INSTALL_DIR)

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2017-12-18 04:51:13 UTC (rev 16073)
+++ packages/trunk/supertuxkart/debian/patches/series	2017-12-18 05:18:03 UTC (rev 16074)
@@ -4,5 +4,4 @@
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff
 irrlicht/use-system-libs.diff
-irrlicht/link-against-needed-libs.diff
 irrlicht/fix-hurd-ftbfs.diff

More information about the Pkg-games-commits mailing list