diff options
| author | Bob Igo <bob@stormlogic.com> | 2009-06-02 19:15:43 (GMT) |
|---|---|---|
| committer | Bob Igo <bob@stormlogic.com> | 2009-06-02 19:15:43 (GMT) |
| commit | 12370737231c3fb917724428fadb94b08a95ab83 (patch) | |
| tree | b8469a01b06ca3910fd73bb751b922e7cae23287 /abs/extra-testing/fuppes-svn | |
| parent | c5efb029b2c21317008cc32385373734dd9fd599 (diff) | |
| parent | 528268bf6b14f8e3c9f4941d5587d982ff1892d6 (diff) | |
| download | linhes_pkgbuild-12370737231c3fb917724428fadb94b08a95ab83.zip linhes_pkgbuild-12370737231c3fb917724428fadb94b08a95ab83.tar.gz linhes_pkgbuild-12370737231c3fb917724428fadb94b08a95ab83.tar.bz2 | |
Merge branch 'master' of ssh://igo@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/extra-testing/fuppes-svn')
| -rw-r--r-- | abs/extra-testing/fuppes-svn/PKGBUILD | 7 | ||||
| -rw-r--r-- | abs/extra-testing/fuppes-svn/fuppes.diff | 25 |
2 files changed, 29 insertions, 3 deletions
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); + } |