rpms/kdemultimedia-extras/FC-6 kdemultimedia-3.5.7-pthread.patch, NONE, 1.1 kdemultimedia-extras.spec, 1.18, 1.19

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Aug 13 20:37:28 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv814

Modified Files:
	kdemultimedia-extras.spec 
Added Files:
	kdemultimedia-3.5.7-pthread.patch 
Log Message:
* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.3
- --disable-new-ldflags (fc6)
- pthread patch


kdemultimedia-3.5.7-pthread.patch:

--- NEW FILE kdemultimedia-3.5.7-pthread.patch ---
--- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread	2006-07-22 03:10:54.000000000 -0500
+++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am	2007-06-28 06:50:53.000000000 -0500
@@ -8,7 +8,7 @@
 			  xinePlayObject_impl.cpp \
 			  audio_fifo_out.c
 libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
+libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
 			 -lkmedia2_idl -lsoundserver_idl -lartsflow
 
 libarts_xine_la_METASOURCES = AUTO


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdemultimedia-extras.spec	13 Aug 2007 20:01:37 -0000	1.18
+++ kdemultimedia-extras.spec	13 Aug 2007 20:36:56 -0000	1.19
@@ -63,7 +63,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.7
-Release: 1%{?dist}.2
+Release: 1%{?dist}.3
 
 License: GPLv2+
 %if "%{?patched:1}" == "1"
@@ -109,6 +109,8 @@
 Patch2: kdemultimedia-3.5.3-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 
+Patch10: kdemultimedia-3.5.7-pthread.patch
+
 ## kde-redhat patches
 # unconditinally include oggvorbis_artsplugin 
 Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch
@@ -180,6 +182,9 @@
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 
+# help with wierd linker errors on older (el4/fc6) systems, should be mostly harmless otherwise
+%patch10 -p1 -b .pthread
+
 #with mpeglib in -extras-nonfree, not really needed -- Rex
 #patch1000   -p1 -b .oggvorbis_artsplugin
 %{?nonfree:%patch74744  -p1 -b .74744}
@@ -496,8 +501,9 @@
 
 
 %changelog
-* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.2
+* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.3
 - --disable-new-ldflags (fc6)
+- pthread patch
 
 * Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.1
 - (re)include kfile_mpeg, which includes metadata support only, no 




More information about the fedora-extras-commits mailing list