From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- media-video/gpac/Manifest | 7 +- media-video/gpac/files/gpac-0.8.1-configure.patch | 100 --------------- media-video/gpac/gpac-0.8.1.ebuild | 149 ---------------------- media-video/gpac/gpac-1.0.1.ebuild | 17 ++- media-video/gpac/gpac-9999.ebuild | 16 ++- 5 files changed, 30 insertions(+), 259 deletions(-) delete mode 100644 media-video/gpac/files/gpac-0.8.1-configure.patch delete mode 100644 media-video/gpac/gpac-0.8.1.ebuild (limited to 'media-video/gpac') diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index 9836ef7ec1a2..970b2ba753ef 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -1,9 +1,6 @@ -AUX gpac-0.8.1-configure.patch 3221 BLAKE2B 702dc30844d48091f13b01c344a877095c09250a274be64610d49553691c24bce3b8cb4cb41bbcb06e5655a3ed9ced23a5120a90d32a5bf59508a5ac401964cf SHA512 4217ee7034ae70bd7edf9ce2c3b0d090841c314bea27a9368da34b84dd593d9d5553955423f229912f6d8d1561ba7f25330b11bb2ab0e334d6051ce6c391b993 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-1.0.1.ebuild 3177 BLAKE2B ccb6602250a1fa0b1bdedfebc243d8c45f0db8810cf124419f3d5ffdcd5a6f85f9e4808d37852ca4234c687a0fae3cd6f084683b748ae394de10f68e88ada1ec SHA512 ac7a4198cb9a3187c9b5a6d2f963497192382e29f54fbf4a44711fae551b7207ddccf649e7d43a9063e6398a9ab5c9e59b2b29f850ca5facde7f4de6a8d3b866 -EBUILD gpac-9999.ebuild 3164 BLAKE2B 9b59ed5f20e75e58d7d7317ae91830ed41c05ca72e44dac0b29dc0274dc07793203eb854fcb2a9e0eafa221e305f944b027842243f56856d123cef0506debe8e SHA512 8d747966d7a4688dcea5b9c96f0ab64577e4627df71acd2f139b5088a58201186822a9afd5d8db79c96ab4a54c79731e3b137756a39b2296ee19e9c7e08315be +EBUILD gpac-1.0.1.ebuild 3333 BLAKE2B 564b90f22fb5c250dd202e939e2495d7f031ad02aa93e5abefaf13cb07526b28421d388150c6072791557c5287bcf0fd9940334e402bc95139ac82a7de9295dc SHA512 ce2d3b82b4a33c27c3107d9f1331d4b9f0cadf7eaa5ad723784b90af397bcd6ec8934e1a3416914090a3f657f57ba03bec6524d7319ce27ab703304dae2614a9 +EBUILD gpac-9999.ebuild 3338 BLAKE2B ea9c06904794bb1d1d0e4e869fd9917e4249c31fed343772f7e8f9e4e3798c672f0362352721f36a19218fdc0a70ddb698de62bdc33afcf5714be03d82c1c172 SHA512 c8f57ee2d753e1d15a883ceb4fe249bad52a8e2c6950268f767b42380cf3fc4ad08df108e9002387048d7137a8830965704ff5ce5a0e5c96bb2cacff8a28ee30 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4 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 4a6c97b6cf3a..000000000000 --- 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 4404cc739152..000000000000 --- 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 -} diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild index 806f4a7262b8..c372803a25a4 100644 --- a/media-video/gpac/gpac-1.0.1.ebuild +++ b/media-video/gpac/gpac-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then 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" + KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" fi inherit flag-o-matic toolchain-funcs ${SCM} xdg @@ -98,7 +98,6 @@ 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 @@ -134,6 +133,18 @@ src_configure() { $(my_use vorbis) $(my_use xvid) ) + + if use amd64 || use x86 ; then + # Don't pass -mno-sse2 on non amd64/x86 + myeconfargs+=( + --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" + ) + else + myeconfargs+=( + --extra-cflags="${CFLAGS}" + ) + fi + econf "${myeconfargs[@]}" } diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index e5828cfed456..abfcbc0e5d9d 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,6 +25,7 @@ IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k lib BDEPEND="virtual/pkgconfig" RDEPEND=" media-libs/libogg + sys-libs/zlib a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) @@ -97,7 +98,6 @@ 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 @@ -133,6 +133,18 @@ src_configure() { $(my_use vorbis) $(my_use xvid) ) + + if use amd64 || use x86 ; then + # Don't pass -mno-sse2 on non amd64/x86 + myeconfargs+=( + --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" + ) + else + myeconfargs+=( + --extra-cflags="${CFLAGS}" + ) + fi + econf "${myeconfargs[@]}" } -- cgit v1.2.3