rpms/amarok/FC-4 amarok-1.3.1-alsa-gst.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 amarok-1.3-engines-cfg.patch, 1.1, 1.2 amarok.spec, 1.26, 1.27 sources, 1.10, 1.11

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv659/FC-4

Modified Files:
	.cvsignore amarok-1.3-engines-cfg.patch amarok.spec sources 
Added Files:
	amarok-1.3.1-alsa-gst.patch 
Log Message:
- version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer



amarok-1.3.1-alsa-gst.patch:

--- NEW FILE amarok-1.3.1-alsa-gst.patch ---
--- ./amarok/src/engine/gst/gstengine.cpp.alsa-gst	2005-09-04 22:47:19.000000000 +0200
+++ ./amarok/src/engine/gst/gstengine.cpp	2005-09-09 19:32:11.000000000 +0200
@@ -806,7 +806,6 @@
 
                     if ( g_strrstr ( factory->details.klass, classname ) ) {
                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-                        if ( name != "alsasink" )
                         results << name;
                     }
                 }
@@ -830,7 +829,7 @@
 
     destroyPipeline();
 
-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
+    if ( GstConfig::soundOutput().isEmpty() ) {
         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
         return false;
     }
@@ -853,7 +852,6 @@
     }
 
     m_gst_audiobin = gst_bin_new( "audiobin" );
-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
 
     /* setting device property for AudioSink*/
     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
@@ -872,6 +870,7 @@
     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
 
+    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
 
     m_pipelineFilled = true;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Aug 2005 13:35:51 -0000	1.10
+++ .cvsignore	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

amarok-1.3-engines-cfg.patch:

Index: amarok-1.3-engines-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok-1.3-engines-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.3-engines-cfg.patch	22 Aug 2005 13:35:51 -0000	1.1
+++ amarok-1.3-engines-cfg.patch	10 Sep 2005 08:22:34 -0000	1.2
@@ -6,7 +6,7 @@
              <label>Sound output method to use</label>
              <whatsthis>Select the sound output plugin ("sink"). Their availability depends on the system configuration.</whatsthis>
 -            <default>osssink</default>
-+            <default>alsasink</default>
++            <default>autoaudiosink</default>
          </entry>
          <entry key="Use Custom Sound Device" type="Bool">
              <label>Do not use the autodetected audiosink sound device</label>


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amarok.spec	23 Aug 2005 22:33:18 -0000	1.26
+++ amarok.spec	10 Sep 2005 08:22:34 -0000	1.27
@@ -6,17 +6,18 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3
-Release:    6%{?dist}
+Version:    1.3.1
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
 #Patch1:     amarok-1.2.4-forward-decl.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 Patch3:     amarok-1.3-endian.patch
+Patch4:     amarok-1.3.1-alsa-gst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -101,10 +102,11 @@
 #%patch1 -p1 -b .forward-decl
 %patch2 -p1 -b .engines-cfg
 %patch3 -p1 -b .endian
+%patch4 -p1 -b .alsa-gst
 
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 # work around an improper ${kdelibsuff}
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
@@ -152,18 +154,18 @@
 %post
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
     # needed because amarok 1.2 puts icon in hicolor
     # and the RPM did not update the cache on uninstall
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %postun
 /sbin/ldconfig
 # update icon themes if necessary
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 fi
 
 
@@ -231,6 +233,13 @@
 
 
 %changelog
+* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-1
+- version 1.3.1
+
 * Tue Aug 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-6
 - add version to obsoletes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Aug 2005 13:35:51 -0000	1.10
+++ sources	10 Sep 2005 08:22:34 -0000	1.11
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2