rpms/amarok/devel amarok-1.4beta1-gst10.patch, NONE, 1.1 amarok.spec, 1.38, 1.39

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4beta1-gst10.patch 
Log Message:
- fix gstreamer 0.10 detection

amarok-1.4beta1-gst10.patch:

--- NEW FILE amarok-1.4beta1-gst10.patch ---
--- ./configure.gst	2006-02-20 06:29:07.000000000 -0500
+++ ./configure	2006-02-20 07:48:48.000000000 -0500
@@ -33551,10 +33551,12 @@
 ### gst/audio/audio.h, which is in gstreamer-plugins (at least for me)
 amarok_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $CFLAGS_GST10"
-if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
+# Don't use cache
+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
   echo "$as_me:$LINENO: checking for gst/audio/audio.h" >&5
 echo $ECHO_N "checking for gst/audio/audio.h... $ECHO_C" >&6
-if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
+# Don't use cache
+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
 echo "$as_me:$LINENO: result: $ac_cv_header_gst_audio_audio_h" >&5
@@ -33678,7 +33680,8 @@
 esac
 echo "$as_me:$LINENO: checking for gst/audio/audio.h" >&5
 echo $ECHO_N "checking for gst/audio/audio.h... $ECHO_C" >&6
-if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
+# Don't use cache
+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_gst_audio_audio_h=$ac_header_preproc
@@ -41326,7 +41329,7 @@
 
 fi
 
-if test x$have_gst = xno; then
+if test x$have_gst = xno -a x$have_gst10 = xno; then
     echo " =========================="
     echo " ===  amaroK - WARNING  ========================================================"
     echo " =========================="
@@ -41447,6 +41450,10 @@
         echo " =   - GStreamer-engine"
     fi
 
+    if test x$have_gst10 != xyes; then
+        echo " =   - GStreamer-engine 0.10"
+    fi
+
     if test x$build_xine != xyes; then
         echo " =   - xine-engine"
     fi
@@ -41520,6 +41527,9 @@
         echo " =   + GStreamer-engine"
     fi
 
+    if test x$have_gst10 = xyes; then
+        echo " =   + GStreamer-engine 0.10"
+    fi
     if test x$build_xine = xyes; then
         echo " =   + xine-engine"
     fi


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- amarok.spec	17 Feb 2006 16:29:47 -0000	1.38
+++ amarok.spec	21 Feb 2006 11:09:32 -0000	1.39
@@ -7,12 +7,13 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.2.beta1%{?dist}
+Release:    0.3.beta1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2
+Patch0:     amarok-1.4beta1-gst10.patch
 #Patch0:     amarok-1.3.4-helix-libs.patch
 #Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
@@ -103,6 +104,8 @@
 #%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
+# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
+%patch0 -p1 -b .gst10
 
 
 %build
@@ -252,6 +255,9 @@
 
 
 %changelog
+* Mon Feb 20 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.3.beta1
+- fix gstreamer 0.10 detection
+
 * Fri Feb 17 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.1.beta1
 - fix gstreamer dependency