Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/faad2/files/, media-libs/faad2/
Date: Tue, 02 Oct 2018 12:43:41
Message-Id: 1538484168.b3b39d03ad6c4e35d6c4d7a02397804d564b08a8.asturm@gentoo
1 commit: b3b39d03ad6c4e35d6c4d7a02397804d564b08a8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 2 12:42:48 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 2 12:42:48 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b39d03
7
8 media-libs/faad2: Security cleanup
9
10 Bug: https://bugs.gentoo.org/634798
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.50, Repoman-2.3.10
13
14 media-libs/faad2/Manifest | 2 -
15 media-libs/faad2/faad2-2.7-r3.ebuild | 48 --------------------
16 media-libs/faad2/faad2-2.8.6.ebuild | 52 ----------------------
17 ...d2-2.7-libmp4ff-install-mp4ff_int_types_h.patch | 13 ------
18 .../files/faad2-2.7-libmp4ff-shared-lib.patch | 29 ------------
19 media-libs/faad2/files/faad2-2.7-man1_MANS.patch | 10 -----
20 6 files changed, 154 deletions(-)
21
22 diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
23 index bbc5b50a00d..7f9837c8098 100644
24 --- a/media-libs/faad2/Manifest
25 +++ b/media-libs/faad2/Manifest
26 @@ -1,3 +1 @@
27 -DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
28 -DIST faad2-2.8.6.tar.gz 1025654 BLAKE2B 16d5e08ea8f0ecfff8d1f5eb17f219d481afd9bc774c42b1cf4bc604f1d57eeb9bfedc0d5654e52d887a4bdf3ba8e6a215e51343a34f781613e588502532bbe2 SHA512 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8
29 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
30
31 diff --git a/media-libs/faad2/faad2-2.7-r3.ebuild b/media-libs/faad2/faad2-2.7-r3.ebuild
32 deleted file mode 100644
33 index d9b34c0d9f3..00000000000
34 --- a/media-libs/faad2/faad2-2.7-r3.ebuild
35 +++ /dev/null
36 @@ -1,48 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=5
41 -inherit autotools eutils multilib-minimal
42 -
43 -DESCRIPTION="AAC audio decoding library"
44 -HOMEPAGE="http://www.audiocoding.com/faad2.html"
45 -SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
46 -
47 -LICENSE="GPL-2+"
48 -SLOT="0"
49 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
50 -IUSE="digitalradio static-libs"
51 -DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
52 -RDEPEND=""
53 -DEPEND=""
54 -
55 -src_prepare() {
56 - epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch \
57 - "${FILESDIR}"/${P}-libmp4ff-install-mp4ff_int_types_h.patch \
58 - "${FILESDIR}"/${P}-man1_MANS.patch
59 -
60 - sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
61 -
62 - # bug 466986
63 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
64 -
65 - eautoreconf
66 -}
67 -
68 -multilib_src_configure() {
69 - ECONF_SOURCE="${S}" econf \
70 - $(use_enable static-libs static) \
71 - --disable-dependency-tracking \
72 - $(use_with digitalradio drm) \
73 - --without-xmms
74 -
75 - # do not build the frontend for non default abis
76 - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
77 - sed -i -e 's/frontend//' Makefile || die
78 - fi
79 -}
80 -
81 -multilib_src_install_all() {
82 - prune_libtool_files --all
83 - einstalldocs
84 -}
85
86 diff --git a/media-libs/faad2/faad2-2.8.6.ebuild b/media-libs/faad2/faad2-2.8.6.ebuild
87 deleted file mode 100644
88 index 3429665fa71..00000000000
89 --- a/media-libs/faad2/faad2-2.8.6.ebuild
90 +++ /dev/null
91 @@ -1,52 +0,0 @@
92 -# Copyright 1999-2017 Gentoo Foundation
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=6
96 -inherit autotools ltprune multilib-minimal
97 -
98 -DESCRIPTION="AAC audio decoding library"
99 -HOMEPAGE="http://www.audiocoding.com/faad2.html"
100 -SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
101 -
102 -LICENSE="GPL-2+"
103 -SLOT="0"
104 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
105 -IUSE="digitalradio static-libs"
106 -DOCS=( AUTHORS ChangeLog NEWS README TODO )
107 -RDEPEND=""
108 -DEPEND=""
109 -
110 -PATCHES=(
111 - "${FILESDIR}"/${PN}-2.8.5-libmp4ff-shared-lib.patch
112 -)
113 -
114 -src_prepare() {
115 - default
116 -
117 - sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
118 -
119 - # bug 466986
120 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
121 -
122 - eautoreconf
123 -}
124 -
125 -multilib_src_configure() {
126 - local myconf=(
127 - --without-xmms
128 - $(use_with digitalradio drm)
129 - $(use_enable static-libs static)
130 - )
131 -
132 - ECONF_SOURCE="${S}" econf "${myconf[@]}"
133 -
134 - # do not build the frontend for non default abis
135 - if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
136 - sed -i -e 's/frontend//' Makefile || die
137 - fi
138 -}
139 -
140 -multilib_src_install_all() {
141 - prune_libtool_files --all
142 - einstalldocs
143 -}
144
145 diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
146 deleted file mode 100644
147 index 5d39cad95d7..00000000000
148 --- a/media-libs/faad2/files/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
149 +++ /dev/null
150 @@ -1,13 +0,0 @@
151 -Install mp4ff_int_types.h for mythmusic.
152 -
153 -http://bugs.gentoo.org/275008
154 -
155 ---- common/mp4ff/Makefile.am
156 -+++ common/mp4ff/Makefile.am
157 -@@ -1,5 +1,5 @@
158 - lib_LTLIBRARIES = libmp4ff.la
159 --include_HEADERS = mp4ff.h mp4ffint.h
160 -+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
161 -
162 - AM_CFLAGS = -DUSE_TAGGING=1
163 -
164
165 diff --git a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch b/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
166 deleted file mode 100644
167 index 56a13119296..00000000000
168 --- a/media-libs/faad2/files/faad2-2.7-libmp4ff-shared-lib.patch
169 +++ /dev/null
170 @@ -1,29 +0,0 @@
171 -Ripped from Debian
172 -
173 -Patch to create a shared lib for libmp4ff.
174 -
175 ---- a/common/mp4ff/Makefile.am
176 -+++ b/common/mp4ff/Makefile.am
177 -@@ -1,7 +1,8 @@
178 --lib_LIBRARIES = libmp4ff.a
179 -+lib_LTLIBRARIES = libmp4ff.la
180 - include_HEADERS = mp4ff.h mp4ffint.h
181 -
182 --libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
183 -+AM_CFLAGS = -DUSE_TAGGING=1
184 -
185 --libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
186 -+libmp4ff_la_LDFLAGS = -version-info 0:0:0
187 -+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
188 - mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
189 ---- a/frontend/Makefile.am
190 -+++ b/frontend/Makefile.am
191 -@@ -5,7 +5,7 @@
192 - -I$(top_srcdir)/common/mp4ff
193 -
194 - faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
195 -- $(top_builddir)/common/mp4ff/libmp4ff.a
196 -+ $(top_builddir)/common/mp4ff/libmp4ff.la
197 -
198 - faad_SOURCES = main.c \
199 - audio.c audio.h \
200
201 diff --git a/media-libs/faad2/files/faad2-2.7-man1_MANS.patch b/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
202 deleted file mode 100644
203 index 9c1ddb01bc3..00000000000
204 --- a/media-libs/faad2/files/faad2-2.7-man1_MANS.patch
205 +++ /dev/null
206 @@ -1,10 +0,0 @@
207 -diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
208 ---- faad2-2.7.orig/frontend/Makefile.am 2009-02-06 18:03:37.000000000 +0200
209 -+++ faad2-2.7/frontend/Makefile.am 2009-07-20 20:27:29.000000000 +0300
210 -@@ -1,5 +1,5 @@
211 - bin_PROGRAMS = faad
212 --man_MANS = faad.man
213 -+man1_MANS = faad.man
214 -
215 - INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
216 - -I$(top_srcdir)/common/mp4ff