[rpms/amarok] epel10: make gstreamer sufficient to build on x86_64

[Aurelien Bompard <abompard@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : bfc3a5667723daaf60e5555315d036533cb2dc01
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-04-14T08:30:45+00:00
Stats  : +28/-24 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/bfc3a5667723daaf60e5555315d036533cb2dc01?branch=epel10

Log:
make gstreamer sufficient to build on x86_64

---
diff --git a/amarok-1.4-gstreamer.patch b/amarok-1.4-gstreamer.patch
new file mode 100644
index 0000000..67c00d0
--- /dev/null
+++ b/amarok-1.4-gstreamer.patch
@@ -0,0 +1,20 @@
+--- ./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
+ 

diff --git a/amarok-1.4-helix.patch b/amarok-1.4-helix.patch
deleted file mode 100644
index ff2c514..0000000
--- a/amarok-1.4-helix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./configure.helix	2006-03-05 20:28:13.000000000 +0100
-+++ ./configure	2006-03-22 00:04:48.000000000 +0100
-@@ -38181,7 +38181,7 @@
- # BEGIN DO_NOT_COMPILE CHECK
- ###############################################################################
- 
--if test x$build_xine != xyes -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
-@@ -40594,7 +40594,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
- 

diff --git a/amarok.spec b/amarok.spec
index 626b567..5dbdb11 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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 @@ use any of xmms' visualisation plugins with Amarok.
 
 %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 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %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)