| 1 |
commit: 4c9fe03abb52a89c250d488d78013f1b64ea0ad5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 8 22:34:10 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 8 22:42:46 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9fe03a |
| 7 |
|
| 8 |
media-video/gpac: sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/gpac/gpac-9999.ebuild | 23 ++++++++++++++--------- |
| 14 |
1 file changed, 14 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild |
| 17 |
index 37ed1edce4a..1fcbfe48c82 100644 |
| 18 |
--- a/media-video/gpac/gpac-9999.ebuild |
| 19 |
+++ b/media-video/gpac/gpac-9999.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2020 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=6 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
if [[ ${PV} == *9999 ]] ; then |
| 28 |
SCM="git-r3" |
| 29 |
@@ -22,6 +22,7 @@ SLOT="0/10" |
| 30 |
IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png |
| 31 |
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X" |
| 32 |
|
| 33 |
+BDEPEND="virtual/pkgconfig" |
| 34 |
RDEPEND=" |
| 35 |
media-libs/libogg |
| 36 |
a52? ( media-libs/a52dec ) |
| 37 |
@@ -30,7 +31,7 @@ RDEPEND=" |
| 38 |
ffmpeg? ( media-video/ffmpeg:0= ) |
| 39 |
jack? ( virtual/jack ) |
| 40 |
jpeg? ( virtual/jpeg:0 ) |
| 41 |
- jpeg2k? ( media-libs/openjpeg:0 ) |
| 42 |
+ jpeg2k? ( media-libs/openjpeg:2 ) |
| 43 |
mad? ( media-libs/libmad ) |
| 44 |
opengl? ( |
| 45 |
media-libs/freeglut |
| 46 |
@@ -53,15 +54,18 @@ RDEPEND=" |
| 47 |
x11-libs/libXv |
| 48 |
x11-libs/libXext |
| 49 |
) |
| 50 |
- xml? ( dev-libs/libxml2:2 ) |
| 51 |
+ xml? ( dev-libs/libxml2:2= ) |
| 52 |
xvid? ( media-libs/xvid ) |
| 53 |
" |
| 54 |
-DEPEND="${RDEPEND} |
| 55 |
- virtual/pkgconfig |
| 56 |
+DEPEND=" |
| 57 |
+ ${RDEPEND} |
| 58 |
dvb? ( sys-kernel/linux-headers ) |
| 59 |
" |
| 60 |
|
| 61 |
-PATCHES=( "${FILESDIR}/${PN}-0.8.1-configure.patch" "${FILESDIR}/zlib.patch" ) |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${PN}-0.8.1-configure.patch" |
| 64 |
+ "${FILESDIR}/zlib.patch" |
| 65 |
+) |
| 66 |
|
| 67 |
DOCS=( |
| 68 |
share/doc/CODING_STYLE |
| 69 |
@@ -72,6 +76,7 @@ DOCS=( |
| 70 |
Changelog |
| 71 |
README.md |
| 72 |
) |
| 73 |
+ |
| 74 |
HTML_DOCS="share/doc/*.html" |
| 75 |
|
| 76 |
my_use() { |
| 77 |
@@ -94,7 +99,7 @@ src_configure() { |
| 78 |
local myeconfargs=( |
| 79 |
--extra-cflags="${CFLAGS}" |
| 80 |
--cc="$(tc-getCC)" |
| 81 |
- --libdir="/$(get_libdir)" |
| 82 |
+ --libdir="$(get_libdir)" |
| 83 |
--verbose |
| 84 |
--enable-pic |
| 85 |
--enable-svg |
| 86 |
@@ -133,6 +138,6 @@ src_configure() { |
| 87 |
|
| 88 |
src_install() { |
| 89 |
einstalldocs |
| 90 |
- emake STRIP="true" DESTDIR="${D}" install |
| 91 |
- emake STRIP="true" DESTDIR="${D}" install-lib |
| 92 |
+ emake STRIP="true" DESTDIR="${ED}" install |
| 93 |
+ emake STRIP="true" DESTDIR="${ED}" install-lib |
| 94 |
} |
Archives