Upgraded Irrlicht SVN version to 3843 revision, and built SuperTuxKart 0.7.2...

Upgraded Irrlicht SVN version to 3843 revision, and built SuperTuxKart 0.7.2 version against it. Also, fixed several issues STK PKGBUILD had before, like run script not being build right.

Upgraded Irrlicht SVN version to 3843 revision, and built SuperTuxKart 0.7.2...
Upgraded Irrlicht SVN version to 3843 revision, and built SuperTuxKart 0.7.2 version against it. Also, fixed several issues STK PKGBUILD had before, like run script not being build right.
2b2fe90c · Adrián Chaves Fernández (Gallaecio) · 90805618 · 2b2fe90c · 2b2fe90c · 2b2fe90c
Commit 2b2fe90c authored Jul 26, 2011 by Adrián Chaves Fernández (Gallaecio)
4 changed files
--- a/irrlicht-svn/PKGBUILD
+++ b/irrlicht-svn/PKGBUILD
@@ -5,99 +5,76 @@

 pkgname=irrlicht-svn
 _pkgname=irrlicht
-pkgver=3777
-pkgrel=3
+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=('freeglut' 'libgl' 'libjpeg' 'bzip2')
+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() {
-  msg "Starting SVN checkout..."
- 
+build() { 
  cd $srcdir
- 
+
  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up)
+    (cd $_svnmod && svn up -r $pkgver)
  else
-    svn co $_svntrunk $_svnmod
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
  fi
- 
-  msg "SVN checkout done or server timeout."
+
+  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
- 
-  # Use system libraries.
-  sed -i -e '/^#define.*NON_SYSTEM*/d'	include/IrrCompileConfig.h || return 1

-  cd source/Irrlicht
-  sed -i -e "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
-	 -e '/^CXXFLAGS/s:-g.*::' \
-         -e '/^CXXFLAGS/s:-Wall::' \
+  # 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 '/^CXXINCS/s:-Izlib -Ijpeglib::' \
-	 -e '/^ZLIBOBJ/d' \
-         -e '/^JPEGLIBOBJ/d' \
-         -e '/^BZIP2OBJ/d' \
-	 -e '/.o=.d/d' \
-	 -e '/^sharedlib: LDFLAGS/s:+=:+= -lGL -lXxf86vm -ljpeg -lbz2 -lz:' \
-         -e 's/0-SVN/1/' \
-         -e 's/.$(VERSION_MINOR) -o/ -o/' \
-	 Makefile || return 1
-
-  make sharedlib || return 1
+	 -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/lib \
-             $pkgdir/usr/share/licenses/$_pkgname \
-             $pkgdir/usr/share/$_pkgname/examples/bin \
-             $pkgdir/usr/share/doc/$_pkgname
+  install -d $pkgdir/usr/share/licenses/$_pkgname \
+             $pkgdir/usr/share/doc/$_pkgname       

-  make install || return 1
+  make install

  cd $srcdir/$_svnmod-build/
  install -m644 readme.txt $pkgdir/usr/share/licenses/$_pkgname

-  # Install static library and fix headers permissions
-  install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib
-  chmod 644 $pkgdir/usr/include/$_pkgname/*
-
-  # Install media files for examples
-  cp -r media $pkgdir/usr/share/$_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
-
-  # Just a helper for examples compilation
-  ln -s libIrrlicht.so.$pkgver $srcdir/$_svnmod-build/lib/Linux/libIrrlicht.so
-
-  # Edit, build and install the examples
-  cd $srcdir/$_svnmod-build/examples
-  sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h || return 1
-  sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *)
-
-  make
-
-  install -m755  ../bin/Linux/* /$pkgdir/usr/share/$_pkgname/examples/bin/
+  ln -s libIrrlicht.so.$_pkgver libIrrlicht.so.1
+  ln -s libIrrlicht.so.$_pkgver libIrrlicht.so
 }
--- a/irrlicht-svn/include-config.diff
+++ b/irrlicht-svn/include-config.diff
+--- IrrCompileConfig.h.orig	2011-07-26 22:02:46.000000000 +0200
+++ IrrCompileConfig.h	2011-07-26 22:08:43.000000000 +0200
+@@ -244,10 +244,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_
+-#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+-#endif
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+ /** This enables the engine to read png images. If you comment this out,
+@@ -260,10 +257,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_
+-#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+-#endif
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+ /** If _IRR_D3D_NO_SHADER_DEBUGGING is undefined in IrrCompileConfig.h,
+@@ -581,17 +575,11 @@
+ disable this feature, the engine can still read archives, but only uncompressed
+ ones. */
+ #define _IRR_COMPILE_WITH_ZLIB_
+-#ifdef NO_IRR_COMPILE_WITH_ZLIB_
+-#undef _IRR_COMPILE_WITH_ZLIB_
+-#endif
+ //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
+ /** 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_
+-#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+-#endif
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ #ifdef NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+@@ -609,18 +597,12 @@
+ /** If this is commented out, Irrlicht will try to compile using the bzlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_BZLIB_
+-#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #undef _IRR_USE_NON_SYSTEM_BZLIB_
+-#endif
+ //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
+ /** LZMA is a very efficient compression code, known from 7zip. Irrlicht
+ currently only supports zip archives, though. */
+-#define _IRR_COMPILE_WITH_LZMA_
+-#ifdef NO_IRR_COMPILE_WITH_LZMA_
+ #undef _IRR_COMPILE_WITH_LZMA_
+ #endif
+-#endif
+ 
+ //! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
+ #define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
--- a/irrlicht-svn/makefile-fixes.diff
+++ b/irrlicht-svn/makefile-fixes.diff
+--- Makefile.orig	2011-07-25 22:23:49.000000000 +0200
+++ Makefile	2011-07-26 22:17:45.000000000 +0200
+@@ -37,7 +37,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
+@@ -50,14 +50,14 @@
+ EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
+	$(IRRGUIOBJ) $(LIBAESGM) \
+ 	$(BZIP2OBJ) $(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
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+ else
+@@ -83,7 +83,7 @@
+ 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
+ 
+ #OSX specific options
--- a/supertuxkart/PKGBUILD
+++ b/supertuxkart/PKGBUILD
@@ -5,18 +5,17 @@

 pkgname=supertuxkart
 _pkgname=SuperTuxKart
-pkgver=0.7.1b
-_pkgver=0.7.1
-pkgrel=2
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="Kart racing game featuring Tux and friends."
 url="http://supertuxkart.sourceforge.net/"
 arch=('i686' 'x86_64')
-license=('GPL3' 'GPL2' 'CCPL-by' 'CCPL-by-sa' 'custom:Creative Commons Sampling Plus 1.0' 'custom:FreeArt License' 'custom:SoundSnap license' 'custom:Public Domain')
+license=('GPL3' 'GPL2' 'CCPL-by' 'CCPL-by-sa' 'custom:Creative Commons Sampling Plus 1.0' 'custom:SoundSnap license' 'custom:Public Domain')
 depends=('bzip2' 'enet' 'freeglut' 'irrlicht' 'libgl' 'libjpeg' 'libogg' 'libpng' 'libvorbis' 'openal')
 conflicts=('supertuxkart-svn')
 changelog=ChangeLog
-source=(http://downloads.sourceforge.net/project/$pkgname/$_pkgname/$_pkgver/$pkgname-$pkgver-src.tar.bz2)
-md5sums=('8538d147d3178035be6e1519a509e4f5')
+source=(http://downloads.sourceforge.net/project/$pkgname/$_pkgname/$pkgver/$pkgname-$pkgver-src.tar.bz2)
+md5sums=('65a5fb2eb9cf6d3f868eb8a504383c9a')

 build() {
  cd $srcdir/$pkgname-$pkgver
@@ -35,9 +34,24 @@ package() {
  
  make DESTDIR=$pkgdir install

-  # Add executable link from /usr/bin
+  # Add executable link from ‘/usr/bin’.
  mkdir -p $pkgdir/usr/bin/
-  echo "#!/bin/bash"		 > $pkgname
-  echo "/usr/games/$pkgname"	>> $pkgname
-  chmod +x ./$pkgname
+  echo '#!/bin/bash'			 > $pkgdir/usr/bin/$pkgname
+  echo "/usr/games/$pkgname \$@"	>> $pkgdir/usr/bin/$pkgname
+  chmod +x $pkgdir/usr/bin/$pkgname
+
+  # Set right game version in .desktop file.
+  sed -i -e "s/0.5/$pkgver/" $pkgdir/usr/share/applications/$pkgname.desktop
+
+  # Remove AUTHORS file from documentation folder.
+  rm $pkgdir/usr/share/doc/$pkgname/AUTHORS
+
+  # Create license folder.
+  install -d $pkgdir/usr/share/licenses/$pkgname
+
+  # Link credits from license folder.
+  ln -s $pkgdir/usr/share/games/$pkgname/data/CREDITS $pkgdir/usr/share/licenses/$pkgname/AUTHORS
+
+  # Move license from documentation folder to license folder.
+  mv $pkgdir/usr/share/doc/$pkgname/COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }