Version bump.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 160 insertions, 2 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index c44f864640b7..0d3dbe7af038 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.160 2009/04/21 20:19:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.161 2009/10/21 07:21:46 vapier Exp $
+
+*libsdl-1.2.14 (21 Oct 2009)
+
+  21 Oct 2009; Mike Frysinger <vapier@gentoo.org> +libsdl-1.2.14.ebuild:
+  Version bump.
 
   21 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   remove negative assertion in the use flag description (bug #266292)
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 7523baa82116..686bb49565d5 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsdl-1.2.13-cld.patch 389 RMD160 c224ba1ede04d98813b655a78301e539c9b3b1c2 SHA1 d452b8e18f9bb1bd215d830b33868583b0c41ed1 SHA256 5e187bd32931aca35f8513e7379db251e40c68806f80c3a908801f47cd25a007
 AUX libsdl-1.2.13-libcaca-new-api.patch 17411 RMD160 623fef5bc3f502e5bbf96fc7a6d945ca5b4aeae2 SHA1 8df72f8dcbe43efe11926fc34b130bed43abb960 SHA256 faaac39d704a2bcbabd8192245521b8cba733d22d5702c37d0d3619ca55c1b5d
 AUX libsdl-1.2.13-pulseaudio.patch 1882 RMD160 85216ee5b297606d2cd7785294e8185270eda7c7 SHA1 0b0dbfc237d7ec071f3acb412d08b7e88254e37f SHA256 4a1233bfe237fc9cf1f77b2ad84fec2ac9871be115f0a035038b799c55ebc83f
 AUX libsdl-1.2.13-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 AUX libsdl-1.2.13-xinerama-head-0.patch 882 RMD160 41cd75c0eaeff10484c363c829a7f022c3dcc261 SHA1 ff63d7c1e8e4876a15a0b13e3b3f99fb7c14accb SHA256 612b6e5aeb0b155fa516124dce73a62a57ee5ab46b39c2ab67ae77de69ec0b8d
 DIST SDL-1.2.13.tar.gz 3373673 RMD160 ed8825fc98f4b3759cf9e5cf8357d71c50df9925 SHA1 51fcaa3e1d5c01fd813ea08688780f86b19cf539 SHA256 94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
+DIST SDL-1.2.14.tar.gz 4014154 RMD160 a3a9a691f5510eb5327ca159a034f55a70cb5801 SHA1 ba625b4b404589b97e92d7acd165992debe576dd SHA256 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
 EBUILD libsdl-1.2.13-r1.ebuild 4373 RMD160 ebc6a4c898cdd0065a9d25814fdbc18dc0d466ce SHA1 ee5ea913517085af419fcec12b1756c326b2c602 SHA256 e0b5cfe7082a2a297cd2e7475cba9918d26164fc587ed4646df655496f3e4aef
-MISC ChangeLog 24906 RMD160 992f53d59ac0bc3d564b63d5ad6e4bb1522b567b SHA1 56b03b13b4ad332d700074344d48c3e95dc64ef6 SHA256 dd02c63ccf2802b3465a07c11eede561e470d2a2c782fef0d63c3708b0f87816
+EBUILD libsdl-1.2.14.ebuild 4152 RMD160 14188dceb9f6112aef61c56d1313302659ca523e SHA1 99590b47e95edb20212cebb0859562b95b4eb8ba SHA256 eda2348adec020561bd8a99becccaaf4523204c581646733109549052b79412c
+MISC ChangeLog 25023 RMD160 cea2b826c467dbb585cb953a7a7b3bd8c049f9d3 SHA1 83e55e15dfee13ec6c4334cf40ca1639933ddcfa SHA256 35c47df547e279e86f3af2dc1b616bba6f5dc26b3d752b6aaa1f098153d20dd1
 MISC metadata.xml 1229 RMD160 70d0e592b73752923ac1ccc51940a836b76a9a31 SHA1 9d2ff3a1aefb073dfa93ac7436d1dcbff18bdfeb SHA256 8af6d4a6ebd4e1cde1c031c2d8fbdf84151e062f60b800034573ae177f0dd06a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkretqQACgkQlPl3HsVfCDq19gCfXcKOPDBzIvajzTf/5FE5yZ6o
+1q4AniJqyOsFhnuUvdNB4Cy3OWoBuyJK
+=w/5I
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/libsdl-1.2.14.ebuild b/media-libs/libsdl/libsdl-1.2.14.ebuild
new file mode 100644
index 000000000000..2a06da7cdf63
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.14.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14.ebuild,v 1.1 2009/10/21 07:21:46 vapier Exp $
+
+EAPI=2
+inherit flag-o-matic toolchain-funcs eutils libtool
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# WARNING:
+# if you disable the audio, video, joystick use flags or turn on the custom-cflags use flag
+# in USE and something breaks, you pick up the pieces.  Be prepared for
+# bug reports to be marked INVALID.
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio"
+
+RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.19 )
+	arts? ( kde-base/arts )
+	nas? (
+		media-libs/nas
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+	)
+	X? (
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXrandr
+	)
+	directfb? ( >=dev-libs/DirectFB-0.9.19 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	svga? ( >=media-libs/svgalib-1.4.2 )
+	aalib? ( media-libs/aalib )
+	libcaca? ( >=media-libs/libcaca-0.9-r1 )
+	opengl? ( virtual/opengl virtual/glu )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	nas? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+	if use !audio || use !video || use !joystick ; then
+		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl with the audio, video, and joystick flags in USE."
+		ewarn "You need to know what you're doing to selectively turn off parts of libsdl."
+		epause 30
+	fi
+	if use custom-cflags ; then
+		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+		ewarn "libsdl without the custom-cflags use flag in USE."
+		epause 10
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.13-sdl-config.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=
+	if [[ $(tc-arch) != "x86" ]] ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use custom-cflags || strip-flags
+	use audio || myconf="${myconf} --disable-audio"
+	use video \
+		&& myconf="${myconf} --enable-video-dummy" \
+		|| myconf="${myconf} --disable-video"
+	use joystick || myconf="${myconf} --disable-joystick"
+
+	local directfbconf="--disable-video-directfb"
+	if use directfb ; then
+		# since DirectFB can link against SDL and trigger a
+		# dependency loop, only link against DirectFB if it
+		# isn't broken #61592
+		echo 'int main(){}' > directfb-test.c
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+			&& directfbconf="--enable-video-directfb" \
+			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
+	fi
+
+	myconf="${myconf} ${directfbconf}"
+
+	econf \
+		--disable-rpath \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-file \
+		--enable-cpuinfo \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(use_enable pulseaudio) \
+		$(use_enable arts) \
+		$(use_enable nas) \
+		$(use_enable X video-x11) \
+		$(use_enable dga) \
+		$(use_enable xv video-x11-xv) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable dga video-dga) \
+		$(use_enable fbcon video-fbcon) \
+		$(use_enable ggi video-ggi) \
+		$(use_enable svga video-svga) \
+		$(use_enable aalib video-aalib) \
+		$(use_enable libcaca video-caca) \
+		$(use_enable opengl video-opengl) \
+		$(use_with X x) \
+		--disable-video-x11-xme \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}