diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-23 03:36:30 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-23 03:36:30 +0000 |
commit | a3cf5f4d6732b03920400f7ac372a18230f49c79 (patch) | |
tree | 48a353c0cff74e44c6a8668e849971cdbf3f42e3 /games-sports/trigger | |
parent | New version bump, fixes a number of bugs. (diff) | |
download | gentoo-2-a3cf5f4d6732b03920400f7ac372a18230f49c79.tar.gz gentoo-2-a3cf5f4d6732b03920400f7ac372a18230f49c79.tar.bz2 gentoo-2-a3cf5f4d6732b03920400f7ac372a18230f49c79.zip |
patch to fix use of latest sdl-image (bug #141072), patch from Tristan Heaven
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'games-sports/trigger')
-rw-r--r-- | games-sports/trigger/ChangeLog | 7 | ||||
-rw-r--r-- | games-sports/trigger/files/trigger-0.5.2-physfs.patch | 33 | ||||
-rw-r--r-- | games-sports/trigger/trigger-0.5.2-r1.ebuild | 6 | ||||
-rw-r--r-- | games-sports/trigger/trigger-0.5.2.ebuild | 5 |
4 files changed, 46 insertions, 5 deletions
diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog index 3878fd36fb6f..e1ff5b43a2e9 100644 --- a/games-sports/trigger/ChangeLog +++ b/games-sports/trigger/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-sports/trigger # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.13 2006/06/14 12:12:17 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.14 2006/07/23 03:36:30 mr_bones_ Exp $ + + 23 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> + +files/trigger-0.5.2-physfs.patch, trigger-0.5.2.ebuild, + trigger-0.5.2-r1.ebuild: + patch to fix use of latest sdl-image (bug #141072), patch from Tristan Heaven 14 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> trigger-0.5.2-r1.ebuild: diff --git a/games-sports/trigger/files/trigger-0.5.2-physfs.patch b/games-sports/trigger/files/trigger-0.5.2-physfs.patch new file mode 100644 index 000000000000..c29c6df70cc4 --- /dev/null +++ b/games-sports/trigger/files/trigger-0.5.2-physfs.patch @@ -0,0 +1,33 @@ +--- src/pengine/physfs_rw.cpp ++++ src/pengine/physfs_rw.cpp +@@ -13,26 +13,20 @@ + {
+ PHYSFS_file *pfile = (PHYSFS_file *)context->hidden.unknown.data1;
+
+- int target;
+-
+- int curpos = PHYSFS_tell(pfile);
+-
+ switch (whence) {
+ default:
+ case SEEK_SET:
+- target = offset;
++ PHYSFS_seek(pfile, offset);
+ break;
+ case SEEK_CUR:
+- target = curpos + offset;
++ PHYSFS_seek(pfile, PHYSFS_tell(pfile) + offset);
+ break;
+ case SEEK_END:
+- target = PHYSFS_fileLength(pfile) + offset;
++ PHYSFS_seek(pfile, PHYSFS_fileLength(pfile) + offset);
+ break;
+ }
+
+- PHYSFS_seek(pfile, target);
+-
+- return curpos;
++ return PHYSFS_tell(pfile);
+ }
+
+
diff --git a/games-sports/trigger/trigger-0.5.2-r1.ebuild b/games-sports/trigger/trigger-0.5.2-r1.ebuild index 81a286833fbf..73eeead06d79 100644 --- a/games-sports/trigger/trigger-0.5.2-r1.ebuild +++ b/games-sports/trigger/trigger-0.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.4 2006/06/14 12:12:17 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.5 2006/07/23 03:36:30 mr_bones_ Exp $ inherit eutils games @@ -44,7 +44,9 @@ src_unpack() { src/glew/GL/glxew.h \ || die "sed failed" epatch "${FILESDIR}"/${P}-freealut.patch \ - "${FILESDIR}/${P}"-gcc41.patch + "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}/${P}"-physfs.patch + } src_compile() { diff --git a/games-sports/trigger/trigger-0.5.2.ebuild b/games-sports/trigger/trigger-0.5.2.ebuild index 848a37a2b5bd..c0b579135b2f 100644 --- a/games-sports/trigger/trigger-0.5.2.ebuild +++ b/games-sports/trigger/trigger-0.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.3 2006/05/23 21:48:57 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.4 2006/07/23 03:36:30 mr_bones_ Exp $ inherit eutils games @@ -42,7 +42,8 @@ src_unpack() { src/glew/glew.cpp \ src/glew/GL/glxew.h \ || die "sed failed" - epatch "${FILESDIR}/${P}"-gcc41.patch + epatch "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}/${P}"-physfs.patch } src_compile() { |