build with clang (bug #448696)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

6 files changed, 139 insertions, 37 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 5f85662e6ea5..940f3dae6cfa 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/sdl-mixer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.112 2012/12/17 01:35:51 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.113 2013/01/02 08:38:39 mr_bones_ Exp $
+
+*sdl-mixer-1.2.12-r3 (02 Jan 2013)
+
+  02 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sdl-mixer-1.2.12-clang.patch, +sdl-mixer-1.2.12-r3.ebuild,
+  files/sdl-mixer-1.2.12-mikmod-r587.patch,
+  files/sdl-mixer-1.2.12-mikmod-r588.patch, files/sdl-mixer-1.2.12-wav.patch:
+  build with clang (bug #448696)
 
 *sdl-mixer-1.2.12-r2 (17 Dec 2012)
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 43599dc3f284..4e2a833fa7c0 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX sdl-mixer-1.2.12-mikmod-r587.patch 1753 SHA256 f2d6268299ebb2c2a32778f4a2b7328b2e7449a2af819e512e1835132f93fb08 SHA512 cf9db17efea9ddfdae5420170314efa322b54ccf96dabba4be45f0aa727c449f32682fbcb695d6d4dcb812ea8ac1a3a012879868dff0aba397d72e4b2a74118e WHIRLPOOL 2735573dba69b384bce8ff8cc5f7efcc2fba1de75ef1daa4c37e22092f47bc20096451bc26292a2342788a552b18426900d7dedc3ed6e6f45e2b2c40839c6a0e
-AUX sdl-mixer-1.2.12-mikmod-r588.patch 1241 SHA256 773bde5cefc791c980863fe0298cbe14657f6fc5a964b376bcf489f4fd57bf0a SHA512 4e2a2838132aeed0e35b3e43af9abe32eb51899899bdbb5833c9a3bfc0bd5957ae5a9a6c1adbca5d70f8c1986b32288d2edd89acefae184c32edc0f673c067c9 WHIRLPOOL 379c87714cb774e8999f3a75ad9d9682b06b77c93a22670111b0666a026dda1eee02eea24377ea1406cfdadb802d554c089fef5c048b86a1fe889b33806cd956
+AUX sdl-mixer-1.2.12-clang.patch 276 SHA256 4d34bb8ac7f7e33b6f9fb9280d187d6b47c8ccd414489eefb68e5ce7c287c2d8 SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e WHIRLPOOL db4b23b541cf0850eb5fda27698cc87b25659e2366445dabf428720d04ba69b68d964cc91682fcbe8ed947e6011bc6d5f984f286552837f8aaff4bb01c382414
+AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 SHA256 f61866f35dbd5e7dc9927df64db2c72cefa32a1093008bf0fe1c7cbc0501def0 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123 WHIRLPOOL cf0e6aebfe512b30d5889d98272b0df91f531e8b881adb242ea3c3533d42bc675aea61ad9169783c1c9bebee0991eff57ff1c5dd5ec72d20a8392a7df2473086
+AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 SHA256 3b9d959dc6660b3b765d8b4a53bc1b56858ba7023a76fb95798391b6a7c43522 SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704 WHIRLPOOL b07f267348d6cd202f35ae59b79c41ee1dd38799bb561cc5179812b63baba9d580234b2a0ef97dc614324d68a546fe16d9c35e21b10931f939d7b60e3c13d711
 AUX sdl-mixer-1.2.12-wav.patch 796 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9 SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491 WHIRLPOOL 8b26551b494cdb6658538a4220c01d48f3996c2eb74f4a4e97b7b4f1aa4945d951e26d885911ef0cd2d7183befd5cace209e3f88469ab21d4981864c6ee2063c
 DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 WHIRLPOOL 046b7a160cfe214cdac8c1a5ea424024a8850d3737908e5630b504f1f12817bfd2f391909f37be3d6994cab7f71ab24ecab92e99f5429dd8405f0e4046bc00a7
 EBUILD sdl-mixer-1.2.12-r1.ebuild 2878 SHA256 7bc2f9790155808aec3623e10e697234ba9bb4346458334b018a6e10909f314b SHA512 1b4feef7c11c74af8ceca50914be97b386d40936baa2913e851507fd8d71c5efebc84bd439709af8715afdc4b998714ebfcd55f8fab8427656b8bd8a8bb2b32c WHIRLPOOL 9de71f8ac0e54aa1f290cab52e741bf09ad8f9f021c74e67e6d9b456603b1daf74a1aa580b0176bac18682858b98fba3e86e44961053bc20eaa75de8f20e8ac8
 EBUILD sdl-mixer-1.2.12-r2.ebuild 2943 SHA256 e682e83be0cc9cfd4a22d9084a63cbfda72519105cf0ae9dd1c1f682630fc5d8 SHA512 b5b0a20eaefb7157edfc0b10ceb7c371f3c4fd5c71b51ff644761a825cc1f033737dbf05c3f9e7b3fa0a2e5b3ba3a4c047993f8db31d755ee79b60d2b0b8862e WHIRLPOOL ed41958d8cf2b2810cba99f4a21ff5e89c5f3f4e77b6852f1623b9c29168a230d0d99e89d6b47ddbb5b9f7b030b7c8dfa4eff0f40295ec1137d69f122237123a
-MISC ChangeLog 14987 SHA256 da6ad294acc17b4e223f8855173655abe74652ca44799f79e766da3494efca87 SHA512 af4f55f96fb395c6e9709c3e9daee283f387621741dbc448db8a6e909f8ae4f3485cf507caa44e9c450a21fa63afbfcc5d7ecc9744433044d8e53ef175be87ba WHIRLPOOL 5da89b9afe9c37d67888994070a9ea06325db41acf63d9d87bfa9f6bdcb891371f786599cf14b83ffa952d79bd65ed2b88f22130324ff3ba80774fb6ef57b2d4
+EBUILD sdl-mixer-1.2.12-r3.ebuild 2981 SHA256 0302a748314b9c158737fd5226f0624ba997f77e8ec8898b5b38a04622492c3f SHA512 d2dfcdbce99e2bf55b4ad43b20cf14f388a5f133175e082a2963babac93663c37da5341f77556ba2e5ac251c622228d985cf36394c03ded756bd49c0210054d7 WHIRLPOOL ddac77e91ffb0f023d5b9858b91bd19049d63b521e3793ca32a5e52b65d43e271d5b8f76af200e1a31d9ffd65e87f9aea3e06a7d169a3af940e6f92a6fe46fec
+MISC ChangeLog 15305 SHA256 4c675eb1a1da45602e1807b5ff082436496b4794da9217ca14372160555a9680 SHA512 fcb49de4df1c950d0ad2f2b0df3e69ddf688979bfc856f7948874c1a8fefb95b2587d001c1bd32ed8e272b502fcc25d0feb57d93d86dcce45eeb72896d1e6002 WHIRLPOOL c7484d2e2c096717e973fdcc4680a293e79d7405e2bac3dce747ebda039fbbbe0654995d0a5ebc030a40dc333939ac892125f607d3ce72d0e059bdeac6457d83
 MISC metadata.xml 572 SHA256 d4c6ae5e121255b47dd978176db7002fd8db1753cbfdf58792e9b4fa7565de35 SHA512 2b0cd28223fffbda314ad0f08415ca39b47b5734e105aea2f802b7ad22bee5aaa1c29c5583848de0605cbfde133901ac7bb1f61dd06c195ed731fc3a1847c656 WHIRLPOOL 50908664fc647d1c2d7c9d83cdb3bb4cb350ae38222dd15ad415bee3e5a85a7caa95ee65f79db44242bf7d94ff48ebe2354d21b1738cfc7a116eedaf4e32dc29
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQznb6AAoJELEHsLL7fEFW2ZgP/jvnj8J1wi0ZWRVKHRSZ7Xag
-iqNTTNJ8PRSOBgWE3zByFjLzusUKB3kYmxH9oe4fg1TMnZeN2g2xeoV37FkWHm1Z
-dKhcvXTGKaqyZviSeyhQiMsc1+lap8KVIR7Q/+pQKdcha/FRHcx4s7XdeloFItWF
-93G3/hG8dsSsHmE2B3DO3WjvkSkPlyeow8O/wAtx6OyMuthRLLTPYA/EntUCivSY
-wtdxJlQ6u6ZJcIr1czC4JR6PybnNi4Gw1gcW7PINhkAjHijzkmZs6BDg38FQ8HBr
-0Kl17N+ABZoPV49upVzVdqDlnycpx2MWOf27360fb1fIa3UKgeDKDy4J7C2YVcVZ
-Ua6A1iEMNE2XBQ11z3uOzp5BFQX7XF6zVLHMUASXTFRGGP/0O4TXKfkECxSpxVGB
-OLfAg+BgBDEjO8rJRYoXtHML8u5Zn6EPJgdzgPq9o1AwpWmsLUKXVFO2Kzw92Kz7
-dqwws03RLRYdTQaXASoQHyA8KbFVMejEKpXpMtrLmlfJ+n6onYfwwtFLeFkPj7r8
-XdvwAjS2a60CSxvVzQpsojuMwcYyzuU1G4eUymlX/+0uUbSOvDRotEahf2+t59IX
-WhTkkVhEXvqXIuEDmdYH4ip4BKZLcr+Vevd9hC/8mkJlK+g0LQOe5mPXLcJhlLiv
-JHC/IW9kPGX0ujGIc6/9
-=ghpq
------END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch
new file mode 100644
index 000000000000..3c462bd97088
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-clang.patch
@@ -0,0 +1,11 @@
+--- SDL_mixer-1.2.12.orig/music_mad.c
++++ SDL_mixer-1.2.12/music_mad.c
+@@ -224,7 +224,7 @@
+   if ((mp3_mad->status & MS_playing) == 0) {
+ 	/* We're not supposed to be playing, so send silence instead. */
+ 	memset(stream, 0, len);
+-	return;
++	return 0;
+   }
+ 
+   out = stream;
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch
index 4763da11413f..d99609f8ab25 100644
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r587.patch
@@ -8,9 +8,8 @@ https://bugs.gentoo.org/445980
 # Parent  c92001a2c18f628698c58aa4e05a7335d10d0e9e
 Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver
 
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c
---- a/dynamic_mod.c	Sun Mar 04 21:32:47 2012 +0000
-+++ b/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
+--- a/dynamic_mod.c
++++ b/dynamic_mod.c
 @@ -93,6 +93,13 @@
  			SDL_UnloadObject(mikmod.handle);
  			return -1;
@@ -25,9 +24,8 @@ diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.c
  		mikmod.Player_Active =
  			(BOOL (*)(void))
  			SDL_LoadFunction(mikmod.handle, "Player_Active");
-diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h
---- a/dynamic_mod.h	Sun Mar 04 21:32:47 2012 +0000
-+++ b/dynamic_mod.h	Sun Jul 22 16:13:27 2012 -0700
+--- a/dynamic_mod.h
++++ b/dynamic_mod.h
 @@ -35,6 +35,7 @@
  	void (*MikMod_RegisterDriver)(struct MDRIVER*);
  	int* MikMod_errno;
@@ -36,9 +34,8 @@ diff -r c92001a2c18f -r 56cad6484b04 dynamic_mod.h
  	BOOL (*Player_Active)(void);
  	void (*Player_Free)(MODULE*);
  	MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL);
-diff -r c92001a2c18f -r 56cad6484b04 music_mod.c
---- a/music_mod.c	Sun Mar 04 21:32:47 2012 +0000
-+++ b/music_mod.c	Sun Jul 22 16:13:27 2012 -0700
+--- a/music_mod.c
++++ b/music_mod.c
 @@ -109,13 +109,13 @@
  
  	list = mikmod.MikMod_InfoDriver();
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch
index a4469c056dd9..d47a8d4534c8 100644
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-mikmod-r588.patch
@@ -8,9 +8,8 @@ https://bugs.gentoo.org/445980
 # Parent  56cad6484b04f83c8d42428c755a046678506436
 Fixed normal linking with libmikmod and linking with earlier versions of libmikmod.
 
-diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c
---- a/dynamic_mod.c	Sun Jul 22 16:13:27 2012 -0700
-+++ b/dynamic_mod.c	Sun Jul 22 16:33:37 2012 -0700
+--- a/dynamic_mod.c
++++ b/dynamic_mod.c
 @@ -97,8 +97,8 @@
  			(void (*)(void*))
  			SDL_LoadFunction(mikmod.handle, "MikMod_free");
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
new file mode 100644
index 000000000000..062e52cd5fb3
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r3.ebuild,v 1.1 2013/01/02 08:38:39 mr_bones_ Exp $
+
+EAPI=4
+inherit eutils
+
+MY_P=${P/sdl-/SDL_}
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+	"
+
+DEPEND=">=media-libs/libsdl-1.2.10
+	flac? ( media-libs/flac )
+	midi? (
+		fluidsynth? ( media-sound/fluidsynth )
+		timidity? ( media-sound/timidity++ )
+	)
+	mp3? (
+		mad? ( media-libs/libmad )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r1 )
+	)
+	mod? (
+		modplug? ( media-libs/libmodplug )
+		mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	)
+	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-wav.patch \
+		"${FILESDIR}"/${P}-clang.patch \
+		"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch #445980
+	sed -i \
+		-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-music-flac-shared \
+		--disable-music-fluidsynth-shared \
+		--disable-music-mod-shared \
+		--disable-music-mp3-shared \
+		--disable-music-ogg-shared \
+		$(use_enable wav music-wave) \
+		$(use_enable vorbis music-ogg) \
+		$(use_enable mikmod music-mod) \
+		$(use_enable modplug music-mod-modplug) \
+		$(use_enable flac music-flac) \
+		$(use_enable static-libs static) \
+		$(use_enable smpeg music-mp3) \
+		$(use_enable mad music-mp3-mad-gpl) \
+		$(use_enable timidity music-timidity-midi) \
+		$(use_enable fluidsynth music-fluidsynth-midi)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+	dodoc CHANGES README
+	if ! use static-libs ; then
+		find "${D}" -type f -name '*.la' -exec rm {} + || die
+	fi
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}