commit: 1805b6d01458e4bfa5d4c373438dc3014a4b8ad1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 30 16:11:38 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 30 16:11:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1805b6d0
media-video/gpac: Drop 0.6.1-r2 Closes: https://bugs.gentoo.org/626240 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/gpac/Manifest | 1 - media-video/gpac/files/110_all_implicitdecls.patch | 22 ---- ...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 --- .../gpac/files/gpac-0.5.3-static-libs.patch | 85 -------------- media-video/gpac/gpac-0.6.1-r2.ebuild | 122 --------------------- 5 files changed, 245 deletions(-) diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index 5b823f36870..ce5adb32da3 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -1,2 +1 @@ -DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403 diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch deleted file mode 100644 index 71017b53b9e..00000000000 --- a/media-video/gpac/files/110_all_implicitdecls.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: gpac/applications/generators/SVG/svggen.h -=================================================================== ---- gpac.orig/applications/generators/SVG/svggen.h -+++ gpac/applications/generators/SVG/svggen.h -@@ -107,6 +107,17 @@ typedef struct { - } SVGGenAttrGrp; - - -+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name); -+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine); -+void generateSVGCode_V1(GF_List *svg_elements); -+void generate_laser_tables_da(GF_List *atts); -+void generate_laser_tables(GF_List *svg_elements); -+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start); -+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start); -+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]); -+void generate_table(GF_List *elements); -+void generateSVGCode_V2(GF_List *svg_elements); -+void generateSVGCode_V3(GF_List *svg_elements); - - /******************************************* - * Structures needed for static allocation * 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 deleted file mode 100644 index df3a5fc3299..00000000000 --- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch +++ /dev/null @@ -1,15 +0,0 @@ -Export gf_isom_set_pixel_aspect_ratio. -media-video/x264-encoder needs it and this funcion used to be exported. - -diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c -index e935acc..9841d85 100644 ---- a/src/isomedia/isom_write.c -+++ b/src/isomedia/isom_write.c -@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes - } - } - -+GF_EXPORT - GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing) - { - GF_Err e; 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 deleted file mode 100644 index ec11eaea172..00000000000 --- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/Makefile b/Makefile -index 62b7850..ff4b589 100644 ---- a/Makefile -+++ b/Makefile -@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes) - $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" - endif - mkdir -p "$(DESTDIR)$(prefix)/$(libdir)" -+ifeq ($(STATICLIBS),yes) - $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)" -+endif - $(MAKE) installdylib - - uninstall-lib: -diff --git a/configure b/configure -index df00dff..561bcd3 100755 ---- a/configure -+++ b/configure -@@ -101,6 +101,7 @@ has_xmlrpc="no" - has_openjpeg="no" - gprof_build="no" - static_build="no" -+static_libs="no" - want_pic="no" - want_gcov="no" - has_joystick="no" -@@ -252,6 +253,7 @@ GPAC configuration options: - --enable-amr-wb enable AMR WB library - --enable-amr enable both AMR NB and WB libraries - --enable-static-bin link statically against libgpac -+ --enable-static-lib GPAC static libraries build - --static-mp4box configure for static linking of MP4Box only. - --enable-depth enables depth handling in the compositor - -@@ -1849,6 +1851,8 @@ for opt do - ;; - --enable-static-bin) static_build="yes"; - ;; -+ --enable-static-lib) static_libs="yes"; -+ ;; - --disable-ipv6) has_ipv6="no" - ;; - --disable-wx) has_wx="no" -@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **" - echo "debug version: $debuginfo" - echo "GProf enabled: $gprof_build" - echo "Static build enabled: $static_build" -+echo "Static libs build enabled: $static_libs" - echo "Memory tracking enabled: $use_memory_tracking" - echo "Fixed-Point Version: $use_fixed_point" - echo "IPV6 Support: $has_ipv6" -@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak - echo "GPROFBUILD=$gprof_build" >> config.mak - echo "MP4BOX_STATIC=$static_mp4box" >> config.mak - echo "STATICBUILD=$static_build" >> config.mak -+echo "STATICLIBS=$static_libs" >> config.mak - - echo "CONFIG_IPV6=$has_ipv6" >> config.mak - if test "$has_ipv6" = "yes" ; then -diff --git a/src/Makefile b/src/Makefile -index ba9d9ab..89ea67f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR) - @echo "LIBS $(EXTRALIBS)" - - ifeq ($(CONFIG_DARWIN),yes) -- -+ifeq ($(STATICLIBS),yes) - $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS) - $(RANLIB) ../bin/gcc/libgpac_static.a -+endif - ifneq ($(STATICBUILD),yes) - $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) - endif - - else - -+ifeq ($(STATICLIBS),yes) - $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS) - $(RANLIB) ../bin/gcc/libgpac_static.a -+endif - ifneq ($(STATICBUILD),yes) - $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) - mv $@ $@.$(VERSION_SONAME) diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild deleted file mode 100644 index 86e1355ce3f..00000000000 --- a/media-video/gpac/gpac-0.6.1-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/gpac/gpac"; -else - SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" -HOMEPAGE="http://gpac.wp.mines-telecom.fr/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png - pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" - -RDEPEND=" - a52? ( media-libs/a52dec ) - aac? ( >=media-libs/faad2-2.0 ) - alsa? ( media-libs/alsa-lib ) - dvb? ( media-tv/linuxtv-dvb-apps ) - ffmpeg? ( - !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - mad? ( >=media-libs/libmad-0.15.1b ) - opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) - >=media-libs/libogg-1.1 - png? ( >=media-libs/libpng-1.4:0= ) - vorbis? ( >=media-libs/libvorbis-1.1 ) - theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4:2 ) - xml? ( >=dev-libs/libxml2-2.6.0:2 ) - xvid? ( >=media-libs/xvid-1.0.1 ) - sdl? ( media-libs/libsdl ) - jpeg2k? ( media-libs/openjpeg:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) ) - pulseaudio? ( media-sound/pulseaudio ) - X? ( - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXext - ) -" -# disabled upstream, see applications/Makefile -# wxwidgets? ( =x11-libs/wxGTK-2.8* ) -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_prepare() { - default - eapply "${FILESDIR}"/110_all_implicitdecls.patch \ - "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \ - "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch - sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die -} - -src_configure() { - tc-export CC CXX AR RANLIB - - econf \ - --enable-svg \ - --enable-pic \ - --disable-amr \ - --use-js=no \ - --use-ogg=system \ - $(use_enable alsa) \ - $(use_enable debug) \ - $(use_enable ipv6) \ - $(use_enable jack jack yes) \ - $(use_enable opengl 3d) \ - $(use_enable oss oss-audio) \ - $(use_enable pulseaudio pulseaudio yes) \ - $(use_enable sdl) \ - $(use_enable ssl) \ - $(use_enable static-libs static-lib) \ - $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \ - --disable-wx \ - $(my_use a52) \ - $(my_use aac faad) \ - $(my_use dvb dvbx) \ - $(my_use ffmpeg) \ - $(my_use jpeg) \ - $(my_use jpeg2k openjpeg) \ - $(my_use mad) \ - $(my_use png) \ - $(my_use theora) \ - $(my_use truetype ft) \ - $(my_use vorbis) \ - $(my_use xvid) \ - --extra-cflags="${CFLAGS}" \ - --cc="$(tc-getCC)" \ - --libdir="/$(get_libdir)" \ - --verbose -} - -src_install() { - emake STRIP="true" DESTDIR="${D}" install - emake STRIP="true" DESTDIR="${D}" install-lib - dodoc AUTHORS BUGS Changelog README.md TODO - dodoc doc/*.txt - dohtml doc/*.html -}
