Hello community,
here is the log from the commit of package amarok
checked in at Sat Apr 8 02:08:58 CEST 2006.
--------
--- KDE/amarok/amarok.changes 2006-04-05 16:52:28.000000000 +0200
+++ /work/users/ro/STABLE/amarok/amarok.changes 2006-04-08 02:06:40.000000000 +0200
@@ -4 +4,6 @@
-- fix memory leak in helix engine (#163481)
+- fix memory leak in helix engine (#163481)
+
+-------------------------------------------------------------------
+Tue Apr 4 02:19:08 CEST 2006 - ro@suse.de
+
+- add gstreamer10 engine from 1.4beta2
New:
----
amarok-gst10.diff
amarok-gst10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.a7SvBN/_old 2006-04-08 02:08:40.000000000 +0200
+++ /var/tmp/diff_new_pack.a7SvBN/_new 2006-04-08 02:08:40.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: amarok
-BuildRequires: SDL-devel flac-devel gnutls-devel gstreamer-plugins-devel kdebase3-devel kdebindings3-javascript kdemultimedia3-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libtunepimp-devel libvisual-devel libwnck-devel mDNSResponder-devel mad-devel sqlite-devel taglib-devel xine-devel xine-lib xmms-devel
+BuildRequires: SDL-devel flac-devel gnutls-devel gstreamer010-plugins-base-devel kdebase3-devel kdebindings3-javascript kdemultimedia3-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libtunepimp-devel libvisual-devel libwnck-devel mDNSResponder-devel mad-devel sqlite-devel taglib-devel xine-devel xine-lib xmms-devel
URL: http://amarok.kde.org
License: GPL
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
@@ -19,12 +19,13 @@
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 1.3.8
-Release: 21
+Release: 22
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rversion 1.3.8
%define mversion 0.5
Source0: %name-%rversion.tar.bz2
Source1: modplug_artsplugin-%{mversion}.tar.bz2
+Source2: amarok-gst10.tar.bz2
Source10: amarok-helix-helper.cpp
Patch0: 1_3_BRANCH.diff
Patch1: helix.diff
@@ -40,8 +41,9 @@
Patch11: helix-aoss-workaround.diff
Patch12: collectiondb-mutex.diff
Patch13: xine-memleak.patch
-Patch14: konqsidebar-translation.diff
-Patch15: helix-memleak-fix.patch
+Patch14: amarok-gst10.diff
+Patch15: konqsidebar-translation.diff
+Patch16: helix-memleak-fix.patch
%description
amaroK is a media player for all kinds of media supported by aRts or
@@ -188,7 +190,7 @@
Stanislav Karchebny
%prep
-%setup -q -n %name-%rversion -b 1
+%setup -q -n %name-%rversion -b 1 -a 2
cd amarok/src
%patch
cd ..
@@ -211,6 +213,7 @@
%patch13
%patch14
%patch15
+%patch16
cp %{S:10} amarok/src/engine/helix/
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -232,7 +235,7 @@
--without-included-sqlite \
%endif
--with-arts \
- --with-gstreamer \
+ --with-gstreamer10 \
--with-xine \
%ifarch %ix86 ppc x86_64 ppc64 ia64
--with-helix=/usr/lib/RealPlayer10 \
@@ -328,8 +331,8 @@
%files gstreamer
%defattr(-,root,root)
/opt/kde3/share/config.kcfg/gstconfig.kcfg
-/opt/kde3/%_lib/kde3/libamarok_gstengine_plugin.*
-/opt/kde3/share/services/amarok_gstengine_plugin.desktop
+/opt/kde3/%_lib/kde3/libamarok_gst10engine_plugin.*
+/opt/kde3/share/services/amarok_gst10engine_plugin.desktop
%endif
%files xmms
@@ -345,6 +348,8 @@
- fix memory leak in helix engine (#163481)
* Tue Apr 04 2006 - stbinner@suse.de
- fix translation of Konqueror sidebar on first start (#162765)
+* Tue Apr 04 2006 - ro@suse.de
+- add gstreamer10 engine from 1.4beta2
* Fri Mar 17 2006 - dmueller@suse.de
- really fix memory leak in xine backend
* Wed Mar 15 2006 - dmueller@suse.de
++++++ amarok-gst10.diff ++++++
--- amarok/configure.in.in
+++ amarok/configure.in.in 2006/04/03 23:52:28
@@ -122,6 +122,49 @@
# END GSTREAMER CHECK
###############################################################################
+###############################################################################
+# BEGIN GSTREAMER CHECK
+###############################################################################
+
+AC_ARG_WITH(gstreamer10,
+ AC_HELP_STRING([--without-gstreamer10],[build amaroK without GStreamer 0.10-engine]),
+ [build_gstreamer10=$withval],
+ [build_gstreamer10=yes]
+)
+
+if test "$build_gstreamer10" != "no"; then
+ if test "$PKGCONFIGFOUND" = "yes" ; then
+ # check for GStreamer
+ dnl Now we're ready to ask for gstreamer libs and cflags
+ dnl And we can also ask for the right version of gstreamer
+ have_gst10=no
+
+ GST10_MAJORMINOR=0.10
+ GST10_REQ=0.10.0
+
+ PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
+ have_gst10=yes,have_gst10=no)
+
+ dnl Give error if we don't have gstreamer
+ if test "x$have_gst10" = "xno"; then
+ LIB_GST10=""
+ CFLAGS_GST10=""
+ else
+ LIB_GST10=$GST10_LIBS
+ CFLAGS_GST10=$GST10_CFLAGS
+ AC_SUBST(LIB_GST10)
+ AC_SUBST(CFLAGS_GST10)
+ AC_SUBST(GST10_MAJORMINOR)
+ AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
+ fi
+ fi
+fi
+
+AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
+
+###############################################################################
+# END GSTREAMER CHECK
+###############################################################################
###############################################################################
--- amarok/src/engine/Makefile.am
+++ amarok/src/engine/Makefile.am 2006/04/03 23:53:51
@@ -13,6 +13,10 @@
GST_ENGINE_SUBDIR = gst
endif
+if with_gst10
+ GST10_ENGINE_SUBDIR = gst10
+endif
+
if with_nmm
NMM_ENGINE_SUBDIR = nmm
endif
@@ -40,6 +44,7 @@
SUBDIRS = . \
void \
$(GST_ENGINE_SUBDIR) \
+ $(GST10_ENGINE_SUBDIR) \
$(XINE_ENGINE_SUBDIR) \
$(ARTS_ENGINE_SUBDIR) \
$(MAS_ENGINE_SUBDIR) \
--- amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006/04/04 15:49:22 1.1
+++ amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop 2006/04/04 15:49:26
@@ -71,6 +71,6 @@
X-KDE-amaroK-email=markey@web.de
X-KDE-amaroK-rank=254
X-KDE-amaroK-version=1
-X-KDE-amaroK-framework-version=19
+X-KDE-amaroK-framework-version=15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...