Adding metadata

2 files changed, 120 insertions, 19 deletions

diff --git a/media-video/gpac/files/gpac-2.2.0-configure.patch b/media-video/gpac/files/gpac-2.2.0-configure.patch
new file mode 100644
index 000000000000..1d26b52a6d90
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-configure.patch
@@ -0,0 +1,104 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+
+Index: gpac-2.2.0/Makefile
+===================================================================
+--- gpac-2.2.0.orig/Makefile
++++ gpac-2.2.0/Makefile
+@@ -276,7 +276,9 @@ install-lib:
+ 	$(INSTALL) $(INSTFLAGS) -m 644 config.h "$(DESTDIR)$(prefix)/include/gpac/configuration.h" || true
+ 
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)"
++ifeq ($(STATIC_LIBS), yes)
+ 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(lib_dir)" || true
++endif
+ 
+ 	$(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig
+ 	$(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig"
+Index: gpac-2.2.0/configure
+===================================================================
+--- gpac-2.2.0.orig/configure
++++ gpac-2.2.0/configure
+@@ -74,6 +74,7 @@ enable_sanitizer="no"
+ libgpac_cflags=""
+ libgpac_extralibs=""
+ static_build="no"
++static_libs="no"
+ static_bin="no"
+ static_modules="no"
+ lm_lib=""
+@@ -273,6 +274,7 @@ GPAC build options:
+   --disable-opt            disable GCC optimizations
+   --static-build           link statically against libgpac but still allow dependencies to shared libraries (enable --static-modules)
+   --static-bin             enable static linking of MP4Box and gpac only (will enable --static-build), disable all libraries not linkable statically.
++  --enable-static-lib      GPAC static libraries build
+   --sdl-cfg=SDL_PATH       specify path to sdl-config for local install [$sdl_path]
+   --enable-sdl-static      use static SDL linking [default=no]
+   --X11-path=X11_PATH      specify path for X11 includes and libraries [$X11_PATH]
+@@ -552,6 +554,8 @@ for opt do
+             echo "$opt deprecated, use --static-build instead"
+             static_build="yes";
+             ;;
++        --enable-static-libs) static_libs="yes";
++            ;;
+         --enable-fixed-point) use_fixed_point="yes"
+             ;;
+         --strip) INSTFLAGS="-s $INSTFLAGS"
+@@ -943,14 +947,6 @@ if docc -lz -Wno-pointer-sign ; then
+ fi
+ 
+ 
+-#GCC opt
+-if test "$no_gcc_opt" = "no"; then
+-    CFLAGS="-O3 $CFLAGS"
+-else
+-    CFLAGS="-O0 $CFLAGS"
+-fi
+-
+-
+ #GCC PIC
+ if test "$cross_prefix" != "" ; then
+     want_pic="no"
+@@ -978,11 +974,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+-
+ #check dlopen support
+ has_dlopen="no"
+ cat > $TMPC << EOF
+@@ -1888,6 +1879,7 @@ else
+ fi
+ echo "debug version: $debuginfo"
+ echo "GProf enabled: $gprof_build"
++echo "Static libs enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -2604,6 +2596,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> config.mak
+ echo "STATIC_BUILD=$static_build" >> config.mak
++echo "STATIC_LIBS=$static_libs" >> config.mak
+ 
+ echo "CONFIG_IPV6=$has_ipv6" >> config.mak
+ if test "$has_ipv6" = "yes" ; then
+Index: gpac-2.2.0/src/Makefile
+===================================================================
+--- gpac-2.2.0.orig/src/Makefile
++++ gpac-2.2.0/src/Makefile
+@@ -369,8 +369,10 @@ endif
+ 
+ else
+ 
++ifeq ($(STATIC_LIBS), yes)
+ 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATIC_BUILD),yes)
+ 	$(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
+ 	mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-2.2.1-r1.ebuild b/media-video/gpac/gpac-2.2.1-r2.ebuild
index df43165d82ca..7ae4943a1c7c 100644
--- a/media-video/gpac/gpac-2.2.1-r1.ebuild
+++ b/media-video/gpac/gpac-2.2.1-r2.ebuild
@@ -8,12 +8,13 @@ DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratc
 HOMEPAGE="https://gpac.wp.imt.fr/"
 GIT_COMMIT="ba14e34dd7a3c4cef5a56962898e9f863dd4b4f3"
 SRC_URI="https://github.com/gpac/gpac/archive/${GIT_COMMIT}.tar.gz -> ${PN}-${GIT_COMMIT}.tar.gz"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 LICENSE="GPL-2"
 # subslot == libgpac major
-SLOT="0/12"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png pulseaudio sdl ssl static-libs theora vorbis xml xvid X"
+SLOT="0/11"
+#IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
+IUSE="a52 aac alsa cpu_flags_x86_sse2 dvb ffmpeg jack jpeg jpeg2k mad opengl oss png pulseaudio theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
@@ -24,7 +25,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	jpeg2k? ( media-libs/openjpeg:2 )
 	mad? ( media-libs/libmad )
 	opengl? (
@@ -33,12 +34,9 @@ RDEPEND="
 		virtual/opengl
 	)
 	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	theora? ( media-libs/libtheora )
-	media-libs/freetype:2
-	sdl? ( media-libs/libsdl )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	truetype? ( media-libs/freetype:2 )
 	vorbis? ( media-libs/libvorbis )
 	X? (
 		x11-libs/libXt
@@ -49,13 +47,16 @@ RDEPEND="
 	xml? ( dev-libs/libxml2:2= )
 	xvid? ( media-libs/xvid )
 "
+#	sdl? ( media-libs/libsdl )
+#	!libressl? ( dev-libs/openssl:0= )
+#	libressl? ( dev-libs/libressl:0= )
 DEPEND="
 	${RDEPEND}
 	dvb? ( sys-kernel/linux-headers )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+	"${FILESDIR}/${PN}-2.2.0-configure.patch"
 )
 
 S=${WORKDIR}/${PN}-${GIT_COMMIT}
@@ -82,6 +83,8 @@ my_use() {
 src_prepare() {
 	default
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+	# TODO: remove when old zlib is no longer in tree
+	has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 }
 
 src_configure() {
@@ -93,9 +96,8 @@ src_configure() {
 		--verbose
 		--enable-pic
 		--enable-svg
-		--enable-ogg
+		--use-ogg=system
 		$(use_enable dvb dvb4linux)
-		$(use_enable ipv6)
 		$(use_enable jack jack yes)
 		$(use_enable opengl 3d)
 		$(use_enable pulseaudio pulseaudio yes)
@@ -108,17 +110,12 @@ src_configure() {
 		$(my_use mad)
 		$(my_use png)
 		$(my_use theora)
+		$(my_use truetype freetype)
 		$(my_use vorbis)
 		$(my_use xvid)
 	)
 
-	if use debug ; then
-		myeconfargs+=(
-			--enable-debug
-		)
-	fi
-
-	if ! use X ; then
+	if !use X ; then
 		myeconfargs+=(
 			--disable-x11
 			--disable-x11-shm