fix build without openal wrt #515662, patch by Ari Malinen

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 37 insertions, 19 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index ae52e7087ff0..03e4a54be942 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.62 2014/07/20 17:45:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.63 2014/07/23 23:59:15 hasufell Exp $
+
+  23 Jul 2014; Julian Ospald <hasufell@gentoo.org> warsow-1.5.1-r1.ebuild,
+  +files/warsow-1.5.1-openal.patch:
+  fix build without openal wrt #515662, patch by Ari Malinen
 
 *warsow-1.5.1-r1 (20 Jul 2014)
 
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index 82461f80de15..3fceb1948a11 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX warsow-1.0-build.patch 16346 SHA256 626f23dc9c99eec2d1e1760e9247eb81079569ea139c165cb3ec908235e3aee7 SHA512 50131166cbd4ea39e9d77936d47ee9ca602f78f37f4f0351c188528deaebee1312b757ec4703b20a104cd23dbb5b68a948af774d67da07d1dac671c752bee4cf WHIRLPOOL 866797b10d0513269e72d2e71cda2d4860c8ca90322a426232dbcbd00cde68350a56ac484dacf350de11263ef329c5632dab5f8d0d8b08795191d6ac671ebe51
 AUX warsow-1.0-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
 AUX warsow-1.5.1-build.patch 20729 SHA256 afeae3eebb8b143ba735b362a653ab770a4d01576d4d0d4d555b4b307bf031e5 SHA512 5393933a169767b1024bf8e0f55efed54f1aa332b0b740e02abdbeb04610d7530976f10f2c1411e64e17a1cc5014e0c2b5fc56f484648135c9fe6093d22de81b WHIRLPOOL d03ccd08d2b8a2ec2815aaf514101ddb25fb216522fb9c42fea588fd85531edf75e9062aa8cd2ae5b1e30a7dff8bccd7866dcc11e40b42cfc4644816797ae7c0
+AUX warsow-1.5.1-openal.patch 567 SHA256 b44ccb17b222d09dd6e27a450cece50f7499c79228ea9981898e80cba93259f0 SHA512 3d3a2c7f8c4167b07f5a8458a0f4d740eed38b518f3e4ce1cf71dc3c436fdaa705ffdf573c35bf8d49c1519212a7e50df6f742678d1d8a27f1f857acb152f7d1 WHIRLPOOL 2c3339eef47ee6b5109367ba351fa630315510ebd397b340490b80286b8d4fd4ef7243e57b4468b257831935c49dee98a710be7085904626342993569ef3ca5a
 AUX warsow-1.5.1-pic.patch 377 SHA256 300c220fb833424be66da460ad4ac1ef6c61cde0dc5b76e1e8e0b75f5ece3782 SHA512 1f712dbf83c3bca6a2f0424f2250133a23903da86c9045d0917ef5a18b311f6485af6cd5afc1bbcc8b47ff0e0f880154fc17f978c2e7400b6edb4b2ba33b2e18 WHIRLPOOL 536ddb836e09c15d0a3e5645066042164a556d608022c9892a82cd56552a489d6d424909878fe89ddf035a1a604d9ba4a73eabe563c6de51f44ccec1f9b7d854
 DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
@@ -11,25 +12,25 @@ DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326b
 DIST warsow_1.51_sdk.tar.gz 89191554 SHA256 ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97 SHA512 64de961de91eee781b90442b275d24e13239dc2b594ece665c24c1d8da75e206a00ab43a2a6f193a953e9b0173b4a93dd18fa94b9b33d92eebcb776493a8b158 WHIRLPOOL 0a1db561eedfb4cafa2bb8f91e4de121adbbb171405828936788c9fa537a821855d89dd7c5b8a9ec186ece0655f1c821b38fa07fc0c2477c61681cf354d3d657
 DIST warsow_1.51_unified.tar.gz 601553865 SHA256 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5 SHA512 a6c3392010de192d9984655193cb2c4359e9e3959bb39176416936c0227e3f6060bb19149688b89e36285572045c2ab19c6ef8de71ace7cd514e30196da83da9 WHIRLPOOL 1f0bf896dd0aad18e3bf3090d856a6ecbfabfa1873d62f9f5c0ccb1fa8dd0e34f0a22e8c095030c309adf32c85894bbadc77496916bddc6302f7646f500aa6ac
 EBUILD warsow-1.0.ebuild 3438 SHA256 2718ea8e803b16d5ae1d291ada956e5993a17e120b08e651e2e3463fde1f7668 SHA512 9565869cec3087019dcf7a66cc9f19825b1e9f713f1fd8875aab053bbcbf8d4c83e24faac5452ef7c4f6b6a5547a0df8483c84d0b78f80deca587bceb823410e WHIRLPOOL fdbd305c14f3db93ff8200277eac6865bee014c04f2b8a81b1a1df3c699f05c8be889119782adfd7bf5e3c406393946b45d685400c4b7f5f4c02965fbb22a82d
-EBUILD warsow-1.5.1-r1.ebuild 3792 SHA256 98795f9aa23a3cb037830e3cf5f5690c53427aca93588b573ece6b7947db4f6f SHA512 85b796d54ea0d1d9cbf87530229c2ad4fbbe5427b98979826a4c89bc41939fb94ce52145fd7ca36364ec9ac0653621ea57d54337bae64f26a10ea20a7ad9d8ca WHIRLPOOL 4e3e7a75d36be4d1f7e68caaeae81524d0e1f421af2e7c98f0d9b433d1224bbeb0157cd5c813415b280d9e992078f0f9127036361ad10dc2a50a7caa1095a72d
-MISC ChangeLog 9390 SHA256 8ac0d4442bc55bd9821c3af58d902aed6863c5b1b3c6a879e59d8e4213a3c5ae SHA512 211ba02516c836086950bc2ee30abcf7c102275d3932cd859f6c05ef2b934d8fe727458b0fe7969f59615325a1f9d8ca2515215c485fa10ae03a0eb081103b9d WHIRLPOOL 2c483b6c6ef99308a8c2dbd02d231a66efa0b7b90caadfa7cbf823e6f9e213647426a8c63c0a25b85034c542aa4b8babb9ab6b10e93b9426876479b034d378da
+EBUILD warsow-1.5.1-r1.ebuild 3828 SHA256 ce49dda39a31d5128ad63829a55d5d42282605da24869565e70b0275344bdcf2 SHA512 27f0bed9adcb95fdb2ba7d1840fdb21764f5a2e3f416d2b78313400ccb87c8d00268a25059241e8bd797c755db94ed321c17e1098a46192111221c1788d5a59f WHIRLPOOL e66c6a438b8267e831107d08034354c2c70f43b3b67b6147bda118655b84c4dae9ef9b2179416d4f748de779f545833804d7780fde6bc6fd1f62e4ea170f2ee5
+MISC ChangeLog 9563 SHA256 3a02257608ed3a090949406e9747ad69ffe41c404040dad60dc4b581acd092b6 SHA512 e0efaa004b8a6ed84f23321b0f44090bb0bf15a6a8858241839534cfa05f23a89815d9b299e32190a9cfc890b564723d7a56b5d485b3ca1747eb8caf73bae1b0 WHIRLPOOL 5cc99bdc2315ebdad698cc686ab832cf8cd094450fdd280692c500ac75fd03c2726b40ab75b25a66a96709438285c90a0b1c9e3fb24fd90bd365706a5e735a71
 MISC metadata.xml 347 SHA256 016dbabb997c28f241f054760d9b81b1c43f5161de6d53936a2ebeb78bccdbea SHA512 34e3d6eae3b4665eac573b096d83a2841aee4488cc1a237e54e6e12c0c7ad8caefbbde6b563d1421c9d68cf7fb2b6c2446dfeddb1390971a7630b5efa494cb77 WHIRLPOOL 9d4cbde23eacc798cb4f1ac0c504963d349619229a5c2e926d8fc1348b1fefc53e999cc21e0be0cdca58affd1bfd4a275ae633709af78ca3dc808431fa365db3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTzAA3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJT0ExUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAggXYQAJH/iygXRYlNue266VN2MrMJ
-rnzV378FU+MYs1Ar9pPBmFaauPumtvh0S4TLYoB9hYPrBjL4XBbCdR9yZuLM9mD+
-eqMrPFqaok5Pu/B7pacUCPP0XIQBv2MqaVNRxng5U5FRjGjbVDpP583dMaaTvlY4
-YIRU26pgTGzZ5Xv9GzNnyA+ln60KBL0W9Pdej730rg31xVkz9WuWLmFFvNn3HGZd
-walfO1TWMSdCa0YbBJEZMefgROBgJiWli4mbYVKAztlM5AR0JwsGF5APB0YTrT2Q
-ckccpRYPF7/UFZ8LLXNcEb+8c+v96+yzFncmFWOlJup2Y0AbwdMX3gbOZ/8nBraV
-+XTswfcBPsCpfCuF66g/e1aRZ1377/pOmbkym9npxS/RgvkXg/ZTVOtXaE+JdIWp
-MZ4sle7gmYsxXBHEy3Tx9rtXiwRHevwBJ0x/ua6BU/iO72NtxfUhWBKq/ijKxDfb
-iItucL0/rvgJW/ecEX98eabuG2r1/qC5GoMw9vTCFLsjZ640OlUxD5RLWOD1te1W
-7mkqM8Ob9GTrGXi8iYz0x4aL9rLTInRNq/tcee+TcxCwvejMHw3PtecoW1C5g8Dc
-W6il/nUu/Si2iwTc09c4gUwkp+HDekddQHKrQke2xe2lAk7KkuUUuZKGV0yt2zKH
-aNFLouaZDDyB3O1HJt2R
-=mv80
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgnvwP/RG2JRe08kRtATwg3FRJVhzE
+y8cvwYTQj8TPWdEnLTa47g02MsxgtDlDHFGVw6y+lt0V1Zc3aexquH82n5XsQCuv
+1TJJqMwMnLj+/uhjzOPjKJLCrNPVuFyB/06P34djWpwlUqONCypbV26f7Cv8DCCl
+RtPw0mpkYiecTYinoToCGwdTZhDwwysuu5xW80g40mz4eZ/A9p1qHDterXPhqONK
+k4X+NEKs5DViC8YtjNpsSyVyuEQlcrBq/X2ukRVigH8tYPGknjw/VAw2kgvo8mEK
+tkC2gvVHRzQ905YyqCDHxc5WjSY9lsMxTwInXT8loRDpYofKMxYFqz39NLSNsqzC
+Zgmv+27226z8Bjs5GzbnUV8fVDqH6bL7Xso3SDxFLHj/XsRCq6w437COkbquES5L
+Qc0nox+XNKJhI2a1/4nNRPvpxBmyREEhsZSUlZfzvdzEtV1zNOFVmCCFV7P+sclx
+XTk8KXdO0kF9t+I8LUDbw0WKJMo5m0PrHcPtQODWP1SWu/9lszjo7MSVuuPXCJg9
+cRvgxhWFfM+CGIBk9+ROlcnqwht3zNSUeAe3QpmW8p9eyEXNfX5X2voahNiMu0Ro
+KG/VJ2nX02fohoDLWOoKtuEN/+XHJtqW/CflbQ5uhLnTLA7D/nliTdeNDjYhQSWF
+ZXVa/Jds1Gq3XxoVJZAh
+=9Bsc
 -----END PGP SIGNATURE-----
diff --git a/games-fps/warsow/files/warsow-1.5.1-openal.patch b/games-fps/warsow/files/warsow-1.5.1-openal.patch
new file mode 100644
index 000000000000..1bce87730556
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.5.1-openal.patch
@@ -0,0 +1,12 @@
+diff -rup warsow_1.51_sdk-upstream/source/source/Makefile warsow_1.51_sdk/source/source/Makefile
+--- warsow_1.51_sdk-upstream/source/source/Makefile	2014-07-23 16:59:16.819811217 +0300
++++ warsow_1.51_sdk/source/source/Makefile	2014-07-23 16:37:40.069824137 +0300
+@@ -285,7 +285,7 @@ endif
+ ifeq ($(BUILD_SND_QF),YES)
+ SDL_CONFIG?=sdl-config
+ 
+-CFLAGS_QF=$(shell $(SDL_CONFIG) --cflags) -I./snd_openal -I./snd_common 
++CFLAGS_QF=$(shell $(SDL_CONFIG) --cflags) -I./snd_qf -I./snd_common 
+ LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
+ endif # BUILD_SND_QF
+ 
diff --git a/games-fps/warsow/warsow-1.5.1-r1.ebuild b/games-fps/warsow/warsow-1.5.1-r1.ebuild
index cd0e5acf9e6a..bb4c43043fbf 100644
--- a/games-fps/warsow/warsow-1.5.1-r1.ebuild
+++ b/games-fps/warsow/warsow-1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1-r1.ebuild,v 1.1 2014/07/20 17:45:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1-r1.ebuild,v 1.2 2014/07/23 23:59:15 hasufell Exp $
 
 EAPI=5
 inherit eutils check-reqs gnome2-utils flag-o-matic games
@@ -78,7 +78,8 @@ src_prepare() {
 
 	cd "${S}"/.. || die
 	epatch "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-pic.patch
+		"${FILESDIR}"/${P}-pic.patch \
+		"${FILESDIR}"/${P}-openal.patch
 	epatch_user
 }