version bump, bug 426666

(Portage version: 2.1.11.22/cvs/Linux x86_64)

6 files changed, 350 insertions, 1 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 1c7b53786bfd..c5fe416e3525 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.99 2012/10/04 17:12:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.100 2012/10/05 13:47:42 axs Exp $
+
+*gpac-0.5.0 (05 Oct 2012)
+
+  05 Oct 2012; Ian Stakenvicius <axs@gentoo.org>
+  +files/110_all_implicitdecls.patch, +files/gpac-0.5.0-build-fixes.patch,
+  +files/160_all_externalamr.patch, +gpac-0.5.0.ebuild,
+  +files/210_all_system_libogg.patch:
+  version bump, bug 426666
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> gpac-0.4.5-r5.ebuild:
   Stable for amd64, wrt bug #437206
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch
new file mode 100644
index 000000000000..71017b53b9eb
--- /dev/null
+++ b/media-video/gpac/files/110_all_implicitdecls.patch
@@ -0,0 +1,22 @@
+Index: gpac/applications/generators/SVG/svggen.h
+===================================================================
+--- gpac.orig/applications/generators/SVG/svggen.h
++++ gpac/applications/generators/SVG/svggen.h
+@@ -107,6 +107,17 @@ typedef struct {
+ } SVGGenAttrGrp;
+ 
+ 
++SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
++void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
++void generateSVGCode_V1(GF_List *svg_elements);
++void generate_laser_tables_da(GF_List *atts);
++void generate_laser_tables(GF_List *svg_elements);
++u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
++u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
++void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
++void generate_table(GF_List *elements);
++void generateSVGCode_V2(GF_List *svg_elements);
++void generateSVGCode_V3(GF_List *svg_elements);
+ 
+ /*******************************************
+  * Structures needed for static allocation *
diff --git a/media-video/gpac/files/160_all_externalamr.patch b/media-video/gpac/files/160_all_externalamr.patch
new file mode 100644
index 000000000000..eda30475fd56
--- /dev/null
+++ b/media-video/gpac/files/160_all_externalamr.patch
@@ -0,0 +1,31 @@
+--- modules/amr_float_dec/Makefile.old	2012-07-15 15:16:18.000000000 +0200
++++ modules/amr_float_dec/Makefile	2012-07-15 15:17:17.000000000 +0200
+@@ -20,19 +20,9 @@
+ 
+ #AMR NB obj
+ CFLAGS+=-DGPAC_HAS_AMR_FT
+-ifeq ($(CONFIG_AMR_NB_FT), yes)
+-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
+-endif
+-
+ 
+ #AMR WB obj
+ CFLAGS+=-DGPAC_HAS_AMR_FT_WB
+-ifeq ($(CONFIG_AMR_WB_FT), yes)
+-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
+-	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
+-	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
+-endif
+-
+ 
+ SRCS := $(OBJS:.o=.c) 
+ 
+@@ -45,7 +35,7 @@
+ 
+ 
+ $(LIB): $(OBJS)
+-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -lamrnb -lamrwb
+ 
+ 
+ %.o: %.c
diff --git a/media-video/gpac/files/210_all_system_libogg.patch b/media-video/gpac/files/210_all_system_libogg.patch
new file mode 100644
index 000000000000..e09f57c43750
--- /dev/null
+++ b/media-video/gpac/files/210_all_system_libogg.patch
@@ -0,0 +1,28 @@
+--- src/Makefile.old	2012-07-15 15:34:54.000000000 +0200
++++ src/Makefile	2012-07-15 15:39:51.000000000 +0200
+@@ -92,9 +92,6 @@
+ ifeq ($(DISABLE_M2PS), no)
+ LIBGPAC_MEDIATOOLS+=media_tools/mpeg2_ps.o
+ endif
+-ifeq ($(DISABLE_OGG), no)
+-LIBGPAC_MEDIATOOLS+=media_tools/gpac_ogg.o
+-endif
+ ifeq ($(DISABLE_MCRYPT), no)
+ LIBGPAC_MEDIATOOLS+=media_tools/ismacryp.o
+ endif
+@@ -230,6 +227,15 @@
+ endif
+ endif
+ 
++#6 - OGG support
++ifeq ($(CONFIG_OGG), no)
++else
++LINKLIBS+= -logg
++ifeq ($(CONFIG_OGG), local)
++NEED_LOCAL_LIB="yes"
++MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/ogg"
++endif
++endif
+ 
+ ## libgpac compositor compilation options
+ COMPOSITOR_CFLAGS=
diff --git a/media-video/gpac/files/gpac-0.5.0-build-fixes.patch b/media-video/gpac/files/gpac-0.5.0-build-fixes.patch
new file mode 100644
index 000000000000..741fd28b6f81
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.0-build-fixes.patch
@@ -0,0 +1,113 @@
+diff -ur gpac/configure gpac.new/configure
+--- gpac/configure	2012-05-25 08:05:57.000000000 -0400
++++ gpac.new/configure	2012-10-04 13:59:58.000000000 -0400
+@@ -103,6 +103,7 @@
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ has_joystick="no"
+ has_xul="no"
+@@ -221,6 +222,7 @@
+   --disable-platinum       disable Platinum UPnP support
+   --disable-alsa           disable Alsa audio
+   --disable-oss-audio      disable OSS audio
++  --disable-sdl            disable SDL support
+   --enable-jack            enable  Jack audio
+   --disable-jack           disable Jack audio
+   --enable-pulseaudio      enable  Pulse audio
+@@ -236,6 +238,7 @@
+   --enable-amr-wb          enable AMR WB library
+   --enable-amr             enable both AMR NB and WB libraries
+   --enable-static-bin      GPAC static build
++  --enable-static-lib      GPAC static libraries build
+   --static-mp4box          configure for static linking of MP4Box.
+   --enable-depth           enables depth handling in the compositor
+ 
+@@ -1607,6 +1610,8 @@
+             ;;
+         --enable-static-bin) static_build="yes";
+             ;;
++        --enable-static-lib) static_libs="yes";
++            ;;
+         --disable-ipv6) has_ipv6="no"
+             ;;
+         --disable-wx) has_wx="no"
+@@ -1615,6 +1620,8 @@
+             ;;
+         --disable-oss-audio) has_oss_audio="no"
+             ;;
++        --disable-sdl) has_sdl="no"
++            ;;
+         --disable-x11-shm) has_x11_shm="no"
+             ;;
+         --disable-x11-xv) has_x11_xv="no"
+@@ -2157,6 +2164,7 @@
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
+ echo "Static build enabled: $static_build"
++echo "Static libs build enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Use standard memory allocator: $use_std_alloc"
+ echo "fixed-point version: $use_fixed_point"
+@@ -2700,6 +2708,7 @@
+ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATICBUILD=$static_build" >> config.mak
++echo "STATICLIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+@@ -2893,8 +2893,6 @@
+     mkdir ./bin/gcc/temp
+ fi
+ 
+-echo '%.opic : %.c' >> config.mak
+-echo '	$(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak
+ 
+ #pkg-config
+ echo "prefix=$prefix"				 > gpac.pc
+diff -ur gpac/Makefile gpac.new/Makefile
+--- gpac/Makefile	2012-05-25 08:05:57.000000000 -0400
++++ gpac.new/Makefile	2012-10-04 14:05:08.000000000 -0400
+@@ -119,9 +119,6 @@
+ 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
+ 	ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
+ 	ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+-ifeq ($(DESTDIR)$(prefix),$(prefix))
+-	ldconfig || true
+-endif
+ endif
+ endif
+ 
+@@ -138,7 +135,9 @@
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
+ endif
+ 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
++ifeq ($(STATICLIBS),yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
++endif
+ 	$(MAKE) installdylib
+ 
+ uninstall-lib:
+diff -ur gpac/src/Makefile gpac.new/src/Makefile
+--- gpac/src/Makefile	2012-10-04 14:14:18.000000000 -0400
++++ gpac.new/src/Makefile	2012-10-04 13:59:58.000000000 -0400
+@@ -291,12 +291,16 @@
+ 
+ $(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
+ ifeq ($(CONFIG_DARWIN),yes)
++ifeq ($(STATICLIBS),yes)
+ 	libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ 	ranlib ../bin/gcc/libgpac_static.a
++endif
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) 
+ else
++ifeq ($(STATICLIBS),yes)
+ 	ar cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	ranlib ../bin/gcc/libgpac_static.a
++endif
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
+ ifeq (,$(findstring yes, $(CONFIG_WIN32)))
+ 	mv ../bin/gcc/$@ ../bin/gcc/$@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-0.5.0.ebuild b/media-video/gpac/gpac-0.5.0.ebuild
new file mode 100644
index 000000000000..a9961e47cc17
--- /dev/null
+++ b/media-video/gpac/gpac-0.5.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+EAPI=4
+
+inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C."
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis wxwidgets xml xvid"
+
+S="${WORKDIR}"/${PN}
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	dvb? ( media-tv/linuxtv-dvb-apps )
+	ffmpeg? ( virtual/ffmpeg )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg )
+	mad? ( >=media-libs/libmad-0.15.1b )
+	opengl? ( virtual/opengl media-libs/freeglut )
+	>=media-libs/libogg-1.1
+	png? ( >=media-libs/libpng-1.4 )
+	vorbis? ( >=media-libs/libvorbis-1.1 )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	wxwidgets? ( =x11-libs/wxGTK-2.8* )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+	jpeg2k? ( media-libs/openjpeg )
+	ssl? ( dev-libs/openssl )
+	pulseaudio? ( media-sound/pulseaudio )
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXext"
+
+DEPEND="${RDEPEND}"
+
+my_use() {
+	local flag="$1" pflag="${2:-$1}"
+	if use ${flag}; then
+		echo "--use-${pflag}=system"
+	else
+		echo "--use-${pflag}=no"
+	fi
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
+		"${FILESDIR}"/160_all_externalamr.patch \
+		"${FILESDIR}"/210_all_system_libogg.patch \
+		"${FILESDIR}"/${P}-build-fixes.patch
+
+	# remove last of internal ogg
+	sed -i \
+		-e 's:<gpac/internal/ogg.h>:<ogg/ogg.h>:' \
+		src/media_tools/{av_parsers,gpac_ogg,media_import,media_export}.c || die
+	rm -f include/gpac/internal/ogg.h || die
+
+	chmod +x configure
+
+	# make sure configure looks for wx without needing eselect set
+	if use wxwidgets; then
+		WX_GTK_VER=2.8
+		need-wxwidgets unicode
+		sed -i -e "s:wx-config:${WX_CONFIG}:g" configure || die
+	else
+		sed -i -e "s:wx-config:wx-config-doesnotexist:g" configure || die
+	fi
+
+	# remove default rule for building objects from code, so that
+	# default make rules apply (fixes -fPIC issues)
+	sed -i -e '/^\%\.o: \%\.c/{N;d;}' \
+		src/Makefile modules/*/Makefile ||die
+
+	# use this to cut down on the warnings noise
+	#append-flags -fno-strict-aliasing
+}
+
+src_configure() {
+	myconf="${myconf} --use-ogg=system"
+	if use vorbis; then
+		myconf="${myconf} --use-vorbis=system"
+	fi
+	if use theora; then
+		myconf="${myconf} --use-theora=system"
+	fi
+
+	tc-export CC CXX AR RANLIB
+
+	econf \
+		--enable-svg \
+		--enable-pic \
+		--disable-amr \
+		--use-js=no \
+		$(use_enable debug) \
+		$(use_enable opengl) \
+		$(use_enable oss oss-audio) \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
+		$(use_enable jack jack yes) \
+		$(use_enable pulseaudio pulseaudio yes) \
+		$(use_enable alsa) \
+		$(use_enable sdl) \
+		$(use_enable wxwidgets wx) \
+		$(use_enable static-libs static-lib) \
+		$(my_use ffmpeg) \
+		$(my_use aac faad) \
+		$(my_use dvb dvbx) \
+		$(my_use jpeg) \
+		$(my_use mad) \
+		$(my_use png) \
+		$(my_use truetype ft) \
+		$(my_use xvid) \
+		$(my_use jpeg2k openjpeg) \
+		$(my_use a52) \
+		--cc="$(tc-getCC)" \
+		--libdir="/$(get_libdir)" \
+		${myconf}
+
+	#temporary build fix
+	cp config.h include/gpac/
+}
+
+src_compile() {
+#	#emake OPTFLAGS="${CFLAGS} -fPIC"
+#	LD="$(tc-getCC)" \
+	emake OPTFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install
+	emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib
+	dodoc AUTHORS BUGS Changelog README TODO INSTALLME
+	dodoc doc/*.txt
+	dohtml doc/*.html
+}