diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-01-06 00:50:12 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-01-06 00:50:12 +0000 |
| commit | 1fd1f2224610311de358c146da8bfb1053f5f55e (patch) | |
| tree | dde550fe0a452259547d8b1a9146d46685069dfb /media-video/gpac | |
| parent | QA: Clean unused versions. (diff) | |
| download | gentoo-2-1fd1f2224610311de358c146da8bfb1053f5f55e.tar.gz gentoo-2-1fd1f2224610311de358c146da8bfb1053f5f55e.tar.bz2 gentoo-2-1fd1f2224610311de358c146da8bfb1053f5f55e.zip | |
BSD compile fix, thanks to Timothy Redaelli <drizzt@gentoo.org>, bug #159240
(Portage version: 2.1.2_rc4-r5)
Diffstat (limited to 'media-video/gpac')
| -rw-r--r-- | media-video/gpac/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.2-bsd.patch | 46 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.4.2-r1.ebuild | 5 |
3 files changed, 55 insertions, 4 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index 51963b276618..dca11ea335d8 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # 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.30 2006/12/21 14:26:09 corsair Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.31 2007/01/06 00:50:12 aballier Exp $ + + 06 Jan 2007; Alexis Ballier <aballier@gentoo.org> + +files/gpac-0.4.2-bsd.patch, gpac-0.4.2-r1.ebuild: + BSD compile fix, thanks to Timothy Redaelli <drizzt@gentoo.org>, bug #159240 21 Dec 2006; Markus Rothe <corsair@gentoo.org> gpac-0.4.2-r1.ebuild: Stable on ppc64; bug #157814 diff --git a/media-video/gpac/files/gpac-0.4.2-bsd.patch b/media-video/gpac/files/gpac-0.4.2-bsd.patch new file mode 100644 index 000000000000..e7898318d280 --- /dev/null +++ b/media-video/gpac/files/gpac-0.4.2-bsd.patch @@ -0,0 +1,46 @@ +diff -Nur gpac.old/applications/mp4box/Makefile gpac/applications/mp4box/Makefile +--- gpac.old/applications/mp4box/Makefile 2006-12-27 22:59:08.000000000 +0100 ++++ gpac/applications/mp4box/Makefile 2006-12-27 22:59:40.000000000 +0100 +@@ -45,7 +45,7 @@ + all: $(PROG) + + $(PROG): $(OBJS) +- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) ++ $(CC) $(LDFLAGS) -pthread -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) + + + %.o: %.c +diff -Nur gpac.old/applications/mp4client/Makefile gpac/applications/mp4client/Makefile +--- gpac.old/applications/mp4client/Makefile 2006-12-27 22:59:08.000000000 +0100 ++++ gpac/applications/mp4client/Makefile 2006-12-27 23:03:40.000000000 +0100 +@@ -40,7 +40,7 @@ + all: $(PROG) + + MP4Client$(EXE): $(OBJS) +- $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lz ++ $(CC) $(LDFLAGS) -pthread -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lz + + %.o: %.c + $(CC) $(CFLAGS) $(INSTALL_FLAGS) -c -o $@ $< +@@ -48,8 +48,8 @@ + clean: + rm -f $(OBJS) ../../bin/gcc/$(PROG) + +-install: clean +- make -override BUILD_INSTALL=yes all ++install: ++ $(MAKE) -override BUILD_INSTALL=yes all + install -c -m 755 ../../bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin" + + uninstall: +diff -Nur gpac.old/applications/osmo4_wx/Makefile gpac/applications/osmo4_wx/Makefile +--- gpac.old/applications/osmo4_wx/Makefile 2006-12-27 22:59:08.000000000 +0100 ++++ gpac/applications/osmo4_wx/Makefile 2006-12-27 22:59:40.000000000 +0100 +@@ -64,7 +64,7 @@ + echo -n 'APPLOsm4' > $(DESTDIR)$(mac_apps)/Osmo4.app/Contents/PkgInfo + else + rm -f wxOsmo4.o +- make -override BUILD_INSTALL=yes all ++ $(MAKE) -override BUILD_INSTALL=yes all + install -c -m 755 ../../bin/gcc/Osmo4 "$(DESTDIR)$(prefix)/bin" + endif
\ No newline at end of file diff --git a/media-video/gpac/gpac-0.4.2-r1.ebuild b/media-video/gpac/gpac-0.4.2-r1.ebuild index f649fd976ab1..9c0737199718 100644 --- a/media-video/gpac/gpac-0.4.2-r1.ebuild +++ b/media-video/gpac/gpac-0.4.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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-r1.ebuild,v 1.3 2006/12/21 14:26:09 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.2-r1.ebuild,v 1.4 2007/01/06 00:50:12 aballier Exp $ inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs @@ -100,6 +100,7 @@ src_unpack() { sed -i 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure epatch "${WORKDIR}/${P}-pic.patch" + epatch "${FILESDIR}/${P}-bsd.patch" } src_compile() { |