From ce348c4bf43966ef22a667e70b86d3f26719ccaf Mon Sep 17 00:00:00 2001 From: James Broadhead Date: Fri, 27 Jan 2012 17:05:32 +0000 Subject: Updated to xbmc-11.0_beta2 --- media-tv/xbmc/Manifest | 6 +- media-tv/xbmc/xbmc-11.0_beta1.ebuild | 219 ---------------------------------- media-tv/xbmc/xbmc-11.0_beta2.ebuild | 221 +++++++++++++++++++++++++++++++++++ 3 files changed, 225 insertions(+), 221 deletions(-) delete mode 100644 media-tv/xbmc/xbmc-11.0_beta1.ebuild create mode 100644 media-tv/xbmc/xbmc-11.0_beta2.ebuild diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest index 6b83ed6..c6e41fa 100644 --- a/media-tv/xbmc/Manifest +++ b/media-tv/xbmc/Manifest @@ -1,3 +1,4 @@ +AUX 1 18994 RMD160 00fed60110f7b6e917bf813b4c08dff6534765cf SHA1 7e90064f04a4778cfe08509504fca39b6532b081 SHA256 b4ac0d0ca9a0869189b8eab523d9b8b99024c2d6b61974f43f6a06f6f876fc6a AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085 AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9 AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002 @@ -5,7 +6,8 @@ AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81f AUX xbmc-11.0_beta1-libpng-1.5-fix-plt-trn-get.patch 1659 RMD160 94404f801cc50f0f83f6d9716b572568981cc238 SHA1 761e00902f9979180966928719ea2ba311ab590b SHA256 fed3ba39de959c46bc43431b229347c187690848ccd3bdc823bb7291bc425e84 AUX xbmc-11.0_beta1-libpng-1.5-headers.patch 450 RMD160 52f5b4974c2e593c3d6518638c81946a9dc325f2 SHA1 e1987cea85f3156b0f00c61d6411e678416df5f3 SHA256 28765af28836502ce2df92c00b0df27733137111f7fbb11a5cd0b5b7c47b0713 AUX xbmc-11.0_beta1-libpng-1.5.patch 18687 RMD160 806918123b89ba86dd548cbd42fe26f9784ca6b9 SHA1 44d8c0f96445db48293f356909cff303b050e279 SHA256 359cc4893cc6922b86269770c11c5e80fd5b33e711ebf1645b232e4f3fc91c28 -DIST xbmc-11.0-Eden_beta1.tar.gz 56530997 RMD160 eaf725779eb343aa63b90949115b1ee7d69b3ac2 SHA1 9b7950f1717cea162a4f2502be3d54c6a2388054 SHA256 f8651ac846d4aa0f06628802a9b8642f4dbbe8f741b3dbacfef63fb9c0be774f -EBUILD xbmc-11.0_beta1.ebuild 5529 RMD160 18bf2348f75764568e9fb333aa7b6488edb3d5cd SHA1 b3d8b39234d08fd67b69e6522dcb412687ff953c SHA256 a655b2b219212626c1926c3bd83a2b7c2205c2dee80093f4d3e3dca835695fa9 +AUX xbmc-11.0_beta2-libpng-1.5-merged.patch 20467 RMD160 c64118241a9f897b9d3cde2ecf3cf9b8e8a26693 SHA1 821d1f3c90d8355db674c051b8f8da7235926911 SHA256 d4ac6cda6f4a0315eb00c709aa8982cac20c060068d2253e34d0f53f4423b17d +DIST xbmc-11.0-Eden_beta2.tar.gz 56577092 RMD160 4970a097a5a939bcc5d2d120b0d01ed4b95cb828 SHA1 1da6a2e1194bd4ed7e1e04ffccd0b5f92c40e734 SHA256 1f87e04b0444bb3587f055ae1b9d86e3f2fbf4284caeab8bc393e36e0e4c2ec6 +EBUILD xbmc-11.0_beta2.ebuild 5531 RMD160 1ca68ebd7ef722d12ff4f389d5c7b834d502b365 SHA1 d86db1b6140d0330c4a700f3bac3b6e7bc274db8 SHA256 4e9c6fd2ff468c857af53a2ff94343c0b5a8354a0a1a49bdcae1e6b4711f2b44 MISC ChangeLog 16667 RMD160 3b640cf19348af77f56e84b58c93ed39ee1720f2 SHA1 14f559e02386b8f2813143660a459bce3e4e7ef5 SHA256 9e508644e3a058e58f171207024340115fc8c0028a083281318df9376a9ea217 MISC metadata.xml 885 RMD160 67687f56afd352af492d990c0d1f0b35e08c16bc SHA1 6e4782708b211b5b45d039c633e14b324f0d3805 SHA256 8a5abffe9692e42653163891290a3f48c1ae68d73597b56e3fcc8ee60ee22c2b diff --git a/media-tv/xbmc/xbmc-11.0_beta1.ebuild b/media-tv/xbmc/xbmc-11.0_beta1.ebuild deleted file mode 100644 index b83d921..0000000 --- a/media-tv/xbmc/xbmc-11.0_beta1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# 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.94 2011/12/21 03:42:04 vapier Exp $ - -EAPI="2" - -inherit autotools eutils python - -EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" -if [[ ${PV} == "9999" ]] ; then - inherit git-2 -else - if [[ ${PV} == *beta* ]] ; then - inherit versionator - CODENAME="Eden" - MY_PV=`get_version_component_range 1-2`-${CODENAME}_`get_version_component_range 3` - MY_P="${PN}-${MY_PV}" - else - MY_P=${P/_/-} - fi - SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/${MY_P} -fi - -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 bluray css debug goom joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - >=dev-lang/python-2.4 - dev-libs/boost - dev-libs/fribidi - dev-libs/libcdio[-minimal] - dev-libs/libpcre[cxx] - dev-libs/lzo - dev-libs/yajl - >=dev-python/pysqlite-2 - dev-python/simplejson - media-libs/alsa-lib - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/glew - media-libs/jasper - media-libs/jbigkit - media-libs/libass - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng - media-libs/libsamplerate - media-libs/libsdl[audio,opengl,video,X] - media-libs/libvorbis - media-libs/sdl-gfx - media-libs/sdl-image[gif,jpeg,png] - media-libs/sdl-mixer - media-libs/sdl-sound - media-libs/tiff - media-sound/wavpack - media-video/ffmpeg - net-misc/curl - =net-wireless/bluez-4.96 - sys-apps/dbus - sys-libs/zlib - virtual/jpeg - virtual/opengl - virtual/mysql - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrender - airplay? ( app-pda/libplist ) - alsa? ( media-libs/libsdl[alsa] ) - avahi? ( net-dns/avahi ) - bluray? ( media-libs/libbluray ) - css? ( media-libs/libdvdcss ) - pulseaudio? ( media-sound/pulseaudio ) - projectm? ( media-libs/libprojectm ) - rtmp? ( media-video/rtmpdump ) - samba? ( >=net-fs/samba-3.4.6[smbclient] ) - vaapi? ( x11-libs/libva ) - vdpau? ( - || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - webserver? ( net-libs/libmicrohttpd ) - xrandr? ( x11-libs/libXrandr )" - -RDEPEND="${COMMON_DEPEND} - udev? ( sys-fs/udisks sys-power/upower )" -DEPEND="${COMMON_DEPEND} - dev-util/gperf - x11-proto/xineramaproto - dev-util/cmake - x86? ( dev-lang/nasm )" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-2_src_unpack - cd "${S}" - rm -f configure - else - unpack ${A} - cd "${S}" - fi - - # Fix case sensitivity - mv media/Fonts/{a,A}rial.ttf || die - mv media/{S,s}plash.png || die -} - -src_prepare() { - # some dirs ship generated autotools, some dont - local d - for d in \ - . \ - lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \ - xbmc/screensavers/rsxs-* \ - xbmc/visualizations/Goom/goom2k4-0 - do - [[ -e ${d}/configure ]] && continue - pushd ${d} >/dev/null - einfo "Generating autotools in ${d}" - eautoreconf - popd >/dev/null - done - - 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 lsb-release dependency - sed -i \ - -e 's:lsb_release -d:cat /etc/gentoo-release:' \ - xbmc/utils/SystemInfo.cpp || die - - # 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 ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5-headers.patch || die - epatch ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5.patch || die - epatch ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5-fix-plt-trn-get.patch || 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) - - 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 css dvdcss) \ - $(use_enable debug) \ - $(use_enable goom) \ - --disable-hal \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable profile profiling) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rsxs) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable xrandr) -} - -src_install() { - emake install DESTDIR="${D}" || die - prepalldocs - - insinto /usr/share/applications - doins tools/Linux/xbmc.desktop - doicon tools/Linux/xbmc.png - - 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 -} - -pkg_postinst() { - elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual" -} diff --git a/media-tv/xbmc/xbmc-11.0_beta2.ebuild b/media-tv/xbmc/xbmc-11.0_beta2.ebuild new file mode 100644 index 0000000..5605b34 --- /dev/null +++ b/media-tv/xbmc/xbmc-11.0_beta2.ebuild @@ -0,0 +1,221 @@ +# 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.94 2011/12/21 03:42:04 vapier Exp $ + +EAPI="2" + +inherit autotools eutils python + +EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" +if [[ ${PV} == "9999" ]] ; then + inherit git-2 +else + if [[ ${PV} == *beta* ]] ; then + inherit versionator + CODENAME="Eden" + MY_PV=`get_version_component_range 1-2`-${CODENAME}_`get_version_component_range 3` + MY_P="${PN}-${MY_PV}" + else + MY_P=${P/_/-} + fi + SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${MY_P} +fi + +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 bluray css debug goom joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr" + +COMMON_DEPEND=" + app-arch/bzip2 + app-arch/unzip + app-arch/zip + app-i18n/enca + >=dev-lang/python-2.4 + dev-libs/boost + dev-libs/fribidi + dev-libs/libcdio[-minimal] + dev-libs/libpcre[cxx] + dev-libs/lzo + dev-libs/yajl + >=dev-python/pysqlite-2 + dev-python/simplejson + media-libs/alsa-lib + media-libs/flac + media-libs/fontconfig + media-libs/freetype + media-libs/glew + media-libs/jasper + media-libs/jbigkit + media-libs/libass + media-libs/libmad + media-libs/libmodplug + media-libs/libmpeg2 + media-libs/libogg + media-libs/libpng + media-libs/libsamplerate + media-libs/libsdl[audio,opengl,video,X] + media-libs/libvorbis + media-libs/sdl-gfx + media-libs/sdl-image[gif,jpeg,png] + media-libs/sdl-mixer + media-libs/sdl-sound + media-libs/tiff + media-sound/wavpack + media-video/ffmpeg + net-misc/curl + =net-wireless/bluez-4.96 + sys-apps/dbus + sys-libs/zlib + virtual/jpeg + virtual/opengl + virtual/mysql + x11-apps/xdpyinfo + x11-apps/mesa-progs + x11-libs/libXinerama + x11-libs/libXrender + airplay? ( app-pda/libplist ) + alsa? ( media-libs/libsdl[alsa] ) + avahi? ( net-dns/avahi ) + bluray? ( media-libs/libbluray ) + css? ( media-libs/libdvdcss ) + pulseaudio? ( media-sound/pulseaudio ) + projectm? ( media-libs/libprojectm ) + rtmp? ( media-video/rtmpdump ) + samba? ( >=net-fs/samba-3.4.6[smbclient] ) + vaapi? ( x11-libs/libva ) + vdpau? ( + || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) + media-video/ffmpeg[vdpau] + ) + webserver? ( net-libs/libmicrohttpd ) + xrandr? ( x11-libs/libXrandr )" + +RDEPEND="${COMMON_DEPEND} + udev? ( sys-fs/udisks sys-power/upower )" +DEPEND="${COMMON_DEPEND} + dev-util/gperf + x11-proto/xineramaproto + dev-util/cmake + x86? ( dev-lang/nasm )" + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + cd "${S}" + rm -f configure + else + unpack ${A} + cd "${S}" + fi + + # Fix case sensitivity + mv media/Fonts/{a,A}rial.ttf || die + mv media/{S,s}plash.png || die +} + +src_prepare() { + # some dirs ship generated autotools, some dont + local d + for d in \ + . \ + lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \ + xbmc/screensavers/rsxs-* \ + xbmc/visualizations/Goom/goom2k4-0 + do + [[ -e ${d}/configure ]] && continue + pushd ${d} >/dev/null + einfo "Generating autotools in ${d}" + eautoreconf + popd >/dev/null + done + + 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 lsb-release dependency + sed -i \ + -e 's:lsb_release -d:cat /etc/gentoo-release:' \ + xbmc/utils/SystemInfo.cpp || die + + # 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 ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5-headers.patch || die + epatch ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5.patch || die + epatch ${FILESDIR}/xbmc-11.0_beta1-libpng-1.5-fix-plt-trn-get.patch || 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) + + 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 css dvdcss) \ + $(use_enable debug) \ + $(use_enable goom) \ + --disable-hal \ + $(use_enable joystick) \ + $(use_enable midi mid) \ + $(use_enable profile profiling) \ + $(use_enable projectm) \ + $(use_enable pulseaudio pulse) \ + $(use_enable rsxs) \ + $(use_enable rtmp) \ + $(use_enable samba) \ + $(use_enable vaapi) \ + $(use_enable vdpau) \ + $(use_enable webserver) \ + $(use_enable xrandr) +} + +src_install() { + emake install DESTDIR="${D}" || die + prepalldocs + + insinto /usr/share/applications + doins tools/Linux/xbmc.desktop + doicon tools/Linux/xbmc.png + + 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 +} + +pkg_postinst() { + elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual" +} -- cgit v1.2.3-65-gdbad