public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Aurelien Bompard <abompard@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/amarok] epel10: - version 1.3.2
Date: Mon, 06 Jul 2026 18:03:11 GMT [thread overview]
Message-ID: <178336099156.1.14002735824326818091.rpms-amarok-88cdc564ef23@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/amarok
Branch : epel10
Commit : 88cdc564ef23e48049457bd25f09f6cfb0ea22f8
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date : 2005-09-21T08:58:12+00:00
Stats : +9/-130 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/amarok/c/88cdc564ef23e48049457bd25f09f6cfb0ea22f8?branch=epel10
Log:
- version 1.3.2
- remove patch 4 (applied upstream)
---
diff --git a/.cvsignore b/.cvsignore
index 9122a56..15c00e9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.3.1.tar.bz2
+amarok-1.3.2.tar.bz2
diff --git a/amarok-1.2.4-forward-decl.patch b/amarok-1.2.4-forward-decl.patch
deleted file mode 100644
index 8896810..0000000
--- a/amarok-1.2.4-forward-decl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur amarok-1.2.4-orig/amarok/src/collectionbrowser.h amarok-1.2.4/amarok/src/collectionbrowser.h
---- amarok-1.2.4-orig/amarok/src/collectionbrowser.h 2005-05-19 19:00:19.000000000 +0200
-+++ amarok-1.2.4/amarok/src/collectionbrowser.h 2005-06-02 23:30:30.000000000 +0200
-@@ -15,6 +15,7 @@
-
- class ClickLineEdit;
- class CollectionDB;
-+class CollectionView;
- class sqlite;
-
- class QCString;
-diff -Nur amarok-1.2.4-orig/amarok/src/mediabrowser.h amarok-1.2.4/amarok/src/mediabrowser.h
---- amarok-1.2.4-orig/amarok/src/mediabrowser.h 2005-05-19 19:00:19.000000000 +0200
-+++ amarok-1.2.4/amarok/src/mediabrowser.h 2005-06-02 23:36:50.000000000 +0200
-@@ -39,6 +39,10 @@
- };
-
-
-+class MediaDevice;
-+class MediaDeviceList;
-+class MediaDeviceView;
-+
- class MediaBrowser : public QVBox
- {
- Q_OBJECT
-diff -Nur amarok-1.2.4-orig/amarok/src/playlistbrowser.h amarok-1.2.4/amarok/src/playlistbrowser.h
---- amarok-1.2.4-orig/amarok/src/playlistbrowser.h 2005-05-19 19:00:19.000000000 +0200
-+++ amarok-1.2.4/amarok/src/playlistbrowser.h 2005-06-02 23:34:23.000000000 +0200
-@@ -22,6 +22,10 @@
- class QSplitter;
- class QTimer;
-
-+class PlaylistBrowserItem;
-+class PlaylistBrowserView;
-+#include "smartplaylist.h"
-+
- class PlaylistBrowser : public QVBox
- {
- Q_OBJECT
-@@ -112,6 +116,9 @@
- };
-
-
-+class PlaylistTrackItem;
-+class TrackItemInfo;
-+
- class PlaylistBrowserItem : public QObject, public KListViewItem
- {
- Q_OBJECT
-diff -Nur amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h amarok-1.2.4/amarok/src/smartplaylisteditor.h
---- amarok-1.2.4-orig/amarok/src/smartplaylisteditor.h 2005-05-19 19:00:19.000000000 +0200
-+++ amarok-1.2.4/amarok/src/smartplaylisteditor.h 2005-06-02 23:38:48.000000000 +0200
-@@ -18,6 +18,7 @@
- class QToolButton;
- class QVGroupBox;
-
-+class CriteriaEditor;
-
- class SmartPlaylistEditor : public KDialogBase
- {
diff --git a/amarok-1.3.1-alsa-gst.patch b/amarok-1.3.1-alsa-gst.patch
deleted file mode 100644
index a635549..0000000
--- a/amarok-1.3.1-alsa-gst.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./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 8ea42af..3aaa64f 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,18 +6,16 @@
Name: amarok
Summary: Media player for KDE
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
Url: http://amarok.kde.org
-Source0: http://dl.sf.net/amarok/amarok-1.3.1.tar.bz2
+Source0: http://dl.sf.net/amarok/amarok-1.3.2.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
@@ -27,11 +25,7 @@ BuildRequires: xorg-x11-Mesa-libGL
BuildRequires: gstreamer-plugins-devel >= 0.8.4
BuildRequires: libmusicbrainz-devel, xmms-devel >= 1:1.2
BuildRequires: libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
-#%if "%fedora" >= "4"
BuildRequires: libtool-ltdl-devel
-#%else
-#BuildRequires: libtool
-#%endif
%ifnarch ppc64 x86_64 s390 s390x ia64
BuildRequires: HelixPlayer
%endif
@@ -71,18 +65,6 @@ Right now, only xmms is supported, which means that you can
use any of xmms' visualisation plugins with Amarok.
-#%if "%fedora" >= "4"
-#%package akode
-#Summary: AKode engine for Amarok
-#Group: Applications/Multimedia
-#Requires: %{name} = %{version}
-#
-#%description akode
-#Amarok can also use the akode engine to decode sound. This package
-#enables it.
-#%endif
-
-
%if 0%{?use_xine}
%package xine
Summary: Xine engine for Amarok
@@ -99,10 +81,8 @@ enables it
%setup -q
# remove test for GCC blacklisting
%patch0 -p1 -b .gcc4bl
-#%patch1 -p1 -b .forward-decl
%patch2 -p1 -b .engines-cfg
%patch3 -p1 -b .endian
-%patch4 -p1 -b .alsa-gst
%build
@@ -213,16 +193,6 @@ rm -fr $RPM_BUILD_ROOT
%{_bindir}/amarok_xmmswrapper2
-#%if "%fedora" >= "4"
-#%files akode
-#%defattr(-,root,root)
-#%{_libdir}/kde3/libamarok_aKode-engine.*
-#%{_datadir}/services/amarok_aKode-engine.desktop
-#%endif
-
-
-
-
%if 0%{?use_xine}
%files xine
%defattr(-,root,root)
@@ -233,6 +203,10 @@ rm -fr $RPM_BUILD_ROOT
%changelog
+* Wed Sep 21 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.2-1
+- version 1.3.2
+- remove patch 4 (applied upstream)
+
* 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
diff --git a/sources b/sources
index 7365d62..1689499 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2
+5988bf5a1e6ac8da41e1a8710d75b6a8 amarok-1.3.2.tar.bz2
reply other threads:[~2026-07-06 18:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178336099156.1.14002735824326818091.rpms-amarok-88cdc564ef23@fedoraproject.org \
--to=abompard@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox