From f65628136faa35d0c4d3b5e7332275c7b35fcd96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Nov 2018 08:36:22 +0000 Subject: gentoo resync : 03.11.2018 --- media-video/gpac/Manifest | 4 +-- media-video/gpac/gpac-0.7.1.ebuild | 4 +-- media-video/gpac/gpac-9999.ebuild | 63 ++++++++++++++++++++++++-------------- 3 files changed, 44 insertions(+), 27 deletions(-) (limited to 'media-video/gpac') diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest index a9a34d467bfd..10e6292297c1 100644 --- a/media-video/gpac/Manifest +++ b/media-video/gpac/Manifest @@ -8,6 +8,6 @@ AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e2832 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5 -EBUILD gpac-0.7.1.ebuild 3499 BLAKE2B 30ef351d63cc2e35d1380fcd973accdec5dbf2fd0e486e44fd7693e6ee889f13dd4e7d0166a4f947f61943b0bb1935247b1d2113f15e8174d69c1de4a49530ae SHA512 3db6c70aee8146a3db6a862d0919dbb96a58fc9077f9b6b4d8a23ab077ae2c209fddf392c1a1e5961af952ff35efe0299f85f052f88cf852c8113755f19df368 -EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06 +EBUILD gpac-0.7.1.ebuild 3480 BLAKE2B 6e1e83a6bdeb6827cf6927c59d15ef299158e8f24b649c75d53601222d12567e224b64fb68678fb72df9ecf3002ccaaeabe1e63760908937fcb82954038279c8 SHA512 991f1af2143baf56748012d48ef6d9132ba4d03e9e6347d41be0e2dd81742310bc24e5b9a76b0be526efc6a9d6e5bb09f135cd69b03ca377990913457588aaa2 +EBUILD gpac-9999.ebuild 3243 BLAKE2B b9ac1b87c46486616ce0212037494ea238d42939f8b6ce88b943840414f0d7ab409d51969d8c30b1b60bb2c559e742ca388b83290ebbf18776d7ee24024a0fb5 SHA512 9f3ff849d76e8747cd913d2a28ac9768678918b5dfb73c98fa50360eac97d636920cd31e330fd1413da41e900ef6080132f876835cad8ad26ecf0ba2fe252f6a MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4 diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild index fea54fdfefe0..73698dcdb6b6 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-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ else KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} +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/" diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index 1853504344e3..0beb2918a9d4 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 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} +inherit flag-o-matic 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/" +DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" +HOMEPAGE="https://gpac.wp.imt.fr/" LICENSE="GPL-2" -SLOT="0" -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png +# subslot == libgpac major +SLOT="0/7" +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=" @@ -27,32 +27,53 @@ RDEPEND=" aac? ( >=media-libs/faad2-2.0 ) alsa? ( media-libs/alsa-lib ) dvb? ( media-tv/linuxtv-dvb-apps ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:0= ) ) jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg ) + 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 ) + png? ( >=media-libs/libpng-1.4:0= ) vorbis? ( >=media-libs/libvorbis-1.1 ) theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4 ) - xml? ( >=dev-libs/libxml2-2.6.0 ) + 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? ( dev-libs/openssl ) + 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} + virtual/pkgconfig" -DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${PN}-0.7.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}" @@ -64,9 +85,7 @@ my_use() { } src_prepare() { - epatch "${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 + default sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die } @@ -83,7 +102,7 @@ src_configure() { $(use_enable debug) \ $(use_enable ipv6) \ $(use_enable jack jack yes) \ - $(use_enable opengl) \ + $(use_enable opengl 3d) \ $(use_enable oss oss-audio) \ $(use_enable pulseaudio pulseaudio yes) \ $(use_enable sdl) \ @@ -110,9 +129,7 @@ src_configure() { } src_install() { + einstalldocs 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 } -- cgit v1.2.3