mgorny 15/02/01 22:59:56 Modified: xbmc-9999.ebuild ChangeLog Added: xbmc-13.2-r1.ebuild Log: Introduce USE=libav to control the preferred implementation. Fixes subslot & implementation switch rebuilds as well. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.167 media-tv/xbmc/xbmc-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild?rev=1.167&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild?rev=1.167&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild?r1=1.166&r2=1.167 Index: xbmc-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- xbmc-9999.ebuild 29 Jan 2015 19:12:22 -0000 1.166 +++ xbmc-9999.ebuild 1 Feb 2015 22:59:56 -0000 1.167 @@ -1,6 +1,6 @@ # Copyright 1999-2015 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.166 2015/01/29 19:12:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.167 2015/02/01 22:59:56 mgorny Exp $ EAPI="5" @@ -45,7 +45,7 @@ LICENSE="GPL-2" SLOT="0" -IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" +IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" REQUIRED_USE=" pvr? ( mysql ) rsxs? ( X ) @@ -100,7 +100,9 @@ media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack - || ( >=media-video/ffmpeg-1.2.1:0=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) ) + !libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] ) + libav? ( media-libs/libpostproc:0= + >=media-video/libav-10_alpha:0=[encode] ) rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) @@ -126,7 +128,8 @@ vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) - || ( >=media-video/ffmpeg-1.2.1:0=[vdpau] >=media-video/libav-10_alpha:=[vdpau] ) + !libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] ) + libav? ( >=media-video/libav-10_alpha:0=[vdpau] ) ) X? ( x11-apps/xdpyinfo @@ -155,7 +158,7 @@ pkg_setup() { python-single-r1_pkg_setup - if has_version 'media-video/libav' ; then + if use libav ; then ewarn "Building ${PN} against media-video/libav is not supported upstream." ewarn "It requires building a (small) wrapper library with some code" ewarn "from media-video/ffmpeg." @@ -222,7 +225,7 @@ --disable-ccache \ --disable-optimizations \ --enable-external-libraries \ - $(has_version 'media-video/libav' && echo "--enable-libav-compat") \ + $(usex libav "--enable-libav-compat" "") \ $(use_enable airplay) \ $(use_enable avahi) \ $(use_enable bluray libbluray) \ 1.218 media-tv/xbmc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/ChangeLog?rev=1.218&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/ChangeLog?rev=1.218&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/ChangeLog?r1=1.217&r2=1.218 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- ChangeLog 29 Jan 2015 19:12:22 -0000 1.217 +++ ChangeLog 1 Feb 2015 22:59:56 -0000 1.218 @@ -1,6 +1,13 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.217 2015/01/29 19:12:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.218 2015/02/01 22:59:56 mgorny Exp $ + +*xbmc-13.2-r1 (01 Feb 2015) + + 01 Feb 2015; Michał Górny <mgo...@gentoo.org> +xbmc-13.2-r1.ebuild, + xbmc-9999.ebuild: + Introduce USE=libav to control the preferred implementation. Fixes subslot & + implementation switch rebuilds as well. 29 Jan 2015; Michał Górny <mgo...@gentoo.org> xbmc-11.0.ebuild, xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild, 1.1 media-tv/xbmc/xbmc-13.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/xbmc-13.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/xbmc-13.2-r1.ebuild?rev=1.1&content-type=text/plain Index: xbmc-13.2-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-13.2-r1.ebuild,v 1.1 2015/02/01 22:59:56 mgorny 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 CODENAME="Gotham" case ${PV} in 9999) EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" inherit git-2 #SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )" ;; *_alpha*|*_beta*|*_rc*) MY_PV="${CODENAME}_${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" S=${WORKDIR}/${MY_P} ;; *|*_p*) MY_PV=${PV/_p/_r} MY_P="${PN}-${MY_PV}" SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"; KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P}-${CODENAME} ;; esac 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 +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" REQUIRED_USE=" pvr? ( mysql ) rsxs? ( X ) X? ( sdl ) 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-fonts/corefonts media-fonts/roboto 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[sound,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 !libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] ) libav? ( media-libs/libpostproc:0= >=media-video/libav-10_alpha:0=[encode] ) rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh[sftp] ) 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 media-libs/mesa[gles2] ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) !libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] ) libav? ( >=media-video/libav-10_alpha:0=[vdpau] ) ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender )" RDEPEND="${COMMON_DEPEND} udisks? ( sys-fs/udisks:0 ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" 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 )" # Force java for latest git version to avoid having to hand maintain the # generated addons package. #488118 [[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" pkg_setup() { python-single-r1_pkg_setup if use libav ; then ewarn "Building ${PN} against media-video/libav is not supported upstream." ewarn "It requires building a (small) wrapper library with some code" ewarn "from media-video/ffmpeg." ewarn "If you experience issues, please try with media-video/ffmpeg." fi } 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 # The mythtv patch touches configure.ac, so force a regen rm -f configure # 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 [[ ${PV} == "9999" ]] && emake -f codegenerator.mk # 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 cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse" use cpu_flags_x86_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 -exec 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 [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) econf \ --docdir=/usr/share/doc/${PF} \ --disable-ccache \ --disable-optimizations \ --enable-external-libraries \ $(usex libav "--enable-libav-compat" "") \ $(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 fishbmc) \ $(use_enable gles) \ $(use_enable goom) \ --disable-hal \ $(use_enable joystick) \ $(use_enable midi mid) \ $(use_enable mysql) \ $(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 media/icon48x48.png xbmc.png # Remove optional addons (platform specific and disabled by USE flag). local disabled_addons=( repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org visualization.dxspectrum ) use fishbmc || disabled_addons+=( visualization.fishbmc ) use projectm || disabled_addons+=( visualization.{milkdrop,projectm} ) use rsxs || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} ) rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}" # Punt simplejson bundle, we use the system one anyway. rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib # Remove fonconfig settings that are used only on MacOSX. # Can't be patched upstream because they just find all files and install # them into same structure like they have in git. rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc # Replace bundled fonts with system ones # teletext.ttf: unknown # bold-caps.ttf: unknown # roboto: roboto-bold, roboto-regular # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-* dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ /usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ /usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf 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"; }
