1 |
commit: 1805b6d01458e4bfa5d4c373438dc3014a4b8ad1 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 30 16:11:38 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 30 16:11:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1805b6d0 |
7 |
|
8 |
media-video/gpac: Drop 0.6.1-r2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/626240 |
11 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
media-video/gpac/Manifest | 1 - |
15 |
media-video/gpac/files/110_all_implicitdecls.patch | 22 ---- |
16 |
...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 --- |
17 |
.../gpac/files/gpac-0.5.3-static-libs.patch | 85 -------------- |
18 |
media-video/gpac/gpac-0.6.1-r2.ebuild | 122 --------------------- |
19 |
5 files changed, 245 deletions(-) |
20 |
|
21 |
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest |
22 |
index 5b823f36870..ce5adb32da3 100644 |
23 |
--- a/media-video/gpac/Manifest |
24 |
+++ b/media-video/gpac/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595 |
27 |
DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403 |
28 |
|
29 |
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch |
30 |
deleted file mode 100644 |
31 |
index 71017b53b9e..00000000000 |
32 |
--- a/media-video/gpac/files/110_all_implicitdecls.patch |
33 |
+++ /dev/null |
34 |
@@ -1,22 +0,0 @@ |
35 |
-Index: gpac/applications/generators/SVG/svggen.h |
36 |
-=================================================================== |
37 |
---- gpac.orig/applications/generators/SVG/svggen.h |
38 |
-+++ gpac/applications/generators/SVG/svggen.h |
39 |
-@@ -107,6 +107,17 @@ typedef struct { |
40 |
- } SVGGenAttrGrp; |
41 |
- |
42 |
- |
43 |
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name); |
44 |
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine); |
45 |
-+void generateSVGCode_V1(GF_List *svg_elements); |
46 |
-+void generate_laser_tables_da(GF_List *atts); |
47 |
-+void generate_laser_tables(GF_List *svg_elements); |
48 |
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start); |
49 |
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start); |
50 |
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]); |
51 |
-+void generate_table(GF_List *elements); |
52 |
-+void generateSVGCode_V2(GF_List *svg_elements); |
53 |
-+void generateSVGCode_V3(GF_List *svg_elements); |
54 |
- |
55 |
- /******************************************* |
56 |
- * Structures needed for static allocation * |
57 |
|
58 |
diff --git a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch |
59 |
deleted file mode 100644 |
60 |
index df3a5fc3299..00000000000 |
61 |
--- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch |
62 |
+++ /dev/null |
63 |
@@ -1,15 +0,0 @@ |
64 |
-Export gf_isom_set_pixel_aspect_ratio. |
65 |
-media-video/x264-encoder needs it and this funcion used to be exported. |
66 |
- |
67 |
-diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c |
68 |
-index e935acc..9841d85 100644 |
69 |
---- a/src/isomedia/isom_write.c |
70 |
-+++ b/src/isomedia/isom_write.c |
71 |
-@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes |
72 |
- } |
73 |
- } |
74 |
- |
75 |
-+GF_EXPORT |
76 |
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing) |
77 |
- { |
78 |
- GF_Err e; |
79 |
|
80 |
diff --git a/media-video/gpac/files/gpac-0.5.3-static-libs.patch b/media-video/gpac/files/gpac-0.5.3-static-libs.patch |
81 |
deleted file mode 100644 |
82 |
index ec11eaea172..00000000000 |
83 |
--- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch |
84 |
+++ /dev/null |
85 |
@@ -1,85 +0,0 @@ |
86 |
-diff --git a/Makefile b/Makefile |
87 |
-index 62b7850..ff4b589 100644 |
88 |
---- a/Makefile |
89 |
-+++ b/Makefile |
90 |
-@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes) |
91 |
- $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" |
92 |
- endif |
93 |
- mkdir -p "$(DESTDIR)$(prefix)/$(libdir)" |
94 |
-+ifeq ($(STATICLIBS),yes) |
95 |
- $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)" |
96 |
-+endif |
97 |
- $(MAKE) installdylib |
98 |
- |
99 |
- uninstall-lib: |
100 |
-diff --git a/configure b/configure |
101 |
-index df00dff..561bcd3 100755 |
102 |
---- a/configure |
103 |
-+++ b/configure |
104 |
-@@ -101,6 +101,7 @@ has_xmlrpc="no" |
105 |
- has_openjpeg="no" |
106 |
- gprof_build="no" |
107 |
- static_build="no" |
108 |
-+static_libs="no" |
109 |
- want_pic="no" |
110 |
- want_gcov="no" |
111 |
- has_joystick="no" |
112 |
-@@ -252,6 +253,7 @@ GPAC configuration options: |
113 |
- --enable-amr-wb enable AMR WB library |
114 |
- --enable-amr enable both AMR NB and WB libraries |
115 |
- --enable-static-bin link statically against libgpac |
116 |
-+ --enable-static-lib GPAC static libraries build |
117 |
- --static-mp4box configure for static linking of MP4Box only. |
118 |
- --enable-depth enables depth handling in the compositor |
119 |
- |
120 |
-@@ -1849,6 +1851,8 @@ for opt do |
121 |
- ;; |
122 |
- --enable-static-bin) static_build="yes"; |
123 |
- ;; |
124 |
-+ --enable-static-lib) static_libs="yes"; |
125 |
-+ ;; |
126 |
- --disable-ipv6) has_ipv6="no" |
127 |
- ;; |
128 |
- --disable-wx) has_wx="no" |
129 |
-@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **" |
130 |
- echo "debug version: $debuginfo" |
131 |
- echo "GProf enabled: $gprof_build" |
132 |
- echo "Static build enabled: $static_build" |
133 |
-+echo "Static libs build enabled: $static_libs" |
134 |
- echo "Memory tracking enabled: $use_memory_tracking" |
135 |
- echo "Fixed-Point Version: $use_fixed_point" |
136 |
- echo "IPV6 Support: $has_ipv6" |
137 |
-@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak |
138 |
- echo "GPROFBUILD=$gprof_build" >> config.mak |
139 |
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak |
140 |
- echo "STATICBUILD=$static_build" >> config.mak |
141 |
-+echo "STATICLIBS=$static_libs" >> config.mak |
142 |
- |
143 |
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak |
144 |
- if test "$has_ipv6" = "yes" ; then |
145 |
-diff --git a/src/Makefile b/src/Makefile |
146 |
-index ba9d9ab..89ea67f 100644 |
147 |
---- a/src/Makefile |
148 |
-+++ b/src/Makefile |
149 |
-@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR) |
150 |
- @echo "LIBS $(EXTRALIBS)" |
151 |
- |
152 |
- ifeq ($(CONFIG_DARWIN),yes) |
153 |
-- |
154 |
-+ifeq ($(STATICLIBS),yes) |
155 |
- $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS) |
156 |
- $(RANLIB) ../bin/gcc/libgpac_static.a |
157 |
-+endif |
158 |
- ifneq ($(STATICBUILD),yes) |
159 |
- $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) |
160 |
- endif |
161 |
- |
162 |
- else |
163 |
- |
164 |
-+ifeq ($(STATICLIBS),yes) |
165 |
- $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS) |
166 |
- $(RANLIB) ../bin/gcc/libgpac_static.a |
167 |
-+endif |
168 |
- ifneq ($(STATICBUILD),yes) |
169 |
- $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) |
170 |
- mv $@ $@.$(VERSION_SONAME) |
171 |
|
172 |
diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild |
173 |
deleted file mode 100644 |
174 |
index 86e1355ce3f..00000000000 |
175 |
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild |
176 |
+++ /dev/null |
177 |
@@ -1,122 +0,0 @@ |
178 |
-# Copyright 1999-2017 Gentoo Foundation |
179 |
-# Distributed under the terms of the GNU General Public License v2 |
180 |
- |
181 |
-EAPI=6 |
182 |
- |
183 |
-if [[ ${PV} == *9999 ]] ; then |
184 |
- SCM="git-r3" |
185 |
- EGIT_REPO_URI="https://github.com/gpac/gpac" |
186 |
-else |
187 |
- SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
188 |
- KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd" |
189 |
-fi |
190 |
- |
191 |
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} |
192 |
- |
193 |
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" |
194 |
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/" |
195 |
- |
196 |
-LICENSE="GPL-2" |
197 |
-SLOT="0" |
198 |
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png |
199 |
- pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" |
200 |
- |
201 |
-RDEPEND=" |
202 |
- a52? ( media-libs/a52dec ) |
203 |
- aac? ( >=media-libs/faad2-2.0 ) |
204 |
- alsa? ( media-libs/alsa-lib ) |
205 |
- dvb? ( media-tv/linuxtv-dvb-apps ) |
206 |
- ffmpeg? ( |
207 |
- !libav? ( media-video/ffmpeg:0= ) |
208 |
- libav? ( media-video/libav:0= ) ) |
209 |
- jack? ( media-sound/jack-audio-connection-kit ) |
210 |
- jpeg? ( virtual/jpeg:0 ) |
211 |
- mad? ( >=media-libs/libmad-0.15.1b ) |
212 |
- opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) |
213 |
- >=media-libs/libogg-1.1 |
214 |
- png? ( >=media-libs/libpng-1.4:0= ) |
215 |
- vorbis? ( >=media-libs/libvorbis-1.1 ) |
216 |
- theora? ( media-libs/libtheora ) |
217 |
- truetype? ( >=media-libs/freetype-2.1.4:2 ) |
218 |
- xml? ( >=dev-libs/libxml2-2.6.0:2 ) |
219 |
- xvid? ( >=media-libs/xvid-1.0.1 ) |
220 |
- sdl? ( media-libs/libsdl ) |
221 |
- jpeg2k? ( media-libs/openjpeg:0 ) |
222 |
- ssl? ( |
223 |
- !libressl? ( dev-libs/openssl:0= ) |
224 |
- libressl? ( dev-libs/libressl:0= ) ) |
225 |
- pulseaudio? ( media-sound/pulseaudio ) |
226 |
- X? ( |
227 |
- x11-libs/libXt |
228 |
- x11-libs/libX11 |
229 |
- x11-libs/libXv |
230 |
- x11-libs/libXext |
231 |
- ) |
232 |
-" |
233 |
-# disabled upstream, see applications/Makefile |
234 |
-# wxwidgets? ( =x11-libs/wxGTK-2.8* ) |
235 |
-DEPEND="${RDEPEND}" |
236 |
- |
237 |
-my_use() { |
238 |
- local flag="$1" pflag="${2:-$1}" |
239 |
- if use ${flag}; then |
240 |
- echo "--use-${pflag}=system" |
241 |
- else |
242 |
- echo "--use-${pflag}=no" |
243 |
- fi |
244 |
-} |
245 |
- |
246 |
-src_prepare() { |
247 |
- default |
248 |
- eapply "${FILESDIR}"/110_all_implicitdecls.patch \ |
249 |
- "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \ |
250 |
- "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch |
251 |
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die |
252 |
-} |
253 |
- |
254 |
-src_configure() { |
255 |
- tc-export CC CXX AR RANLIB |
256 |
- |
257 |
- econf \ |
258 |
- --enable-svg \ |
259 |
- --enable-pic \ |
260 |
- --disable-amr \ |
261 |
- --use-js=no \ |
262 |
- --use-ogg=system \ |
263 |
- $(use_enable alsa) \ |
264 |
- $(use_enable debug) \ |
265 |
- $(use_enable ipv6) \ |
266 |
- $(use_enable jack jack yes) \ |
267 |
- $(use_enable opengl 3d) \ |
268 |
- $(use_enable oss oss-audio) \ |
269 |
- $(use_enable pulseaudio pulseaudio yes) \ |
270 |
- $(use_enable sdl) \ |
271 |
- $(use_enable ssl) \ |
272 |
- $(use_enable static-libs static-lib) \ |
273 |
- $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \ |
274 |
- --disable-wx \ |
275 |
- $(my_use a52) \ |
276 |
- $(my_use aac faad) \ |
277 |
- $(my_use dvb dvbx) \ |
278 |
- $(my_use ffmpeg) \ |
279 |
- $(my_use jpeg) \ |
280 |
- $(my_use jpeg2k openjpeg) \ |
281 |
- $(my_use mad) \ |
282 |
- $(my_use png) \ |
283 |
- $(my_use theora) \ |
284 |
- $(my_use truetype ft) \ |
285 |
- $(my_use vorbis) \ |
286 |
- $(my_use xvid) \ |
287 |
- --extra-cflags="${CFLAGS}" \ |
288 |
- --cc="$(tc-getCC)" \ |
289 |
- --libdir="/$(get_libdir)" \ |
290 |
- --verbose |
291 |
-} |
292 |
- |
293 |
-src_install() { |
294 |
- emake STRIP="true" DESTDIR="${D}" install |
295 |
- emake STRIP="true" DESTDIR="${D}" install-lib |
296 |
- dodoc AUTHORS BUGS Changelog README.md TODO |
297 |
- dodoc doc/*.txt |
298 |
- dohtml doc/*.html |
299 |
-} |