rpms/amarok/devel amarok-1.4-gstreamer.patch, NONE, 1.1 amarok.spec, 1.45, 1.46 amarok-1.4-helix.patch, 1.2, NONE

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13254/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4-gstreamer.patch 
Removed Files:
	amarok-1.4-helix.patch 
Log Message:
make gstreamer sufficient to build on x86_64

amarok-1.4-gstreamer.patch:

--- NEW FILE amarok-1.4-gstreamer.patch ---
--- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
+++ ./configure	2006-04-14 10:23:09.000000000 +0200
@@ -37922,7 +37922,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
@@ -40316,7 +40316,7 @@
     echo " =================================="
     echo " ="
     echo " = No suitable multimedia framework was detected. You need to install at least"
-    echo " = the Xine or Helix framework as detailed in the amaroK README."
+    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
     echo " ="
 fi
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	14 Apr 2006 07:29:15 -0000	1.45
+++ amarok.spec	14 Apr 2006 08:30:45 -0000	1.46
@@ -1,14 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.11.beta3%{?dist}
+Release:    0.12.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch1:     amarok-1.4-helix.patch
+Patch1:     amarok-1.4-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta3c
-# Discover the helix libs
-#%patch1 -p1 -b .helix
+# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -208,6 +208,10 @@
 
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
+- add patch to make Gstreamer sufficient to build (only engine available
+  on x86_64
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
 - drop the non-free bits
 - beta 3 (akode has been disabled)


--- amarok-1.4-helix.patch DELETED ---