summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-02 18:05:29 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-02 18:05:29 +0000
commit3f8ad5575199f59bea65569af2c5ce463ae8499b (patch)
treee7cbb854b1d9956b5f4898a8b59d2d0b542aef0e
parentStable on alpha, bug #349659 (diff)
downloadgentoo-2-3f8ad5575199f59bea65569af2c5ce463ae8499b.tar.gz
gentoo-2-3f8ad5575199f59bea65569af2c5ce463ae8499b.tar.bz2
gentoo-2-3f8ad5575199f59bea65569af2c5ce463ae8499b.zip
Punt deprecated liba52/libdts usage #350360 by hal.
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/xbmc-10.0.ebuild6
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild8
3 files changed, 12 insertions, 8 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index fef68233696a..bffa0a29e62a 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.74 2011/01/01 21:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.75 2011/01/02 18:05:29 vapier Exp $
+
+ 02 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
+ xbmc-9999.ebuild:
+ Punt deprecated liba52/libdts usage #350360 by hal.
01 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
+files/xbmc-10.0-python-2.7.patch:
diff --git a/media-tv/xbmc/xbmc-10.0.ebuild b/media-tv/xbmc/xbmc-10.0.ebuild
index ca855d56230f..c5ccc343c72f 100644
--- a/media-tv/xbmc/xbmc-10.0.ebuild
+++ b/media-tv/xbmc/xbmc-10.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.3 2011/01/01 21:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.4 2011/01/02 18:05:29 vapier Exp $
EAPI="2"
@@ -39,7 +39,6 @@ RDEPEND="virtual/opengl
dev-libs/libpcre[cxx]
dev-libs/lzo
>=dev-python/pysqlite-2
- media-libs/a52dec
media-libs/alsa-lib
media-libs/faad2
media-libs/flac
@@ -50,7 +49,6 @@ RDEPEND="virtual/opengl
media-libs/jbigkit
media-libs/jpeg:0
>=media-libs/libass-0.9.7
- media-libs/libdca
css? ( media-libs/libdvdcss )
media-libs/libmad
media-libs/libmms
@@ -169,6 +167,8 @@ src_configure() {
--enable-external-libraries \
--enable-goom \
--enable-gl \
+ --disable-liba52 \
+ --disable-libdts \
$(use_enable avahi) \
$(use_enable css dvdcss) \
$(use_enable debug) \
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 04e0f2e54a4c..53a17c62e1b6 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.68 2010/12/31 18:19:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.69 2011/01/02 18:05:29 vapier Exp $
EAPI="2"
@@ -41,7 +41,6 @@ COMMON_DEPEND="virtual/opengl
dev-libs/libpcre[cxx]
dev-libs/lzo
>=dev-python/pysqlite-2
- media-libs/a52dec
media-libs/alsa-lib
media-libs/faad2
media-libs/flac
@@ -52,7 +51,6 @@ COMMON_DEPEND="virtual/opengl
media-libs/jbigkit
media-libs/jpeg:0
>=media-libs/libass-0.9.7
- media-libs/libdca
css? ( media-libs/libdvdcss )
media-libs/libmad
media-libs/libmms
@@ -170,6 +168,8 @@ src_configure() {
--enable-external-libraries \
--enable-goom \
--enable-gl \
+ --disable-liba52 \
+ --disable-libdts \
$(use_enable avahi) \
$(use_enable css dvdcss) \
$(use_enable debug) \