| 1 |
commit: 932d92b665e50803ed71bc846da723af547c2e49 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 16 10:08:44 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 16 10:09:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932d92b6 |
| 7 |
|
| 8 |
media-video/libav: update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/libav/libav-12.3.ebuild | 4 ++-- |
| 14 |
media-video/libav/libav-9999.ebuild | 21 +++++++++++---------- |
| 15 |
2 files changed, 13 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild |
| 18 |
index dc5cf52493f..b519bf55f1a 100644 |
| 19 |
--- a/media-video/libav/libav-12.3.ebuild |
| 20 |
+++ b/media-video/libav/libav-12.3.ebuild |
| 21 |
@@ -6,7 +6,7 @@ EAPI="6" |
| 22 |
inherit flag-o-matic multilib multilib-minimal toolchain-funcs |
| 23 |
|
| 24 |
if [[ ${PV} == *9999 ]] ; then |
| 25 |
- : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} |
| 26 |
+ : ${EGIT_REPO_URI:="https://git.libav.org/libav.git"} |
| 27 |
if [[ ${PV%9999} != "" ]] ; then |
| 28 |
: ${EGIT_BRANCH:="release/${PV%.9999}"} |
| 29 |
fi |
| 30 |
@@ -345,5 +345,5 @@ multilib_src_install_all() { |
| 31 |
multilib_src_test() { |
| 32 |
local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)" |
| 33 |
einfo "LD_LIBRARY_PATH is set to \"${_libs}\"" |
| 34 |
- LD_LIBRARY_PATH="${_libs}" make -j1 fate V=1 |
| 35 |
+ LD_LIBRARY_PATH="${_libs}" emake -j1 fate V=1 |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild |
| 39 |
index ca54c7a80c2..dc8296df27e 100644 |
| 40 |
--- a/media-video/libav/libav-9999.ebuild |
| 41 |
+++ b/media-video/libav/libav-9999.ebuild |
| 42 |
@@ -1,12 +1,12 @@ |
| 43 |
-# Copyright 1999-2017 Gentoo Foundation |
| 44 |
+# Copyright 1999-2018 Gentoo Authors |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
-EAPI=5 |
| 48 |
+EAPI="6" |
| 49 |
|
| 50 |
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs |
| 51 |
+inherit flag-o-matic multilib multilib-minimal toolchain-funcs |
| 52 |
|
| 53 |
if [[ ${PV} == *9999 ]] ; then |
| 54 |
- : ${EGIT_REPO_URI:="git://git.libav.org/libav.git"} |
| 55 |
+ : ${EGIT_REPO_URI:="https://git.libav.org/libav.git"} |
| 56 |
if [[ ${PV%9999} != "" ]] ; then |
| 57 |
: ${EGIT_BRANCH:="release/${PV%.9999}"} |
| 58 |
fi |
| 59 |
@@ -19,17 +19,15 @@ if [[ ${PV} == *9999 ]] ; then |
| 60 |
SRC_URI="" |
| 61 |
elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot |
| 62 |
SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" |
| 63 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )" |
| 64 |
else # Official release |
| 65 |
SRC_URI="https://libav.org/releases/${P}.tar.xz" |
| 66 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )" |
| 67 |
fi |
| 68 |
-# 9999 does not have fate-*.tar.xz |
| 69 |
-[[ ${PV%9999} != "" ]] && SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )" |
| 70 |
|
| 71 |
LICENSE="LGPL-2.1 gpl? ( GPL-3 )" |
| 72 |
SLOT="0/13" |
| 73 |
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 |
| 74 |
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos |
| 75 |
-~x64-solaris ~x86-solaris" |
| 76 |
+[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 77 |
IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk |
| 78 |
frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3 |
| 79 |
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl |
| 80 |
@@ -143,7 +141,7 @@ src_unpack() { |
| 81 |
} |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
- epatch_user |
| 85 |
+ eapply_user |
| 86 |
|
| 87 |
# if we have snapshot then we need to hardcode the version |
| 88 |
if [[ ${PV%_p*} != ${PV} ]]; then |
| 89 |
@@ -154,6 +152,9 @@ src_prepare() { |
| 90 |
use zlib && TOOLS+=( cws2fws ) |
| 91 |
|
| 92 |
MAKEOPTS+=" V=1" |
| 93 |
+ |
| 94 |
+ # needed at leasts for tests in live ebuild |
| 95 |
+ multilib_copy_sources |
| 96 |
} |
| 97 |
|
| 98 |
multilib_src_configure() { |
Archives