From 1d2f1a1e70011a41d17f2f16d5e90c491ccdabb8 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Sep 2011 23:14:33 +0000 Subject: Sun Sep 11 23:14:33 UTC 2011 --- community/gpac/PKGBUILD | 15 +++++++++------ community/gpac/openjpeg14.patch | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 community/gpac/openjpeg14.patch (limited to 'community/gpac') diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 69717e2bc..a38817828 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -5,18 +5,20 @@ pkgname=gpac pkgver=0.4.5 -pkgrel=7 +pkgrel=8 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64') url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \ +depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad' 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') +# 'js' license=('LGPL') options=('!makeflags') # Multiple build jobs aren't handled correctly source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - libpng14-infopp-null.patch) + libpng14-infopp-null.patch openjpeg14.patch) md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca') + '14d6483c9eb84434aea68596f243e0ca' + '1605fc11bd49b9c8220820bb38912021') build() { cd ${srcdir}/${pkgname} @@ -29,13 +31,14 @@ build() { #FS#14506 sed -i 's#lib64#lib#g' configure patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch + patch -Np1 -i ${srcdir}/openjpeg14.patch # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined # symbol: XvQueryExtension" with our LDFLAGS :\ - unset LDFLAGS + export LDFLAGS=${LDFLAGS/,--as-needed/} ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make + make } package() { diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch new file mode 100644 index 000000000..68a625eeb --- /dev/null +++ b/community/gpac/openjpeg14.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/show_bug.cgi?id=361359 + +Index: gpac/modules/img_in/jp2_dec.c +=================================================================== +--- gpac.orig/modules/img_in/jp2_dec.c ++++ gpac/modules/img_in/jp2_dec.c +@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe + return GF_OK; + } + ++char opj_version_buffer[500]; ++ + static const char *JP2_GetCodecName(GF_BaseDecoder *dec) + { ++#ifndef OPENJPEG_VERSION ++ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version()); ++ return opj_version_buffer; ++#else + return "OpenJPEG "OPENJPEG_VERSION ; ++#endif + } + + -- cgit v1.2.3-54-g00ecf