Version bump. Add patch to stop the makefile from stripping binaries (bug #137639). Add patch so library has a SONAME field.

(Portage version: 2.1.1_pre2-r8)

8 files changed, 355 insertions, 1 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index ec20b7b2b880..f81f0a0daee7 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.22 2006/08/01 14:18:01 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.23 2006/08/01 17:12:56 chutzpah Exp $
+
+*gpac-0.4.2 (01 Aug 2006)
+
+  01 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/gpac-0.4.2-DESTDIR.patch, +files/gpac-0.4.2-configure-ogg.patch,
+  +files/gpac-0.4.2-nostrip.patch, +files/gpac-0.4.2-soname.patch,
+  +files/gpac-0.4.2-static-defs.patch, +gpac-0.4.2.ebuild:
+  Version bump. Add patch to stop the makefile from stripping binaries (bug
+  #137639). Add patch so library has a SONAME field.
 
   01 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
   gpac-0.4.1_pre20060122-r1.ebuild:
diff --git a/media-video/gpac/files/digest-gpac-0.4.2 b/media-video/gpac/files/digest-gpac-0.4.2
new file mode 100644
index 000000000000..87d70c23fc03
--- /dev/null
+++ b/media-video/gpac/files/digest-gpac-0.4.2
@@ -0,0 +1,5 @@
+MD5 cfd9012bff83afdf5ad069b86d3063b6 26104-610.zip 292640
+MD5 e78e35eabe09eea50198f1a27b81eb60 26204-600.zip 255764
+MD5 834910b42ef007410fcc49a5acd4656b gpac-0.4.2.tar.gz 3916608
+RMD160 17d2691651b633497ae96ec71912cfafa864c90a gpac-0.4.2.tar.gz 3916608
+SHA256 0e300b02824f12767e5fa0c70b138b6a17375c3d6000aea2568464a9bb1cd956 gpac-0.4.2.tar.gz 3916608
diff --git a/media-video/gpac/files/gpac-0.4.2-DESTDIR.patch b/media-video/gpac/files/gpac-0.4.2-DESTDIR.patch
new file mode 100644
index 000000000000..8fdee1d05942
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-DESTDIR.patch
@@ -0,0 +1,95 @@
+diff -ur gpac.orig/Makefile gpac/Makefile
+--- gpac.orig/Makefile	2006-08-01 11:35:35.000000000 -0400
++++ gpac/Makefile	2006-08-01 11:39:19.000000000 -0400
+@@ -53,13 +53,13 @@
+ 	( tar zcvf ~/$(FILE).tar.gz ../gpac --exclude CVS --exclude bin --exclude lib --exclude Obj --exclude temp --exclude amr_nb --exclude amr_nb_ft --exclude amr_wb_ft --exclude *.mak --exclude *.o --exclude *.~*)
+ 
+ install:
+-	install -d "$(prefix)/bin"
+-	install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(prefix)/bin"
++	install -d "$(DESTDIR)$(prefix)/bin"
++	install $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
+ 	$(MAKE) -C applications install
+-	install -d "$(moddir)"
+-	install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(moddir)"
+-	rm -f $(moddir)/libgpac.$(DYN_LIB_SUFFIX)
+-	rm -f $(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
++	install -d "$(DESTDIR)$(moddir)"
++	install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
++	rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
++	rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib
+ else
+@@ -70,15 +70,15 @@
+ 	install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+ 	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+ else
+-	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+-	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
++	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
++	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+ 	ldconfig || true
+ endif
+ endif
+-	install -d "$(mandir)/man1"
+-	install -m 644 doc/man/mp4box.1 $(mandir)/man1/
+-	install -m 644 doc/man/mp4client.1 $(mandir)/man1/
+-	install -m 644 doc/man/gpac.1 $(mandir)/man1/
++	install -d "$(DESTDIR)$(mandir)/man1"
++	install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
++	install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
++	install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+ 
+ uninstall:
+ 	$(MAKE) -C applications uninstall
+@@ -91,14 +91,14 @@
+ 	rm -rf $(mandir)/man1/gpac.1
+ 
+ install-lib:
+-	mkdir -p "$(prefix)/include/gpac"
+-	install -m 644 $(SRC_PATH)/include/gpac/*.h "$(prefix)/include/gpac"
+-	mkdir -p "$(prefix)/include/gpac/internal" 
+-	install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(prefix)/include/gpac/internal"
+-	mkdir -p "$(prefix)/include/gpac/modules" 
+-	install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(prefix)/include/gpac/modules"
+-	mkdir -p "$(prefix)/lib"
+-	install -m 644 "./bin/gcc/libgpac_static.a" "$(prefix)/lib"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac"
++	install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" 
++	install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
++	mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" 
++	install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
++	mkdir -p "$(DESTDIR)$(prefix)/lib"
++	install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
+ 
+ uninstall-lib:
+ 	rm -rf "$(prefix)/include/gpac/internal"
+Only in gpac: Makefile.orig
+diff -ur gpac.orig/applications/mp4client/Makefile gpac/applications/mp4client/Makefile
+--- gpac.orig/applications/mp4client/Makefile	2006-08-01 11:35:35.000000000 -0400
++++ gpac/applications/mp4client/Makefile	2006-08-01 11:36:16.000000000 -0400
+@@ -50,7 +50,7 @@
+ 
+ install: clean
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/MP4Client "$(prefix)/bin"
++	install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
+ 
+ uninstall:
+ 	rm -rf $(prefix)/bin/MP4Client
+Only in gpac/applications/mp4client: Makefile.orig
+diff -ur gpac.orig/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile
+--- gpac.orig/applications/osmo4_wx/Makefile	2006-08-01 11:35:35.000000000 -0400
++++ gpac/applications/osmo4_wx/Makefile	2006-08-01 11:36:16.000000000 -0400
+@@ -65,7 +65,7 @@
+ else
+ 	rm -f wxOsmo4.o
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(prefix)/bin"
++	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ endif
+ 
+ uninstall:
+Only in gpac/applications/osmo4_wx: Makefile.orig
diff --git a/media-video/gpac/files/gpac-0.4.2-configure-ogg.patch b/media-video/gpac/files/gpac-0.4.2-configure-ogg.patch
new file mode 100644
index 000000000000..df3e4de7c91b
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-configure-ogg.patch
@@ -0,0 +1,25 @@
+--- configure.orig	2006-07-12 13:25:26.000000000 -0400
++++ configure	2006-08-01 11:32:47.000000000 -0400
+@@ -143,6 +143,9 @@
+ echo "  --use-mad=OPT            force MAD OPT=[no,local]"
+ echo "  --use-xvid=OPT           force XVID OPT=[no,local]"
+ echo "  --use-ffmpeg=OPT         force FFMPEG OPT=[no,local]"
++echo "  --use-ogg=OPT            force OGG OPT=[no,system,local]"
++echo "  --use-vorbis=OPT         force vorbis OPT=[no,system,local]"
++echo "  --use-theora=OPT         force theora OPT=[no,system,local]"
+ echo ""
+ echo "NOTE: The object files are build at the place where configure is launched"
+ exit 1
+@@ -786,6 +789,12 @@
+   ;;
+   --use-ffmpeg=*) has_ffmpeg=${opt#--use-ffmpeg=}
+   ;;
++  --use-ogg=*) has_ogg=${opt#--use-ogg=}
++  ;;
++  --use-vorbis=*) has_vorbis=${opt#--use-vorbis=}
++  ;;
++  --use-theora=*) has_theora=${opt#--use-theora=}
++  ;;
+   --use-png=*) has_png=${opt#--use-png=}
+   ;;
+   esac
diff --git a/media-video/gpac/files/gpac-0.4.2-nostrip.patch b/media-video/gpac/files/gpac-0.4.2-nostrip.patch
new file mode 100644
index 000000000000..33ba61524891
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-nostrip.patch
@@ -0,0 +1,55 @@
+diff -ur gpac.orig/Makefile gpac/Makefile
+--- gpac.orig/Makefile	2006-08-01 12:45:53.000000000 -0400
++++ gpac/Makefile	2006-08-01 12:50:27.000000000 -0400
+@@ -5,10 +5,7 @@
+ 
+ vpath %.c $(SRC_PATH)
+ 
+-INSTFLAGS=-s
+-ifeq ($(DEBUGBUILD),yes)
+ INSTFLAGS=
+-endif
+ 
+ all: lib apps mods
+ 
+@@ -63,9 +60,6 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib
+ else
+-ifeq ($(DEBUGBUILD),no)
+-	$(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX)
+-endif
+ ifeq ($(CONFIG_DARWIN),yes)
+ 	install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+ 	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+diff -ur gpac.orig/applications/mp4client/Makefile gpac/applications/mp4client/Makefile
+--- gpac.orig/applications/mp4client/Makefile	2006-08-01 12:45:53.000000000 -0400
++++ gpac/applications/mp4client/Makefile	2006-08-01 12:44:17.000000000 -0400
+@@ -50,7 +50,7 @@
+ 
+ install: clean
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
++	install -c -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
+ 
+ uninstall:
+ 	rm -rf $(prefix)/bin/MP4Client
+diff -ur gpac.orig/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile
+--- gpac.orig/applications/osmo4_wx/Makefile	2006-08-01 12:45:53.000000000 -0400
++++ gpac/applications/osmo4_wx/Makefile	2006-08-01 12:44:17.000000000 -0400
+@@ -59,13 +59,13 @@
+ 	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/English.lproj/InfoPlist.strings
+ 	cp ./Darwin.Osmo.icns \
+ 	   $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/Resources/Osmo.icns
+-	install -c -s -m 755 ../../bin/gcc/Osmo4 \
++	install -c -m 755 ../../bin/gcc/Osmo4 \
+ 	      $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/MacOS
+ 	echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo
+ else
+ 	rm -f wxOsmo4.o
+ 	make -override BUILD_INSTALL=yes all
+-	install -c -s -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
++	install -c -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin"
+ endif
+ 
+ uninstall:
diff --git a/media-video/gpac/files/gpac-0.4.2-soname.patch b/media-video/gpac/files/gpac-0.4.2-soname.patch
new file mode 100644
index 000000000000..e5951b33358e
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-soname.patch
@@ -0,0 +1,11 @@
+--- gpac.orig/src/Makefile	2006-07-11 11:53:44.000000000 -0400
++++ gpac/src/Makefile	2006-08-01 12:58:38.000000000 -0400
+@@ -197,7 +197,7 @@
+ $(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) isomedia scenegraph mcrypt mediatools sceneman term render
+ 	ar cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	ranlib ../bin/gcc/libgpac_static.a
+-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
++	$(CC) $(SHFLAGS) -Wl,-soname,$(LIB) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
+ 
+ dep: depend
+ 
diff --git a/media-video/gpac/files/gpac-0.4.2-static-defs.patch b/media-video/gpac/files/gpac-0.4.2-static-defs.patch
new file mode 100644
index 000000000000..06e19fc19519
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.4.2-static-defs.patch
@@ -0,0 +1,11 @@
+--- gpac.orig/modules/svg_loader/svg_parser.c	2006-08-01 11:35:35.000000000 -0400
++++ gpac/modules/svg_loader/svg_parser.c	2006-08-01 11:52:13.000000000 -0400
+@@ -365,7 +365,7 @@
+ 	return ID;
+ }
+ 
+-static u32 svg_get_node_id(SVGParser *parser, xmlChar *nodename)
++u32 svg_get_node_id(SVGParser *parser, xmlChar *nodename)
+ {
+ 	GF_Node *n;
+ 	u32 ID;
diff --git a/media-video/gpac/gpac-0.4.2.ebuild b/media-video/gpac/gpac-0.4.2.ebuild
new file mode 100644
index 000000000000..4f232c9ce732
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2.ebuild,v 1.1 2006/08/01 17:12:56 chutzpah Exp $
+
+inherit wxwidgets flag-o-matic multilib
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C."
+HOMEPAGE="http://gpac.sourceforge.net/"
+NBV="610"
+WBV="600"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-${NBV}.zip
+		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-${WBV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac amr debug ffmpeg ft jpeg javascript mad ogg opengl oss png sdl ssl theora truetype vorbis wxwindows xml xvid"
+
+S="${WORKDIR}/${PN}"
+
+RDEPEND="aac? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg )
+	jpeg? ( media-libs/jpeg )
+	javascript? ( dev-lang/spidermonkey )
+	mad? ( media-libs/libmad )
+	opengl? ( virtual/opengl )
+	ogg? ( media-libs/libogg )
+	png? ( media-libs/libpng )
+	vorbis? ( media-libs/libvorbis )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2.1 )
+	wxwindows? ( >=x11-libs/wxGTK-2.6.0 )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.0.1 )
+	sdl? ( media-libs/libsdl )
+		|| ( (
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXext
+		) virtual/x11 )"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-configure-ogg.patch"
+	epatch "${FILESDIR}/${P}-DESTDIR.patch"
+	epatch "${FILESDIR}/${P}-static-defs.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-soname.patch"
+	sed -ie '/ldconfig / d' "${S}/Makefile"
+
+	if use amr; then
+		cd modules/amr_float_dec
+		unzip -jaq ${WORKDIR}/26104-${NBV}_ANSI_C_source_code.zip -d amr_nb_ft
+		unzip -jaq ${WORKDIR}/26204-${WBV}_ANSI-C_source_code.zip -d amr_wb_ft
+	fi
+
+	cd "${S}"
+
+	chmod +x configure
+}
+
+src_compile() {
+	# make sure configure looks for wx-2.6
+	if use wxwindows; then
+		sed -i -e 's/wx-config/wx-config-2.6/' configure
+	else
+		sed -i 's:^has_wx="yes:has_wx="no:' configure
+	fi
+
+	use !sdl && sed -i 's:^has_sdl=yes:has_sdl=no:' configure
+
+	# fix hardcoded paths in source
+	sed -i -e \
+		"s:\([^f]\)\ M4_PLUGIN_PATH:\1 \"/usr/$(get_libdir)\":" \
+		applications/mp4client/main.c \
+		applications/osmo4_wx/wxOsmo4.cpp \
+		|| die "path fixation failed"
+
+	# make sure mozilla won't be used
+	sed -i -e 's/osmozilla//g' applications/Makefile
+
+	# use this to cute down on the warnings noise
+	append-flags -fno-strict-aliasing
+
+	# amd64 compile
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	# multilib libdir fix
+	sed -i 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile
+	sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure
+
+	if use ogg; then
+		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
+	else
+		myconf="${myconf} --use-ogg=no"
+	fi
+
+	econf \
+		--enable-svg \
+		$(use_enable amr) \
+		$(use_enable debug) \
+		$(use_enable opengl) \
+		$(use_enable oss oss-audio) \
+		$(use_enable ssl) \
+		$(my_use ffmpeg) \
+		$(my_use aac faad) \
+		$(my_use jpeg) \
+		$(my_use mad) \
+		$(my_use javascript js) \
+		$(my_use png) \
+		$(my_use ft) \
+		$(my_use xvid) \
+		${myconf} || die "configure died"
+
+	make OPTFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die
+	make OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die
+	dodoc AUTHORS BUGS Changelog README TODO
+	dodoc doc/*.html doc/*.txt doc/libisomedia_license doc/SGGen
+}