commit: 909822b6b67aed377cfcc99407e52eb7e3aa9565
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 15:57:15 2023 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 16:16:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909822b6
media-video/gpac: bump to 2.2.0
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/gpac/Manifest | 1 +
media-video/gpac/files/gpac-2.2.0-configure.patch | 104 +++++++++++++++++++++
media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch | 24 +++++
.../gpac/{gpac-9999.ebuild => gpac-2.2.0.ebuild} | 19 +---
media-video/gpac/gpac-9999.ebuild | 19 +---
5 files changed, 139 insertions(+), 28 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 1eeffa596c2a..5b4301b8344a 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B
a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086
SHA512
e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
+DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B
f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089
SHA512
4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
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/files/gpac-2.2.0-ffmpeg6.patch
b/media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch
new file mode 100644
index 000000000000..89bd0492b7ed
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-ffmpeg6.patch
@@ -0,0 +1,24 @@
+Index: gpac-2.2.0/src/filters/ff_mx.c
+===================================================================
+--- gpac-2.2.0.orig/src/filters/ff_mx.c
++++ gpac-2.2.0/src/filters/ff_mx.c
+@@ -503,7 +503,7 @@ static GF_Err ffmx_close_seg(GF_Filter *
+ evt.seg_size.is_init = 0;
+ }
+ evt.seg_size.media_range_start = ctx->offset_at_seg_start;
+- evt.seg_size.media_range_end = ctx->muxer->pb ?
(ctx->muxer->pb->written-1) : 0;
++ evt.seg_size.media_range_end = ctx->muxer->pb ?
(ctx->muxer->pb->bytes_written-1) : 0;
+ ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+
+ gf_filter_pid_send_event(pid, &evt);
+@@ -1013,8 +1013,8 @@ static GF_Err ffmx_configure_pid(GF_Filt
+ ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
+ }
+
+- if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) {
+- res = ctx->muxer->oformat->query_codec(ff_codec_id, 1);
++ if (ctx->muxer->oformat) {
++ res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, 1);
+ if (!res) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec
%s not supported in container %s\n", gf_codecid_name(codec_id),
ctx->muxer->oformat->name));
+ return GF_NOT_SUPPORTED;
diff --git a/media-video/gpac/gpac-9999.ebuild
b/media-video/gpac/gpac-2.2.0.ebuild
similarity index 91%
copy from media-video/gpac/gpac-9999.ebuild
copy to media-video/gpac/gpac-2.2.0.ebuild
index 777f20e6208b..d8ee67521cd8 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,8 +63,9 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-2.0.0-configure.patch"
+ "${FILESDIR}/${PN}-2.2.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+ "${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
)
DOCS=(
@@ -77,8 +78,6 @@ DOCS=(
README.md
)
-HTML_DOCS="share/doc/*.html"
-
my_use() {
local flag="$1" pflag="${2:-$1}"
if use ${flag}; then
@@ -88,11 +87,6 @@ my_use() {
fi
}
-src_prepare() {
- default
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
src_configure() {
tc-export CC CXX AR RANLIB
@@ -100,11 +94,8 @@ src_configure() {
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose
- --enable-ipv6
--enable-pic
--enable-svg
- --disable-amr
- --use-js=no
--use-ogg=system
$(use_enable alsa)
$(use_enable debug)
@@ -121,14 +112,14 @@ src_configure() {
$(use_enable X x11-xv)
$(my_use a52)
$(my_use aac faad)
- $(my_use dvb dvbx)
+ $(use_enable dvb dvbx)
$(my_use ffmpeg)
$(my_use jpeg)
$(my_use jpeg2k openjpeg)
$(my_use mad)
$(my_use png)
$(my_use theora)
- $(my_use truetype ft)
+ $(my_use truetype freetype)
$(my_use vorbis)
$(my_use xvid)
)
diff --git a/media-video/gpac/gpac-9999.ebuild
b/media-video/gpac/gpac-9999.ebuild
index 777f20e6208b..d8ee67521cd8 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,8 +63,9 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-2.0.0-configure.patch"
+ "${FILESDIR}/${PN}-2.2.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
+ "${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
)
DOCS=(
@@ -77,8 +78,6 @@ DOCS=(
README.md
)
-HTML_DOCS="share/doc/*.html"
-
my_use() {
local flag="$1" pflag="${2:-$1}"
if use ${flag}; then
@@ -88,11 +87,6 @@ my_use() {
fi
}
-src_prepare() {
- default
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
src_configure() {
tc-export CC CXX AR RANLIB
@@ -100,11 +94,8 @@ src_configure() {
--cc="$(tc-getCC)"
--libdir="$(get_libdir)"
--verbose
- --enable-ipv6
--enable-pic
--enable-svg
- --disable-amr
- --use-js=no
--use-ogg=system
$(use_enable alsa)
$(use_enable debug)
@@ -121,14 +112,14 @@ src_configure() {
$(use_enable X x11-xv)
$(my_use a52)
$(my_use aac faad)
- $(my_use dvb dvbx)
+ $(use_enable dvb dvbx)
$(my_use ffmpeg)
$(my_use jpeg)
$(my_use jpeg2k openjpeg)
$(my_use mad)
$(my_use png)
$(my_use theora)
- $(my_use truetype ft)
+ $(my_use truetype freetype)
$(my_use vorbis)
$(my_use xvid)
)
