| 1 |
commit: 2d771155b7364db76c3253624e0334a41b96c1a5 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 7 08:16:22 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 08:16:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d771155 |
| 7 |
|
| 8 |
media-video/mplayer: drop enca usedep on libass, which has been removed upstream. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.22 |
| 11 |
|
| 12 |
.../{mplayer-9999.ebuild => mplayer-1.2-r1.ebuild} | 17 ++++++++++++++--- |
| 13 |
media-video/mplayer/mplayer-9999.ebuild | 2 +- |
| 14 |
2 files changed, 15 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.2-r1.ebuild |
| 17 |
similarity index 96% |
| 18 |
copy from media-video/mplayer/mplayer-9999.ebuild |
| 19 |
copy to media-video/mplayer/mplayer-1.2-r1.ebuild |
| 20 |
index 04b762c..33a2fc0 100644 |
| 21 |
--- a/media-video/mplayer/mplayer-9999.ebuild |
| 22 |
+++ b/media-video/mplayer/mplayer-1.2-r1.ebuild |
| 23 |
@@ -60,7 +60,7 @@ RDEPEND+=" |
| 24 |
sys-libs/ncurses:0= |
| 25 |
app-arch/bzip2 |
| 26 |
sys-libs/zlib |
| 27 |
- >=media-video/ffmpeg-2.8:0=[vdpau?] |
| 28 |
+ >=media-video/ffmpeg-2.6:0=[vdpau?] |
| 29 |
a52? ( media-libs/a52dec ) |
| 30 |
aalib? ( media-libs/aalib ) |
| 31 |
alsa? ( media-libs/alsa-lib ) |
| 32 |
@@ -94,7 +94,7 @@ RDEPEND+=" |
| 33 |
jpeg? ( virtual/jpeg:0 ) |
| 34 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 35 |
ladspa? ( media-libs/ladspa-sdk ) |
| 36 |
- libass? ( >=media-libs/libass-0.9.10:=[enca?] ) |
| 37 |
+ libass? ( >=media-libs/libass-0.9.10:= ) |
| 38 |
libcaca? ( media-libs/libcaca ) |
| 39 |
libmpeg2? ( media-libs/libmpeg2 ) |
| 40 |
lirc? ( app-misc/lirc ) |
| 41 |
@@ -159,7 +159,7 @@ RDEPEND+=" |
| 42 |
SLOT="0" |
| 43 |
LICENSE="GPL-2" |
| 44 |
if [[ ${PV} != *9999* ]]; then |
| 45 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 46 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 47 |
else |
| 48 |
KEYWORDS="" |
| 49 |
fi |
| 50 |
@@ -188,6 +188,11 @@ REQUIRED_USE=" |
| 51 |
xvmc? ( xv )" |
| 52 |
RESTRICT="faac? ( bindist )" |
| 53 |
|
| 54 |
+PATCHES=( |
| 55 |
+ # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241 |
| 56 |
+ "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch |
| 57 |
+) |
| 58 |
+ |
| 59 |
pkg_setup() { |
| 60 |
if [[ ${PV} == *9999* ]]; then |
| 61 |
elog |
| 62 |
@@ -260,6 +265,12 @@ src_prepare() { |
| 63 |
|
| 64 |
# Use sane default for >=virtual/udev-197 |
| 65 |
sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die |
| 66 |
+ |
| 67 |
+ if has_version '>=media-video/ffmpeg-2.9'; then |
| 68 |
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch" |
| 69 |
+ epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch" |
| 70 |
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch" |
| 71 |
+ fi |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
|
| 76 |
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild |
| 77 |
index 04b762c..666fcca 100644 |
| 78 |
--- a/media-video/mplayer/mplayer-9999.ebuild |
| 79 |
+++ b/media-video/mplayer/mplayer-9999.ebuild |
| 80 |
@@ -94,7 +94,7 @@ RDEPEND+=" |
| 81 |
jpeg? ( virtual/jpeg:0 ) |
| 82 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 83 |
ladspa? ( media-libs/ladspa-sdk ) |
| 84 |
- libass? ( >=media-libs/libass-0.9.10:=[enca?] ) |
| 85 |
+ libass? ( >=media-libs/libass-0.9.10:= ) |
| 86 |
libcaca? ( media-libs/libcaca ) |
| 87 |
libmpeg2? ( media-libs/libmpeg2 ) |
| 88 |
lirc? ( app-misc/lirc ) |
Archives