* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2015-08-22 9:17 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2015-08-22 9:17 UTC (permalink / raw
To: gentoo-commits
commit: 7572631c02d9cd344896f44e5d3999cc5c58668d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 09:16:58 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 09:16:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7572631c
media-video/gpac-9999: update to use github instead of sf.net
Package-Manager: portage-2.2.20.1
...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 ++++
.../gpac/files/gpac-0.5.2-static-libs.patch | 85 ++++++++++++++++++++++
media-video/gpac/gpac-9999.ebuild | 16 ++--
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 0000000..df3a5fc
--- /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 0000000..ec11eae
--- /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 d2209c4..ab5603b 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
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2015-08-22 9:29 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2015-08-22 9:29 UTC (permalink / raw
To: gentoo-commits
commit: c6e6f0001f670de9b9fc20d2b17fa051ed725b0a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 09:26:43 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 09:26:43 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e6f000
media-video/gpac: bump to 0.5.2
Package-Manager: portage-2.2.20.1
media-video/gpac/Manifest | 1 +
.../gpac/files/gpac-0.5.2-static-libs.patch | 80 ++++++++++++++
media-video/gpac/gpac-0.5.2.ebuild | 116 +++++++++++++++++++++
3 files changed, 197 insertions(+)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index f16d0af..dd66f6e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,3 @@
DIST gpac-0.5.0.tar.gz 7861057 SHA256 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278 WHIRLPOOL 1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 81746ad1d9a8ae0a84c73652d1af5d86d9c36229b278422c13e353893893a83c SHA512 25883e32d83dc2b4649c506b86f745d2f8eaaaa75fff629b534205979aeb519a167243e62ec0d78e453d1edc27435acffd521a8c08a739cde05196f61e93ac47 WHIRLPOOL af5a89cb52802bc45edd29c6f0f5ce9f48decea16eef8a76c33c7161a6d48b3d43f1a2b4c3049d2f1f92d0c3f22b787a33c1652f42d2c0cf3b84ad58c2fb7589
+DIST gpac-0.5.2.tar.gz 9044537 SHA256 14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 b6828953333c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979 WHIRLPOOL d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122
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 0000000..91c89c4
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,80 @@
+Index: gpac-0.5.2/configure
+===================================================================
+--- gpac-0.5.2.orig/configure
++++ gpac-0.5.2/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"
+@@ -248,6 +249,7 @@ GPAC configuration options:
+ --enable-amr-wb enable AMR WB library
+ --enable-amr enable both AMR NB and WB libraries
+ --enable-static-bin GPAC static build
++ --enable-static-lib GPAC static libraries build
+ --static-mp4box configure for static linking of MP4Box.
+ --enable-depth enables depth handling in the compositor
+
+@@ -1775,6 +1777,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"
+@@ -2452,6 +2456,7 @@ echo "** GPAC $version rev$revision Core
+ 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 "Use standard memory allocator: $use_std_alloc"
+ echo "Fixed-Point Version: $use_fixed_point"
+@@ -3064,6 +3069,7 @@ echo "CONFIG_AMR_WB_FT=$has_amr_wb" >> c
+ echo "DEBUGBUILD=$debuginfo" >> config.mak
+ echo "GPROFBUILD=$gprof_build" >> 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
+Index: gpac-0.5.2/Makefile
+===================================================================
+--- gpac-0.5.2.orig/Makefile
++++ gpac-0.5.2/Makefile
+@@ -203,7 +203,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:
+Index: gpac-0.5.2/src/Makefile
+===================================================================
+--- gpac-0.5.2.orig/src/Makefile
++++ gpac-0.5.2/src/Makefile
+@@ -606,12 +606,16 @@ compositor: $(LIBGPAC_COMPOSITOR)
+ @echo "OBJS $(OBJS)"
+ @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
+ $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+ else
++ifeq ($(STATICLIBS),yes)
+ $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+ $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+ ifeq (,$(findstring yes, $(CONFIG_WIN32)))
+ mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-0.5.2.ebuild b/media-video/gpac/gpac-0.5.2.ebuild
new file mode 100644
index 0000000..19d06af
--- /dev/null
+++ b/media-video/gpac/gpac-0.5.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/gpac/gpac"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+
+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"
+
+
+RDEPEND="
+ a52? ( media-libs/a52dec )
+ aac? ( >=media-libs/faad2-2.0 )
+ alsa? ( media-libs/alsa-lib )
+ dvb? ( media-tv/linuxtv-dvb-apps )
+ ffmpeg? ( virtual/ffmpeg )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg )
+ mad? ( >=media-libs/libmad-0.15.1b )
+ opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
+ >=media-libs/libogg-1.1
+ png? ( >=media-libs/libpng-1.4 )
+ vorbis? ( >=media-libs/libvorbis-1.1 )
+ theora? ( media-libs/libtheora )
+ truetype? ( >=media-libs/freetype-2.1.4 )
+ xml? ( >=dev-libs/libxml2-2.6.0 )
+ xvid? ( >=media-libs/xvid-1.0.1 )
+ sdl? ( media-libs/libsdl )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ssl? ( dev-libs/openssl )
+ pulseaudio? ( media-sound/pulseaudio )
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXv
+ x11-libs/libXext"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+
+DEPEND="${RDEPEND}"
+
+my_use() {
+ local flag="$1" pflag="${2:-$1}"
+ if use ${flag}; then
+ echo "--use-${pflag}=system"
+ else
+ echo "--use-${pflag}=no"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/110_all_implicitdecls.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
+}
+
+src_configure() {
+ tc-export CC CXX AR RANLIB
+
+ econf \
+ --enable-svg \
+ --enable-pic \
+ --disable-amr \
+ --use-js=no \
+ --use-ogg=system \
+ $(use_enable alsa) \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable jack jack yes) \
+ $(use_enable opengl) \
+ $(use_enable oss oss-audio) \
+ $(use_enable pulseaudio pulseaudio yes) \
+ $(use_enable sdl) \
+ $(use_enable ssl) \
+ $(use_enable static-libs static-lib) \
+ --disable-wx \
+ $(my_use a52) \
+ $(my_use aac faad) \
+ $(my_use 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 vorbis) \
+ $(my_use xvid) \
+ --extra-cflags="${CFLAGS}" \
+ --cc="$(tc-getCC)" \
+ --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
+ dodoc doc/*.txt
+ dohtml doc/*.html
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2018-04-20 18:12 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2018-04-20 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 0e30c98c3d9687a5128deb9eccffe317faca8d06
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 17:25:06 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 18:11:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e30c98c
media-video/gpac: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-video/gpac/files/ffmpeg4.patch | 44 ++++++++++++++++++++++++++++++++++++
media-video/gpac/gpac-0.7.1.ebuild | 3 ++-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/media-video/gpac/files/ffmpeg4.patch b/media-video/gpac/files/ffmpeg4.patch
new file mode 100644
index 00000000000..61f329806a5
--- /dev/null
+++ b/media-video/gpac/files/ffmpeg4.patch
@@ -0,0 +1,44 @@
+Index: gpac-0.7.1/applications/dashcast/video_encoder.c
+===================================================================
+--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c
++++ gpac-0.7.1/applications/dashcast/video_encoder.c
+@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
+ }
+
+ //the global header gives access to the extradata (SPS/PPS)
+- video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ video_output_file->vstream_idx = 0;//video_stream->index;
+
+Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+===================================================================
+--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
+@@ -49,7 +49,7 @@
+ static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+ uint8_t * buffer;
+ /* Size of buffer must be larger, see avcodec_decode_video2 documentation */
+- u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
++ u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
+ if (oldBuffer)
+ gf_free(oldBuffer);
+ buffer = (uint8_t*)gf_malloc( allocatedSz );
+@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ capability->cap.valueInt = 1;
+ return GF_OK;
+ case GF_CODEC_PADDING_BYTES:
+- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ return GF_OK;
+ case GF_CODEC_REORDER:
+ capability->cap.valueInt = 1;
+@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
+ break;
+
+ case GF_CODEC_PADDING_BYTES:
+- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+ break;
+ default:
+ capability->cap.valueInt = 0;
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index 2e7046a175c..ca4acbd586e 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}"
# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
PATCHES=(
"${FILESDIR}/${PN}-0.7.1-configure.patch"
+ "${FILESDIR}/ffmpeg4.patch"
)
DOCS=(
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2018-06-13 16:21 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2018-06-13 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 02e7c018532a058fa4d5c73cbe74fca48f085f19
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 15:53:08 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 16:20:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e7c018
media-video/gpac: Fixed build with openssl-1.1
Closes: https://bugs.gentoo.org/592550
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../gpac/files/gpac-0.7.1-openssl-1.1.patch | 126 +++++++++++++++++++++
media-video/gpac/gpac-0.7.1.ebuild | 1 +
2 files changed, 127 insertions(+)
diff --git a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
new file mode 100644
index 00000000000..e25a5bca78b
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
@@ -0,0 +1,126 @@
+From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
+From: Aurelien David <aurelien.david@telecom-paristech.fr>
+Date: Fri, 6 Oct 2017 16:46:18 +0200
+Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
+
+diff --git a/src/utils/downloader.c b/src/utils/downloader.c
+index b8c923b88..3b7d37b41 100644
+--- a/src/utils/downloader.c
++++ b/src/utils/downloader.c
+@@ -204,7 +204,7 @@ struct __gf_download_manager
+ u32 limit_data_rate, read_buf_size;
+ u64 max_cache_size;
+ Bool allow_broken_certificate;
+-
++
+ GF_List *skip_proxy_servers;
+ GF_List *credentials;
+ GF_List *cache_entries;
+@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
+ return GF_TRUE;
+ }
++
++ /* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
++ ** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
++ ** Similarly it will also automatically deinitialise as required.
++ */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_library_init();
+ SSL_load_error_strings();
+ SSLeay_add_all_algorithms();
+ SSLeay_add_ssl_algorithms();
++#endif
++
+ _ssl_is_initialized = GF_TRUE;
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
+ return GF_FALSE;
+@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ }
+
+ switch (mode) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ case 0:
+ meth = SSLv23_client_method();
+ break;
+@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
+ case 3:
+ meth = TLSv1_client_method();
+ break;
++#else /* for openssl 1.1+ this is the prefered method */
++ case 0:
++ meth = TLS_client_method();
++ break;
++#endif
+ default:
+ goto error;
+ }
+@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
+ gf_sk_del(sess->sock);
+ gf_list_del(sess->headers);
+ gf_mx_del(sess->mx);
+-
++
+ gf_free(sess);
+ GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
+ }
+@@ -1145,7 +1159,7 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ {
+ GF_DownloadSession *sess;
+ if (!dm) return NULL;
+-
++
+ GF_SAFEALLOC(sess, GF_DownloadSession);
+ if (!sess) {
+ GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
+@@ -1166,8 +1180,8 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
+ gf_free(sess);
+ return NULL;
+ }
+-
+-
++
++
+ assert( dm );
+
+ *e = gf_dm_sess_setup_from_url(sess, url);
+@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
+ gf_mx_v(sess->mx);
+ return GF_IP_CONNECTION_CLOSED;
+ }
+-
++
+ #ifdef GPAC_HAS_SSL
+ if (sess->ssl) {
+ s32 size;
+@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
+ const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
+ if (altname->type == GEN_DNS)
+ {
+- unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++ #if OPENSSL_VERSION_NUMBER < 0x10100000L
++ unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
++ #else
++ unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
++ #endif
+ gf_list_add(valid_names, altname_str);
+ }
+ }
+@@ -1806,7 +1824,7 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
+ dm->limit_data_rate = 1000 * atoi(opt) / 8;
+ else
+ gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
+-
++
+
+ dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
+ //when rate is limited, use smaller smaller read size
+@@ -2943,7 +2961,7 @@ static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
+ hdrp->value = gf_strdup(hdr_val);
+ gf_list_add(sess->headers, hdrp);
+ }
+-
++
+ if (sep) sep[0]=':';
+ if (hdr_sep) hdr_sep[0] = '\r';
+ }
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index ed5c090d045..fea54fdfefe 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.7.1-configure.patch"
"${FILESDIR}/ffmpeg4.patch"
"${FILESDIR}/${PN}-freetype.patch"
+ "${FILESDIR}/${P}-openssl-1.1.patch"
)
DOCS=(
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2019-01-30 16:12 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-01-30 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 1805b6d01458e4bfa5d4c373438dc3014a4b8ad1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 16:11:38 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 16:11:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1805b6d0
media-video/gpac: Drop 0.6.1-r2
Closes: https://bugs.gentoo.org/626240
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/gpac/Manifest | 1 -
media-video/gpac/files/110_all_implicitdecls.patch | 22 ----
...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 ---
.../gpac/files/gpac-0.5.3-static-libs.patch | 85 --------------
media-video/gpac/gpac-0.6.1-r2.ebuild | 122 ---------------------
5 files changed, 245 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 5b823f36870..ce5adb32da3 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch
deleted file mode 100644
index 71017b53b9e..00000000000
--- a/media-video/gpac/files/110_all_implicitdecls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===================================================================
---- gpac.orig/applications/generators/SVG/svggen.h
-+++ gpac/applications/generators/SVG/svggen.h
-@@ -107,6 +107,17 @@ typedef struct {
- } SVGGenAttrGrp;
-
-
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generate_laser_tables_da(GF_List *atts);
-+void generate_laser_tables(GF_List *svg_elements);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-
- /*******************************************
- * Structures needed for static allocation *
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
deleted file mode 100644
index df3a5fc3299..00000000000
--- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.3-static-libs.patch b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
deleted file mode 100644
index ec11eaea172..00000000000
--- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild
deleted file mode 100644
index 86e1355ce3f..00000000000
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
- SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
- pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
- a52? ( media-libs/a52dec )
- aac? ( >=media-libs/faad2-2.0 )
- alsa? ( media-libs/alsa-lib )
- dvb? ( media-tv/linuxtv-dvb-apps )
- ffmpeg? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= ) )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- mad? ( >=media-libs/libmad-0.15.1b )
- opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
- >=media-libs/libogg-1.1
- png? ( >=media-libs/libpng-1.4:0= )
- vorbis? ( >=media-libs/libvorbis-1.1 )
- theora? ( media-libs/libtheora )
- truetype? ( >=media-libs/freetype-2.1.4:2 )
- xml? ( >=dev-libs/libxml2-2.6.0:2 )
- xvid? ( >=media-libs/xvid-1.0.1 )
- sdl? ( media-libs/libsdl )
- jpeg2k? ( media-libs/openjpeg:0 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= ) )
- pulseaudio? ( media-sound/pulseaudio )
- X? (
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/libXext
- )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
-
-my_use() {
- local flag="$1" pflag="${2:-$1}"
- if use ${flag}; then
- echo "--use-${pflag}=system"
- else
- echo "--use-${pflag}=no"
- fi
-}
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/110_all_implicitdecls.patch \
- "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
- "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
- tc-export CC CXX AR RANLIB
-
- econf \
- --enable-svg \
- --enable-pic \
- --disable-amr \
- --use-js=no \
- --use-ogg=system \
- $(use_enable alsa) \
- $(use_enable debug) \
- $(use_enable ipv6) \
- $(use_enable jack jack yes) \
- $(use_enable opengl 3d) \
- $(use_enable oss oss-audio) \
- $(use_enable pulseaudio pulseaudio yes) \
- $(use_enable sdl) \
- $(use_enable ssl) \
- $(use_enable static-libs static-lib) \
- $(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
- --disable-wx \
- $(my_use a52) \
- $(my_use aac faad) \
- $(my_use 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 vorbis) \
- $(my_use xvid) \
- --extra-cflags="${CFLAGS}" \
- --cc="$(tc-getCC)" \
- --libdir="/$(get_libdir)" \
- --verbose
-}
-
-src_install() {
- emake STRIP="true" DESTDIR="${D}" install
- emake STRIP="true" DESTDIR="${D}" install-lib
- dodoc AUTHORS BUGS Changelog README.md TODO
- dodoc doc/*.txt
- dohtml doc/*.html
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2020-08-20 12:30 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2020-08-20 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 4b34462e1b49b4b30ed014713f3011d5a246a91e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 12:12:54 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 12:30:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b34462e
media-video/gpac: security bump to 0.8.1
We're bumping to 0.8.1 before 1.0.0 because there was
a substantial rewrite. The aim is to stabilise this release
first, give 1.0.0 (later commit) a few days in ~arch, then do that.
Bug: https://bugs.gentoo.org/711262
Closes: https://bugs.gentoo.org/701538
Closes: https://bugs.gentoo.org/654418
Closes: https://bugs.gentoo.org/658062
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/gpac/Manifest | 1 +
media-video/gpac/files/gpac-0.8.1-configure.patch | 100 +++++++++++++++
media-video/gpac/gpac-0.8.1.ebuild | 149 ++++++++++++++++++++++
3 files changed, 250 insertions(+)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index ce5adb32da3..8340f361bd6 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
+DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch b/media-video/gpac/files/gpac-0.8.1-configure.patch
new file mode 100644
index 00000000000..4a6c97b6cf3
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.8.1-configure.patch
@@ -0,0 +1,100 @@
+diff --git a/Makefile b/Makefile
+index 61241cd..7481027 100644
+--- a/Makefile
++++ b/Makefile
+@@ -270,7 +270,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 ($(STATIC_LIBS),yes)
+ $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
++endif
+ if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
+ $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
+ fi
+diff --git a/configure b/configure
+index 6ef2258..240b6b0 100755
+--- a/configure
++++ b/configure
+@@ -108,6 +108,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"
+@@ -266,6 +267,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
+
+@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ 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"
+@@ -1931,6 +1924,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"
+@@ -2622,6 +2617,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"
+@@ -3291,6 +3287,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 935ffff..b3464b7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR)
+
+ 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) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
+ 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/media-video/gpac/gpac-0.8.1.ebuild b/media-video/gpac/gpac-0.8.1.ebuild
new file mode 100644
index 00000000000..82441609b59
--- /dev/null
+++ b/media-video/gpac/gpac-0.8.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://github.com/gpac/gpac"
+else
+ SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit flag-o-matic toolchain-funcs ${SCM}
+
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/ https://github.com/gpac/gpac"
+
+LICENSE="GPL-2"
+# subslot == libgpac major
+SLOT="0/8"
+IUSE="a52 aac alsa 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"
+RDEPEND="
+ media-libs/libogg
+ a52? ( media-libs/a52dec )
+ aac? ( media-libs/faad2 )
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ mad? ( media-libs/libmad )
+ opengl? (
+ media-libs/freeglut
+ virtual/glu
+ virtual/opengl
+ )
+ png? ( media-libs/libpng:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ theora? ( media-libs/libtheora )
+ truetype? ( media-libs/freetype:2 )
+ sdl? ( media-libs/libsdl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ vorbis? ( media-libs/libvorbis )
+ X? (
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXv
+ x11-libs/libXext
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xvid? ( media-libs/xvid )
+"
+# disabled upstream, see applications/Makefile
+# wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}
+ dvb? ( sys-kernel/linux-headers )
+"
+
+# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.8.1-configure.patch"
+)
+
+DOCS=(
+ doc/CODING_STYLE
+ doc/GPAC\ UPnP.doc
+ doc/ISO\ 639-2\ codes.txt
+ doc/SceneGenerators
+ doc/ipmpx_syntax.bt
+ Changelog
+ AUTHORS
+ BUGS
+ README.md
+ TODO
+)
+
+HTML_DOCS="doc/*.html"
+
+my_use() {
+ local flag="$1" pflag="${2:-$1}"
+ if use ${flag}; then
+ echo "--use-${pflag}=system"
+ else
+ echo "--use-${pflag}=no"
+ fi
+}
+
+src_prepare() {
+ default
+ sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
+}
+
+src_configure() {
+ tc-export CC CXX AR RANLIB
+
+ local myeconfargs=(
+ --extra-cflags="${CFLAGS}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --libdir="/$(get_libdir)"
+ --verbose
+ --enable-pic
+ --enable-svg
+ --disable-amr
+ --disable-wx
+ --use-js=no
+ --use-ogg=system
+ $(use_enable alsa)
+ $(use_enable debug)
+ $(use_enable dvb dvb4linux)
+ $(use_enable ipv6)
+ $(use_enable jack jack yes)
+ $(use_enable opengl 3d)
+ $(use_enable oss oss-audio)
+ $(use_enable pulseaudio pulseaudio yes)
+ $(use_enable sdl)
+ $(use_enable ssl)
+ $(use_enable static-libs static-lib)
+ $(use_enable X x11)
+ $(use_enable X x11-shm)
+ $(use_enable X x11-xv)
+ $(my_use a52)
+ $(my_use aac faad)
+ $(my_use 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 vorbis)
+ $(my_use xvid)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ einstalldocs
+ emake STRIP="true" DESTDIR="${D}" install
+ emake STRIP="true" DESTDIR="${D}" install-lib
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2020-08-31 23:15 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2020-08-31 23:15 UTC (permalink / raw
To: gentoo-commits
commit: a373cdf5df43887629aaf902bd080f6b7f46a10e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 23:13:31 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 23:14:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a373cdf5
media-video/gpac: security cleanup
Bug: https://bugs.gentoo.org/711262
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/gpac/Manifest | 1 -
media-video/gpac/files/ffmpeg4.patch | 44 ------
media-video/gpac/files/gpac-0.7.1-configure.patch | 94 -------------
.../gpac/files/gpac-0.7.1-openssl-1.1.patch | 126 -----------------
media-video/gpac/files/gpac-freetype.patch | 15 ---
media-video/gpac/gpac-0.7.1-r1.ebuild | 150 ---------------------
6 files changed, 430 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 8340f361bd6..fa53da9d266 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
diff --git a/media-video/gpac/files/ffmpeg4.patch b/media-video/gpac/files/ffmpeg4.patch
deleted file mode 100644
index 61f329806a5..00000000000
--- a/media-video/gpac/files/ffmpeg4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gpac-0.7.1/applications/dashcast/video_encoder.c
-===================================================================
---- gpac-0.7.1.orig/applications/dashcast/video_encoder.c
-+++ gpac-0.7.1/applications/dashcast/video_encoder.c
-@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
- }
-
- //the global header gives access to the extradata (SPS/PPS)
-- video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- video_output_file->vstream_idx = 0;//video_stream->index;
-
-Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-===================================================================
---- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c
-+++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
-@@ -49,7 +49,7 @@
- static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
- uint8_t * buffer;
- /* Size of buffer must be larger, see avcodec_decode_video2 documentation */
-- u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
-+ u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
- if (oldBuffer)
- gf_free(oldBuffer);
- buffer = (uint8_t*)gf_malloc( allocatedSz );
-@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- capability->cap.valueInt = 1;
- return GF_OK;
- case GF_CODEC_PADDING_BYTES:
-- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- return GF_OK;
- case GF_CODEC_REORDER:
- capability->cap.valueInt = 1;
-@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- break;
-
- case GF_CODEC_PADDING_BYTES:
-- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- break;
- default:
- capability->cap.valueInt = 0;
diff --git a/media-video/gpac/files/gpac-0.7.1-configure.patch b/media-video/gpac/files/gpac-0.7.1-configure.patch
deleted file mode 100644
index 8bc3ec9f907..00000000000
--- a/media-video/gpac/files/gpac-0.7.1-configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- gpac-0.7.1/Makefile.orig 2017-07-25 09:34:51.910379115 -0600
-+++ gpac-0.7.1/Makefile 2017-07-25 09:36:18.906385736 -0600
-@@ -252,7 +252,9 @@
- $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
- mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATIC_LIBS),yes)
- $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- $(MAKE) installdylib
-
- uninstall-lib:
---- gpac-0.7.1/src/Makefile.orig 2017-07-25 09:37:48.157392528 -0600
-+++ gpac-0.7.1/src/Makefile 2017-07-25 09:39:06.092398459 -0600
-@@ -267,16 +267,20 @@
-
- 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) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
- 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)
---- gpac-0.7.1/configure.orig 2017-07-25 10:01:58.789502926 -0600
-+++ gpac-0.7.1/configure 2017-07-25 10:02:54.110507136 -0600
-@@ -109,6 +109,7 @@
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -260,6 +261,7 @@
- --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
-
-@@ -705,15 +707,6 @@
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- 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"
-@@ -1885,6 +1878,8 @@
- ;;
- --enable-static-bin) static_build="yes";
- ;;
-+ --enable-static-lib) static_libs="yes";
-+ ;;
- --disable-ipv6) has_ipv6="no"
- ;;
- --disable-wx) has_wx="no"
-@@ -2559,6 +2554,7 @@
- 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 "Fixed-Point Version: $use_fixed_point"
- echo "IPV6 Support: $has_ipv6"
-@@ -3194,6 +3190,7 @@
- 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/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch b/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
deleted file mode 100644
index e25a5bca78b..00000000000
--- a/media-video/gpac/files/gpac-0.7.1-openssl-1.1.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From e64a7d229fdcb5c190064b7860ade50124dcc735 Mon Sep 17 00:00:00 2001
-From: Aurelien David <aurelien.david@telecom-paristech.fr>
-Date: Fri, 6 Oct 2017 16:46:18 +0200
-Subject: [PATCH] compatibility with OpenSSL 1.1.x (#616)
-
-diff --git a/src/utils/downloader.c b/src/utils/downloader.c
-index b8c923b88..3b7d37b41 100644
---- a/src/utils/downloader.c
-+++ b/src/utils/downloader.c
-@@ -204,7 +204,7 @@ struct __gf_download_manager
- u32 limit_data_rate, read_buf_size;
- u64 max_cache_size;
- Bool allow_broken_certificate;
--
-+
- GF_List *skip_proxy_servers;
- GF_List *credentials;
- GF_List *cache_entries;
-@@ -392,10 +392,18 @@ static Bool init_ssl_lib() {
- GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
- return GF_TRUE;
- }
-+
-+ /* per https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
-+ ** As of version 1.1.0 OpenSSL will automatically allocate all resources that it needs so no explicit initialisation is required.
-+ ** Similarly it will also automatically deinitialise as required.
-+ */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- SSL_library_init();
- SSL_load_error_strings();
- SSLeay_add_all_algorithms();
- SSLeay_add_ssl_algorithms();
-+#endif
-+
- _ssl_is_initialized = GF_TRUE;
- GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
- return GF_FALSE;
-@@ -422,6 +430,7 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
- }
-
- switch (mode) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- case 0:
- meth = SSLv23_client_method();
- break;
-@@ -436,6 +445,11 @@ static int ssl_init(GF_DownloadManager *dm, u32 mode)
- case 3:
- meth = TLSv1_client_method();
- break;
-+#else /* for openssl 1.1+ this is the prefered method */
-+ case 0:
-+ meth = TLS_client_method();
-+ break;
-+#endif
- default:
- goto error;
- }
-@@ -771,7 +785,7 @@ void gf_dm_sess_del(GF_DownloadSession *sess)
- gf_sk_del(sess->sock);
- gf_list_del(sess->headers);
- gf_mx_del(sess->mx);
--
-+
- gf_free(sess);
- GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
- }
-@@ -1145,7 +1159,7 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
- {
- GF_DownloadSession *sess;
- if (!dm) return NULL;
--
-+
- GF_SAFEALLOC(sess, GF_DownloadSession);
- if (!sess) {
- GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
-@@ -1166,8 +1180,8 @@ GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *u
- gf_free(sess);
- return NULL;
- }
--
--
-+
-+
- assert( dm );
-
- *e = gf_dm_sess_setup_from_url(sess, url);
-@@ -1225,7 +1239,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
- gf_mx_v(sess->mx);
- return GF_IP_CONNECTION_CLOSED;
- }
--
-+
- #ifdef GPAC_HAS_SSL
- if (sess->ssl) {
- s32 size;
-@@ -1451,7 +1465,11 @@ static void gf_dm_connect(GF_DownloadSession *sess)
- const GENERAL_NAME *altname = sk_GENERAL_NAME_value(altnames, i);
- if (altname->type == GEN_DNS)
- {
-- unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
-+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ unsigned char *altname_str = ASN1_STRING_data(altname->d.ia5);
-+ #else
-+ unsigned char *altname_str = (unsigned char *)ASN1_STRING_get0_data(altname->d.ia5);
-+ #endif
- gf_list_add(valid_names, altname_str);
- }
- }
-@@ -1806,7 +1824,7 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
- dm->limit_data_rate = 1000 * atoi(opt) / 8;
- else
- gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
--
-+
-
- dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
- //when rate is limited, use smaller smaller read size
-@@ -2943,7 +2961,7 @@ static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
- hdrp->value = gf_strdup(hdr_val);
- gf_list_add(sess->headers, hdrp);
- }
--
-+
- if (sep) sep[0]=':';
- if (hdr_sep) hdr_sep[0] = '\r';
- }
diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch
deleted file mode 100644
index 98224aff30e..00000000000
--- a/media-video/gpac/files/gpac-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gpac-0.7.1/configure
-===================================================================
---- gpac-0.7.1.orig/configure
-+++ gpac-0.7.1/configure
-@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag
- fi
- if test "$cross_prefix" = "" ; then
- if test "$has_ft" = "no" ; then
-- ft_cflags="`freetype-config --cflags 2>>$logs`"
-- ft_lflags="`freetype-config --libs 2>>$logs`"
-+ ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
-+ ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
- if docc $ft_cflags $ft_lflags $LDFLAGS ; then
- has_ft="system"
- fi
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
deleted file mode 100644
index bdac8071f89..00000000000
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
- SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/"
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
- pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
- media-libs/libogg
- a52? ( media-libs/a52dec )
- aac? ( media-libs/faad2 )
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( media-video/ffmpeg:0= )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- mad? ( media-libs/libmad )
- opengl? (
- media-libs/freeglut
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- theora? ( media-libs/libtheora )
- truetype? ( media-libs/freetype:2 )
- sdl? ( media-libs/libsdl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- vorbis? ( media-libs/libvorbis )
- X? (
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/libXext
- )
- xml? ( dev-libs/libxml2:2 )
- xvid? ( media-libs/xvid )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dvb? ( sys-kernel/linux-headers )
-"
-
-# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
-PATCHES=(
- "${FILESDIR}/${PN}-0.7.1-configure.patch"
- "${FILESDIR}/ffmpeg4.patch"
- "${FILESDIR}/${PN}-freetype.patch"
- "${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-DOCS=(
- doc/CODING_STYLE
- doc/GPAC\ UPnP.doc
- doc/ISO\ 639-2\ codes.txt
- doc/SceneGenerators
- doc/ipmpx_syntax.bt
- Changelog
- AUTHORS
- BUGS
- README.md
- TODO
-)
-HTML_DOCS="doc/*.html"
-
-my_use() {
- local flag="$1" pflag="${2:-$1}"
- if use ${flag}; then
- echo "--use-${pflag}=system"
- else
- echo "--use-${pflag}=no"
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
- tc-export CC CXX AR RANLIB
-
- local myeconfargs=(
- --extra-cflags="${CFLAGS}"
- --cc="$(tc-getCC)"
- --libdir="/$(get_libdir)"
- --verbose
- --enable-pic
- --enable-svg
- --disable-amr
- --disable-wx
- --use-js=no
- --use-ogg=system
- $(use_enable alsa)
- $(use_enable debug)
- $(use_enable dvb dvb4linux)
- $(use_enable ipv6)
- $(use_enable jack jack yes)
- $(use_enable opengl 3d)
- $(use_enable oss oss-audio)
- $(use_enable pulseaudio pulseaudio yes)
- $(use_enable sdl)
- $(use_enable ssl)
- $(use_enable static-libs static-lib)
- $(use_enable X x11)
- $(use_enable X x11-shm)
- $(use_enable X x11-xv)
- $(my_use a52)
- $(my_use aac faad)
- $(my_use 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 vorbis)
- $(my_use xvid)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- einstalldocs
- emake STRIP="true" DESTDIR="${D}" install
- emake STRIP="true" DESTDIR="${D}" install-lib
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2020-09-04 16:47 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2020-09-04 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 1d8ec424bccc9f21f88062ca9df4498f09dccf58
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 16:13:19 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 16:47:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8ec424
media-video/gpac: bump to 1.0.0
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/gpac/Manifest | 1 +
media-video/gpac/files/zlib.patch | 33 ++++++++++++++++++++++
.../gpac/{gpac-9999.ebuild => gpac-1.0.0.ebuild} | 22 ++++++---------
media-video/gpac/gpac-9999.ebuild | 22 ++++++---------
4 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index fa53da9d266..261a41794a2 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +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
diff --git a/media-video/gpac/files/zlib.patch b/media-video/gpac/files/zlib.patch
new file mode 100644
index 00000000000..c5b1fc4ab56
--- /dev/null
+++ b/media-video/gpac/files/zlib.patch
@@ -0,0 +1,33 @@
+Index: gpac-1.0.0/src/utils/gzio.c
+===================================================================
+--- gpac-1.0.0.orig/src/utils/gzio.c
++++ gpac-1.0.0/src/utils/gzio.c
+@@ -93,10 +93,10 @@ typedef struct gz_stream {
+ //local gzFile gz_open OF((const char *path, const char *mode, int fd));
+ //local int do_flush OF((gzFile file, int flush));
+ //local int get_byte OF((gz_stream *s));
+-local void check_header OF((gz_stream *s));
+-local int destroy OF((gz_stream *s));
++local void check_header _Z_OF((gz_stream *s));
++local int destroy _Z_OF((gz_stream *s));
+ //local void putLong OF((FILE *file, uLong x));
+-local uLong getLong OF((gz_stream *s));
++local uLong getLong _Z_OF((gz_stream *s));
+
+ /* ===========================================================================
+ Opens a gzip (.gz) file for reading or writing. The mode parameter
+Index: gpac-1.0.0/src/utils/zutil.h
+===================================================================
+--- gpac-1.0.0.orig/src/utils/zutil.h
++++ gpac-1.0.0/src/utils/zutil.h
+@@ -262,8 +262,8 @@ extern void z_error OF((char *m));
+ #endif
+
+
+-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+-void zcfree OF((voidpf opaque, voidpf ptr));
++voidpf zcalloc _Z_OF((voidpf opaque, unsigned items, unsigned size));
++void zcfree _Z_OF((voidpf opaque, voidpf ptr));
+
+ #define ZALLOC(strm, items, size) \
+ (*((strm)->zalloc))((strm)->opaque, (items), (size))
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-1.0.0.ebuild
similarity index 89%
copy from media-video/gpac/gpac-9999.ebuild
copy to media-video/gpac/gpac-1.0.0.ebuild
index 5c4fcbaddd1..37ed1edce4a 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
# subslot == libgpac major
-SLOT="0/7"
+SLOT="0/10"
IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
@@ -56,28 +56,23 @@ RDEPEND="
xml? ( dev-libs/libxml2:2 )
xvid? ( media-libs/xvid )
"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
DEPEND="${RDEPEND}
virtual/pkgconfig
dvb? ( sys-kernel/linux-headers )
"
-PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
DOCS=(
- doc/CODING_STYLE
- doc/GPAC\ UPnP.doc
- doc/ISO\ 639-2\ codes.txt
- doc/SceneGenerators
- doc/ipmpx_syntax.bt
+ share/doc/CODING_STYLE
+ share/doc/GPAC\ UPnP.doc
+ share/doc/ISO\ 639-2\ codes.txt
+ share/doc/SceneGenerators
+ share/doc/ipmpx_syntax.bt
Changelog
- AUTHORS
- BUGS
README.md
- TODO
)
-HTML_DOCS="doc/*.html"
+HTML_DOCS="share/doc/*.html"
my_use() {
local flag="$1" pflag="${2:-$1}"
@@ -104,7 +99,6 @@ src_configure() {
--enable-pic
--enable-svg
--disable-amr
- --disable-wx
--use-js=no
--use-ogg=system
$(use_enable alsa)
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 5c4fcbaddd1..37ed1edce4a 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
# subslot == libgpac major
-SLOT="0/7"
+SLOT="0/10"
IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
@@ -56,28 +56,23 @@ RDEPEND="
xml? ( dev-libs/libxml2:2 )
xvid? ( media-libs/xvid )
"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
DEPEND="${RDEPEND}
virtual/pkgconfig
dvb? ( sys-kernel/linux-headers )
"
-PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
DOCS=(
- doc/CODING_STYLE
- doc/GPAC\ UPnP.doc
- doc/ISO\ 639-2\ codes.txt
- doc/SceneGenerators
- doc/ipmpx_syntax.bt
+ share/doc/CODING_STYLE
+ share/doc/GPAC\ UPnP.doc
+ share/doc/ISO\ 639-2\ codes.txt
+ share/doc/SceneGenerators
+ share/doc/ipmpx_syntax.bt
Changelog
- AUTHORS
- BUGS
README.md
- TODO
)
-HTML_DOCS="doc/*.html"
+HTML_DOCS="share/doc/*.html"
my_use() {
local flag="$1" pflag="${2:-$1}"
@@ -104,7 +99,6 @@ src_configure() {
--enable-pic
--enable-svg
--disable-amr
- --disable-wx
--use-js=no
--use-ogg=system
$(use_enable alsa)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2020-09-08 22:42 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2020-09-08 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 62238af1490e6900856b6f8fdd196ab779b46e72
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 22:30:23 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 22:42:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62238af1
media-video/gpac: fix failed install for 1.0.0
Upstream are currently rewriting huge amounts
of their codebase. 0.8.x -> 1.0.0 marks a large change.
In this process, they inadverently broke non-Debian
builds by relying on "IS_DEB_MAKE" being set to
'undefined'.
We also change the openjpeg slot to :2 as per
changing upstream requirements.
Closes: https://bugs.gentoo.org/740404
Bug: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gpac/files/gpac-1.0.0-makefile-debian.patch | 13 ++++++++++++
media-video/gpac/gpac-1.0.0.ebuild | 24 ++++++++++++++--------
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
new file mode 100644
index 00000000000..8bb8074b1ce
--- /dev/null
+++ b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b147725..244b07c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
+ $(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+ $(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+
+-ifeq ($(IS_DEB_MAKE),undefined)
++ifeq ($(IS_DEB_MAKE),)
+ ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
+ $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+ else
diff --git a/media-video/gpac/gpac-1.0.0.ebuild b/media-video/gpac/gpac-1.0.0.ebuild
index 37ed1edce4a..6a8fe8c576a 100644
--- a/media-video/gpac/gpac-1.0.0.ebuild
+++ b/media-video/gpac/gpac-1.0.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == *9999 ]] ; then
SCM="git-r3"
@@ -22,6 +22,7 @@ SLOT="0/10"
IUSE="a52 aac alsa 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"
RDEPEND="
media-libs/libogg
a52? ( media-libs/a52dec )
@@ -30,7 +31,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:0= )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2 )
mad? ( media-libs/libmad )
opengl? (
media-libs/freeglut
@@ -53,15 +54,19 @@ RDEPEND="
x11-libs/libXv
x11-libs/libXext
)
- xml? ( dev-libs/libxml2:2 )
+ xml? ( dev-libs/libxml2:2= )
xvid? ( media-libs/xvid )
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="
+ ${RDEPEND}
dvb? ( sys-kernel/linux-headers )
"
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.8.1-configure.patch"
+ "${FILESDIR}/${PN}-1.0.0-makefile-debian.patch"
+ "${FILESDIR}/zlib.patch"
+)
DOCS=(
share/doc/CODING_STYLE
@@ -72,6 +77,7 @@ DOCS=(
Changelog
README.md
)
+
HTML_DOCS="share/doc/*.html"
my_use() {
@@ -94,7 +100,7 @@ src_configure() {
local myeconfargs=(
--extra-cflags="${CFLAGS}"
--cc="$(tc-getCC)"
- --libdir="/$(get_libdir)"
+ --libdir="$(get_libdir)"
--verbose
--enable-pic
--enable-svg
@@ -133,6 +139,6 @@ src_configure() {
src_install() {
einstalldocs
- emake STRIP="true" DESTDIR="${D}" install
- emake STRIP="true" DESTDIR="${D}" install-lib
+ emake STRIP="true" DESTDIR="${ED}" install
+ emake STRIP="true" DESTDIR="${ED}" install-lib
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2021-01-22 3:34 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-01-22 3:34 UTC (permalink / raw
To: gentoo-commits
commit: 5f2a9819918f18f9001ff08a4ab2c9dec0f2861a
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Jan 20 01:37:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 03:34:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2a9819
media-video/gpac: cleanup for openjpeg cleanup
Closes: https://bugs.gentoo.org/735600
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19133
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/gpac/Manifest | 1 -
media-video/gpac/files/gpac-0.8.1-configure.patch | 100 ---------------
media-video/gpac/gpac-0.8.1.ebuild | 149 ----------------------
3 files changed, 250 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3eb8fc2546c..3119d5d920e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1 @@
-DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch b/media-video/gpac/files/gpac-0.8.1-configure.patch
deleted file mode 100644
index 4a6c97b6cf3..00000000000
--- a/media-video/gpac/files/gpac-0.8.1-configure.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 61241cd..7481027 100644
---- a/Makefile
-+++ b/Makefile
-@@ -270,7 +270,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 ($(STATIC_LIBS),yes)
- $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \
- $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \
- fi
-diff --git a/configure b/configure
-index 6ef2258..240b6b0 100755
---- a/configure
-+++ b/configure
-@@ -108,6 +108,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"
-@@ -266,6 +267,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
-
-@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- 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"
-@@ -1931,6 +1924,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"
-@@ -2622,6 +2617,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"
-@@ -3291,6 +3287,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 935ffff..b3464b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR)
-
- 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) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS)
- 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/media-video/gpac/gpac-0.8.1.ebuild b/media-video/gpac/gpac-0.8.1.ebuild
deleted file mode 100644
index 4404cc73915..00000000000
--- a/media-video/gpac/gpac-0.8.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
- SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/ https://github.com/gpac/gpac"
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/8"
-IUSE="a52 aac alsa 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"
-RDEPEND="
- media-libs/libogg
- a52? ( media-libs/a52dec )
- aac? ( media-libs/faad2 )
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( media-video/ffmpeg:0= )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- mad? ( media-libs/libmad )
- opengl? (
- media-libs/freeglut
- virtual/glu
- virtual/opengl
- )
- png? ( media-libs/libpng:0= )
- pulseaudio? ( media-sound/pulseaudio )
- theora? ( media-libs/libtheora )
- truetype? ( media-libs/freetype:2 )
- sdl? ( media-libs/libsdl )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- vorbis? ( media-libs/libvorbis )
- X? (
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/libXext
- )
- xml? ( dev-libs/libxml2:2 )
- xvid? ( media-libs/xvid )
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}
- dvb? ( sys-kernel/linux-headers )
-"
-
-# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
-PATCHES=(
- "${FILESDIR}/${PN}-0.8.1-configure.patch"
-)
-
-DOCS=(
- doc/CODING_STYLE
- doc/GPAC\ UPnP.doc
- doc/ISO\ 639-2\ codes.txt
- doc/SceneGenerators
- doc/ipmpx_syntax.bt
- Changelog
- AUTHORS
- BUGS
- README.md
- TODO
-)
-
-HTML_DOCS="doc/*.html"
-
-my_use() {
- local flag="$1" pflag="${2:-$1}"
- if use ${flag}; then
- echo "--use-${pflag}=system"
- else
- echo "--use-${pflag}=no"
- fi
-}
-
-src_prepare() {
- default
- sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
- tc-export CC CXX AR RANLIB
-
- local myeconfargs=(
- --extra-cflags="${CFLAGS}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --libdir="/$(get_libdir)"
- --verbose
- --enable-pic
- --enable-svg
- --disable-amr
- --disable-wx
- --use-js=no
- --use-ogg=system
- $(use_enable alsa)
- $(use_enable debug)
- $(use_enable dvb dvb4linux)
- $(use_enable ipv6)
- $(use_enable jack jack yes)
- $(use_enable opengl 3d)
- $(use_enable oss oss-audio)
- $(use_enable pulseaudio pulseaudio yes)
- $(use_enable sdl)
- $(use_enable ssl)
- $(use_enable static-libs static-lib)
- $(use_enable X x11)
- $(use_enable X x11-shm)
- $(use_enable X x11-xv)
- $(my_use a52)
- $(my_use aac faad)
- $(my_use 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 vorbis)
- $(my_use xvid)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- einstalldocs
- emake STRIP="true" DESTDIR="${D}" install
- emake STRIP="true" DESTDIR="${D}" install-lib
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/
@ 2022-02-25 9:46 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2022-02-25 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 1eebad3a210f378c87a67b32d2963c44ee5bb208
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 09:46:05 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 09:46:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eebad3a
media-video/gpac: bump to 2.0.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/gpac/Manifest | 1 +
media-video/gpac/files/gpac-2.0.0-configure.patch | 113 +++++++++++++++++++++
.../gpac/{gpac-9999.ebuild => gpac-2.0.0.ebuild} | 6 +-
media-video/gpac/gpac-9999.ebuild | 6 +-
4 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 3119d5d920e5..84cbbe3a0255 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1 +1,2 @@
DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
+DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
diff --git a/media-video/gpac/files/gpac-2.0.0-configure.patch b/media-video/gpac/files/gpac-2.0.0-configure.patch
new file mode 100644
index 000000000000..2b54d16a8d22
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.0.0-configure.patch
@@ -0,0 +1,113 @@
+* Makes static libs optional
+* Removes auto-SSE2 detection
+----
+Index: gpac-2.0.0/Makefile
+===================================================================
+--- gpac-2.0.0.orig/Makefile
++++ gpac-2.0.0/Makefile
+@@ -298,8 +298,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"
+
+Index: gpac-2.0.0/configure
+===================================================================
+--- gpac-2.0.0.orig/configure
++++ gpac-2.0.0/configure
+@@ -106,6 +106,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"
+@@ -271,6 +272,7 @@ GPAC configuration options:
+ --static-modules use static modules in libgpac rather than dynamic library modules
+ --static-build link statically against libgpac but still allow dependencies to shared libraries (enable --static-modules)
+ --enable-static-bin old name for --static-build, deprecated
++ --enable-static-lib GPAC static libraries build
+ --static-bin enable static linking of MP4Box and gpac only (enable --static-build), disable MP4Client and all libraries not linkable statically.
+ --static-mp4box old name for --static-bin, deprecated
+ --enable-depth enables depth handling in the compositor
+@@ -741,14 +743,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"
+@@ -776,10 +770,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
+@@ -1790,6 +1780,8 @@ for opt do
+ echo "$opt deprecated, use --static-build instead"
+ static_build="yes";
+ ;;
++ --enable-static-libs) static_libs="yes";
++ ;;
+ --disable-ipv6) has_ipv6="no"
+ ;;
+ --disable-platinum) has_platinum="no"
+@@ -2521,6 +2513,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"
+@@ -3252,6 +3245,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.m
+ echo "GPROFBUILD=$gprof_build" >> config.mak
+ echo "STATIC_BINARY=$static_bin" >> 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
+Index: gpac-2.0.0/src/Makefile
+===================================================================
+--- gpac-2.0.0.orig/src/Makefile
++++ gpac-2.0.0/src/Makefile
+@@ -387,7 +387,6 @@ jsmods: $(LIBGPAC_JSMODS)
+ # @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)
+@@ -395,9 +394,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/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-2.0.0.ebuild
similarity index 97%
copy from media-video/gpac/gpac-9999.ebuild
copy to media-video/gpac/gpac-2.0.0.ebuild
index e1c72932c19e..1c87f44bd3fe 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
# subslot == libgpac major
-SLOT="0/10"
+SLOT="0/11"
IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
@@ -63,7 +63,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.0.1-configure.patch"
+ "${FILESDIR}/${PN}-2.0.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
)
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index e1c72932c19e..1c87f44bd3fe 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
LICENSE="GPL-2"
# subslot == libgpac major
-SLOT="0/10"
+SLOT="0/11"
IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
@@ -63,7 +63,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-1.0.1-configure.patch"
+ "${FILESDIR}/${PN}-2.0.0-configure.patch"
"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
)
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-02-25 9:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-22 9:17 [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2015-08-22 9:29 Alexis Ballier
2018-04-20 18:12 Alexis Ballier
2018-06-13 16:21 Lars Wendler
2019-01-30 16:12 Andreas Sturmlechner
2020-08-20 12:30 Sam James
2020-08-31 23:15 Sam James
2020-09-04 16:47 Alexis Ballier
2020-09-08 22:42 Sam James
2021-01-22 3:34 Sam James
2022-02-25 9:46 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox