diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-11-22 14:30:11 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-11-22 14:30:11 +0000 |
| commit | 5c237c2408442978ffa67272d649f0992fe04b22 (patch) | |
| tree | 0e729ce7e8ba93b7550020065102f9d4f8bf36a8 /games-fps | |
| parent | Replace the V4L patch with a correct one. (diff) | |
| download | gentoo-2-5c237c2408442978ffa67272d649f0992fe04b22.tar.gz gentoo-2-5c237c2408442978ffa67272d649f0992fe04b22.tar.bz2 gentoo-2-5c237c2408442978ffa67272d649f0992fe04b22.zip | |
fix missing patches wrt #444177
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/warsow/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/warsow/files/warsow-1.0-pic.patch | 11 | ||||
| -rw-r--r-- | games-fps/warsow/files/warsow-1.02-pic.patch | 11 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-1.0.ebuild | 4 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-1.02.ebuild | 4 |
5 files changed, 32 insertions, 5 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 165a03e93f9e..55bc7015c189 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/warsow # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.45 2012/11/13 07:14:25 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.46 2012/11/22 14:30:11 hasufell Exp $ + + 22 Nov 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.0.ebuild, + +files/warsow-1.0-pic.patch, warsow-1.02.ebuild, + +files/warsow-1.02-pic.patch: + fix missing patches wrt #444177 13 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> -files/warsow-0.5-build.patch, -files/warsow-0.5-openal.patch, diff --git a/games-fps/warsow/files/warsow-1.0-pic.patch b/games-fps/warsow/files/warsow-1.0-pic.patch new file mode 100644 index 000000000000..71c4d8eed690 --- /dev/null +++ b/games-fps/warsow/files/warsow-1.0-pic.patch @@ -0,0 +1,11 @@ +--- source/snd_qf/snd_mix.c ++++ source/snd_qf/snd_mix.c +@@ -27,7 +27,7 @@ + int *snd_p, snd_linear_count, snd_vol, music_vol; + short *snd_out; + +-#if !defined ( id386 ) || defined ( __MACOSX__ ) ++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ ) + #ifdef _WIN32 + #pragma warning( push ) + #pragma warning( disable : 4310 ) // cast truncates constant value diff --git a/games-fps/warsow/files/warsow-1.02-pic.patch b/games-fps/warsow/files/warsow-1.02-pic.patch new file mode 100644 index 000000000000..71c4d8eed690 --- /dev/null +++ b/games-fps/warsow/files/warsow-1.02-pic.patch @@ -0,0 +1,11 @@ +--- source/snd_qf/snd_mix.c ++++ source/snd_qf/snd_mix.c +@@ -27,7 +27,7 @@ + int *snd_p, snd_linear_count, snd_vol, music_vol; + short *snd_out; + +-#if !defined ( id386 ) || defined ( __MACOSX__ ) ++#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ ) + #ifdef _WIN32 + #pragma warning( push ) + #pragma warning( disable : 4310 ) // cast truncates constant value diff --git a/games-fps/warsow/warsow-1.0.ebuild b/games-fps/warsow/warsow-1.0.ebuild index f7e055dd4a06..1e49ce71d85d 100644 --- a/games-fps/warsow/warsow-1.0.ebuild +++ b/games-fps/warsow/warsow-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.0.ebuild,v 1.5 2012/10/17 03:07:16 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.0.ebuild,v 1.6 2012/11/22 14:30:11 hasufell Exp $ EAPI=4 inherit eutils check-reqs gnome2-utils games @@ -63,7 +63,7 @@ src_prepare() { cd "${WORKDIR}"/${MY_P}_sdk || die epatch "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${PN}-0.5-pic.patch + "${FILESDIR}"/${P}-pic.patch epatch_user } diff --git a/games-fps/warsow/warsow-1.02.ebuild b/games-fps/warsow/warsow-1.02.ebuild index fefcc65c521a..b28038994a74 100644 --- a/games-fps/warsow/warsow-1.02.ebuild +++ b/games-fps/warsow/warsow-1.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.1 2012/10/21 00:37:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.2 2012/11/22 14:30:11 hasufell Exp $ EAPI=4 inherit eutils check-reqs gnome2-utils games @@ -73,7 +73,7 @@ src_prepare() { cd "${WORKDIR}"/${MY_P}_sdk || die epatch "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${PN}-0.5-pic.patch + "${FILESDIR}"/${P}-pic.patch epatch_user } |