From 1805b6d01458e4bfa5d4c373438dc3014a4b8ad1 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 30 Jan 2019 17:11:38 +0100 Subject: 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 --- 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 ---------------------- 3 files changed, 122 deletions(-) delete mode 100644 media-video/gpac/files/110_all_implicitdecls.patch delete mode 100644 media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch delete mode 100644 media-video/gpac/files/gpac-0.5.3-static-libs.patch (limited to 'media-video/gpac/files') 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 71017b53b9eb..000000000000 --- 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 df3a5fc32990..000000000000 --- 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 ec11eaea172a..000000000000 --- 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) -- cgit v1.2.3-65-gdbad