Mon Feb 6 23:14:50 UTC 2012

2 files changed, 84 insertions, 21 deletions

diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index 7206154f9..3f00c689d 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -1,39 +1,45 @@
-# $Id: PKGBUILD 9321 2010-01-25 01:55:48Z ibiru $
+# $Id: PKGBUILD 63544 2012-02-05 11:55:05Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Eric Belanger <eric.archlinux.org>
 # Contributor: Fabio Scotoni <CCuleX.gmail.com>
-
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=extremetuxracer
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Downhill racing game starring Tux"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="http://www.extremetuxracer.com"
 license=('GPL')
 depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu')
 conflicts=('ppracer' 'etracer')
 replaces=('ppracer' 'etracer')
-source=(http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz \
-       $pkgname.png $pkgname.desktop libpng14.patch)
-md5sums=('6830eb4e1ca7c5a541f286ded3853f9f'
-         'a188e4ce61d0376fa42059e13157c5d1'
-         '429974a3d7f4640073e8fbfb4f0f45d2'
-         '0c16eb309df6413397cd886f63361fcc')
+source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
+       "$pkgname.png"
+       "$pkgname.desktop"
+       "libpng15.patch")
+sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
+            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
+            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
+            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
 
 build() {
-  cd ${srcdir}/extremetuxracer-$pkgver
-
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-
-  sed -i -e 's/libpng12/libpng14/g' configure || return 1
+  cd "$srcdir/extremetuxracer-$pkgver"
 
+  patch -Np1 -i ${srcdir}/libpng15.patch
+  sed -i -e 's/libpng12/libpng15/g' configure
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/extremetuxracer-$pkgver"
+  make DESTDIR="$pkgdir" install
 
  # Install icon and desktop file
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
-  install -D -m644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/extremetuxracer/libpng15.patch b/community/extremetuxracer/libpng15.patch
new file mode 100644
index 000000000..5c9999857
--- /dev/null
+++ b/community/extremetuxracer/libpng15.patch
@@ -0,0 +1,57 @@
+diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
+--- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
++++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
+@@ -53,7 +53,7 @@
+     if (!info_ptr)
+     {
+         png_destroy_read_struct(&png_ptr,
+-           (png_infopp)NULL, (png_infopp)NULL);
++           NULL, NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -62,7 +62,7 @@
+     if (!end_info)
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr,
+-          (png_infopp)NULL);
++          NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -77,7 +77,7 @@
+ 	
+ 	
+ 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++       &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	
+ 	if(bit_depth == 16)
+         png_set_strip_16(png_ptr);
+@@ -88,7 +88,7 @@
+ 		png_set_expand(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 	
+ 	if( color_type == PNG_COLOR_TYPE_GRAY ||
+@@ -96,7 +96,7 @@
+ 		png_set_gray_to_rgb(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 		
+ 	this->width=width;
+@@ -114,7 +114,7 @@
+ 	}
+ 	
+ 	png_read_end(png_ptr, info_ptr);
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	fclose(fp);
+ }
+