rpms/libprojectM/devel libprojectM-USE_THREADS.patch, NONE, 1.1 import.log, 1.8, 1.9 libprojectM.spec, 1.9, 1.10

[Jameson Pugh]

Author: imntreal

Update of /cvs/pkgs/rpms/libprojectM/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28467/devel

Modified Files:
	import.log libprojectM.spec 
Added Files:
	libprojectM-USE_THREADS.patch 
Log Message:
Remove USE_THREADS option pending an update from upstream


libprojectM-USE_THREADS.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libprojectM-USE_THREADS.patch ---
diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt
--- libprojectM-2.0.1-orig/CMakeLists.txt	2010-02-08 09:11:11.000000000 -0500
+++ libprojectM-2.0.1/CMakeLists.txt	2010-02-08 09:20:37.000000000 -0500
@@ -112,7 +112,7 @@
 
 SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1)
 
-ADD_DEFINITIONS(-DUSE_THREADS)
+#ADD_DEFINITIONS(-DUSE_THREADS)
 
 if (APPLE)
 ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
@@ -123,7 +123,7 @@
 ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
 else(WIN32)
 set (RESOURCE_PREFIX "share/projectM")
-ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
 endif(WIN32)
 endif(APPLE)
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- import.log	16 Jan 2010 22:58:25 -0000	1.8
+++ import.log	8 Feb 2010 14:33:31 -0000	1.9
@@ -6,3 +6,4 @@ libprojectM-1_2_0-8_fc10:HEAD:libproject
 libprojectM-1_2_0-9_fc10:HEAD:libprojectM-1.2.0-9.fc10.src.rpm:1235610375
 libprojectM-2_0_1-1_fc12:HEAD:libprojectM-2.0.1-1.fc12.src.rpm:1260820819
 libprojectM-2_0_1-2_fc12:HEAD:libprojectM-2.0.1-2.fc12.src.rpm:1263682561
+libprojectM-2_0_1-3_fc12:HEAD:libprojectM-2.0.1-3.fc12.src.rpm:1265639585


Index: libprojectM.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM/devel/libprojectM.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- libprojectM.spec	16 Jan 2010 22:58:26 -0000	1.9
+++ libprojectM.spec	8 Feb 2010 14:33:31 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	2.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -10,6 +10,8 @@ Source0:	http://downloads.sourceforge.ne
 Patch0:		libprojectM-fonts.patch
 #Bump soname
 Patch1:		libprojectM-soname.patch
+#Turn off USE_THREADS until the bug is fixed upstream
+Patch2:		libprojectM-USE_THREADS.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ftgl-devel, cmake, glew-devel
@@ -35,6 +37,7 @@ developing applications that use %{name}
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 sed -i 's/\r//' ChangeLog
 
 %build
@@ -71,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 08 2010 Jameson Pugh (imntreal at gmail.com) - 2.0.1-3
+- Patch to remove the USE_THREADS option pending an update from upstream
+
 * Sun Jan 10 2010 Jameson Pugh (imntreal at gmail.com) - 2.0.1-2
 - Made needed soname bump