From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- media-video/gpac/Manifest | 7 +- .../gpac/files/gpac-1.0.0-makefile-debian.patch | 13 ++ .../gpac/files/gpac-1.0.0-zlib-compile.patch | 33 +++++ media-video/gpac/files/gpac-1.0.1-configure.patch | 117 +++++++++++++++++ media-video/gpac/gpac-1.0.1.ebuild | 143 +++++++++++++++++++++ media-video/gpac/gpac-9999.ebuild | 49 ++++--- 6 files changed, 336 insertions(+), 26 deletions(-) create mode 100644 media-video/gpac/files/gpac-1.0.0-makefile-debian.patch create mode 100644 media-video/gpac/files/gpac-1.0.0-zlib-compile.patch create mode 100644 media-video/gpac/files/gpac-1.0.1-configure.patch create mode 100644 media-video/gpac/gpac-1.0.1.ebuild (limited to 'media-video/gpac') diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index a3cfd1bc15dd..0f104a27d08b 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -1,5 +1,10 @@ AUX gpac-0.8.1-configure.patch 3221 BLAKE2B 702dc30844d48091f13b01c344a877095c09250a274be64610d49553691c24bce3b8cb4cb41bbcb06e5655a3ed9ced23a5120a90d32a5bf59508a5ac401964cf SHA512 4217ee7034ae70bd7edf9ce2c3b0d090841c314bea27a9368da34b84dd593d9d5553955423f229912f6d8d1561ba7f25330b11bb2ab0e334d6051ce6c391b993 +AUX gpac-1.0.0-makefile-debian.patch 508 BLAKE2B 1f8c39abf868392df1bbbd9836272895a9c324dde43eedf27763e49974fcb8bb796c1d7828389a36bdc9bf6cee7eb5f2e74aa7ef31408af81903014995565d8b SHA512 1f1a57934eca75f41a876bd2c2fca89d44e9b807ef32139cdabf733a24b22df0d863c0e28cc87227418804973a6e475de88638e380d92d3e4c5d64b8cd90d2cf +AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c +AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac242c5e31248d26cc59f646bddb78670f5370ffd65db3bdd2025aa1d17e554f6479e9aab5e6d68c3b73c081bd2a230 SHA512 1b141de1b6bdb58970e4e3361e70ec1ff7675935f2039cd28e80deb4c21c118c56f1dca5bd6539b12332cbc2a1c13298568cc90c981e84fecea23914185d2ca8 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1 +DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b EBUILD gpac-0.8.1.ebuild 3307 BLAKE2B c3e648d567676021dd9410d0a9b3d155b46df03672fce0c20979d0ed49bc331c32e3c897d70a97b373636be062995a682fa7cb39452bdafa26927bec1c4b767b SHA512 e82f9528bb74a55059118839cefb2e3af0ded030d9e99184a639f5cfa5f47ec880c1e3ca3f997db800c3eb8cf051548dad9d2ba82e93a61f6631c66414c40560 -EBUILD gpac-9999.ebuild 3116 BLAKE2B ebce6b15686887a082521e278f48b33045641ce1c4fd891d5fdbc00d08e841b0c13ec9217ced028a087643f9cc2f487489fcc406daf757ec2add2031bf036c27 SHA512 0a0772d18c18c0a6e5af1878c000ddbf8657afe38486f3ad357d659eaba4650b750b47b0270a2bd2d1b0d094587bcfe86dc4168f3e99539ed98e064e2f5820a0 +EBUILD gpac-1.0.1.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be +EBUILD gpac-9999.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4 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 000000000000..8bb8074b1ce8 --- /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/files/gpac-1.0.0-zlib-compile.patch b/media-video/gpac/files/gpac-1.0.0-zlib-compile.patch new file mode 100644 index 000000000000..c5b1fc4ab56f --- /dev/null +++ b/media-video/gpac/files/gpac-1.0.0-zlib-compile.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/files/gpac-1.0.1-configure.patch b/media-video/gpac/files/gpac-1.0.1-configure.patch new file mode 100644 index 000000000000..e471157af6b6 --- /dev/null +++ b/media-video/gpac/files/gpac-1.0.1-configure.patch @@ -0,0 +1,117 @@ +* Makes static libs optional +* Removes auto-SSE2 detection +---- +diff --git a/Makefile b/Makefile +index 303a413..1ef750e 100644 +--- a/Makefile ++++ b/Makefile +@@ -284,8 +284,9 @@ ifeq ($(GPAC_ENST),yes) + endif + + $(INSTALL) -d "$(DESTDIR)$(prefix)/$(lib_dir)" ++ifeq ($(STATIC_LIBS), yes) + $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(lib_dir)" || true +- ++endif + $(INSTALL) -d $(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig + $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(lib_dir)/pkgconfig" + +diff --git a/configure b/configure +index de8ea99..4f5a6a8 100755 +--- a/configure ++++ b/configure +@@ -105,6 +105,7 @@ has_dvb4linux="no" + has_openjpeg="no" + gprof_build="no" + static_build="no" ++static_libs="no" + want_pic="no" + want_gcov="no" + has_joystick="no" +@@ -264,6 +265,7 @@ GPAC configuration options: + --enable-amr-wb enable AMR WB library + --enable-amr enable both AMR NB and WB libraries + --enable-static-bin link statically against libgpac ++ --enable-static-lib GPAC static libraries build + --static-mp4box configure for static linking of MP4Box only. + --enable-depth enables depth handling in the compositor + +@@ -706,14 +708,6 @@ if docc -lz -Wno-pointer-sign ; then + fi + + +-#GCC opt +-if test "$no_gcc_opt" = "no"; then +- CFLAGS="-O3 $CFLAGS" +-else +- CFLAGS="-O0 $CFLAGS" +-fi +- +- + #GCC PIC + if test "$cross_prefix" != "" ; then + want_pic="no" +@@ -1710,6 +1704,8 @@ for opt do + ;; + --enable-static-bin) static_build="yes"; + ;; ++ --enable-static-libs) static_libs="yes"; ++ ;; + --disable-ipv6) has_ipv6="no" + ;; + --disable-platinum) has_platinum="no" +@@ -2357,6 +2353,7 @@ echo "** GPAC $version rev$revision Core Configuration **" + echo "debug version: $debuginfo" + echo "GProf enabled: $gprof_build" + echo "Static build enabled: $static_build" ++echo "Static libs enabled: $static_libs" + echo "Memory tracking enabled: $use_memory_tracking" + echo "Sanitizer enabled: $enable_sanitizer" + echo "Fixed-Point Version: $use_fixed_point" +@@ -3049,6 +3046,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak + echo "GPROFBUILD=$gprof_build" >> config.mak + echo "MP4BOX_STATIC=$static_mp4box" >> config.mak + echo "STATICBUILD=$static_build" >> config.mak ++echo "STATICLIBS=$static_libs" >> config.mak + + echo "CONFIG_IPV6=$has_ipv6" >> config.mak + if test "$has_ipv6" = "yes" ; then +diff --git a/src/Makefile b/src/Makefile +index c483c8d..b24d5bb 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -347,7 +347,6 @@ filters_svc: $(LIBGPAC_FILTERS_SVC) + @echo "LIBS $(EXTRALIBS)" + + ifeq ($(CONFIG_DARWIN),yes) +- + $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS) + $(RANLIB) ../bin/gcc/libgpac_static.a + ifneq ($(STATICBUILD),yes) +@@ -355,9 +354,10 @@ ifneq ($(STATICBUILD),yes) + endif + + else +- ++ifeq ($(STATICLIBS), yes) + $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS) + $(RANLIB) ../bin/gcc/libgpac_static.a ++endif + ifneq ($(STATICBUILD),yes) + $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS) + mv $@ $@.$(VERSION_SONAME) +diff --git a/configure b/configure +index 4f5a6a8..baba248 100755 +--- a/configure ++++ b/configure +@@ -735,10 +735,6 @@ cat > $TMPC << EOF + int main( void ) { return 0; } + EOF + +-if docc -msse2 $LDFLAGS ; then +- CFLAGS="$CFLAGS -msse2" +-fi +- + + #look for zlib + cat > $TMPC << EOF diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild new file mode 100644 index 000000000000..e5828cfed456 --- /dev/null +++ b/media-video/gpac/gpac-1.0.1.ebuild @@ -0,0 +1,143 @@ +# 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} xdg + +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/10" +IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png + pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" + +BDEPEND="virtual/pkgconfig" +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:2 ) + 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 ) +" +DEPEND=" + ${RDEPEND} + dvb? ( sys-kernel/linux-headers ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.1-configure.patch" + "${FILESDIR}/${PN}-1.0.0-zlib-compile.patch" +) + +DOCS=( + 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 + README.md +) + +HTML_DOCS="share/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} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" + --cc="$(tc-getCC)" + --libdir="$(get_libdir)" + --verbose + --enable-pic + --enable-svg + --disable-amr + --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="${ED}" install + emake STRIP="true" DESTDIR="${ED}" install-lib +} diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index 5c4fcbaddd14..e5828cfed456 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.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" @@ -11,17 +11,18 @@ else KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" fi -inherit flag-o-matic toolchain-funcs ${SCM} +inherit flag-o-matic toolchain-funcs ${SCM} xdg DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" HOMEPAGE="https://gpac.wp.imt.fr/" 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 +SLOT="0/10" +IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" +BDEPEND="virtual/pkgconfig" 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,31 +54,30 @@ RDEPEND=" x11-libs/libXv x11-libs/libXext ) - xml? ( dev-libs/libxml2:2 ) + xml? ( dev-libs/libxml2:2= ) xvid? ( media-libs/xvid ) " -# disabled upstream, see applications/Makefile -# wxwidgets? ( =x11-libs/wxGTK-2.8* ) -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND=" + ${RDEPEND} dvb? ( sys-kernel/linux-headers ) " -PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.0.1-configure.patch" + "${FILESDIR}/${PN}-1.0.0-zlib-compile.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}" @@ -97,14 +97,13 @@ src_configure() { tc-export CC CXX AR RANLIB local myeconfargs=( - --extra-cflags="${CFLAGS}" + --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" --cc="$(tc-getCC)" - --libdir="/$(get_libdir)" + --libdir="$(get_libdir)" --verbose --enable-pic --enable-svg --disable-amr - --disable-wx --use-js=no --use-ogg=system $(use_enable alsa) @@ -139,6 +138,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 } -- cgit v1.2.3