rpms/libprojectM/F-13 01-change-texture-size.patch, NONE, 1.1 04-change-preset-duration.patch, NONE, 1.1 import.log, 1.11, 1.12 libprojectM.spec, 1.12, 1.13

[Jameson Pugh]

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17111/F-13

Modified Files:
	import.log libprojectM.spec 
Added Files:
	01-change-texture-size.patch 04-change-preset-duration.patch 
Log Message:
Added patches so clementine can be built against it


01-change-texture-size.patch:
 projectM.cpp |   10 ++++++++++
 projectM.hpp |    2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE 01-change-texture-size.patch ---
Index: projectM.cpp
===================================================================
--- projectM.cpp	(revision 1048)
+++ projectM.cpp	(revision 1049)
@@ -907,3 +907,13 @@
 }
 
 
+void projectM::changeTextureSize(int size) {
+  _settings.textureSize = size;
+
+  delete renderer;
+  renderer = new Renderer(_settings.windowWidth, _settings.windowHeight,
+                          _settings.meshX, _settings.meshY,
+                          _settings.textureSize, beatDetect, _settings.presetURL,
+                          _settings.titleFontURL, _settings.menuFontURL);
+}
+
Index: projectM.hpp
===================================================================
--- projectM.hpp	(revision 1048)
+++ projectM.hpp	(revision 1049)
@@ -153,9 +153,9 @@
   virtual ~projectM();
 
 
+  void changeTextureSize(int size);
 
 
-
   const Settings & settings() const {
 		return _settings;
   }

04-change-preset-duration.patch:
 TimeKeeper.hpp |    2 ++
 projectM.cpp   |    4 ++++
 projectM.hpp   |    1 +
 3 files changed, 7 insertions(+)

--- NEW FILE 04-change-preset-duration.patch ---
Index: TimeKeeper.hpp
===================================================================
--- TimeKeeper.hpp	(revision 1063)
+++ TimeKeeper.hpp	(revision 1064)
@@ -37,6 +37,8 @@
 
   double sampledPresetDuration();
 
+  void ChangePresetDuration(int seconds) { _presetDuration = seconds; }
+
 #ifndef WIN32
   /* The first ticks value of the application */
   struct timeval startTime;
Index: projectM.cpp
===================================================================
--- projectM.cpp	(revision 1063)
+++ projectM.cpp	(revision 1064)
@@ -917,3 +917,7 @@
                           _settings.titleFontURL, _settings.menuFontURL);
 }
 
+void projectM::changePresetDuration(int seconds) {
+  timeKeeper->ChangePresetDuration(seconds);
+}
+
Index: projectM.hpp
===================================================================
--- projectM.hpp	(revision 1063)
+++ projectM.hpp	(revision 1064)
@@ -154,6 +154,7 @@
 
 
   void changeTextureSize(int size);
+  void changePresetDuration(int seconds);
 
 
   const Settings & settings() const {


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-13/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	22 May 2010 16:25:03 -0000	1.11
+++ import.log	10 Jul 2010 22:00:30 -0000	1.12
@@ -9,3 +9,4 @@ libprojectM-2_0_1-2_fc12:HEAD:libproject
 libprojectM-2_0_1-3_fc12:HEAD:libprojectM-2.0.1-3.fc12.src.rpm:1265639585
 libprojectM-2_0_1-4_fc12:F-13:libprojectM-2.0.1-4.fc12.src.rpm:1270915017
 libprojectM-2_0_1-5_fc12:F-13:libprojectM-2.0.1-5.fc12.src.rpm:1274545483
+libprojectM-2_0_1-6_fc13:F-13:libprojectM-2.0.1-6.fc13.src.rpm:1278798626


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/F-13/libprojectM.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libprojectM.spec	22 May 2010 16:25:03 -0000	1.12
+++ libprojectM.spec	10 Jul 2010 22:00:30 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	2.0.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -13,6 +13,9 @@ Patch0:		libprojectM-fonts.patch
 Patch1:		libprojectM-soname.patch
 #Turn off USE_THREADS until the bug is fixed upstream
 Patch2:		libprojectM-USE_THREADS.patch
+#Patches for clementine
+Patch3:		01-change-texture-size.patch
+Patch4:		04-change-preset-duration.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
@@ -39,6 +42,8 @@ developing applications that use %{name}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
+%patch4 -p0
 sed -i 's/\r//' ChangeLog
 cp -f %{SOURCE1} README.fedora
 
@@ -73,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Jul 10 2010 Jameson Pugh (imntreal at gmail.com) - 2.0.1-6
+- Added patches so clementine can be built against it
+
 * Fri May 21 2010 Jameson Pugh (imntreal at gmail.com) - 2.0.1-5
 - Don't create fonts directory
 - Add a README.fedora for instructions on upgrading from -3