summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog8
-rw-r--r--media-tv/xbmc/xbmc-11.0_rc1.ebuild (renamed from media-tv/xbmc/xbmc-11.0_beta3.ebuild)9
2 files changed, 12 insertions, 5 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 650aedde8154..55272308665b 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.117 2012/03/01 05:12:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.118 2012/03/01 05:14:52 vapier Exp $
+
+*xbmc-11.0_rc1 (01 Mar 2012)
+
+ 01 Mar 2012; Mike Frysinger <vapier@gentoo.org> -xbmc-11.0_beta3.ebuild,
+ +xbmc-11.0_rc1.ebuild:
+ Version bump #406299 by Ben Kohler.
01 Mar 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+files/xbmc-9999-no-exec-stack.patch:
diff --git a/media-tv/xbmc/xbmc-11.0_beta3.ebuild b/media-tv/xbmc/xbmc-11.0_rc1.ebuild
index c78009be110c..0e831d783e82 100644
--- a/media-tv/xbmc/xbmc-11.0_beta3.ebuild
+++ b/media-tv/xbmc/xbmc-11.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0_beta3.ebuild,v 1.3 2012/02/26 23:47:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-11.0_rc1.ebuild,v 1.1 2012/03/01 05:14:52 vapier Exp $
EAPI="4"
@@ -14,7 +14,7 @@ else
MY_P=${P/_/-Eden_}
SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
- S=${WORKDIR}/${MY_P}.1
+ S=${WORKDIR}/${MY_P}
fi
DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
@@ -96,8 +96,6 @@ DEPEND="${COMMON_DEPEND}
dev-util/cmake
x86? ( dev-lang/nasm )"
-QA_EXECSTACK="usr/lib*/xbmc/xbmc.bin"
-
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-2_src_unpack
@@ -117,6 +115,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-11.0-libpng-1.5.patch #380127
epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+ epatch "${FILESDIR}"/${PN}-9999-no-exec-stack.patch
+ # The mythtv patch touches configure.ac, so force a regen
+ rm -f configure
# some dirs ship generated autotools, some dont
local d