gd, correction port

6 files changed, 15 insertions, 73 deletions

diff --git a/extra/akode/.footprint b/extra/akode/.footprint
deleted file mode 100644
index 0caf1808a..000000000
--- a/extra/akode/.footprint
+++ /dev/null
@@ -1,46 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/akode-config
--rwxr-xr-x	root/root	usr/bin/akodeplay
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/akode/
--rw-r--r--	root/root	usr/include/akode/akode_export.h
--rw-r--r--	root/root	usr/include/akode/akodelib.h
--rw-r--r--	root/root	usr/include/akode/audiobuffer.h
--rw-r--r--	root/root	usr/include/akode/audioconfiguration.h
--rw-r--r--	root/root	usr/include/akode/audioframe.h
--rw-r--r--	root/root	usr/include/akode/auto_sink.h
--rw-r--r--	root/root	usr/include/akode/buffered_decoder.h
--rw-r--r--	root/root	usr/include/akode/bytebuffer.h
--rw-r--r--	root/root	usr/include/akode/converter.h
--rw-r--r--	root/root	usr/include/akode/crossfader.h
--rw-r--r--	root/root	usr/include/akode/decoder.h
--rw-r--r--	root/root	usr/include/akode/encoder.h
--rw-r--r--	root/root	usr/include/akode/fast_resampler.h
--rw-r--r--	root/root	usr/include/akode/file.h
--rw-r--r--	root/root	usr/include/akode/framedecoder.h
--rw-r--r--	root/root	usr/include/akode/localfile.h
--rw-r--r--	root/root	usr/include/akode/magic.h
--rw-r--r--	root/root	usr/include/akode/mmapfile.h
--rw-r--r--	root/root	usr/include/akode/player.h
--rw-r--r--	root/root	usr/include/akode/pluginhandler.h
--rw-r--r--	root/root	usr/include/akode/resampler.h
--rw-r--r--	root/root	usr/include/akode/sink.h
--rw-r--r--	root/root	usr/include/akode/void_sink.h
--rw-r--r--	root/root	usr/include/akode/volumefilter.h
--rw-r--r--	root/root	usr/include/akode/wav_decoder.h
-drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libakode.la
-lrwxrwxrwx	root/root	usr/lib/libakode.so -> libakode.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libakode.so.2 -> libakode.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libakode.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libakode_alsa_sink.la
--rwxr-xr-x	root/root	usr/lib/libakode_alsa_sink.so
--rwxr-xr-x	root/root	usr/lib/libakode_mpc_decoder.la
--rwxr-xr-x	root/root	usr/lib/libakode_mpc_decoder.so
--rwxr-xr-x	root/root	usr/lib/libakode_mpeg_decoder.la
--rwxr-xr-x	root/root	usr/lib/libakode_mpeg_decoder.so
--rwxr-xr-x	root/root	usr/lib/libakode_oss_sink.la
--rwxr-xr-x	root/root	usr/lib/libakode_oss_sink.so
--rwxr-xr-x	root/root	usr/lib/libakode_xiph_decoder.la
--rwxr-xr-x	root/root	usr/lib/libakode_xiph_decoder.so
diff --git a/extra/akode/.md5sum b/extra/akode/.md5sum
deleted file mode 100644
index 12fddaff2..000000000
--- a/extra/akode/.md5sum
+++ /dev/null
@@ -1,2 +0,0 @@
-659ced0c9c735cb3e55b9138ff02342c  30375-akode-2.0.2.tar.bz2
-6e22d4a54a06443b1a63437932a633d6  gcc43.patch
diff --git a/extra/akode/Pkgfile b/extra/akode/Pkgfile
deleted file mode 100644
index ac3d90ba5..000000000
--- a/extra/akode/Pkgfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Description: Librairie audio pour KDE4
-# URL: http://carewolf.com/akode/ 
-# Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
-# Depends on: alsa-lib, libmad
-# Run on: alsa-lib,libmad
-
-name=akode
-version=2.0.2
-release=2
-source=(http://www.kde-apps.org/CONTENT/content-files/30375-akode-$version.tar.bz2 \
-        http://nutyx.meticul.eu/files/patchs/$name/gcc43.patch)
-build() {
-	cd $name-$version
-	patch -Np0 -i ../gcc43.patch
-	./configure --prefix=/usr \
-		--without-flac \
-		--without-ffmpeg
-	make
-	make DESTDIR=$PKG install
-}
-  
diff --git a/extra/gd/.md5sum b/extra/gd/.md5sum
index efaeaf992..81e2348b1 100644
--- a/extra/gd/.md5sum
+++ b/extra/gd/.md5sum
@@ -1,2 +1,2 @@
+ac7bd291a83cffe8d5c3662d23fac185  gd-2.0.35-libpng14.patch
 982963448dc36f20cb79b6e9ba6fdede  gd-2.0.35.tar.gz
-7921556f4960e8d66cf4fb67ea7101b5  libpng14.patch
diff --git a/extra/gd/Pkgfile b/extra/gd/Pkgfile
index 64cba6597..3bde0826a 100644
--- a/extra/gd/Pkgfile
+++ b/extra/gd/Pkgfile
@@ -9,11 +9,11 @@ name=gd
 version=2.0.35
 release=1
 source=(http://www.libgd.org/releases/$name-$version.tar.gz\
-	http://nutyx.meticul.eu/files/patchs/$name/libpng14.patch)
+	gd-2.0.35-libpng14.patch)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libpng14.patch
+	patch -Np1 -i ../gd-2.0.35-libpng14.patch
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/extra/gd/gd-2.0.35-libpng14.patch b/extra/gd/gd-2.0.35-libpng14.patch
new file mode 100644
index 000000000..da5b4fb00
--- /dev/null
+++ b/extra/gd/gd-2.0.35-libpng14.patch
@@ -0,0 +1,12 @@
+diff -Nur gd-2.0.35.orig/gd_png.c gd-2.0.35/gd_png.c
+--- gd-2.0.35.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
++++ gd-2.0.35/gd_png.c	2010-01-17 17:14:11.000000000 +0200
+@@ -151,7 +151,7 @@
+ 	return NULL;
+   }
+ 
+-	if (!png_check_sig (sig, 8)) { /* bad signature */
++	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
+     	return NULL;		/* bad signature */
+ 	}
+