summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-08-22 11:16:58 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-08-22 11:16:58 +0200
commit7572631c02d9cd344896f44e5d3999cc5c58668d (patch)
tree260052154d03ae93f325a72261b20ea56520968f /media-video/gpac/files
parentgames-strategy/freeciv: Bump to version 2.5.1 (diff)
downloadgentoo-7572631c02d9cd344896f44e5d3999cc5c58668d.tar.gz
gentoo-7572631c02d9cd344896f44e5d3999cc5c58668d.tar.bz2
gentoo-7572631c02d9cd344896f44e5d3999cc5c58668d.zip
media-video/gpac-9999: update to use github instead of sf.net
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-video/gpac/files')
-rw-r--r--media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch15
-rw-r--r--media-video/gpac/files/gpac-0.5.2-static-libs.patch85
2 files changed, 100 insertions, 0 deletions
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
new file mode 100644
index 000000000000..df3a5fc32990
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
@@ -0,0 +1,15 @@
+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.2-static-libs.patch b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
new file mode 100644
index 000000000000..ec11eaea172a
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,85 @@
+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)