| 1 |
mr_bones_ 14/07/04 08:19:46 |
| 2 |
|
| 3 |
Modified: quake2-icculus-0.16.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
EAPI=5; punt svga support |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.29 games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.29&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?rev=1.29&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild?r1=1.28&r2=1.29 |
| 15 |
|
| 16 |
Index: quake2-icculus-0.16.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v |
| 19 |
retrieving revision 1.28 |
| 20 |
retrieving revision 1.29 |
| 21 |
diff -u -r1.28 -r1.29 |
| 22 |
--- quake2-icculus-0.16.1-r1.ebuild 15 May 2014 16:44:49 -0000 1.28 |
| 23 |
+++ quake2-icculus-0.16.1-r1.ebuild 4 Jul 2014 08:19:46 -0000 1.29 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.28 2014/05/15 16:44:49 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.29 2014/07/04 08:19:46 mr_bones_ Exp $ |
| 29 |
|
| 30 |
-EAPI=2 |
| 31 |
+EAPI=5 |
| 32 |
inherit eutils toolchain-funcs games |
| 33 |
|
| 34 |
MY_P="quake2-r${PV}" |
| 35 |
@@ -16,12 +16,11 @@ |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd" |
| 39 |
-IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix" |
| 40 |
+IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix" |
| 41 |
|
| 42 |
UIDEPEND="aalib? ( media-libs/aalib ) |
| 43 |
alsa? ( media-libs/alsa-lib ) |
| 44 |
opengl? ( virtual/opengl ) |
| 45 |
- svga? ( media-libs/svgalib ) |
| 46 |
sdl? ( media-libs/libsdl[sound,joystick?,video] ) |
| 47 |
X? ( |
| 48 |
x11-libs/libXxf86dga |
| 49 |
@@ -62,16 +61,12 @@ |
| 50 |
mkdir -p src/${g} |
| 51 |
pushd src/${g} |
| 52 |
local shar=../../../${g}src320.shar |
| 53 |
- sed -i \ |
| 54 |
- -e 's:^read ans:ans=yes :' ${shar} \ |
| 55 |
- || die "sed ${shar} failed" |
| 56 |
+ sed -i -e 's:^read ans:ans=yes :' ${shar} || die |
| 57 |
echo ">>> Unpacking ${shar} to ${PWD}" |
| 58 |
- env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed" |
| 59 |
+ env PATH="${T}:${PATH}" unshar ${shar} || die |
| 60 |
popd |
| 61 |
done |
| 62 |
- sed -i \ |
| 63 |
- -e 's:jpeg_mem_src:_&:' \ |
| 64 |
- src/ref_candygl/gl_image.c || die |
| 65 |
+ sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die |
| 66 |
|
| 67 |
sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die |
| 68 |
# -amd64.patch # make sure this is still needed in future versions |
| 69 |
@@ -116,10 +111,10 @@ |
| 70 |
[[ ${BUILD_QMAX} == "YES" ]] \ |
| 71 |
&& libsuffix=-qmax \ |
| 72 |
|| libsuffix= |
| 73 |
- make clean || die "cleaning failed" |
| 74 |
+ emake -j1 clean |
| 75 |
emake -j1 build_release \ |
| 76 |
BUILD_SDLQUAKE2=$(yesno sdl) \ |
| 77 |
- BUILD_SVGA=$(yesno svga) \ |
| 78 |
+ BUILD_SVGA=NO \ |
| 79 |
BUILD_X11=$(yesno X) \ |
| 80 |
BUILD_GLX=$(yesno opengl) \ |
| 81 |
BUILD_SDL=$(yesno sdl) \ |
| 82 |
@@ -138,8 +133,7 @@ |
| 83 |
DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \ |
| 84 |
DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \ |
| 85 |
OPT_CFLAGS="${CFLAGS}" \ |
| 86 |
- CC="$(tc-getCC)" \ |
| 87 |
- || die "make failed" |
| 88 |
+ CC="$(tc-getCC)" |
| 89 |
# now we save the build dir ... except for the object files ... |
| 90 |
rm release*/*/*.o |
| 91 |
mv release* my-rel-${BUILD_QMAX} |
| 92 |
@@ -176,7 +170,7 @@ |
| 93 |
if use qmax ; then |
| 94 |
dodir "${q2maxdir}" |
| 95 |
cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die |
| 96 |
- newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax || die |
| 97 |
+ newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax |
| 98 |
rm "${D}/${q2maxdir}"/quake2 |
| 99 |
use dedicated \ |
| 100 |
&& newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \ |
| 101 |
@@ -186,7 +180,7 @@ |
| 102 |
&& rm "${D}/${q2maxdir}"/sdlquake2 |
| 103 |
|
| 104 |
insinto "${q2maxdir}"/baseq2 |
| 105 |
- doins "${DISTDIR}"/maxpak.pak || die |
| 106 |
+ doins "${DISTDIR}"/maxpak.pak |
| 107 |
|
| 108 |
make_desktop_entry quake2-qmax Quake2-qmax quake2 |
| 109 |
fi |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
1.48 games-fps/quake2-icculus/ChangeLog |
| 114 |
|
| 115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.48&view=markup |
| 116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?rev=1.48&content-type=text/plain |
| 117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/ChangeLog?r1=1.47&r2=1.48 |
| 118 |
|
| 119 |
Index: ChangeLog |
| 120 |
=================================================================== |
| 121 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v |
| 122 |
retrieving revision 1.47 |
| 123 |
retrieving revision 1.48 |
| 124 |
diff -u -r1.47 -r1.48 |
| 125 |
--- ChangeLog 15 May 2014 16:44:49 -0000 1.47 |
| 126 |
+++ ChangeLog 4 Jul 2014 08:19:46 -0000 1.48 |
| 127 |
@@ -1,6 +1,10 @@ |
| 128 |
# ChangeLog for games-fps/quake2-icculus |
| 129 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 130 |
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.47 2014/05/15 16:44:49 ulm Exp $ |
| 131 |
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.48 2014/07/04 08:19:46 mr_bones_ Exp $ |
| 132 |
+ |
| 133 |
+ 04 Jul 2014; Michael Sterrett <mr_bones_@g.o> |
| 134 |
+ quake2-icculus-0.16.1-r1.ebuild: |
| 135 |
+ EAPI=5; punt svga support |
| 136 |
|
| 137 |
15 May 2014; Ulrich Müller <ulm@g.o> quake2-icculus-0.16.1-r1.ebuild: |
| 138 |
Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to |
Archives