Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-tv/xbmc/ChangeLog13
-rw-r--r--media-tv/xbmc/files/xbmc-12.0-system-projectm.patch113
-rw-r--r--media-tv/xbmc/files/xbmc-13.0-system-projectm.patch112
-rw-r--r--media-tv/xbmc/xbmc-12.1-r1.ebuild265
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild28
5 files changed, 516 insertions, 15 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 94ae73e94aca..067ea7ff508f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.179 2013/04/13 19:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.180 2013/04/20 17:22:26 scarabeus Exp $
+
+*xbmc-12.1-r1 (20 Apr 2013)
+
+ 20 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/xbmc-12.0-system-projectm.patch,
+ +files/xbmc-13.0-system-projectm.patch, +xbmc-12.1-r1.ebuild,
+ xbmc-9999.ebuild:
+ Update to python-single-r1 wrt bug#458682. Apply projectm unbundle patch.
+ Apply libav patchset provided by Anton Khirnov to 12.1-r1 ebuild and remove
+ keywords as it depends on too new ffmpeg/libav with this. (the patchset still
+ needs few touchups before submitting to master/9999 ebuild)
13 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/generate.sh,
xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
new file mode 100644
index 000000000000..959071c2ae7f
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
@@ -0,0 +1,113 @@
+From 72f017641cf7acdb1d3caf408bbcdaec39de8ce3 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Sat, 23 Feb 2013 11:21:44 +0100
+Subject: [PATCH] Allow usage of system ProjectM
+
+Conflicts:
+ configure.in
+---
+ configure.in | 45 ++++++++++++++++++++++++----
+ xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
+ 2 files changed, 45 insertions(+), 12 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 78104ad..296eb4d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -302,9 +302,15 @@ AC_ARG_ENABLE([rsxs],
+
+ AC_ARG_ENABLE([projectm],
+ [AS_HELP_STRING([--enable-projectm],
+- [enable ProjectM visualisation (default is yes)])],
++ [enable ProjectM visualisation (default is auto)])],
+ [use_projectm=$enableval],
+- [use_projectm=yes])
++ [use_projectm=auto])
++
++AC_ARG_WITH([projectm-presets-dir],
++ [AS_HELP_STRING([--with-projectm-presets-dir],
++ [path to ProjectM presets to incude in default list (default is bundled path)])],
++ [projectm_presets_dir=$withval],
++ [projectm_presets_dir=bundled])
+
+ AC_ARG_ENABLE([x11],
+ [AS_HELP_STRING([--enable-x11],
+@@ -1257,9 +1263,38 @@ fi
+ if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
+ AC_MSG_NOTICE($projectm_disabled)
+ DISABLE_PROJECTM=1
++ DISABLE_INTERNAL_PROJECTM=1
+ else
+- AC_MSG_NOTICE($projectm_enabled)
+- DISABLE_PROJECTM=0
++ if test "$host_vendor" != "apple" ; then
++ if test "$use_projectm" = "yes"; then
++ PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
++ else
++ PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
++ fi
++ if test "$use_projectm" != "no"; then
++ INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++ fi
++ DISABLE_INTERNAL_PROJECTM=1
++ else
++ DISABLE_INTERNAL_PROJECTM=0
++ fi
++ if test "$use_projectm" != "no"; then
++ AC_MSG_NOTICE($projectm_enabled)
++ DISABLE_PROJECTM=0
++ # verify preset dir actually exist if user don't want to use bundled one
++ if test "$projectm_presets_dir" != "bundled" ; then
++ if ! test -d "$projectm_presets_dir"; then
++ AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
++ fi
++ PROJECTM_PRESETS_DIR=$projectm_presets_dir
++ else
++ PROJECTM_PRESETS_DIR=libprojectM/presets/
++ fi
++ AC_SUBST(PROJECTM_PRESETS_DIR)
++ else
++ AC_MSG_NOTICE($projectm_disabled)
++ DISABLE_PROJECTM=1
++ fi
+ fi
+
+ # skin touched
+@@ -2661,7 +2696,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
+ sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
+ fi
+ set +x
+-], [$DISABLE_PROJECTM])
++], [$DISABLE_INTERNAL_PROJECTM])
+
+ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
+ ./configure \
+diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
+index 249338c..2c16306 100644
+--- a/xbmc/visualizations/XBMCProjectM/Makefile.in
++++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
+@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
+ libprojectM/libprojectM.dylib:
+ $(MAKE) -C libprojectM
+ else
+-$(SLIB): $(OBJS) libprojectM/libprojectM.so
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
++$(SLIB): $(OBJS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
+ $(MAKE) $(PRESETS)
+-
+-libprojectM/libprojectM.so:
+- $(MAKE) -C libprojectM
+ endif
+
+-$(PRESETS): libprojectM/presets/*
+- zip -j $@ libprojectM/presets/*
++$(PRESETS):
++ zip -j $@ @PROJECTM_PRESETS_DIR@/*
++
+
+ CLEAN_FILES = \
+ libprojectM/libprojectM.so \
+--
+1.8.1.5
+
diff --git a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
new file mode 100644
index 000000000000..acc72d1f9fdf
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
@@ -0,0 +1,112 @@
+From 57b29a277ca8d87bdfe4d6865eb23441b133ae52 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Sat, 23 Feb 2013 11:21:44 +0100
+Subject: [PATCH] Allow usage of system ProjectM
+
+---
+ configure.in | 45 ++++++++++++++++++++++++----
+ xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
+ 2 files changed, 45 insertions(+), 12 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index db1d012..3e11588 100644
+--- a/configure.in
++++ b/configure.in
+@@ -310,9 +310,15 @@ AC_ARG_ENABLE([fishbmc],
+
+ AC_ARG_ENABLE([projectm],
+ [AS_HELP_STRING([--enable-projectm],
+- [enable ProjectM visualisation (default is yes)])],
++ [enable ProjectM visualisation (default is auto)])],
+ [use_projectm=$enableval],
+- [use_projectm=yes])
++ [use_projectm=auto])
++
++AC_ARG_WITH([projectm-presets-dir], [
++ [AS_HELP_STRING([--with-projectm-presets-dir], [
++ [path to ProjectM presets to incude in default list (default is bundled path)])],
++ [projectm_presets_dir=$withval],
++ [projectm_presets_dir=bundled])
+
+ AC_ARG_ENABLE([x11],
+ [AS_HELP_STRING([--enable-x11],
+@@ -1313,10 +1319,39 @@ fi
+ if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
+ AC_MSG_NOTICE($projectm_disabled)
+ DISABLE_PROJECTM=1
++ DISABLE_INTERNAL_PROJECTM=1
+ use_projectm="no"
+ else
+- AC_MSG_NOTICE($projectm_enabled)
+- DISABLE_PROJECTM=0
++ if test "$host_vendor" != "apple" ; then
++ if test "$use_projectm" = "yes"; then
++ PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
++ else
++ PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
++ fi
++ if test "$use_projectm" != "no"; then
++ INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++ fi
++ DISABLE_INTERNAL_PROJECTM=1
++ else
++ DISABLE_INTERNAL_PROJECTM=0
++ fi
++ if test "$use_projectm" != "no"; then
++ AC_MSG_NOTICE($projectm_enabled)
++ DISABLE_PROJECTM=0
++ # verify preset dir actually exist if user don't want to use bundled one
++ if test "$projectm_presets_dir" != "bundled" ; then
++ if ! test -d "$projectm_presets_dir"; then
++ AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
++ fi
++ PROJECTM_PRESETS_DIR=$projectm_presets_dir
++ else
++ PROJECTM_PRESETS_DIR=libprojectM/presets/
++ fi
++ AC_SUBST(PROJECTM_PRESETS_DIR)
++ else
++ AC_MSG_NOTICE($projectm_disabled)
++ DISABLE_PROJECTM=1
++ fi
+ fi
+
+ # skin touched
+@@ -2712,7 +2747,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
+ sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
+ fi
+ set +x
+-], [$DISABLE_PROJECTM])
++], [$DISABLE_INTERNAL_PROJECTM])
+
+ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
+ ./configure \
+diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
+index 249338c..2c16306 100644
+--- a/xbmc/visualizations/XBMCProjectM/Makefile.in
++++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
+@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
+ libprojectM/libprojectM.dylib:
+ $(MAKE) -C libprojectM
+ else
+-$(SLIB): $(OBJS) libprojectM/libprojectM.so
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
++$(SLIB): $(OBJS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
+ $(MAKE) $(PRESETS)
+-
+-libprojectM/libprojectM.so:
+- $(MAKE) -C libprojectM
+ endif
+
+-$(PRESETS): libprojectM/presets/*
+- zip -j $@ libprojectM/presets/*
++$(PRESETS):
++ zip -j $@ @PROJECTM_PRESETS_DIR@/*
++
+
+ CLEAN_FILES = \
+ libprojectM/libprojectM.so \
+--
+1.8.1.5
+
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
new file mode 100644
index 000000000000..69f63a592e46
--- /dev/null
+++ b/media-tv/xbmc/xbmc-12.1-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.1 2013/04/20 17:22:26 scarabeus Exp $
+
+EAPI=5
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 multiprocessing autotools
+
+case ${PV} in
+9999)
+ EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+ inherit git-2
+ SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
+ ;;
+*_alpha*|*_beta*|*_rc*)
+ MY_PV="Frodo_${PV#*_}"
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ !java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
+ KEYWORDS="~amd64 ~x86"
+ ;;
+*)
+ MY_P=${P/_/-*_}
+ SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+ KEYWORDS=""
+ ;;
+esac
+
+# libav patchset
+SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/xbmc-12-libav.tar.xz"
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr"
+REQUIRED_USE="
+ pvr? ( mysql )
+ rsxs? ( X )
+ xrandr? ( X )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/bzip2
+ app-arch/unzip
+ app-arch/zip
+ app-i18n/enca
+ airplay? ( app-pda/libplist )
+ dev-libs/boost
+ dev-libs/fribidi
+ dev-libs/libcdio[-minimal]
+ cec? ( >=dev-libs/libcec-2.1 )
+ dev-libs/libpcre[cxx]
+ >=dev-libs/lzo-2.04
+ dev-libs/tinyxml[stl]
+ dev-libs/yajl
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ media-libs/alsa-lib
+ media-libs/flac
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/glew-1.5.6
+ media-libs/jasper
+ media-libs/jbigkit
+ >=media-libs/libass-0.9.7
+ bluray? ( media-libs/libbluray )
+ css? ( media-libs/libdvdcss )
+ media-libs/libmad
+ media-libs/libmodplug
+ media-libs/libmpeg2
+ media-libs/libogg
+ media-libs/libpng
+ projectm? ( media-libs/libprojectm )
+ media-libs/libsamplerate
+ sdl? ( media-libs/libsdl[audio,opengl,video,X] )
+ alsa? ( media-libs/libsdl[alsa] )
+ >=media-libs/taglib-1.8
+ media-libs/libvorbis
+ sdl? (
+ media-libs/sdl-gfx
+ >=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+ media-libs/sdl-mixer
+ media-libs/sdl-sound
+ )
+ media-libs/tiff
+ pulseaudio? ( media-sound/pulseaudio )
+ media-sound/wavpack
+ || ( media-libs/libpostproc media-video/ffmpeg )
+ >=virtual/ffmpeg-9[encode]
+ rtmp? ( media-video/rtmpdump )
+ avahi? ( net-dns/avahi )
+ nfs? ( net-fs/libnfs )
+ webserver? ( net-libs/libmicrohttpd[messages] )
+ sftp? ( net-libs/libssh )
+ net-misc/curl
+ samba? ( >=net-fs/samba-3.4.6[smbclient] )
+ bluetooth? ( net-wireless/bluez )
+ sys-apps/dbus
+ caps? ( sys-libs/libcap )
+ sys-libs/zlib
+ virtual/jpeg
+ usb? ( virtual/libusb )
+ mysql? ( virtual/mysql )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gles? ( virtual/opengl )
+ vaapi? ( x11-libs/libva[opengl] )
+ vdpau? (
+ || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+ virtual/ffmpeg[vdpau]
+ )
+ X? (
+ x11-apps/xdpyinfo
+ x11-apps/mesa-progs
+ x11-libs/libXinerama
+ xrandr? ( x11-libs/libXrandr )
+ x11-libs/libXrender
+ )"
+RDEPEND="${COMMON_DEPEND}
+ udev? ( sys-fs/udisks:0 sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ dev-lang/swig
+ dev-util/gperf
+ X? ( x11-proto/xineramaproto )
+ dev-util/cmake
+ x86? ( dev-lang/nasm )
+ java? ( virtual/jre )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ [[ ${PV} == "9999" ]] && git-2_src_unpack || default
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+ epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+ epatch "${FILESDIR}"/${PN}-12.0-system-projectm.patch
+ # The mythtv patch touches configure.ac, so force a regen
+ rm -f configure
+
+ # libav patchset
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+
+ # some dirs ship generated autotools, some dont
+ multijob_init
+ local d
+ for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+ [[ -e ${d} ]] && continue
+ pushd ${d/%configure/.} >/dev/null || die
+ AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+ multijob_child_init eautoreconf
+ popd >/dev/null
+ done
+ multijob_finish
+ elibtoolize
+
+ # Disable internal func checks as our USE/DEPEND
+ # stuff handles this just fine already #408395
+ export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+ local squish #290564
+ use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+ use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+ use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+ sed -i \
+ -e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+ -e "1iCXXFLAGS += ${squish}" \
+ lib/libsquish/Makefile.in || die
+
+ # Fix XBMC's final version string showing as "exported"
+ # instead of the SVN revision number.
+ export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+ # avoid long delays when powerkit isn't running #348580
+ sed -i \
+ -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+ xbmc/linux/*.cpp || die
+
+ epatch_user #293109
+
+ # Tweak autotool timestamps to avoid regeneration
+ find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_configure() {
+ # Disable documentation generation
+ export ac_cv_path_LATEX=no
+ # Avoid help2man
+ export HELP2MAN=$(type -P help2man || echo true)
+ # No configure flage for this #403561
+ export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+ # Requiring java is asine #434662
+ export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-ccache \
+ --disable-optimizations \
+ --enable-external-libraries \
+ --enable-gl \
+ $(use_enable airplay) \
+ $(use_enable avahi) \
+ $(use_enable bluray libbluray) \
+ $(use_enable caps libcap) \
+ $(use_enable cec libcec) \
+ $(use_enable css dvdcss) \
+ $(use_enable debug) \
+ $(use_enable gles) \
+ $(use_enable goom) \
+ --disable-hal \
+ $(use_enable joystick) \
+ $(use_enable midi mid) \
+ $(use_enable mysql) \
+ $(use_enable neon) \
+ $(use_enable nfs) \
+ $(use_enable opengl gl) \
+ $(use_enable profile profiling) \
+ $(use_enable projectm) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable pvr mythtv) \
+ $(use_enable rsxs) \
+ $(use_enable rtmp) \
+ $(use_enable samba) \
+ $(use_enable sdl) \
+ $(use_enable sftp ssh) \
+ $(use_enable usb libusb) \
+ $(use_enable upnp) \
+ $(use_enable vaapi) \
+ $(use_enable vdpau) \
+ $(use_enable webserver) \
+ $(use_enable X x11) \
+ $(use_enable xrandr)
+}
+
+src_install() {
+ default
+ rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+ domenu tools/Linux/xbmc.desktop
+ newicon tools/Linux/xbmc-48x48.png xbmc.png
+
+ python_domodule tools/EventClients/lib/python/xbmcclient.py
+ python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
+}
+
+pkg_postinst() {
+ elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+}
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 65cbdceb3fa3..bfbcaf72e655 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2013 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.141 2013/04/13 19:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.142 2013/04/20 17:22:26 scarabeus Exp $
-EAPI="4"
+EAPI=5
# Does not work with py3 here
# It might work with py:2.5 but I didn't test that
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH=sqlite
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
-inherit eutils python multiprocessing autotools
+inherit eutils python-single-r1 multiprocessing autotools
case ${PV} in
9999)
@@ -43,7 +43,8 @@ REQUIRED_USE="
xrandr? ( X )
"
-COMMON_DEPEND="app-arch/bzip2
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/bzip2
app-arch/unzip
app-arch/zip
app-i18n/enca
@@ -57,7 +58,7 @@ COMMON_DEPEND="app-arch/bzip2
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
dev-libs/yajl
- dev-python/simplejson
+ dev-python/simplejson[${PYTHON_USEDEP}]
media-fonts/corefonts
media-fonts/roboto
media-libs/alsa-lib
@@ -90,8 +91,8 @@ COMMON_DEPEND="app-arch/bzip2
media-libs/tiff
pulseaudio? ( media-sound/pulseaudio )
media-sound/wavpack
- || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
- >=virtual/ffmpeg-0.6[encode]
+ || ( media-libs/libpostproc media-video/ffmpeg )
+ >=virtual/ffmpeg-9[encode]
rtmp? ( media-video/rtmpdump )
avahi? ( net-dns/avahi )
nfs? ( net-fs/libnfs )
@@ -137,8 +138,7 @@ DEPEND="${COMMON_DEPEND}
S=${WORKDIR}/${MY_P}
pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
+ python-single-r1_pkg_setup
}
src_unpack() {
@@ -148,6 +148,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+ epatch "${FILESDIR}"/${PN}-13.0-system-projectm.patch
# The mythtv patch touches configure.ac, so force a regen
rm -f configure
@@ -278,9 +279,8 @@ src_install() {
dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
- insinto "$(python_get_sitedir)" #309885
- doins tools/EventClients/lib/python/xbmcclient.py || die
- newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
+ python_domodule tools/EventClients/lib/python/xbmcclient.py
+ python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
}
pkg_postinst() {