summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-12-28 23:05:46 -0500
committerMichael Sterrett <mr_bones_@gentoo.org>2015-12-29 02:40:51 -0500
commit38eb1039ea4457656b4a3c39266c490810814634 (patch)
tree3c4b1fe5dcaadb282fa3be7505dd1efce4d58527 /games-action/supertuxkart/files
parentold (diff)
downloadgentoo-38eb1039ea4457656b4a3c39266c490810814634.tar.gz
gentoo-38eb1039ea4457656b4a3c39266c490810814634.tar.bz2
gentoo-38eb1039ea4457656b4a3c39266c490810814634.zip
old
Package-Manager: portage-2.2.24
Diffstat (limited to 'games-action/supertuxkart/files')
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch20
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch24
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch47
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch19
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch69
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch11
-rw-r--r--games-action/supertuxkart/files/supertuxkart-0.8.1-mesa-10.x.patch38
7 files changed, 0 insertions, 228 deletions
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
deleted file mode 100644
index 17a723640f7f..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt.orig 2015-06-13 01:47:50.493401323 -0400
-+++ CMakeLists.txt 2015-06-13 01:48:53.691255054 -0400
-@@ -128,6 +128,9 @@
- find_package(OpenGL REQUIRED)
- include_directories(${OPENGL_INCLUDE_DIR})
-
-+find_package(X11 REQUIRED)
-+include_directories(${X11_INCLUDE_DIR})
-+
- if(UNIX AND NOT APPLE)
- find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
- mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
-@@ -239,6 +242,7 @@
- ${IRRLICHT_XF86VM_LIBRARY}
- ${OPENAL_LIBRARY}
- ${OPENGL_LIBRARIES}
-+ ${X11_LIBRARIES}
- png
- jpeg
- bz2
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
deleted file mode 100644
index 076645692bcd..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-desktopfile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Dec 13 18:45:18 UTC 2012
-Subject: fix desktop file
-
---- data/supertuxkart_desktop.template
-+++ data/supertuxkart_desktop.template
-@@ -1,14 +1,14 @@
- [Desktop Entry]
- Name=SuperTuxKart
--Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
-+Icon=supertuxkart
- GenericName=A kart racing game
- GenericName[de_DE]=Ein Kart-Rennspiel
- GenericName[fr_FR]=Un jeu de karting
- GenericName[gl]=Xogo de carreiras con karts
- GenericName[ro_RO]=Un joc de curse cu carturi
--Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
-+Exec=@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
- Terminal=false
- StartupNotify=false
- Type=Application
--TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
-+TryExec=@STK_INSTALL_BINARY_DIR@/supertuxkart
- Categories=Game;ArcadeGame;
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
deleted file mode 100644
index 647c52245dab..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-gentoo specific hacks because we unbundle the
-deps of irrlicht
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ 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")
-
- # Build the Wiiuse library
-@@ -137,6 +136,13 @@ else()
- endif()
-
-
-+# Irrlicht
-+if (APPLE)
-+ set(IRRLICHT_LIBRARY "/Library/Frameworks/IrrFramework.framework")
-+else()
-+ set(IRRLICHT_LIBRARY ${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a)
-+endif()
-+
-
- # Set some compiler options
- if(UNIX)
-@@ -226,12 +232,17 @@ target_link_libraries(supertuxkart
- bulletcollision
- bulletmath
- enet
-- stkirrlicht
- ${CURL_LIBRARIES}
-+ ${IRRLICHT_LIBRARIES}
- ${OGGVORBIS_LIBRARIES}
-+ ${IRRLICHT_LIBRARY}
- ${IRRLICHT_XF86VM_LIBRARY}
- ${OPENAL_LIBRARY}
-- ${OPENGL_LIBRARIES})
-+ ${OPENGL_LIBRARIES}
-+ png
-+ jpeg
-+ bz2
-+ z)
-
- 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
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
deleted file mode 100644
index 5ce3fff0dd39..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit f46a26640382ffc76e71f58eaaf1e5223a11c9a0
-Author: hasufell <hasufell@gentoo.org>
-Date: Tue Nov 26 22:13:21 2013 +0100
-
- fix icon install dest
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -304,7 +304,9 @@ endif()
- install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
- install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE)
- install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
--install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
-+install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
-+install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
-+
-
- set(PREFIX ${CMAKE_INSTALL_PREFIX})
- configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch
deleted file mode 100644
index 43130d14a09a..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-irrlicht.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-unbundle Irrlicht dependencies
-and respect CFLAGS
-
---- lib/irrlicht/include/IrrCompileConfig.h
-+++ lib/irrlicht/include/IrrCompileConfig.h
-@@ -245,7 +245,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_
-+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #endif
-@@ -261,7 +261,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_
-+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
- #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
- #endif
-@@ -598,7 +598,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_
-+//#define _IRR_USE_NON_SYSTEM_ZLIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
- #undef _IRR_USE_NON_SYSTEM_ZLIB_
- #endif
---- lib/irrlicht/source/Irrlicht/Makefile
-+++ lib/irrlicht/source/Irrlicht/Makefile
-@@ -46,11 +46,7 @@
- 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
- 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
--JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
--LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
- LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
-
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions
- EXTRAOBJ =
-@@ -61,18 +57,16 @@
-
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti
- ifndef NDEBUG
--CXXFLAGS += -g -D_DEBUG
--else
--CXXFLAGS += -fexpensive-optimizations -O3
-+CXXFLAGS += -D_DEBUG
- endif
- ifdef PROFILE
- CXXFLAGS += -pg
- endif
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC
- sharedlib sharedlib_osx: CFLAGS += -fPIC
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch
deleted file mode 100644
index b1bae371b71d..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp.old
-+++ lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- // DO NOTHING
-- return 1;
-+ return TRUE;
- }
-
-
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-mesa-10.x.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-mesa-10.x.patch
deleted file mode 100644
index b4d8e68a9049..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-mesa-10.x.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Apr 29 23:28:11 UTC 2014
-Subject: fix build with mesa-10.x
-
---- lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-+++ lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,6 +21,7 @@
- #endif
- #include <GL/gl.h>
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- #include "glext.h"
- #endif
- #include "wglext.h"
-@@ -36,6 +37,7 @@
- #endif
- #include <OpenGL/gl.h>
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- #include "glext.h"
- #endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-@@ -49,6 +51,7 @@
- #define NO_SDL_GLEXT
- #include <SDL/SDL_video.h>
- #include <SDL/SDL_opengl.h>
-+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- #include "glext.h"
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -61,6 +64,7 @@
- #include <GL/gl.h>
- #include <GL/glx.h>
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
- #include "glext.h"
- #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- #include "glxext.h"