diff --git a/cegui/PKGBUILD b/cegui/PKGBUILD index 50cc4bce1847675c46ea573b23d7d1850c11fafa..1ae7958c16ffbf4987b001bbe0c42b3be358383a 100644 --- a/cegui/PKGBUILD +++ b/cegui/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cegui _pkgname=CEGUI pkgver=0.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines." arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" @@ -19,6 +19,9 @@ md5sums=('8b83577f86eaa1581765dd155c7c8f24') build() { cd "${srcdir}/${_pkgname}-${pkgver}" + + # Typo fixed in Irrlicht 1.8.0, whereas CEGUI 0.7.7 was based on Irrlicht 1.7.x. + sed -e "s#texureBlend#textureBlend#" -i cegui/src/RendererModules/Irrlicht/CEGUIIrrlichtGeometryBuffer.cpp ./bootstrap ./configure \ diff --git a/cegui/fix-missing-ptrdiff_t.patch b/cegui/fix-missing-ptrdiff_t.patch deleted file mode 100644 index f5117034f6b1da6f5a249f8078ee8a2b567698ef..0000000000000000000000000000000000000000 --- a/cegui/fix-missing-ptrdiff_t.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# HG changeset patch -# User Paul Turner -# Date 1303380086 -3600 -# Node ID c813e7a3e87311cf52a4534fdd373e5d91ca8ee3 -# Parent a208cc7c172bc454fd41d13634fd6d57cb5516b3 -FIX: include of cstddef header was missing for ptrdiff_t useage. see: http://www.cegui.org.uk/phpBB2/viewtopic.php?f=3&t=5546 - -diff -r a208cc7c172b -r c813e7a3e873 cegui/include/CEGUIString.h ---- a/cegui/include/CEGUIString.h Thu Apr 21 08:21:25 2011 +0100 -+++ b/cegui/include/CEGUIString.h Thu Apr 21 11:01:26 2011 +0100 -@@ -31,9 +31,9 @@ - #define _CEGUIString_h_ - - #include "CEGUIBase.h" --#include - #include - #include -+#include - - // Start of CEGUI namespace section - namespace CEGUI -@@ -62,7 +62,7 @@ - *************************************************************************/ - typedef utf32 value_type; //!< Basic 'code point' type used for String (utf32) - typedef size_t size_type; //!< Unsigned type used for size values and indices -- typedef ptrdiff_t difference_type; //!< Signed type used for differences -+ typedef std::ptrdiff_t difference_type; //!< Signed type used for differences - typedef utf32& reference; //!< Type used for utf32 code point references - typedef const utf32& const_reference; //!< Type used for constant utf32 code point references - typedef utf32* pointer; //!< Type used for utf32 code point pointers - diff --git a/irrlicht-svn/ChangeLog b/irrlicht-svn/ChangeLog deleted file mode 100644 index d3378f32d618f16b9100958a202e73aa31d9abd9..0000000000000000000000000000000000000000 --- a/irrlicht-svn/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2010-11-16 Adrián Chaves Fernández (Gallaecio) - - * 1.7.2-1 : - Upgraded. - -2010-09-15 Adrián Chaves Fernández (Gallaecio) - - * 1.7.1-1 : - Imported from Arch Linux Packages. diff --git a/irrlicht-svn/PKGBUILD b/irrlicht-svn/PKGBUILD deleted file mode 100644 index cfa089283dc52ba7d968db68aef1659173986d91..0000000000000000000000000000000000000000 --- a/irrlicht-svn/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# -# Games Packages for Chakra, part of chakra-project.org -# -# Maintainer: Adrián Chaves Fernández (Gallaecio) - -pkgname=irrlicht-svn -_pkgname=irrlicht -pkgver=3843 -_pkgver=1.8.0 -pkgrel=1 -pkgdesc="High performance realtime 3D graphics engine." -arch=('i686' 'x86_64') -url="http://irrlicht.sourceforge.net/" -license=('ZLIB') -depends=('bzip2' 'freeglut' 'libgl' 'libjpeg' 'libpng' 'zlib') -makedepends=('subversion') -changelog=ChangeLog -provides=('irrlicht') -replaces=('irrlicht') # It will be this way until SuperTuxKart supports a stable release. -conflicts=('irrlicht') -source=(include-config.diff - makefile-fixes.diff) -md5sums=('7ff49d8ddc50deac316f4e2141828f31' - '1b5ffa3a9bfa005f18799a36a1bb477a') - -_svntrunk="https://$_pkgname.svn.sourceforge.net/svnroot/$_pkgname/trunk" -_svnmod="$_pkgname" - -build() { - cd $srcdir - - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - rm -rf $srcdir/$_svnmod-build - cp -r $srcdir/$_svnmod $srcdir/$_svnmod-build - cd $srcdir/$_svnmod-build - - # Patches. - patch -uN $srcdir/$_svnmod-build/include/IrrCompileConfig.h $srcdir/include-config.diff - patch -uN $srcdir/$_svnmod-build/source/Irrlicht/Makefile $srcdir/makefile-fixes.diff - sed -i -e '/^CXXFLAGS/s:-g.*::' \ - -e '/^CXXFLAGS/s:-Wall::' \ - -e '/^CFLAGS/s/:= -O3 -fexpensive-optimizations/+=/' \ - -e 's:--no-export-all-symbols --add-stdcall-alias::' \ - -e 's/0-SVN/0/' \ - -e "/^INSTALL_DIR/s:=.*:= ${pkgdir}/usr/lib:" \ - $srcdir/$_svnmod-build/source/Irrlicht/Makefile - - # Compilation. - cd source/Irrlicht - make sharedlib - make -} - -package() { - cd $srcdir/$_svnmod-build/source/Irrlicht - - install -d $pkgdir/usr/share/licenses/$_pkgname \ - $pkgdir/usr/share/doc/$_pkgname - - make install - - cd $srcdir/$_svnmod-build/ - install -m644 readme.txt $pkgdir/usr/share/licenses/$_pkgname - - # Install documentation - cp -r doc/* $pkgdir/usr/share/doc/$_pkgname - rm -f $pkgdir/usr/share/doc/$_pkgname/*.txt - - cd $pkgdir/usr/lib - ln -s libIrrlicht.so.$_pkgver libIrrlicht.so.1 - ln -s libIrrlicht.so.$_pkgver libIrrlicht.so -} diff --git a/irrlicht/PKGBUILD b/irrlicht/PKGBUILD new file mode 100644 index 0000000000000000000000000000000000000000..0283522150595cc689c478f340c2211da74a29a0 --- /dev/null +++ b/irrlicht/PKGBUILD @@ -0,0 +1,50 @@ +# +# Games Packages for Chakra, part of chakra-project.org +# +# Maintainer: Adrian Chaves Fernandez (Gallaecio) + +pkgname=irrlicht +pkgver=1.8.0 +verpfx=${pkgver:0:(-2)} +pkgrel=1 +pkgdesc="High performance realtime 3D graphics engine." +arch=('i686' 'x86_64') +url="http://irrlicht.sourceforge.net/" +license=('ZLIB') +depends=('bzip2' 'freeglut' 'libgl' 'libjpeg' 'libpng' 'zlib') +provides=('irrlicht') +conflicts=('irrlicht-svn') +source=("http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.zip" + "include-config.diff" + "makefile-systemlibs.diff") +md5sums=('d06329d8f466658caaf4838ba349e393' + '7ff49d8ddc50deac316f4e2141828f31' + '2385b8b5ed3bf9588b2f5db9af3f4788') + +build() { + # Patches. + patch -uN $srcdir/$pkgname-$verpfx/include/IrrCompileConfig.h $srcdir/include-config.diff + patch -uN $srcdir/$pkgname-$verpfx/source/Irrlicht/Makefile $srcdir/makefile-systemlibs.diff + + cd $srcdir/$pkgname-$verpfx/source/Irrlicht + sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \ + Makefile + + # Compilation. + make sharedlib NDEBUG=1 +} + +package() { + cd $srcdir/$pkgname-$verpfx/source/Irrlicht + + make install + + install -d $pkgdir/usr/share/licenses/$pkgname \ + $pkgdir/usr/share/doc/$pkgname + + install -m644 $srcdir/$pkgname-$verpfx/readme.txt $pkgdir/usr/share/licenses/$pkgname + + # Install documentation + cp -r $srcdir/$pkgname-$verpfx/doc/* $pkgdir/usr/share/doc/$pkgname + rm -f $pkgdir/usr/share/doc/$pkgname/*.txt +} diff --git a/irrlicht-svn/include-config.diff b/irrlicht/include-config.diff similarity index 100% rename from irrlicht-svn/include-config.diff rename to irrlicht/include-config.diff diff --git a/irrlicht-svn/makefile-fixes.diff b/irrlicht/makefile-systemlibs.diff similarity index 87% rename from irrlicht-svn/makefile-fixes.diff rename to irrlicht/makefile-systemlibs.diff index 318913897a8b0bb8a5b645f63dac35dec524ed7a..adc5c9e3dcfa6a42a98f9bf14bb83b12e2a8dbb3 100644 --- a/irrlicht-svn/makefile-fixes.diff +++ b/irrlicht/makefile-systemlibs.diff @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-07-25 22:23:49.000000000 +0200 -+++ Makefile 2011-07-26 22:17:45.000000000 +0200 -@@ -37,7 +37,7 @@ +--- Makefile.old 2012-11-05 15:14:12.000000000 +0100 ++++ Makefile 2012-11-10 17:51:41.474234126 +0100 +@@ -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 @@ -9,28 +9,26 @@ 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 -@@ -50,14 +50,14 @@ +@@ -56,12 +56,12 @@ EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ +- $(BZIP2OBJ) $(EXTRAOBJ) + $(IRRGUIOBJ) $(LIBAESGM) \ - $(BZIP2OBJ) $(EXTRAOBJ) ++ $(EXTRAOBJ) ############### #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 -pipe -fno-exceptions -fstrict-aliasing + CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing ifndef NDEBUG - CXXFLAGS += -g -D_DEBUG - else -@@ -83,7 +83,7 @@ +@@ -88,7 +88,7 @@ + LIB_PATH = ../../lib/$(SYSTEM) INSTALL_DIR = /usr/local/lib sharedlib install: SHARED_LIB = libIrrlicht.so - staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2 staticlib sharedlib: CXXINCS += -I/usr/X11R6/include diff --git a/supertuxkart/PKGBUILD b/supertuxkart/PKGBUILD index 196d9ea63e0fdd780ec54a2896ff08394b14fc6f..df8763d6a6cb6d2620901f2e54551a9b4e577454 100644 --- a/supertuxkart/PKGBUILD +++ b/supertuxkart/PKGBUILD @@ -6,7 +6,7 @@ pkgname=supertuxkart _pkgname=SuperTuxKart pkgver=0.7.3 -pkgrel=3 +pkgrel=5 pkgdesc="Kart racing game featuring Tux and friends." url="http://supertuxkart.sourceforge.net/" arch=('i686' 'x86_64') @@ -21,6 +21,13 @@ md5sums=('502664b2ec9ad5ab88b1882fef4c074d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Typo fixed in Irrlicht 1.8.0, already fixed in STK 0.8.0. + sed -e "s#texureBlend#textureBlend#g" -i "src/graphics/material.cpp" + + # http://sourceforge.net/apps/trac/supertuxkart/changeset/10229 + sed -e "s#virtual video::SColor const \& getOverrideColor(#virtual video::SColor getOverrideColor(#" -i "src/guiengine/widgets/CGUIEditBox.h" + sed -e "s#video::SColor const\& CGUIEditBox::getOverrideColor(#video::SColor CGUIEditBox::getOverrideColor(#" -i "src/guiengine/widgets/CGUIEditBox.cpp" + LDFLAGS="-lpng -ljpeg -lpthread" \ LIBS="-lbz2" \ ./configure \