X-Git-Url: https://git.sthu.org/?p=shuber-gentoo-overlay.git;a=blobdiff_plain;f=games-action%2Fsupertuxkart%2Ffiles%2Fsupertuxkart-0.8.1-irrlicht.patch;fp=games-action%2Fsupertuxkart%2Ffiles%2Fsupertuxkart-0.8.1-irrlicht.patch;h=0000000000000000000000000000000000000000;hp=43130d14a09a89dbe445dbe4d5117ef318102a5f;hb=48cd36aa3925a1da5bdb0911eacf5bcd8597d8d7;hpb=73fa44dbd16d18877a0a938e8dbb6bd1510a263e 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 43130d1..0000000 --- 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