| 1 |
commit: 20efd03e10052684b6bf79f2a593ae5687e2eaad |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 30 14:52:01 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 30 15:13:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20efd03e |
| 7 |
|
| 8 |
media-video/gpac: Sync 9999 with 0.7.1 |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
media-video/gpac/gpac-9999.ebuild | 63 +++++++++++++++++++++++++-------------- |
| 14 |
1 file changed, 40 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild |
| 17 |
index 1853504344e..0beb2918a9d 100644 |
| 18 |
--- a/media-video/gpac/gpac-9999.ebuild |
| 19 |
+++ b/media-video/gpac/gpac-9999.ebuild |
| 20 |
@@ -1,25 +1,25 @@ |
| 21 |
-# Copyright 1999-2014 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=4 |
| 26 |
+EAPI=6 |
| 27 |
|
| 28 |
if [[ ${PV} == *9999 ]] ; then |
| 29 |
SCM="git-r3" |
| 30 |
EGIT_REPO_URI="https://github.com/gpac/gpac" |
| 31 |
- KEYWORDS="" |
| 32 |
else |
| 33 |
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 34 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 35 |
fi |
| 36 |
|
| 37 |
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} |
| 38 |
+inherit flag-o-matic toolchain-funcs ${SCM} |
| 39 |
|
| 40 |
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" |
| 41 |
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/" |
| 42 |
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C" |
| 43 |
+HOMEPAGE="https://gpac.wp.imt.fr/" |
| 44 |
|
| 45 |
LICENSE="GPL-2" |
| 46 |
-SLOT="0" |
| 47 |
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png |
| 48 |
+# subslot == libgpac major |
| 49 |
+SLOT="0/7" |
| 50 |
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png |
| 51 |
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" |
| 52 |
|
| 53 |
RDEPEND=" |
| 54 |
@@ -27,32 +27,53 @@ RDEPEND=" |
| 55 |
aac? ( >=media-libs/faad2-2.0 ) |
| 56 |
alsa? ( media-libs/alsa-lib ) |
| 57 |
dvb? ( media-tv/linuxtv-dvb-apps ) |
| 58 |
- ffmpeg? ( virtual/ffmpeg ) |
| 59 |
+ ffmpeg? ( |
| 60 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 61 |
+ libav? ( media-video/libav:0= ) ) |
| 62 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 63 |
- jpeg? ( virtual/jpeg ) |
| 64 |
+ jpeg? ( virtual/jpeg:0 ) |
| 65 |
mad? ( >=media-libs/libmad-0.15.1b ) |
| 66 |
opengl? ( virtual/opengl media-libs/freeglut virtual/glu ) |
| 67 |
>=media-libs/libogg-1.1 |
| 68 |
- png? ( >=media-libs/libpng-1.4 ) |
| 69 |
+ png? ( >=media-libs/libpng-1.4:0= ) |
| 70 |
vorbis? ( >=media-libs/libvorbis-1.1 ) |
| 71 |
theora? ( media-libs/libtheora ) |
| 72 |
- truetype? ( >=media-libs/freetype-2.1.4 ) |
| 73 |
- xml? ( >=dev-libs/libxml2-2.6.0 ) |
| 74 |
+ truetype? ( >=media-libs/freetype-2.1.4:2 ) |
| 75 |
+ xml? ( >=dev-libs/libxml2-2.6.0:2 ) |
| 76 |
xvid? ( >=media-libs/xvid-1.0.1 ) |
| 77 |
sdl? ( media-libs/libsdl ) |
| 78 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 79 |
- ssl? ( dev-libs/openssl ) |
| 80 |
+ ssl? ( |
| 81 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 82 |
+ libressl? ( dev-libs/libressl:0= ) ) |
| 83 |
pulseaudio? ( media-sound/pulseaudio ) |
| 84 |
X? ( |
| 85 |
x11-libs/libXt |
| 86 |
x11-libs/libX11 |
| 87 |
x11-libs/libXv |
| 88 |
x11-libs/libXext |
| 89 |
- )" |
| 90 |
+ ) |
| 91 |
+" |
| 92 |
# disabled upstream, see applications/Makefile |
| 93 |
# wxwidgets? ( =x11-libs/wxGTK-2.8* ) |
| 94 |
+DEPEND="${RDEPEND} |
| 95 |
+ virtual/pkgconfig" |
| 96 |
|
| 97 |
-DEPEND="${RDEPEND}" |
| 98 |
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" ) |
| 99 |
+ |
| 100 |
+DOCS=( |
| 101 |
+ doc/CODING_STYLE |
| 102 |
+ doc/GPAC\ UPnP.doc |
| 103 |
+ doc/ISO\ 639-2\ codes.txt |
| 104 |
+ doc/SceneGenerators |
| 105 |
+ doc/ipmpx_syntax.bt |
| 106 |
+ Changelog |
| 107 |
+ AUTHORS |
| 108 |
+ BUGS |
| 109 |
+ README.md |
| 110 |
+ TODO |
| 111 |
+) |
| 112 |
+HTML_DOCS="doc/*.html" |
| 113 |
|
| 114 |
my_use() { |
| 115 |
local flag="$1" pflag="${2:-$1}" |
| 116 |
@@ -64,9 +85,7 @@ my_use() { |
| 117 |
} |
| 118 |
|
| 119 |
src_prepare() { |
| 120 |
- epatch "${FILESDIR}"/110_all_implicitdecls.patch \ |
| 121 |
- "${FILESDIR}"/${PN}-0.5.3-static-libs.patch \ |
| 122 |
- "${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch |
| 123 |
+ default |
| 124 |
sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die |
| 125 |
} |
| 126 |
|
| 127 |
@@ -83,7 +102,7 @@ src_configure() { |
| 128 |
$(use_enable debug) \ |
| 129 |
$(use_enable ipv6) \ |
| 130 |
$(use_enable jack jack yes) \ |
| 131 |
- $(use_enable opengl) \ |
| 132 |
+ $(use_enable opengl 3d) \ |
| 133 |
$(use_enable oss oss-audio) \ |
| 134 |
$(use_enable pulseaudio pulseaudio yes) \ |
| 135 |
$(use_enable sdl) \ |
| 136 |
@@ -110,9 +129,7 @@ src_configure() { |
| 137 |
} |
| 138 |
|
| 139 |
src_install() { |
| 140 |
+ einstalldocs |
| 141 |
emake STRIP="true" DESTDIR="${D}" install |
| 142 |
emake STRIP="true" DESTDIR="${D}" install-lib |
| 143 |
- dodoc AUTHORS BUGS Changelog README.md TODO |
| 144 |
- dodoc doc/*.txt |
| 145 |
- dohtml doc/*.html |
| 146 |
} |
Archives