[rpms/amarok] epel10.2: - version 1.3.1

[Aurelien Bompard <abompard@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 6de243dd74859c7f03ef076f52dd2d62678b2b20
            Author : Aurelien Bompard <abompard@fedoraproject.org>
            Date   : 2005-09-10T08:22:35+00:00
            Stats  : +51/-7 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/6de243dd74859c7f03ef076f52dd2d62678b2b20?branch=epel10.2

            Log:
            - version 1.3.1
- add patch from upstream to fix alsasink in gstreamer
- default to autoaudiosink for gstreamer

---
diff --git a/.cvsignore b/.cvsignore
index 4afb5c2..9122a56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.3.tar.bz2
+amarok-1.3.1.tar.bz2

diff --git a/amarok-1.3-engines-cfg.patch b/amarok-1.3-engines-cfg.patch
index ed95297..345f85c 100644
--- a/amarok-1.3-engines-cfg.patch
+++ b/amarok-1.3-engines-cfg.patch
@@ -6,7 +6,7 @@ diff -Nur amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg amarok-1.3
              <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>

diff --git a/amarok-1.3.1-alsa-gst.patch b/amarok-1.3.1-alsa-gst.patch
new file mode 100644
index 0000000..a635549
--- /dev/null
+++ b/amarok-1.3.1-alsa-gst.patch
@@ -0,0 +1,35 @@
+--- ./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;

diff --git a/amarok.spec b/amarok.spec
index a03734c..8ea42af 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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 @@ enables it
 #%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 \
@@ -231,6 +233,13 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %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
 

diff --git a/sources b/sources
index 231663e..7365d62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dd100584795fb20c621fdbc96cbee1e  amarok-1.3.tar.bz2
+31f504e5fe985bbdb3c99f0e72d08fa1  amarok-1.3.1.tar.bz2