Updating liguros repo

4 files changed, 126 insertions, 10 deletions

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 261a41794a29..3eb8fc2546c5 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,2 @@
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
-DIST gpac-1.0.0.tar.gz 10289999 BLAKE2B 9bd1134a53c59fae59bb18a2e4f8c5db0639fbbc7e2270a16d8a621c3cb37529c7bdf536b0ac71227579b3b6c09305960775f6676a1f4d0f15b3cf3ae99b91ef SHA512 930b4b02f1d68554a99b9fde3faf6a429d78a86522b52da7601a40907d41e159724c935952becc008ae626001cb23543e446125dfb58764513d5808197ec4e29
+DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
diff --git a/media-video/gpac/files/gpac-1.0.1-configure.patch b/media-video/gpac/files/gpac-1.0.1-configure.patch
new file mode 100644
index 000000000000..e471157af6b6
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.1-configure.patch
@@ -0,0 +1,117 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+----
+diff --git a/Makefile b/Makefile
+index 303a413..1ef750e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -284,8 +284,9 @@ ifeq ($(GPAC_ENST),yes)
+ endif
+ 
+ 	$(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"
+ 
+diff --git a/configure b/configure
+index de8ea99..4f5a6a8 100755
+--- a/configure
++++ b/configure
+@@ -105,6 +105,7 @@ has_dvb4linux="no"
+ has_openjpeg="no"
+ gprof_build="no"
+ static_build="no"
++static_libs="no"
+ want_pic="no"
+ want_gcov="no"
+ has_joystick="no"
+@@ -264,6 +265,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
+ 
+@@ -706,14 +708,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"
+@@ -1710,6 +1704,8 @@ for opt do
+             ;;
+         --enable-static-bin) static_build="yes";
+             ;;
++        --enable-static-libs) static_libs="yes";
++            ;;
+         --disable-ipv6) has_ipv6="no"
+             ;;
+         --disable-platinum) has_platinum="no"
+@@ -2357,6 +2353,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 enabled: $static_libs"
+ echo "Memory tracking enabled: $use_memory_tracking"
+ echo "Sanitizer enabled: $enable_sanitizer"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3049,6 +3046,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 c483c8d..b24d5bb 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -347,7 +347,6 @@ filters_svc: $(LIBGPAC_FILTERS_SVC)
+ 	@echo "LIBS $(EXTRALIBS)"
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
+ 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+ 	$(RANLIB) ../bin/gcc/libgpac_static.a
+ ifneq ($(STATICBUILD),yes)
+@@ -355,9 +354,10 @@ ifneq ($(STATICBUILD),yes)
+ 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) -o $@ $(OBJS) $(EXTRALIBS)	 $(LDFLAGS)
+ 	mv $@ $@.$(VERSION_SONAME)
+diff --git a/configure b/configure
+index 4f5a6a8..baba248 100755
+--- a/configure
++++ b/configure
+@@ -735,10 +735,6 @@ cat > $TMPC << EOF
+ int main( void ) { return 0; }
+ EOF
+ 
+-if docc -msse2 $LDFLAGS ; then
+-  CFLAGS="$CFLAGS -msse2"
+-fi
+-
+ 
+ #look for zlib
+ cat > $TMPC << EOF
diff --git a/media-video/gpac/gpac-1.0.0.ebuild b/media-video/gpac/gpac-1.0.1.ebuild
index 7721c668112c..e5828cfed456 100644
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ b/media-video/gpac/gpac-1.0.1.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+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 truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -63,8 +63,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
+	"${FILESDIR}/${PN}-1.0.1-configure.patch"
 	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
@@ -98,7 +97,7 @@ src_configure() {
 	tc-export CC CXX AR RANLIB
 
 	local myeconfargs=(
-		--extra-cflags="${CFLAGS}"
+		--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
 		--cc="$(tc-getCC)"
 		--libdir="$(get_libdir)"
 		--verbose
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index eb3754e022a1..e5828cfed456 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/10"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
+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 truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -63,7 +63,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1-configure.patch"
+	"${FILESDIR}/${PN}-1.0.1-configure.patch"
 	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 )
 
@@ -97,7 +97,7 @@ src_configure() {
 	tc-export CC CXX AR RANLIB
 
 	local myeconfargs=(
-		--extra-cflags="${CFLAGS}"
+		--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
 		--cc="$(tc-getCC)"
 		--libdir="$(get_libdir)"
 		--verbose