summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-01-04 16:16:01 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-01-04 16:16:01 +0000
commitc794d4db22724759b3fdadab565b4d6d94311139 (patch)
tree299bc43776883fa32667ac1c5194d745a10d9c7d /games-arcade/koules
parentinherit multilib (diff)
downloadhistorical-c794d4db22724759b3fdadab565b4d6d94311139.tar.gz
historical-c794d4db22724759b3fdadab565b4d6d94311139.tar.bz2
historical-c794d4db22724759b3fdadab565b4d6d94311139.zip
Fix build wih svga USE flag
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-arcade/koules')
-rw-r--r--games-arcade/koules/ChangeLog6
-rw-r--r--games-arcade/koules/Manifest5
-rw-r--r--games-arcade/koules/files/koules-1.4-io_h.patch11
-rw-r--r--games-arcade/koules/koules-1.4-r2.ebuild11
4 files changed, 24 insertions, 9 deletions
diff --git a/games-arcade/koules/ChangeLog b/games-arcade/koules/ChangeLog
index f449ededb3f9..7a7c53c5a81b 100644
--- a/games-arcade/koules/ChangeLog
+++ b/games-arcade/koules/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/koules
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.15 2010/01/02 19:19:42 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.16 2010/01/04 16:16:00 tupone Exp $
+
+ 04 Jan 2010; Tupone Alfredo <tupone@gentoo.org> koules-1.4-r2.ebuild,
+ +files/koules-1.4-io_h.patch:
+ Fix build wih svga USE flag
02 Jan 2010; Tupone Alfredo <tupone@gentoo.org> koules-1.4-r2.ebuild,
+files/koules-1.4-sndsrv.patch:
diff --git a/games-arcade/koules/Manifest b/games-arcade/koules/Manifest
index e3b70f26c1e6..a01819da948c 100644
--- a/games-arcade/koules/Manifest
+++ b/games-arcade/koules/Manifest
@@ -1,6 +1,7 @@
+AUX koules-1.4-io_h.patch 423 RMD160 828252ce2b9a84f8db54754dd0c8e4901db8ffc3 SHA1 58a21175f74332fbaad9e6f7a09f716521889731 SHA256 61222169db44bbdfc2d8f861d3e0baed4191de9f23bb819fe387e53376ad89ea
AUX koules-1.4-sndsrv.patch 1033 RMD160 e511dfa0149059f4eb72ee500131e67d60342489 SHA1 981bb676f4f8888fd5dda6a673f6f65f113731a7 SHA256 44e45510029579af5363f08f31787c5fd2548fda23a7627ec852e4e06585aae9
DIST koules-1.4-gcc3.patch.bz2 5635 RMD160 cf2751890aff57cc87fa241137e832a0d158ab6d SHA1 338e3da351e593fd015b72a777b6d60215b42fe9 SHA256 adf7b6b6353b024088a90b5b80b00a10813a624d2d1a4f63ecebad613ca591d4
DIST koules1.4-src.tar.gz 315386 RMD160 d43eb5cf68abad12d4d8a16789cda43f307b2fe7 SHA1 bfd6ece4452b067b0b0f9a9a7085cf43b88f0ef9 SHA256 c36f93feafeebd59983bf44100240e67a84a8bacabd7ee528c93046defe4a21b
-EBUILD koules-1.4-r2.ebuild 2663 RMD160 618ef821472bf739684b09b702250ee26d0628f3 SHA1 349e847ccf562aca09bd30a4f01df068bd68c77b SHA256 9bd53109c19c7ec764b972c75ca016136a77c582bba96d266690015ed4e393f5
-MISC ChangeLog 2101 RMD160 2ba88410c73a53a9f9247bde0f6c65df1f20c6c2 SHA1 01df3efb2837dd2a13c8b39059e1df040ac886aa SHA256 805e74205a86f5663c062bc5999e18fd8e426025487147b05ba6eb7da71b9fcb
+EBUILD koules-1.4-r2.ebuild 2649 RMD160 6cb28b1716d624a6aabeab6fa52f46f972d13fc5 SHA1 d9f32b550b563915d26630dab06893746ff9850f SHA256 3034121e72f9a392fb06d2070c2f80b53ecd64541d0da64c0ba82270fb0817a0
+MISC ChangeLog 2236 RMD160 7b7e6c8b15408b3fe921be68aa082c8ea4ac2537 SHA1 b00254d91d90147a9b3eff41783b047f1b2260b4 SHA256 082cab147bf9530787ac602da81c459b12f166ba29e03916eba5f006ca377577
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/koules/files/koules-1.4-io_h.patch b/games-arcade/koules/files/koules-1.4-io_h.patch
new file mode 100644
index 000000000000..80b7f3f615ad
--- /dev/null
+++ b/games-arcade/koules/files/koules-1.4-io_h.patch
@@ -0,0 +1,11 @@
+--- svgalib/init.c.old 2010-01-04 16:38:38.000000000 +0100
++++ svgalib/init.c 2010-01-04 16:39:09.000000000 +0100
+@@ -44,7 +44,7 @@
+ #include <sys/stat.h>
+ #include <sys/vt.h>
+ #include <unistd.h>
+-#include <asm/io.h> /*for waiting for retrace */
++#include <sys/io.h> /*for waiting for retrace */
+ #include <sys/ioctl.h> /*for waiting for retrace */
+ extern void fadein1 ();
+ extern GraphicsContext *starbackground;
diff --git a/games-arcade/koules/koules-1.4-r2.ebuild b/games-arcade/koules/koules-1.4-r2.ebuild
index 1f875f23bb2e..0b2304243469 100644
--- a/games-arcade/koules/koules-1.4-r2.ebuild
+++ b/games-arcade/koules/koules-1.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.5 2010/01/02 19:19:43 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.6 2010/01/04 16:16:00 tupone Exp $
EAPI=2
inherit eutils games
@@ -39,7 +39,8 @@ S=${WORKDIR}/${PN}${PV}
src_prepare() {
epatch "${WORKDIR}"/${P}-gcc3.patch \
- "${FILESDIR}"/${P}-sndsrv.patch
+ "${FILESDIR}"/${P}-sndsrv.patch \
+ "${FILESDIR}"/${P}-io_h.patch
sed -i \
-e "/^KOULESDIR/s:=.*:=${GAMES_BINDIR}:" \
-e "/^SOUNDDIR/s:=.*:=${GAMES_DATADIR}/${PN}:" Iconfig \
@@ -77,13 +78,11 @@ src_compile() {
-e '/SYSDEFS =/d' \
-e "/^ *CFLAGS =/s:$: ${CFLAGS}:" Makefile \
|| die "sed Makefile failed"
- emake -j1 || die "emake X failed"
+ emake || die "emake X failed"
mv xkoules bins/
fi
if use svga ; then
- make clean
- ln -s ../init.o svgalib/
- emake -j1 -f Makefile.svgalib || die "emake svga failed"
+ emake -f Makefile.svgalib || die "emake svga failed"
mv koules.svga bins/
fi
}