rpms/frogatto/devel frogatto-1.0.3-yugiohjcj.patch, NONE, 1.1 frogatto-1.2-Makefile.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 frogatto.spec, 1.6, 1.7 sources, 1.5, 1.6 frogatto-1.1-Makefile.patch, 1.1, NONE

Sun Dec 25 20:46:11 CET 2011

Author: musuruan

Update of /cvs/nonfree/rpms/frogatto/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26911

Modified Files:
	.cvsignore frogatto.spec sources 
Added Files:
	frogatto-1.0.3-yugiohjcj.patch frogatto-1.2-Makefile.patch 
Removed Files:
	frogatto-1.1-Makefile.patch 
Log Message:
* Sun Dec 25 2011 Andrea Musuruane <musuruan at gmail.com> 1.2-1
- Updated to upstream 1.2
- Added a patch by YuGiOhJCJ to add joystick support for Microsoft X-Box 
  360 pad and Microsoft SideWinder Game Pad USB


frogatto-1.0.3-yugiohjcj.patch:
 joystick.cpp |   22 ++++++++++!!!!!!!!!!!!
 1 file changed, 10 insertions(+), 12 modifications(!)

--- NEW FILE frogatto-1.0.3-yugiohjcj.patch ---
diff -cr frogatto-1.0.3/src/joystick.cpp frogatto-1.0.3-patched/src/joystick.cpp
*** frogatto-1.0.3/src/joystick.cpp	2010-08-04 22:09:20.000000000 +0200
--- frogatto-1.0.3-patched/src/joystick.cpp	2011-03-20 17:43:01.000000000 +0100
***************
*** 55,60 ****
--- 55,65 ----
  					return true;
  			}
  		}
+ 		const Sint16 state1 = SDL_JoystickGetAxis(j, 1);
+ 		if(state1 < -32000)
+ 		{
+ 			return true;
+ 		}
  
  	}
  
***************
*** 77,83 ****
  					return true;
  			}
  		}
! 
  	}
  
  	return false;
--- 82,92 ----
  					return true;
  			}
  		}
! 		const Sint16 state1 = SDL_JoystickGetAxis(j, 1);
! 		if(state1 > 32000)
! 		{
! 			return true;
! 		}
  	}
  
  	return false;
***************
*** 99,105 ****
  					return true;
  			}
  		}
! 
  	}
  
  	return false;
--- 108,118 ----
  					return true;
  			}
  		}
! 		const Sint16 state1 = SDL_JoystickGetAxis(j, 0);
! 		if(state1 < -32000)
! 		{
! 			return true;
! 		}
  	}
  
  	return false;
***************
*** 121,126 ****
--- 134,144 ----
  					return true;
  			}
  		}
+ 		const Sint16 state1 = SDL_JoystickGetAxis(j, 0);
+ 		if(state1 > 32000)
+ 		{
+ 			return true;
+ 		}
  	}
  
  	return false;

frogatto-1.2-Makefile.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE frogatto-1.2-Makefile.patch ---
diff -durN frogatto-frogatto-64c84bf.orig/Makefile frogatto-frogatto-64c84bf/Makefile
--- frogatto-frogatto-64c84bf.orig/Makefile	2011-11-30 06:31:31.000000000 +0100
+++ frogatto-frogatto-64c84bf/Makefile	2011-12-25 16:49:42.639667432 +0100
@@ -9,10 +9,10 @@
 	$(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
 
 game: $(objects)
-	$(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
+	$(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
 
 server: $(server_objects)
-	$(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
+	$(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
 
 formula_test: $(formula_test_objects)
 	$(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Jul 2011 14:47:30 -0000	1.5
+++ .cvsignore	25 Dec 2011 19:46:10 -0000	1.6
@@ -1 +1 @@
-frogatto-1.1.1.tar.bz2
+frogatto-frogatto-1.2-0-g07a33cd.tar.gz


Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- frogatto.spec	23 Jul 2011 14:47:30 -0000	1.6
+++ frogatto.spec	25 Dec 2011 19:46:10 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           frogatto
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        An old-school 2D platform game
 
@@ -7,13 +7,19 @@
 # Artwork and music not released under an open license
 License:        GPLv3+ and proprietary
 URL:            http://www.frogatto.com/
-Source0:        http://www.frogatto.com/files/%{name}-%{version}.tar.bz2
+# You can get this tarball from:
+# https://github.com/frogatto/frogatto/tarball/1.2
+Source0:        frogatto-frogatto-1.2-0-g07a33cd.tar.gz
 Source1:        %{name}.sh
 Source2:        %{name}.desktop
 Source3:        %{name}.xpm
 Source4:        %{name}.pod
 # Patch Makefile not to link lSDLmain
-Patch0:         %{name}-1.1-Makefile.patch
+Patch0:         %{name}-1.2-Makefile.patch
+# Add joystick support for
+# Microsoft X-Box 360 pad and Microsoft SideWinder Game Pad USB
+# http://yugiohjcj.1s.fr/
+Patch1:         %{name}-1.0.3-yugiohjcj.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.7
@@ -41,8 +47,9 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-64c84bf
 %patch0 -p1
+%patch1 -p1
 
 # Fix locale file path
 sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
@@ -122,6 +129,11 @@
 
 
 %changelog
+* Sun Dec 25 2011 Andrea Musuruane <musuruan at gmail.com> 1.2-1
+- Updated to upstream 1.2
+- Added a patch by YuGiOhJCJ to add joystick support for Microsoft X-Box 
+  360 pad and Microsoft SideWinder Game Pad USB
+
 * Sat Jul 16 2011 Andrea Musuruane <musuruan at gmail.com> 1.1.1-1
 - Updated to upstream 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2011 14:47:30 -0000	1.5
+++ sources	25 Dec 2011 19:46:10 -0000	1.6
@@ -1 +1 @@
-bf5a2ee4c3254a424766895ff250758b  frogatto-1.1.1.tar.bz2
+b60924f384e04728eb6e76cdd48ab8f9  frogatto-frogatto-1.2-0-g07a33cd.tar.gz


--- frogatto-1.1-Makefile.patch DELETED ---

