media-video/gpac-9999: update to use github instead of sf.net

Package-Manager: portage-2.2.20.1

3 files changed, 109 insertions, 7 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)
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index d2209c42a53b..ab5603b67980 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -5,12 +5,13 @@
 EAPI=4
 
 if [[ ${PV} == *9999 ]] ; then
-	SCM="subversion"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/gpac/code/trunk/gpac"
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/gpac/gpac"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}"/${PN}
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -22,7 +23,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid"
 
-S="${WORKDIR}"/${PN}
 
 RDEPEND="
 	a52? ( media-libs/a52dec )
@@ -65,7 +65,8 @@ my_use() {
 
 src_prepare() {
 	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
-			"${FILESDIR}"/${PN}-0.5.1-build-fixes.patch
+			"${FILESDIR}"/${PN}-0.5.2-static-libs.patch \
+			"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
 }
 
@@ -103,13 +104,14 @@ src_configure() {
 		$(my_use xvid) \
 		--extra-cflags="${CFLAGS}" \
 		--cc="$(tc-getCC)" \
-		--libdir="/$(get_libdir)"
+		--libdir="/$(get_libdir)" \
+		--verbose
 }
 
 src_install() {
 	emake STRIP="true" DESTDIR="${D}" install
 	emake STRIP="true" DESTDIR="${D}" install-lib
-	dodoc AUTHORS BUGS Changelog README TODO INSTALLME
+	dodoc AUTHORS BUGS Changelog README.md TODO
 	dodoc doc/*.txt
 	dohtml doc/*.html
 }