summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer2/Manifest2
-rw-r--r--media-video/mplayer2/mplayer2-9999-r1.ebuild16
-rw-r--r--net-voip/telepathy-salut/Manifest2
3 files changed, 9 insertions, 11 deletions
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index eb73372f..8ba37ae5 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,4 +1,4 @@
DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
-EBUILD mplayer2-9999-r1.ebuild 15610 RMD160 bf2ee6281671fa069b9be0c2dfaba5e6256ffd12 SHA1 5d94382b150ec7999a66b4fbfbd689f52f444a03 SHA256 d17249009663b67b69e9ed538854be22c55c052f4545d3ce80b367bf9d1281cb
+EBUILD mplayer2-9999-r1.ebuild 15493 RMD160 6caab5c519c5d0a4c8ee57292e2d80823523e153 SHA1 771dd7cc0c133865b8e4a8f2e32c0f70c2c5d246 SHA256 d9a98c8fa11824b07c94c4c4f39c3f5e35102fc7b7c224795b28c81778b4e60a
diff --git a/media-video/mplayer2/mplayer2-9999-r1.ebuild b/media-video/mplayer2/mplayer2-9999-r1.ebuild
index a2c2bcc7..999d1b2c 100644
--- a/media-video/mplayer2/mplayer2-9999-r1.ebuild
+++ b/media-video/mplayer2/mplayer2-9999-r1.ebuild
@@ -26,7 +26,7 @@ bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
-+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
++network nut +opengl oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid"
@@ -300,12 +300,13 @@ src_configure() {
myconf+=" --disable-tv-bsdbt848"
# broken upstream, won't work with recent kernels
myconf+=" --disable-ivtv"
- if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
+ # v4l1 is gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
use dvb || myconf+=" --disable-dvb"
use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l1"
- use v4l2 || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l || use v4l2; }; then
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
myconf+="
--enable-radio
--disable-radio-capture
@@ -319,7 +320,6 @@ src_configure() {
else
myconf+="
--disable-tv
- --disable-tv-v4l1
--disable-tv-v4l2
--disable-radio
--disable-radio-v4l2
@@ -459,7 +459,6 @@ src_configure() {
done
use dga || myconf+=" --disable-dga1 --disable-dga2"
use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
use vdpau || myconf+=" --disable-vdpau"
use video_cards_vesa || myconf+=" --disable-vesa"
use xscreensaver || myconf+=" --disable-xss"
@@ -476,7 +475,7 @@ src_configure() {
--disable-xv
--disable-x11
"
- uses="dga dxr3 ggi opengl osdmenu vdpau xinerama xscreensaver xv"
+ uses="dga dxr3 ggi opengl vdpau xinerama xscreensaver xv"
for i in ${uses}; do
use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
done
@@ -571,7 +570,6 @@ src_install() {
[default]
_EOF_
doins "${S}/etc/input.conf"
- use osdmenu && doins "${S}/etc/menu.conf"
# set unrar path when required
if use rar; then
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 5e987b3a..835dca85 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1 +1 @@
-EBUILD telepathy-salut-9999.ebuild 1104 RMD160 b60a1e61de226c3e51747c8028272ec1a0e96305 SHA1 e881cea0ab72d22385dfc8d4a767bccbf505fb76 SHA256 0aea56ed166895c2beb0040aaa108216df16c88fa20a79858a9b79a797130c70
+EBUILD telepathy-salut-9999.ebuild 1138 RMD160 10fe7ff09ca65a82a6384187033377ea77c3909e SHA1 9a193a8a0c532c0dc6143541087c5745407199d6 SHA256 8ee676e6ce0874179c70b61a427f94242f97990e1fec6804baf6307db0927e66