diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-14 21:28:09 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-14 21:28:09 +0000 |
| commit | c83458756ca0f0ee290371182750df88bbce3938 (patch) | |
| tree | 0672a860b552d870cd766bfc8a41c5aaca7f8f81 /media-video/gpac | |
| parent | revision bump for all the previous changes (diff) | |
| download | gentoo-2-c83458756ca0f0ee290371182750df88bbce3938.tar.gz gentoo-2-c83458756ca0f0ee290371182750df88bbce3938.tar.bz2 gentoo-2-c83458756ca0f0ee290371182750df88bbce3938.zip | |
drop the external amr patch since we disable it since ages
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/gpac')
| -rw-r--r-- | media-video/gpac/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gpac/files/160_all_externalamr.patch | 31 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.5.0-r1.ebuild | 3 |
3 files changed, 6 insertions, 34 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index e00a17f6ccaf..8a15c866077b 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gpac # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.113 2013/08/14 21:20:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.114 2013/08/14 21:28:09 aballier Exp $ + + 14 Aug 2013; Alexis Ballier <aballier@gentoo.org> gpac-0.5.0-r1.ebuild, + -files/160_all_externalamr.patch: + drop the external amr patch since we disable it since ages *gpac-0.5.0-r1 (14 Aug 2013) diff --git a/media-video/gpac/files/160_all_externalamr.patch b/media-video/gpac/files/160_all_externalamr.patch deleted file mode 100644 index eda30475fd56..000000000000 --- a/media-video/gpac/files/160_all_externalamr.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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/gpac-0.5.0-r1.ebuild b/media-video/gpac/gpac-0.5.0-r1.ebuild index 90661facb72e..85db9654047f 100644 --- a/media-video/gpac/gpac-0.5.0-r1.ebuild +++ b/media-video/gpac/gpac-0.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0-r1.ebuild,v 1.1 2013/08/14 21:20:02 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.5.0-r1.ebuild,v 1.2 2013/08/14 21:28:09 aballier Exp $ EAPI=4 @@ -58,7 +58,6 @@ my_use() { src_prepare() { epatch "${FILESDIR}"/110_all_implicitdecls.patch \ - "${FILESDIR}"/160_all_externalamr.patch \ "${FILESDIR}"/210_all_system_libogg.patch \ "${FILESDIR}"/${P}-build-fixes.patch \ "${FILESDIR}"/${P}-libav9.patch \ |