summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-07-23 23:59:15 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-07-23 23:59:15 +0000
commit193311da4b42f55e5c7fdad457954d57218360e0 (patch)
treebba430ba90ca794f5007001e1052e8b7fb0d71ca /games-fps
parentVersion bump. (diff)
downloadgentoo-2-193311da4b42f55e5c7fdad457954d57218360e0.tar.gz
gentoo-2-193311da4b42f55e5c7fdad457954d57218360e0.tar.bz2
gentoo-2-193311da4b42f55e5c7fdad457954d57218360e0.zip
fix build without openal wrt #515662, patch by Ari Malinen
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/warsow/ChangeLog6
-rw-r--r--games-fps/warsow/files/warsow-1.5.1-openal.patch12
-rw-r--r--games-fps/warsow/warsow-1.5.1-r1.ebuild5
3 files changed, 20 insertions, 3 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/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
}