From 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Feb 2012 23:14:50 +0000
Subject: Mon Feb  6 23:14:50 UTC 2012

---
 community/performous/PKGBUILD    | 12 ++++++++----
 community/performous/png15.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 community/performous/png15.patch

(limited to 'community/performous')

diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ba8c7a3db..71d46daae 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59954 2011-12-02 20:59:56Z ibiru $
+# $Id: PKGBUILD 63696 2012-02-05 12:07:40Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=11
+pkgrel=12
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -16,10 +16,12 @@ makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
 optdepends=('performous-freesongs: free songs for performous')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
         boost-filesystem-v3.patch
-        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a")
+        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a"
+	png15.patch)
 md5sums=('451a759de77984b5a699e91107fe52e2'
          '42a8c825d80b0de16bd5752d2a80e585'
-         'ff0ffa681dfaa09c4f42133a65309bf0')
+         'ff0ffa681dfaa09c4f42133a65309bf0'
+         '89157d5e21b0efd09fcbeee299d23c7e')
 
 build() {
   cd ${srcdir}/Performous-${pkgver}-Source
@@ -28,6 +30,8 @@ build() {
   patch -Np1 -i ../boost-filesystem-v3.patch
   # fix with ffmpeg-0.8
   patch -Np1 -i ../ffmpeg-0.8.patch
+  # fix for libpng 1.5
+  patch -Np1 -i ../png15.patch
 
   mkdir -p build
   cd build
diff --git a/community/performous/png15.patch b/community/performous/png15.patch
new file mode 100644
index 000000000..b6fb8fb14
--- /dev/null
+++ b/community/performous/png15.patch
@@ -0,0 +1,33 @@
+diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
+--- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
++++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
+@@ -10,7 +10,7 @@
+ 
+ include(LibFindMacros)
+ 
+-libfind_pkg_check_modules(Png_PKGCONF Png)
++libfind_pkg_check_modules(Png_PKGCONF libpng)
+ 
+ find_path(Png_INCLUDE_DIR
+   NAMES pngconf.h
+@@ -18,7 +18,7 @@
+ )
+ 
+ find_library(Png_LIBRARY
+-  NAMES png png12 png14
++  NAMES png png12 png14 png15
+   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
+ )
+ 
+diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
+--- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
++++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
+@@ -26,7 +26,7 @@
+ 	}
+ 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
+ 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
+-		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
++		png_set_read_fn(pngPtr, &file, readPngHelper);
+ 		png_read_info(pngPtr, infoPtr);
+ 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
+ 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
-- 
cgit v1.2.3-54-g00ecf