Version bump.

Package-Manager: portage-2.1.3_rc8

4 files changed, 177 insertions, 5 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 9fdce6b4f4de..0a3194f73dd5 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.134 2007/07/01 18:05:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.135 2007/07/23 20:02:40 vapier Exp $
+
+*libsdl-1.2.12 (23 Jul 2007)
+
+  23 Jul 2007; Mike Frysinger <vapier@gentoo.org> +libsdl-1.2.12.ebuild:
+  Version bump.
 
   01 Jul 2007; Raúl Porcel <armin76@gentoo.org> libsdl-1.2.11-r2.ebuild:
   alpha stable wrt #182505
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 4e51f175f4a4..6dd82dcbb773 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libsdl-1.2.11-audioConv.patch 428 RMD160 0d4092a4c573f95560b9cc10bfdca546d5140755 SHA1 468bd74d05646cae87d18d36f0a0c2a384ad54c2 SHA256 c7a9d541334c5d2638b3283fa8a4c9ab91b3c547148a3fb559aaaa48f1074a9f
 MD5 b4a5108fe1f2fab8203422d8d057e334 files/libsdl-1.2.11-audioConv.patch 428
 RMD160 0d4092a4c573f95560b9cc10bfdca546d5140755 files/libsdl-1.2.11-audioConv.patch 428
@@ -35,6 +38,7 @@ MD5 1017c51fb31a030a6782ad0cbe314807 files/libsdl-1.2.11-yasm-checks.patch 3226
 RMD160 17dc39bb8e73c2fe62ce8e2d602dc2d654caece1 files/libsdl-1.2.11-yasm-checks.patch 3226
 SHA256 6b7ec4108f06c75a256edfdaa2542c95724c2e6ca45022eec465e432bcecdf91 files/libsdl-1.2.11-yasm-checks.patch 3226
 DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
+DIST SDL-1.2.12.tar.gz 2829456 RMD160 3871023c63ea056eba43ce4f55ee8d3a73ff3022 SHA1 2c37ff1683368369c0f555d4a742f0544153610d SHA256 df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
 EBUILD libsdl-1.2.11-r1.ebuild 4898 RMD160 cb224659e8f898ac175ad25a1067302390e79a80 SHA1 60c4b8959a8949ada07fe3d32d53bca7f0592e82 SHA256 3d26f99868ce209cb6d95dd18e3eae2aa4c29b4d99174d64068c37e1c0af8546
 MD5 81d59dd483faefb893722adf2aa77b33 libsdl-1.2.11-r1.ebuild 4898
 RMD160 cb224659e8f898ac175ad25a1067302390e79a80 libsdl-1.2.11-r1.ebuild 4898
@@ -47,10 +51,14 @@ EBUILD libsdl-1.2.11.ebuild 4777 RMD160 5e694b0b93b016010281dc116bc7786c691cdebf
 MD5 f6e57388c8444f0c7d4a7800445a11bf libsdl-1.2.11.ebuild 4777
 RMD160 5e694b0b93b016010281dc116bc7786c691cdebf libsdl-1.2.11.ebuild 4777
 SHA256 f85c78f0e05989ac61a5129ad01cb2562046b83d00b38b00316983b40cfb119b libsdl-1.2.11.ebuild 4777
-MISC ChangeLog 20987 RMD160 d4041dd448f30732741cc0b81353c7611e66e7c1 SHA1 669104f1fd9ddd5eb78d8ec4da0957784743dacb SHA256 0f1a670b7723d8fbdc2f2057a2c6a3e15e0e446f7d341736f9270401f861ff99
-MD5 92543caaf4e7bf027290252a674409b3 ChangeLog 20987
-RMD160 d4041dd448f30732741cc0b81353c7611e66e7c1 ChangeLog 20987
-SHA256 0f1a670b7723d8fbdc2f2057a2c6a3e15e0e446f7d341736f9270401f861ff99 ChangeLog 20987
+EBUILD libsdl-1.2.12.ebuild 4290 RMD160 a421f3547a80368a40d0e9af00b884df8439fe03 SHA1 041cdfdc46f9ae8d4b933d8f91c1bc5b0cf9d4d6 SHA256 2aad14cecc8c047c1b8ff0043eb80c672b273a4ced3ac90a2cd24a38cccfd6cc
+MD5 ed1cade28a0b80cbf1a4ea9ef9ca8bf0 libsdl-1.2.12.ebuild 4290
+RMD160 a421f3547a80368a40d0e9af00b884df8439fe03 libsdl-1.2.12.ebuild 4290
+SHA256 2aad14cecc8c047c1b8ff0043eb80c672b273a4ced3ac90a2cd24a38cccfd6cc libsdl-1.2.12.ebuild 4290
+MISC ChangeLog 21106 RMD160 86b2091652f1a78d5c6a8e8b2d0efb17f894b917 SHA1 58a0de91586dc816fd63d9b6a376a02fda8c0aea SHA256 9a6d41a4b7b6eae1a88c52e4a86a407f8354879bd9a7fdc57cd5f9aa666973f9
+MD5 6de4cbe6aee6ca31647d45333b7e52c4 ChangeLog 21106
+RMD160 86b2091652f1a78d5c6a8e8b2d0efb17f894b917 ChangeLog 21106
+SHA256 9a6d41a4b7b6eae1a88c52e4a86a407f8354879bd9a7fdc57cd5f9aa666973f9 ChangeLog 21106
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -64,3 +72,13 @@ SHA256 be7333b21a407831ab4861ba67e56d36c9759b78f3b42400981abf3e34f5fda8 files/di
 MD5 9ed8388b30dd3fb3d16a0ae5bd5ce94e files/digest-libsdl-1.2.11-r2 235
 RMD160 71eb2fb51f72febbc870a867d83d3cac7aefe7df files/digest-libsdl-1.2.11-r2 235
 SHA256 be7333b21a407831ab4861ba67e56d36c9759b78f3b42400981abf3e34f5fda8 files/digest-libsdl-1.2.11-r2 235
+MD5 9394ecdf1ee90adec62e82149bac7d4f files/digest-libsdl-1.2.12 235
+RMD160 b1c36c257d9a76c0081ca2647814080427da31db files/digest-libsdl-1.2.12 235
+SHA256 522164950cd8161dc27730b6ec68a898ad152cd38c19effa8e0dd71208887dec files/digest-libsdl-1.2.12 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGpQmOp/wUKkr7RBoRAkmHAJ47OTyOPIHWrBjhBI1KFdASujGJXACfdf4n
+z//o7kWO5cxEKbuH0q2nR4w=
+=SMix
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.12 b/media-libs/libsdl/files/digest-libsdl-1.2.12
new file mode 100644
index 000000000000..13c679dca615
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.12
@@ -0,0 +1,3 @@
+MD5 544b4554986e51eed6d34435cf9c5f3f SDL-1.2.12.tar.gz 2829456
+RMD160 3871023c63ea056eba43ce4f55ee8d3a73ff3022 SDL-1.2.12.tar.gz 2829456
+SHA256 df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9 SDL-1.2.12.tar.gz 2829456
diff --git a/media-libs/libsdl/libsdl-1.2.12.ebuild b/media-libs/libsdl/libsdl-1.2.12.ebuild
new file mode 100644
index 000000000000..a02dd145c783
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.12.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.1 2007/07/23 20:02:40 vapier Exp $
+
+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 have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# 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 noaudio novideo nojoystick noflagstrip"
+
+RDEPEND="!noaudio? ( >=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
+	)
+	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 )"
+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 noaudio || use novideo || use nojoystick ; 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 without the no* flags in USE.  You need to know what"
+		ewarn "you're doing to selectively turn off parts of libsdl."
+		epause 30
+	fi
+	if use noflagstrip ; 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 noflagstrip use flag in USE."
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.2.11-libcaca-new-api.patch #40224
+	epatch "${FILESDIR}"/${PN}-1.2.11-sdl-config.patch
+	epatch "${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch #145917
+
+	./autogen.sh || die "autogen failed"
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=
+	if [[ $(tc-arch) != "x86" ]] ; then
+		myconf="${myconf} --disable-nasm"
+	else
+		myconf="${myconf} --enable-nasm"
+	fi
+	use noflagstrip || strip-flags
+	use noaudio && myconf="${myconf} --disable-audio"
+	use novideo \
+		&& myconf="${myconf} --disable-video" \
+		|| myconf="${myconf} --enable-video-dummy"
+	use nojoystick && 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-dependency-tracking \
+		--disable-rpath \
+		--enable-events \
+		--enable-cdrom \
+		--enable-threads \
+		--enable-timers \
+		--enable-endian \
+		--enable-file \
+		--enable-cpuinfo \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(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} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+	dohtml -r ./
+}