summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-30 19:55:27 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-30 19:55:27 +0000
commitc47ba954fc5bb9467bec3fa09c39ef0dc416c205 (patch)
tree48d0b9aaf3319402fdf8af89f7a964d75f61a3c6 /media-video
parentAdded a patch to fix erratic icon behavior. See http://bugzilla.xfce.org/show... (diff)
downloadgentoo-2-c47ba954fc5bb9467bec3fa09c39ef0dc416c205.tar.gz
gentoo-2-c47ba954fc5bb9467bec3fa09c39ef0dc416c205.tar.bz2
gentoo-2-c47ba954fc5bb9467bec3fa09c39ef0dc416c205.zip
Update patchlevel to add a patch to build live555 as plugin when using system libraries, use the correct path for the live555 tree when building against old style ebuild, and allow using new-style live555 ebuilds.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog7
-rw-r--r--media-video/vlc/files/digest-vlc-0.8.66
-rw-r--r--media-video/vlc/vlc-0.8.6.ebuild11
3 files changed, 17 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 5b615e3311d7..5eb195c54bf7 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/vlc
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.200 2006/12/21 15:50:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.201 2006/12/30 19:55:27 flameeyes Exp $
+
+ 30 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.6.ebuild:
+ Update patchlevel to add a patch to build live555 as plugin when using
+ system libraries, use the correct path for the live555 tree when building
+ against old style ebuild, and allow using new-style live555 ebuilds.
21 Dec 2006; Markus Rothe <corsair@gentoo.org> vlc-0.8.6.ebuild:
Added ~ppc64; bug #139252
diff --git a/media-video/vlc/files/digest-vlc-0.8.6 b/media-video/vlc/files/digest-vlc-0.8.6
index 8cf9494bd557..44b6a98f1c90 100644
--- a/media-video/vlc/files/digest-vlc-0.8.6
+++ b/media-video/vlc/files/digest-vlc-0.8.6
@@ -1,6 +1,6 @@
MD5 77a275f3408c4c9feae451d4eae47f89 vlc-0.8.6.tar.bz2 10506025
RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d vlc-0.8.6.tar.bz2 10506025
SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 vlc-0.8.6.tar.bz2 10506025
-MD5 4183603323a21b2aa38717051c8a3487 vlc-patches-31.tar.bz2 9153
-RMD160 bfd6b5207f55d057827128211770eb92dafd15d5 vlc-patches-31.tar.bz2 9153
-SHA256 dd0b4c797416fe1ad4f2a7c50fed140e4c860addae7672e01f04277650cd3ba3 vlc-patches-31.tar.bz2 9153
+MD5 3be810ccf43a4e1919fff0c69dfe3029 vlc-patches-32.tar.bz2 9409
+RMD160 b38a5c6df7d68b58379f53614bcc9366aed92d81 vlc-patches-32.tar.bz2 9409
+SHA256 52af8539833331104e07b9b7f2bb082ea5cb35eb7671164b3bca0ad954796e52 vlc-patches-32.tar.bz2 9409
diff --git a/media-video/vlc/vlc-0.8.6.ebuild b/media-video/vlc/vlc-0.8.6.ebuild
index 1d8528fcd1bc..ab2c3cfab34e 100644
--- a/media-video/vlc/vlc-0.8.6.ebuild
+++ b/media-video/vlc/vlc-0.8.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6.ebuild,v 1.3 2006/12/21 15:50:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6.ebuild,v 1.4 2006/12/30 19:55:27 flameeyes Exp $
WANT_AUTOMAKE=latest
WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ MY_PV="${PV/_/-}"
MY_PV="${MY_PV/-beta/-test}"
MY_P="${PN}-${MY_PV}"
-PATCHLEVEL="31"
+PATCHLEVEL="32"
DESCRIPTION="VLC media player - Video player and streamer"
HOMEPAGE="http://www.videolan.org/vlc/"
@@ -168,6 +168,12 @@ src_compile () {
fi
fi
+ if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+ myconf="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+ else
+ myconf="$(use_enable live live555)"
+ fi
+
econf \
$(use_enable altivec) \
$(use_enable stream sout) \
@@ -203,7 +209,6 @@ src_compile () {
$(use_enable ncurses) \
$(use_enable xosd) \
$(use_enable lirc) \
- $(use_enable live live555) $(use_with live live555-tree /usr/lib/live) \
$(use_enable mp3 mad) \
$(use_enable a52) \
$(use_enable dts) \