From 170c4c7f3df183b6a65e9f2e52eec1544e5f3157 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Fri, 29 May 2009 13:28:56 -0700
Subject: Added patch needed for FUPPES for compile.

---
 abs/extra-testing/fuppes-svn/PKGBUILD    |  7 ++++---
 abs/extra-testing/fuppes-svn/fuppes.diff | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 abs/extra-testing/fuppes-svn/fuppes.diff

diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
index b019c6e..82576b1 100644
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD
@@ -10,8 +10,8 @@ url="http://fuppes.ulrich-voelkel.de/"
 license=('GPL2')
 depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
 makdepends=('pkgconfig' 'autoconf' 'subversion')
-source=(fuppes-r634-archlinux.patch)
-md5sums=('5d9f6331cc91b64aab69449ce327b214')
+source=(fuppes-r634-archlinux.patch fuppes.diff)
+md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee')
 
 _svnmod="fuppes"
 _svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk"
@@ -21,12 +21,13 @@ build()
 	cd ${startdir}/src
 
 	msg "Getting sources..."
-	svn co ${_svntrunk} ${_svnmod} 
+	svn co ${_svntrunk} ${_svnmod} -r 634
 	msg "Done getting sources or failed to connect to server."
 
 	cd ${_svnmod}
 
 	patch -Np0 -i ../fuppes-r634-archlinux.patch
+	patch -Np0 -i ../fuppes.diff
 	autoreconf -vfi
 	
 	./configure --prefix=/usr \
diff --git a/abs/extra-testing/fuppes-svn/fuppes.diff b/abs/extra-testing/fuppes-svn/fuppes.diff
new file mode 100644
index 0000000..9b7b6a8
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/fuppes.diff
@@ -0,0 +1,25 @@
+--- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-05-29 20:12:09.000000000 +0000
++++ src/plugins/ffmpeg/ffmpeg.cpp	2009-05-29 20:10:01.000000000 +0000
+@@ -1021,19 +1021,9 @@
+         if (subtitle_to_free) {
+             if (subtitle_to_free->rects != NULL) {
+                 for (i = 0; i < subtitle_to_free->num_rects; i++) {
+-									
+-#ifndef LIBAVCODEC_VERSION_MINOR
+-#define LIBAVCODEC_VERSION_MINOR 0
+-#endif
+-
+-#if LIBAVCODEC_VERSION_MINOR >= 11
+-                    av_freep(subtitle_to_free->rects[i]->pict.data[0]);
+-                    av_freep(subtitle_to_free->rects[i]->pict.data[1]);
+-                    av_freep(subtitle_to_free->rects[i]);
+-#else
+-                    av_free(subtitle_to_free->rects[i].bitmap);
+-                    av_free(subtitle_to_free->rects[i].rgba_palette);									
+-#endif
++		av_freep(&subtitle_to_free->rects[i]->pict.data[0]);
++		av_freep(&subtitle_to_free->rects[i]->pict.data[1]);
++		av_freep(&subtitle_to_free->rects[i]);
+                 }
+                 av_freep(&subtitle_to_free->rects);
+             }
-- 
cgit v0.12