add fps limiting patch from Rudi Lippert (bug #196013)

Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 45 insertions, 14 deletions

diff --git a/games-puzzle/tong/ChangeLog b/games-puzzle/tong/ChangeLog
index 7a13dbaabc93..84446011c476 100644
--- a/games-puzzle/tong/ChangeLog
+++ b/games-puzzle/tong/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/tong
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.6 2009/02/10 16:32:32 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.7 2009/04/06 21:57:42 mr_bones_ Exp $
+
+  06 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/tong-1.0-fps.patch, -files/1.0-makefile.patch,
+  +files/tong-1.0-makefile.patch, tong-1.0.ebuild:
+  add fps limiting patch from Rudi Lippert (bug #196013)
 
   10 Feb 2009; Alfredo Tupone <tupone@gentoo.org> files/1.0-makefile.patch:
   Fix --as-needed bug #247448 by flameeyes@gentoo.org
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
index da04183ed0bb..cf2e0a11435a 100644
--- a/games-puzzle/tong/Manifest
+++ b/games-puzzle/tong/Manifest
@@ -1,5 +1,6 @@
-AUX 1.0-makefile.patch 929 RMD160 d6cb28ab7041a6c9a7cd95848fa6d0491035d165 SHA1 202d99a6f011fb864684c60792052d259e61044e SHA256 fdbb3314e558aa3aa5009b6a9b60036e88618a30d0cc8116c00ad4cd515767aa
+AUX tong-1.0-fps.patch 670 RMD160 92c52b58016b2ce07e77825ec49fba23453c1a2c SHA1 99b0dff37c98c635980fd9b0c0ce1a1163c66d6f SHA256 85b1aaade219761f347f39ec1d513db81bd2e966b25a5aef57ecd4dd6ef176f7
+AUX tong-1.0-makefile.patch 929 RMD160 d6cb28ab7041a6c9a7cd95848fa6d0491035d165 SHA1 202d99a6f011fb864684c60792052d259e61044e SHA256 fdbb3314e558aa3aa5009b6a9b60036e88618a30d0cc8116c00ad4cd515767aa
 DIST tong-1.0.tar.gz 33291881 RMD160 620361e15403951423f664f29584b416056c5d94 SHA1 a7b1a39f0bb2f81956e36c8240ce66724c97cb7f SHA256 430e3b36b01cadf73680578f132cc5e095939f7a75ca06812e61e466c2de2271
-EBUILD tong-1.0.ebuild 1073 RMD160 92d91ecb675d7a67a9b63d083139ae97a39626f4 SHA1 0bbbbdd06c8f9fab45ebcee74ef323c740962e97 SHA256 2f070950d2aca66c8dae408c3487e9e2ca6553245b3eedd566bb095cfee50ec5
-MISC ChangeLog 918 RMD160 74149877ae34cd0fd0a2c9ce11a2a3fe6bb806f0 SHA1 876c85e4a36587101ef49b496fdccc877ffe2062 SHA256 b424f58e52059b0bc7ce6d653a4472814d1a1f77844a8850b36678e809c26376
+EBUILD tong-1.0.ebuild 1103 RMD160 1f53a4991ccd3d91adbdbb1761747dacbc4e35cb SHA1 13c01bae149d1e2f8b3cd57da8e7f1f63c299750 SHA256 ca38ad6d6cda0c0412b39da6cae60dcb152d705840a1a20237e8c2c294be0d10
+MISC ChangeLog 1141 RMD160 1468a82f8ae2f0e81ea7f5f8b8bee869271eca70 SHA1 094458183bd9a6aff7b187e5725ae4c92a9dc09a SHA256 8d499488da1e4d12ca21e349a3c2c8bcb22d3b586eeb8a823bd2b930ef292dd7
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/tong/files/tong-1.0-fps.patch b/games-puzzle/tong/files/tong-1.0-fps.patch
new file mode 100644
index 000000000000..59c1244d3537
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.0-fps.patch
@@ -0,0 +1,25 @@
+--- tong.cpp.ori	2007-10-15 19:27:54.000000000 +0200
++++ tong.cpp	2007-10-15 19:36:51.000000000 +0200
+@@ -54,6 +54,8 @@
+ #define MENUMOUSE_THRESHOLD 40
+ #define DEMO_TIME           8000
+ 
++#define MIN_TIME            45
++
+ bool drop_piece(Tetrad*, Tetrad*, Bucket*, Uint32&, bool&, bool&, Option*,
+ 		int&);
+ 
+@@ -1979,6 +1981,13 @@
+     SDL_Flip(screen);
+     lastlastupdate=lastupdate;
+     lastupdate=SDL_GetTicks();
++    
++    // limit to 1000/MIN_TIME fps
++    if (lastupdate-lastlastupdate < MIN_TIME) {
++      SDL_Delay(MIN_TIME - (lastupdate - lastlastupdate));
++    }
++    lastupdate = SDL_GetTicks();
++    
+   }  //main game loop
+ 
+   if(Mix_PlayingMusic()) {
diff --git a/games-puzzle/tong/files/1.0-makefile.patch b/games-puzzle/tong/files/tong-1.0-makefile.patch
index 4c7fc65fc103..4c7fc65fc103 100644
--- a/games-puzzle/tong/files/1.0-makefile.patch
+++ b/games-puzzle/tong/files/tong-1.0-makefile.patch
diff --git a/games-puzzle/tong/tong-1.0.ebuild b/games-puzzle/tong/tong-1.0.ebuild
index 7b783263de71..3e609526a04e 100644
--- a/games-puzzle/tong/tong-1.0.ebuild
+++ b/games-puzzle/tong/tong-1.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/tong-1.0.ebuild,v 1.5 2008/02/29 19:29:34 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/tong-1.0.ebuild,v 1.6 2009/04/06 21:57:42 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Tetris and Pong in the same place at the same time"
@@ -14,14 +15,13 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-makefile.patch"
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-fps.patch"
 	sed -i \
 		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
 		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
@@ -35,7 +35,7 @@ src_install() {
 	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die "cp failed"
 	dodoc CHANGELOG README making-of.txt CREDITS
 
-	make_desktop_entry tong TONG ${PN}
+	make_desktop_entry tong TONG
 	doicon "${T}/${PN}.png"
 	prepgamesdirs
 }