packages: phonon-backend-mplayer/phonon-backend-mplayer.spec, phonon-backen...

[blekot]

Author: blekot                       Date: Wed Sep  8 13:42:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch for x86_64
- builds

---- Files affected:
packages/phonon-backend-mplayer:
   phonon-backend-mplayer.spec (1.3 -> 1.4) , phonon-backend-mplayer-x86_64.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/phonon-backend-mplayer/phonon-backend-mplayer.spec
diff -u packages/phonon-backend-mplayer/phonon-backend-mplayer.spec:1.3 packages/phonon-backend-mplayer/phonon-backend-mplayer.spec:1.4
--- packages/phonon-backend-mplayer/phonon-backend-mplayer.spec:1.3	Wed Sep  8 15:00:19 2010
+++ packages/phonon-backend-mplayer/phonon-backend-mplayer.spec	Wed Sep  8 15:42:04 2010
@@ -1,26 +1,19 @@
 # $Revision$, $Date$
 
-#TODO
-
-# Linking CXX shared module phonon_mplayer.so
-# /usr/bin/ld: libmplayer/liblibmplayer.a(MPlayerProcess.cpp.o): relocation R_X86_64_32S against `_ZN7QString11shared_nullE' can not be used when making a shared object; recompile with -fPIC
-# libmplayer/liblibmplayer.a: could not read symbols: Bad value
-
-
-
 %define		qtver		4.6.3
 %define		kdever		4.4.5
 
 Summary:	mplayer backend for Phonon
 Summary(pl.UTF-8):	Wtyczka mplayer dla Phonona
 Name:		phonon-backend-mplayer
-Version:	0.git.20100908.1
-Release:	0.1
+Version:	0.git.20100908
+Release:	0.2
 License:	LGPL 2.1
 Group:		X11/Applications
 Source0:	http://www.gitorious.org/phonon/phonon-mplayer/archive-tarball/master
 # Source0-md5:	ea4e86aba13efaff5abbc283eb25905c
-#URL:		http://
+Patch0:         %{name}-x86_64.patch
+URL:		http://kde-apps.org/content/show.php/Phonon+MPlayer+Backend?content=123714
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	kde4-kdebase-workspace-devel >= %{kdever}
@@ -39,6 +32,7 @@
 
 %prep
 %setup -q -n phonon-phonon-mplayer
+%patch0 -p1
 
 %build
 install -d build
@@ -72,6 +66,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/09/08 13:42:04  blekot
+- patch for x86_64
+- builds
+
 Revision 1.3  2010/09/08 13:00:19  blekot
 - added mplayer.desktop
 - builds on i686 and i486, x86_64 is still broken

================================================================
Index: packages/phonon-backend-mplayer/phonon-backend-mplayer-x86_64.patch
diff -u /dev/null packages/phonon-backend-mplayer/phonon-backend-mplayer-x86_64.patch:1.1
--- /dev/null	Wed Sep  8 15:42:09 2010
+++ packages/phonon-backend-mplayer/phonon-backend-mplayer-x86_64.patch	Wed Sep  8 15:42:04 2010
@@ -0,0 +1,13 @@
+--- phonon-phonon-mplayer/CMakeLists.txt~	2010-08-23 22:57:11.000000000 +0200
++++ phonon-phonon-mplayer/CMakeLists.txt	2010-09-08 15:18:07.000000000 +0200
+@@ -5,6 +5,10 @@
+ set(QT_MIN_VERSION 4.6.0)
+ find_package(Qt4 REQUIRED)
+ 
++IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC"  )
++	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fPIC"  )
++ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ 
+ 
+ set(PHONON_LIBS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phonon-backend-mplayer/phonon-backend-mplayer.spec?r1=1.3&r2=1.4&f=u