Request 296 (accepted)

Overview

Request 296 (accepted)

update to 0.8DrO_o. please enable build for all targets. we're smart enough :-)

Created by marguerite over 11 years ago
In state accepted

Submit xmms2

Submit package home:marguerite:branches:Multimedia / xmms2 to package Multimedia / xmms2

xmms2.changes Changed

xmms2.spec Changed

@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
 %if 0%{?suse_version} >= 1120
@@ -28,93 +28,126 @@
 %bcond_with    gme
 %endif
 
-%define codename DrNo
+%define codename DrO_o
 
-%define _ruby_sitedir %(ruby -rrbconfig -e 'puts Config::CONFIG"sitelibdir"')
+%define _ruby_sitedir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG"sitelibdir"')
 
-%{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?python_sitelib:  %global python_sitelib  %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           xmms2
-Summary:        A modular audio framework and plugin architecture
-Version:        0.7
-Release:        13
+Version:        0.8
+Release:        0
 # TODO: Make sure to update the verison number in xmms2-pkgconfig.patch.
-License:        LGPLv2+ and GPLv2+ and BSD
+License:        LGPL-2.0+ and GPL-2.0+ and BSD-3-Clause
+Summary:        A modular audio framework and plugin architecture
 Group:          Productivity/Multimedia/Sound/Players
 Source0:        http://prdownloads.sourceforge.net/xmms2/xmms2-%{version}%{codename}.tar.bz2
 Source1:        xmms2-client-launcher.sh
 Source2:        README.SuSE
-Source3:        %name-ripper.1
+Source3:        %{name}-ripper.1
 # Don't add extra CFLAGS, we're smart enough, thanks.
-Patch0:         %name-0.7-no-O0.patch
-Patch1:         %name-0.7-no-return.patch
-Patch2:         %name-0.7-cli-output-verbosity.patch
-Patch3:         %name-0.7-escape-minus-signes.patch
-Patch4:         %name-0.7-rpath.patch
-Patch5:         %name-0.7-silent-launcher.patch
-Patch6:         %name-0.7-spelling-error.patch
-Patch7:         %name-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch
-Patch8:         %name-0.7-vorbis-picture-support.patch
-Patch9:         %name-0.7-linker-flags.patch
-Patch10:        %name-0.7-fix-cast-error.patch
-Patch11:        %name-0.7-remove-path_max.patch
-# PATCH-FIX-UPSTREAM xmms2-pkgconfig.patch dimstar@opensuse.org -- pkg-config Version field contains illegal characters.
+Patch0:         %{name}-0.8-no-O0.patch
+# Remove rpath in sid plugin
+Patch4:         %{name}-0.8-rpath.patch
+Patch6:         %{name}-0.8-spelling-error.patch
+
+# Add -as-needed flag
+Patch9:         %{name}-0.8-linker-flags.patch
+Patch10:        %{name}-0.8-fix-cast-error.patch
 Patch13:        xmms2-pkgconfig.patch
-Patch14:        %name-0.7-fixwarnings.patch
-%if %suse_version > 1140
-Patch15:        %name-0.7-add-lib-vorbis.patch
+Patch14:        %{name}-0.8-fixwarnings.patch
+%if 0%{?suse_version} > 1140
+# Add vorbis and ogg to build env
+Patch15:        %{name}-0.8-add-lib-vorbis-and-ogg.patch
 %endif
-Url:            http://wiki.xmms2.xmms.se/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       %name-plugin-base
-BuildRequires:  flac-devel libofa-devel libvorbis-devel speex-devel sqlite-devel
-BuildRequires:  libcdio-devel libdiscid-devel libsmbclient-devel wavpack-devel
-BuildRequires:  gnome-vfs2-devel jack-audio-connection-kit-devel libmpcdec-devel
-BuildRequires:  alsa-lib-devel fftw3-devel libsamplerate-devel libxml2-devel
-BuildRequires:  libao-devel libcurl-devel libshout-devel pyrex ruby ruby-devel
-BuildRequires:  boost-devel libavahi-glib-devel libpulse-devel perl python-devel
-BuildRequires:  avahi-compat-mDNSResponder-devel doxygen libmodplug-devel
-BuildRequires:  autoconf automake fdupes gcc gcc-c++ libogg-devel libopenssl-devel make
-BuildRequires:  mad-devel
+Url:            http://xmms2.org
+BuildRequires:  SDL-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  avahi-compat-mDNSResponder-devel
+BuildRequires:  boost-devel
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  fftw3-devel
+BuildRequires:  flac-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  libao-devel
+BuildRequires:  libavahi-glib-devel
+BuildRequires:  libcdio-devel
+%if 0%{?suse_version} >= 1220
+# for libcdio_cdda1
+BuildRequires:  libcdio-paranoia-devel
+%endif
+BuildRequires:  libcurl-devel
+BuildRequires:  libdiscid-devel
 BuildRequires:  libffmpeg_oldabi-devel
-BuildRequires:  SDL-devel libvisual-devel readline-devel
+BuildRequires:  libmodplug-devel
+BuildRequires:  libmpcdec-devel
+BuildRequires:  libofa-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libopenssl-devel
+BuildRequires:  libpulse-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libshout-devel
+BuildRequires:  libsmbclient-devel
+BuildRequires:	libsndfile-devel
+BuildRequires:  libvisual-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  mad-devel
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  pyrex
+BuildRequires:  python-devel
+BuildRequires:  readline-devel
+BuildRequires:  ruby
+BuildRequires:  ruby-devel
+BuildRequires:  speex-devel
+BuildRequires:  sqlite-devel
+BuildRequires:  wavpack-devel
+BuildRequires:  pkgconfig(libxml-2.0)
+Requires:       %{name}-plugin-base
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %ifarch %ix86 x86_64 ppc ppc64
 BuildRequires:  valgrind-devel
 %endif
 
 %if %{with libsidplay}
-%if %suse_version >= 1120
+%if 0%{?suse_version} >= 1120
 BuildRequires:  sidplay-libs-devel >= 2.0
 %else
 BuildRequires:  libsidplay-devel >= 2.0
 %endif
 %endif
 
-%if %suse_version >= 1120
+%if 0%{?suse_version} >= 1120
 %if %{with gme}
 BuildRequires:  libgme-devel
 %endif
 %endif
 
 %if %{with restricted}
-BuildRequires:  libfaad-devel libmms-devel libmpg123-devel
+BuildRequires:  libfaad-devel
+BuildRequires:  libmms-devel
+BuildRequires:  libmpg123-devel
 %endif
 
 %description
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
-
 %package -n libxmmsclient++-glib1
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Glib c++ client library for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 
@@ -122,7 +155,6 @@
 A simple glib c++ client library for XMMS2
 
 %package -n libxmmsclient++4
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        C++ client library for  %{name}
 Group:          Productivity/Multimedia/Sound/Players
 
@@ -130,7 +162,6 @@
 A simple C++ client library for XMMS2
 
 %package -n libxmmsclient-glib1
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Glib client library for  %{name}
 Group:          Productivity/Multimedia/Sound/Players
 
@@ -138,7 +169,6 @@
 A simple Glib client library for XMMS2
 
 %package -n libxmmsclient6
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Client library for  %{name}
 Group:          Productivity/Multimedia/Sound/Players
 
@@ -146,24 +176,22 @@
 A simple client library for XMMS2
 
 %package devel
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Development libraries and headers for XMMS2
 Group:          Development/Libraries/C and C++
-Requires:       glib2-devel
+Requires:       %{name} = %{version}
 Requires:       boost-devel
-Requires:       pkgconfig
-Requires:       libxmmsclient6
-Requires:       libxmmsclient-glib1
-Requires:       libxmmsclient++4
 Requires:       libxmmsclient++-glib1
-Requires:       %{name} = %{version}
+Requires:       libxmmsclient++4
+Requires:       libxmmsclient-glib1
+Requires:       libxmmsclient6
+Requires:       pkgconfig
+Requires:       pkgconfig(glib-2.0)
 
 %description devel
 Development libraries and headers for XMMS2. You probably need this to develop
 or build new plugins for XMMS2.
 
 %package docs
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Development documentation for XMMS2
 Group:          Documentation/Other
 Requires:       %{name} = %{version}
@@ -172,7 +200,6 @@
 API documentation for the XMMS2 modular audio framework architecture.
 
 %package -n python-xmms2
-License:        LGPLv2+ and GPLv2+ and BSD
 Summary:        Python support for XMMS2
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -182,8 +209,8 @@
 Python bindings for XMMS2.
 
 %package perl
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Perl support for XMMS2
-License:        GPL+ or Artistic
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 Requires:       perl-base
@@ -192,7 +219,7 @@
 Perl bindings for XMMS2.
 
 %package ruby
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Ruby support for XMMS2
 Group:          System/Libraries
 Requires:       %{name} = %{version}
@@ -201,250 +228,249 @@
 %description ruby
 Ruby bindings for XMMS2.
 
-
 %package plugin-base
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Base plugins for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-base
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-airplay
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Airplay Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-airplay
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-ao
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Ao Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-ao
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-apefile
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Apefile Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-apefile
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-asf
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Asf Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-asf
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-asx
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Asx Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-asx
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-cdda
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Cdda Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-cdda
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-cue
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Cue Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-cue
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-curl
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Curl Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-curl
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-daap
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Daap Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
-%description plugin-daap 
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+%description plugin-daap
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-ffmpeg
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        FFmpeg Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-ffmpeg
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-flac
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Flac Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-flac
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-flv
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Flv Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-flv
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-gvfs
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Gvfs Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
-%description plugin-gvfs 
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+%description plugin-gvfs
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
-%if %suse_version >= 1120
+%if 0%{?suse_version} >= 1120
 %if %{with gme}
 
 %package plugin-gme
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Gme Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
@@ -463,109 +489,109 @@
 %endif
 
 %package plugin-html
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Html Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-html
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-ices
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Ices Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-ices
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-icymetaint
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        SDL Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-icymetaint
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-id3v2
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Id3v2 Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-id3v2
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-jack
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Jack Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-jack
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-karaoke
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Karaoke Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-karaoke
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-m3u
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        M3u Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
@@ -582,7 +608,7 @@
 client (such as gxmms2 or esperanza).
 
 %package plugin-mad
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Mad MP3 Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
@@ -599,213 +625,230 @@
 client (such as gxmms2 or esperanza).
 
 %package plugin-modplug
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Modplug Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-modplug
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-mp4
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Mp4 Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-mp4
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-musepack
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Musepack Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-musepack
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-normalize
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Normalize Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-normalize
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-ofa
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Ofa Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-ofa
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-pulse
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Pulse Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-pulse
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-samba
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Samba Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-samba
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
+client (such as gxmms2 or esperanza).
+
+%package plugin-sndfile
+License:        GPL-2.0+ or Artistic-1.0
+Summary:        Sndfile Support for %{name}
+Group:          Productivity/Multimedia/Sound/Players
+Requires:       %{name} = %{version}
+
+%description plugin-sndfile
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-speex
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Speex Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-speex
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-tta
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Tta Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-tta
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-vocoder
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Vocoder Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-vocoder
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-wave
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Wave Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-wave
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %package plugin-wavpack
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Wavpack Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
 
 %description plugin-wavpack
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
-will not play videos. It has a modular framework and plugin architecture for 
-audio processing, visualisation and output, but this framework has not been 
-designed to support video. Also the client-server design of XMMS2 (and the 
-daemon being independent of any graphics output) practically prevents direct 
-video output being implemented. It has support for a wide range of audio 
-formats, which is expandable via plugins. It includes a basic CLI interface 
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
+XMMS2 is an audio framework, but it is not a general multimedia player - it
+will not play videos. It has a modular framework and plugin architecture for
+audio processing, visualisation and output, but this framework has not been
+designed to support video. Also the client-server design of XMMS2 (and the
+daemon being independent of any graphics output) practically prevents direct
+video output being implemented. It has support for a wide range of audio
+formats, which is expandable via plugins. It includes a basic CLI interface
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
 client (such as gxmms2 or esperanza).
 
 %if %{with restricted}
 
 %package plugin-restricted
-License:        GPL+ or Artistic
+License:        GPL-2.0+ or Artistic-1.0
 Summary:        Restricted plugins Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
@@ -825,34 +868,22 @@
 %prep
 %setup -q -n %{name}-%{version}%{codename}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %patch13 -p1
 %patch14 -p1
-%if %suse_version > 1140
+%if 0%{?suse_version} > 1140
 %patch15 -p1
 %endif
 # This header doesn't need to be executable
 chmod -x src/include/xmmsclient/xmmsclient++/dict.h
-# Clean up paths in wafadmin
-WAFADMIN_FILES=`find wafadmin/ -type f`
-for i in $WAFADMIN_FILES; do
-    sed -i 's|/usr/lib|%{_libdir}|g' $i
-done
 
 %build
-%__cp %SOURCE2 .
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+cp %{SOURCE2} .
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 ./waf build -v %{?_smp_mflags}
 # make the docs
@@ -864,19 +895,19 @@
 for i in %{buildroot}%{_mandir}/man1/*.gz; do
     gunzip $i;
 done
-for i in %{buildroot}%{_mandir}/man1/*.1 ChangeLog; do
+for i in %{buildroot}%{_mandir}/man1/*.1; do
     iconv -o $i.iso88591 -f iso88591 -t utf8 $i
     mv $i.iso88591 $i
 done
-install -m0755 %SOURCE1 %{buildroot}%{_bindir}
+install -m0755 %{SOURCE1} %{buildroot}%{_bindir}
 
 #the libraries are built as 64bit, they are just installed in the wrong dir
-%if "%_lib" == "lib64"
-%__mv %buildroot/usr/lib/* %buildroot/%_libdir/
-%__mv %buildroot/%_libdir/perl* %buildroot/usr/lib/
+%if "%{_lib}" == "lib64"
+mv %{buildroot}%{_prefix}/lib/* %{buildroot}/%{_libdir}/
+mv %{buildroot}/%{_libdir}/perl* %{buildroot}%{_prefix}/lib/
 %endif
 
-%__cp %{SOURCE3} %buildroot/%_mandir/man1/
+cp %{SOURCE3} %{buildroot}/%{_mandir}/man1/
 %fdupes -s %{buildroot}
 
 %clean
@@ -900,40 +931,38 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO README.SuSE
-%_bindir/*
-%dir %_libdir/%name
-%_mandir/man1/*.gz
-%_datadir/pixmaps/*
-%dir %_datadir/%name
-%_datadir/%name/*
+%doc AUTHORS COPYING COPYING.GPL COPYING.LGPL README TODO README.SuSE
+%{_bindir}/*
+%dir %{_libdir}/%{name}
+%{_mandir}/man1/*.gz
+%{_datadir}/pixmaps/*
+%{_datadir}/%{name}/
 
 %files -n libxmmsclient++-glib1
 %defattr(-,root,root,-)
-%_libdir/libxmmsclient++-glib.so.1
-%_libdir/libxmmsclient++-glib.so.1.0.0
+%{_libdir}/libxmmsclient++-glib.so.1
+%{_libdir}/libxmmsclient++-glib.so.1.0.0
 
 %files -n libxmmsclient++4
 %defattr(-,root,root,-)
-%_libdir/libxmmsclient++.so.4
-%_libdir/libxmmsclient++.so.4.0.0
+%{_libdir}/libxmmsclient++.so.4
+%{_libdir}/libxmmsclient++.so.4.0.0
 
 %files -n libxmmsclient-glib1
 %defattr(-,root,root,-)
-%_libdir/libxmmsclient-glib.so.1
-%_libdir/libxmmsclient-glib.so.1.0.0
+%{_libdir}/libxmmsclient-glib.so.1
+%{_libdir}/libxmmsclient-glib.so.1.0.0
 
 %files -n libxmmsclient6
 %defattr(-,root,root,-)
-%_libdir/libxmmsclient.so.6
-%_libdir/libxmmsclient.so.6.0.0
+%{_libdir}/libxmmsclient.so.6
+%{_libdir}/libxmmsclient.so.6.0.0
 
 %files devel
 %defattr(-,root,root,-)
-%dir %_includedir/%name
-%_includedir/%name/*
-%_libdir/libxmmsclient*.so
-%_libdir/pkgconfig/%name-*.pc
+%{_includedir}/%{name}/
+%{_libdir}/libxmmsclient*.so
+%{_libdir}/pkgconfig/%{name}-*.pc
 
 %files docs
 %defattr(-,root,root,-)
@@ -956,169 +985,173 @@
 
 %files plugin-base
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_alsa.so
-%_libdir/xmms2/libxmms_diskwrite.so
-%_libdir/xmms2/libxmms_equalizer.so
-%_libdir/xmms2/libxmms_file.so
-%_libdir/xmms2/libxmms_xml.so
-%_libdir/xmms2/libxmms_vorbis.so
-%_libdir/xmms2/libxmms_null.so
-%_libdir/xmms2/libxmms_nulstripper.so
-%_libdir/xmms2/libxmms_oss.so
-%_libdir/xmms2/libxmms_pls.so
-%_libdir/xmms2/libxmms_replaygain.so
-%_libdir/xmms2/libxmms_rss.so
-%_libdir/xmms2/libxmms_xspf.so
+%{_libdir}/xmms2/libxmms_alsa.so
+%{_libdir}/xmms2/libxmms_diskwrite.so
+%{_libdir}/xmms2/libxmms_equalizer.so
+%{_libdir}/xmms2/libxmms_file.so
+%{_libdir}/xmms2/libxmms_xml.so
+%{_libdir}/xmms2/libxmms_vorbis.so
+%{_libdir}/xmms2/libxmms_null.so
+%{_libdir}/xmms2/libxmms_nulstripper.so
+%{_libdir}/xmms2/libxmms_oss.so
+%{_libdir}/xmms2/libxmms_pls.so
+%{_libdir}/xmms2/libxmms_replaygain.so
+%{_libdir}/xmms2/libxmms_rss.so
+%{_libdir}/xmms2/libxmms_xspf.so
 
 %files plugin-airplay
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_airplay.so
+%{_libdir}/xmms2/libxmms_airplay.so
 
 %files plugin-ao
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_ao.so
+%{_libdir}/xmms2/libxmms_ao.so
 
 %files plugin-apefile
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_apefile.so
+%{_libdir}/xmms2/libxmms_apefile.so
 
 %files plugin-asf
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_asf.so
+%{_libdir}/xmms2/libxmms_asf.so
 
 %files plugin-asx
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_asx.so
+%{_libdir}/xmms2/libxmms_asx.so
 
 %files plugin-cdda
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_cdda.so
+%{_libdir}/xmms2/libxmms_cdda.so
 
 %files plugin-cue
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_cue.so
+%{_libdir}/xmms2/libxmms_cue.so
 
 %files plugin-curl
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_curl.so
+%{_libdir}/xmms2/libxmms_curl.so
 
 %files plugin-daap
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_daap.so
+%{_libdir}/xmms2/libxmms_daap.so
 
 %files plugin-ffmpeg
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_avcodec.so
+%{_libdir}/xmms2/libxmms_avcodec.so
 
 %files plugin-flac
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_flac.so
+%{_libdir}/xmms2/libxmms_flac.so
 
 %files plugin-flv
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_flv.so
+%{_libdir}/xmms2/libxmms_flv.so
 
 %files plugin-gvfs
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_gvfs.so
+%{_libdir}/xmms2/libxmms_gvfs.so
 
-%if %suse_version >= 1120
+%if 0%{?suse_version} >= 1120
 %if %{with gme}
 
 %files plugin-gme
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_gme.so
+%{_libdir}/xmms2/libxmms_gme.so
 %endif
 %endif
 
 %files plugin-html
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_html.so
+%{_libdir}/xmms2/libxmms_html.so
 
 %files plugin-ices
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_ices.so
+%{_libdir}/xmms2/libxmms_ices.so
 
 %files plugin-icymetaint
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_icymetaint.so
+%{_libdir}/xmms2/libxmms_icymetaint.so
 
 %files plugin-id3v2
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_id3v2.so
+%{_libdir}/xmms2/libxmms_id3v2.so
 
 %files plugin-jack
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_jack.so
+%{_libdir}/xmms2/libxmms_jack.so
 
 %files plugin-karaoke
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_karaoke.so
+%{_libdir}/xmms2/libxmms_karaoke.so
 
 %files plugin-m3u
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_m3u.so
+%{_libdir}/xmms2/libxmms_m3u.so
 
 %files plugin-mad
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_mad.so
+%{_libdir}/xmms2/libxmms_mad.so
 
 
 %files plugin-modplug
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_modplug.so
+%{_libdir}/xmms2/libxmms_modplug.so
 
 %files plugin-mp4
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_mp4.so
+%{_libdir}/xmms2/libxmms_mp4.so
 
 %files plugin-musepack
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_musepack.so
+%{_libdir}/xmms2/libxmms_musepack.so
 
 %files plugin-normalize
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_normalize.so
+%{_libdir}/xmms2/libxmms_normalize.so
 
 %files plugin-ofa
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_ofa.so
+%{_libdir}/xmms2/libxmms_ofa.so
 
 %files plugin-pulse
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_pulse.so
+%{_libdir}/xmms2/libxmms_pulse.so
 
 %files plugin-samba
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_samba.so
+%{_libdir}/xmms2/libxmms_samba.so
+
+%files plugin-sndfile
+%defattr(-,root,root,-)
+%{_libdir}/xmms2/libxmms_sndfile.so
 
 %files plugin-speex
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_speex.so
+%{_libdir}/xmms2/libxmms_speex.so
 
 %files plugin-tta
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_tta.so
+%{_libdir}/xmms2/libxmms_tta.so
 
 %files plugin-vocoder
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_vocoder.so
+%{_libdir}/xmms2/libxmms_vocoder.so
 
 %files plugin-wave
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_wave.so
+%{_libdir}/xmms2/libxmms_wave.so
 
 %files plugin-wavpack
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_wavpack.so
+%{_libdir}/xmms2/libxmms_wavpack.so
 
 %if %{with restricted}
 
 %files plugin-restricted
 %defattr(-,root,root,-)
-%_libdir/xmms2/libxmms_faad.so
-%_libdir/xmms2/libxmms_mms.so
-%_libdir/xmms2/libxmms_mpg123.so
+%{_libdir}/xmms2/libxmms_faad.so
+%{_libdir}/xmms2/libxmms_mms.so
+%{_libdir}/xmms2/libxmms_mpg123.so
 %endif
 
-%changelog
+%changelog
\ No newline at end of file

xmms2-0.7-add-lib-vorbis.patch Deleted

@@ -1,26 +0,0 @@
---- xmms2-0.7DrNo/src/clients/vistest/wscript	2010-02-19 18:43:54.000000000 +0100
-+++ new/src/clients/vistest/wscript	2011-10-18 15:49:35.159111529 +0200
-@@ -15,13 +15,13 @@
-     obj.uselib_local = 'xmmsclient-glib xmmsclient'
-     obj.uselib = 'glib2 math'
- 
--    if bld.env'LIB_vorbisenc':
-+    if bld.env'LIB_vorbisenc' and bld.env'LIB_vorbis':
-         obj = bld.new_task_gen('cc', 'program')
-         obj.target = 'xmms2-ripper'
-         obj.source = 'ripper.c'
-         obj.includes = '. ../../.. ../../include'
-         obj.uselib_local = 'xmmsclient'
--        obj.uselib = 'vorbisenc'
-+        obj.uselib = 'vorbisenc vorbis'
- 
-     if bld.env'LIB_visual' and bld.env'LIB_sdl':
-         obj = bld.new_task_gen('cc', 'program')
-@@ -39,6 +39,7 @@
-     conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
-     conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
-     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
-+    conf.check_cfg(package='vorbis', uselib_store='vorbis', args='--cflags --libs')
- 
- def set_options(opt):
-     pass

xmms2-0.7-cli-output-verbosity.patch Deleted

@@ -1,84 +0,0 @@
-Description: respects now the common Unix convention for output verbosity
- Common unix convention for CLI programs is being silent for successful
- operations, and being verbose on errors. This patch adjust the output verbosity
- to match the unix conventions.
-Bug-Debian: http://bugs.debian.org/510374
-Author: Jan Braun <janbraun@gmx.net>
-Forwarded: No
-
-Index: debian.git/src/clients/cli/cmd_pls.c
-===================================================================
---- debian.git.orig/src/clients/cli/cmd_pls.c	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/cli/cmd_pls.c	2010-02-20 12:49:57.302899620 +0100
-@@ -39,7 +39,7 @@
- 
- 	url = format_url (item, G_FILE_TEST_IS_REGULAR);
- 	if (!url) {
--		print_error ("Invalid url");
-+		print_error ("Invalid url: %s", item);
- 	}
- 
- 	res = xmmsc_playlist_add_url (conn, playlist, url);
-@@ -52,7 +52,9 @@
- 	}
- 	xmmsc_result_unref (res);
- 
--	print_info ("Added %s", item);
-+	if (verbose) {
-+        print_info ("Added %s", item);
-+    }
- }
- 
- 
-@@ -259,7 +261,7 @@
- 	if (!url) {
- 		url = format_url (argv3, G_FILE_TEST_IS_REGULAR);
- 		if (!url) {
--			print_error ("Invalid url");
-+			print_error ("Invalid url: %s", argv3);
- 		} else {
- 			/* FIXME: Fulhack to check for optional playlist argument */
- 			playlist = argv2;
-@@ -307,7 +309,7 @@
- 	}
- 
- 	if (!url) {
--		print_error ("Invalid url");
-+		print_error ("Invalid url: %s", (*endptr == '\0') ? argv3 : argv4 );
- 	}
- 
- 	res = xmmsc_playlist_insert_url (conn, playlist, pos, url);
-Index: debian.git/src/clients/cli/common.h
-===================================================================
---- debian.git.orig/src/clients/cli/common.h	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/cli/common.h	2010-02-20 12:49:57.302899620 +0100
-@@ -31,6 +31,8 @@
- 	void (*func) (xmmsc_connection_t *conn, int argc, char **argv);
- } cmds;
- 
-+gboolean verbose;
-+
- gboolean x_realpath (const gchar *item, gchar *rpath);
- gchar *x_path2url (gchar *path);
- gchar *format_url (gchar *item, GFileTest test);
-Index: debian.git/src/clients/cli/main.c
-===================================================================
---- debian.git.orig/src/clients/cli/main.c	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/cli/main.c	2010-02-20 12:49:57.302899620 +0100
-@@ -254,6 +254,16 @@
- 
- 	setlocale (LC_ALL, "");
- 
-+    verbose = FALSE;
-+    while ( argc >1 && ( !g_ascii_strcasecmp (argv1, "-v") ||
-+                    !g_ascii_strcasecmp (argv1, "--verbose") )
-+    ) {
-+        verbose = TRUE;
-+        argv1 = argv0;
-+        --argc;
-+        ++argv;
-+    }
-+
- 	config = read_config ();
- 	atexit (free_config);
-

xmms2-0.7-escape-minus-signes.patch Deleted

@@ -1,269 +0,0 @@
-Description: Escape minus signes in man pages.
-Author: Benjamin Drung <bdrung@ubuntu.com>
-Bug: http://bugs.xmms2.xmms.se/view.php?id=2225
-
-Index: debian.git/src/clients/launcher/xmms2-launcher.1
-===================================================================
---- debian.git.orig/src/clients/launcher/xmms2-launcher.1	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/launcher/xmms2-launcher.1	2010-02-20 12:50:04.522899969 +0100
-@@ -75,20 +75,20 @@
- These options are currently recognised:
- .TP
- .I
---l logfile / --logfile=logfile
-+\-l logfile / \-\-logfile=logfile
- Write log file to 
- .I logfile
- instead of the default log file location
- .TP
- .I
--- P pidfile / --pidfile=pidfile
-+\- P pidfile / \-\-pidfile=pidfile
- Write the pid of 
- .I xmms2d
- to the file specified by 
- .I pidfile
- .TP
- .I
---? / --help  
-+\-? / \-\-help
- Show help options
- .SH FILES
- .TP
-Index: debian.git/src/clients/nycli/nyxmms2.1
-===================================================================
---- debian.git.orig/src/clients/nycli/nyxmms2.1	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/nycli/nyxmms2.1	2010-02-20 12:50:04.522899969 +0100
-@@ -80,7 +80,7 @@
- .PP
- 
- .TP
--\fBstop\fR -n <tracks> | -t <time>
-+\fBstop\fR \-n <tracks> | \-t <time>
- .PP
- .RS 4
- Stop playback.
-@@ -139,7 +139,7 @@
- .PP
- 
- .TP
--\fBstatus\fR -r <time> -f <format>
-+\fBstatus\fR \-r <time> \-f <format>
- .PP
- .RS 4
- Display playback status, either continuously or once.
-@@ -198,7 +198,7 @@
- .PP
- 
- .TP
--\fBjump\fR -b <pattern|positions>
-+\fBjump\fR \-b <pattern|positions>
- .PP
- .RS 4
- Jump to the first media maching the pattern.
-@@ -235,7 +235,7 @@
- .PP
- 
- .TP
--\fBsearch\fR -p <name> | -c <name> -o <prop1,prop2...> -l <prop1,prop2...> <pattern>
-+\fBsearch\fR \-p <name> | \-c <name> \-o <prop1,prop2...> \-l <prop1,prop2...> <pattern>
- .PP
- .RS 4
- Search and print all media matching the pattern. Search can be restricted
-@@ -279,7 +279,7 @@
- .PP
- 
- .TP
--\fBlist\fR -p <name> pattern
-+\fBlist\fR \-p <name> pattern
- .PP
- .RS 4
- List the contents of a playlist (the active playlist by default). If a
-@@ -303,7 +303,7 @@
- .PP
- 
- .TP
--\fBadd\fR -f -N -P -p <playlist> | -c <collection> -n | -a <pos|offset> pattern | paths
-+\fBadd\fR \-f \-N \-P \-p <playlist> | \-c <collection> \-n | \-a <pos|offset> pattern | paths
- .PP
- .RS 4
- Add the matching media or files to a playlist.
-@@ -320,7 +320,7 @@
- \-P | \-\-pls
- .RE
- .RS 8
--Treat the files as playlist files (implies --file.)
-+Treat the files as playlist files (implies \-\-file.)
- .RE
- .PP
- .RS 4
-@@ -367,7 +367,7 @@
- .PP
- 
- .TP
--\fBremove\fR -p <playlist> <pattern|positions>
-+\fBremove\fR \-p <playlist> <pattern|positions>
- .PP
- .RS 4
- Remove the matching media from a playlist.
-@@ -389,7 +389,7 @@
- .PP
- 
- .TP
--\fBmove\fR -p <playlist> -n | -a <pos|offset> <pattern|positions>
-+\fBmove\fR \-p <playlist> \-n | \-a <pos|offset> <pattern|positions>
- .PP
- .RS 4
- Move entries inside a playlist.
-@@ -440,7 +440,7 @@
- .PP
- 
- .TP
--\fBhelp\fR -a command
-+\fBhelp\fR \-a command
- .PP
- .RS 4
- List all commands, or help on one command.
-@@ -462,7 +462,7 @@
- .PP
- .SH PLAYLIST COMMANDS
- .TP
--\fBplaylist list\fR -a pattern
-+\fBplaylist list\fR \-a pattern
- .PP
- .RS 4
- List all playlists.
-@@ -514,7 +514,7 @@
- .PP
- 
- .TP
--\fBplaylist create\fR -p <playlist> <name>
-+\fBplaylist create\fR \-p <playlist> <name>
- .PP
- .RS 4
- Change the active playlist.
-@@ -536,7 +536,7 @@
- .PP
- 
- .TP
--\fBplaylist rename\fR -f -p <playlist> <newname>
-+\fBplaylist rename\fR \-f \-p <playlist> <newname>
- .PP
- .RS 4
- Rename a playlist.  By default, rename the active playlist.
-@@ -610,7 +610,7 @@
- .PP
- 
- .TP
--\fBplaylist sort\fR -o <order> playlist
-+\fBplaylist sort\fR \-o <order> playlist
- .PP
- .RS 4
- Sort a playlist.  By default, sort the active playlist.
-@@ -632,7 +632,7 @@
- .PP
- 
- .TP
--\fBplaylist config\fR -t <type> -s <history> -u <upcoming> -i <coll> playlist
-+\fBplaylist config\fR \-t <type> \-s <history> \-u <upcoming> \-i <coll> playlist
- .PP
- .RS 4
- Configure a playlist by changing its type, attributes, etc.
-@@ -721,7 +721,7 @@
- .PP
- 
- .TP
--\fBcollection create\fR -f -a | -e -c <collection> <name> pattern
-+\fBcollection create\fR \-f \-a | \-e \-c <collection> <name> pattern
- .PP
- .RS 4
- Create a new collection.
-@@ -759,7 +759,7 @@
- .PP
- 
- .TP
--\fBcollection rename\fR -f <oldname> <newname>
-+\fBcollection rename\fR \-f <oldname> <newname>
- .PP
- .RS 4
- Rename a collection.
-@@ -814,7 +814,7 @@
- .PP
- .SH SERVER COMMANDS
- .TP
--\fBserver import\fR -N <path>
-+\fBserver import\fR \-N <path>
- .PP
- .RS 4
- Import new files into the media library.
-@@ -901,7 +901,7 @@
- .PP
- 
- .TP
--\fBserver property\fR -i | -s | -D -S <mid> name value
-+\fBserver property\fR \-i | \-s | \-D \-S <mid> name value
- .PP
- .RS 4
- Get or set properties for a given media.
-@@ -910,10 +910,10 @@
- If both a name and a value are provided, set the new value of the property.
- 
- By default, set operations use client specific source and list, display operations use source-preference.
--Use the --source option to override this behaviour.
-+Use the \-\-source option to override this behaviour.
- 
- By default, the value will be used to determine whether it should be saved as a string or an integer.
--Use the --int or --string flag to override this behaviour.
-+Use the \-\-int or \-\-string flag to override this behaviour.
- .RE
- .PP
- .RS 4
-@@ -968,12 +968,12 @@
- .PP
- 
- .TP
--\fBserver volume\fR -c <name> value
-+\fBserver volume\fR \-c <name> value
- .PP
- .RS 4
- Get or set the audio volume (in a range of 0-100).
- If a value is provided, set the new value of the volume. Otherwise, display the current volume.
--By default, the command applies to all audio channels. Use the --channel flag to override this behaviour.
-+By default, the command applies to all audio channels. Use the \-\-channel flag to override this behaviour.
- .RE
- .PP
- .RS 4
-@@ -1053,7 +1053,7 @@
- \fBaddpls\fR 
- .PP
- .RS 4
--add -f -P $@
-+add \-f \-P $@
- .RE
- .PP
- .RS 4
-@@ -1068,7 +1068,7 @@
- \fBcurrent\fR 
- .PP
- .RS 4
--status -f $1
-+status \-f $1
- .RE
- .PP
- .RS 4
-@@ -1189,13 +1189,13 @@
- .RS 8
- An alias can use positional parameters, for example:
- .PP
--foo = add -f $1 $3
-+foo = add \-f $1 $3
- .PP
- foo ctkoz.ogg and slre.ogg
- .PP
- Will result in:
- .PP
--add -f ctkoz.ogg slre.ogg
-+add \-f ctkoz.ogg slre.ogg
- .PP
- .RE
- .RS 4

xmms2-0.7-fix-cast-error.patch Deleted

xmms2-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch Deleted

xmms2-0.7-fixwarnings.patch Deleted

xmms2-0.7-linker-flags.patch Deleted

xmms2-0.7-no-return.patch Deleted

xmms2-0.7-remove-path_max.patch Deleted

@@ -1,206 +0,0 @@
-Description: Replace PATH_MAX by XMMS_PATH_MAX to fix FTBFS on hurd-i386
- This is only a workaround. Fixing these issues usually boils down to replacing
- char fooPATH_MAX by char *foo, and using dynamic memory allocation.
-Author: Benjamin Drung <bdrung@ubuntu.com>
-Bug: http://bugs.xmms2.xmms.se/view.php?id=2347
-
---- xmms2-0.7DrNo.orig/src/clients/cli/main.c
-+++ xmms2-0.7DrNo/src/clients/cli/main.c
-@@ -128,17 +128,17 @@ parse_config (const gchar *buffer)
- 
- static gchar *
- get_config_dir (void) {
--	gchar userconfPATH_MAX;
-+	gchar userconfXMMS_PATH_MAX;
- 
--	xmmsc_userconfdir_get (userconf, PATH_MAX);
-+	xmmsc_userconfdir_get (userconf, XMMS_PATH_MAX);
- 	return g_build_path (G_DIR_SEPARATOR_S, userconf, "clients", NULL);
- }
- 
- static gchar *
- get_config_path (void) {
--	gchar userconfPATH_MAX;
-+	gchar userconfXMMS_PATH_MAX;
- 
--	xmmsc_userconfdir_get (userconf, PATH_MAX);
-+	xmmsc_userconfdir_get (userconf, XMMS_PATH_MAX);
- 	return g_build_path (G_DIR_SEPARATOR_S, userconf, "clients", "cli.conf",
- 	                     NULL);
- }
---- xmms2-0.7DrNo.orig/src/clients/cli/common.c
-+++ xmms2-0.7DrNo/src/clients/cli/common.c
-@@ -20,7 +20,7 @@
- gchar *
- format_url (gchar *item, GFileTest test)
- {
--	gchar *url, rpathPATH_MAX, *p;
-+	gchar *url, rpathXMMS_PATH_MAX, *p;
- 
- 	p = strchr (item, ':');
- 	if (!(p && p1 == '/' && p2 == '/')) {
---- xmms2-0.7DrNo.orig/src/clients/nycli/configuration.c
-+++ xmms2-0.7DrNo/src/clients/nycli/configuration.c
-@@ -125,9 +125,9 @@ configuration_init (const gchar *path)
- 
- 	history_file = configuration_get_string (config, "HISTORY_FILE");
- 	if (!history_file || !*history_file) {
--		gchar cfilePATH_MAX;
-+		gchar cfileXMMS_PATH_MAX;
- 
--		xmms_usercachedir_get (cfile, PATH_MAX);
-+		xmms_usercachedir_get (cfile, XMMS_PATH_MAX);
- 		config->histpath = g_build_filename (cfile, HISTORY_FILE_BASE, NULL);
- 	} else {
- 		config->histpath = strdup (history_file);
---- xmms2-0.7DrNo.orig/src/clients/launcher/xmms2-launcher.c
-+++ xmms2-0.7DrNo/src/clients/launcher/xmms2-launcher.c
-@@ -71,8 +71,8 @@ main (int argc, char **argv)
- 	}
- 	
- 	if (!logfile) {
--		char cachePATH_MAX;
--		xmms_usercachedir_get (cache, PATH_MAX);
-+		char cacheXMMS_PATH_MAX;
-+		xmms_usercachedir_get (cache, XMMS_PATH_MAX);
- 		logfile = g_build_filename (cache, "xmms2d.log", NULL);
- 		if (!g_file_test (cache, G_FILE_TEST_IS_DIR)) {
- 			g_mkdir_with_parents (cache, 0755);
---- xmms2-0.7DrNo.orig/src/clients/lib/perl/XMMSClient.xs
-+++ xmms2-0.7DrNo/src/clients/lib/perl/XMMSClient.xs
-@@ -1408,9 +1408,9 @@ Get the absolute path to the user config
- const char *
- xmmsc_userconfdir_get (class)
- 	PREINIT:
--		char pathPATH_MAX;
-+		char pathXMMS_PATH_MAX;
- 	CODE:
--		RETVAL = xmmsc_userconfdir_get (path, PATH_MAX);
-+		RETVAL = xmmsc_userconfdir_get (path, XMMS_PATH_MAX);
- 	OUTPUT:
- 		RETVAL
- 
---- xmms2-0.7DrNo.orig/src/clients/lib/ruby/rb_xmmsclient_main.c
-+++ xmms2-0.7DrNo/src/clients/lib/ruby/rb_xmmsclient_main.c
-@@ -33,9 +33,9 @@ static VALUE
- m_userconfdir_get (VALUE self)
- {
- 	const char *p;
--	char pathPATH_MAX;
-+	char pathXMMS_PATH_MAX;
- 
--	p = xmmsc_userconfdir_get (path, PATH_MAX);
-+	p = xmmsc_userconfdir_get (path, XMMS_PATH_MAX);
- 
- 	return p ? rb_str_new2 (p) : Qnil;
- }
---- xmms2-0.7DrNo.orig/src/plugins/mp4/mp4ff/drms.c
-+++ xmms2-0.7DrNo/src/plugins/mp4/mp4ff/drms.c
-@@ -131,7 +131,7 @@ struct drms_s
-     uint32_t p_key 4 ;
-     struct aes_s aes;
- 
--    char     psz_homedir PATH_MAX ;
-+    char     psz_homedir XMMS_PATH_MAX ;
- };
- 
- /*****************************************************************************
-@@ -204,8 +204,8 @@ void *drms_alloc( char *psz_homedir )
- 
-     memset( p_drms, 0, sizeof(struct drms_s) );
- 
--    strncpy( p_drms->psz_homedir, psz_homedir, PATH_MAX );
--    p_drms->psz_homedir PATH_MAX - 1  = '\0';
-+    strncpy( p_drms->psz_homedir, psz_homedir, XMMS_PATH_MAX );
-+    p_drms->psz_homedir XMMS_PATH_MAX - 1  = '\0';
- 
-     return (void *)p_drms;
- }
-@@ -820,9 +820,9 @@ static int WriteUserKey( void *_p_drms, 
-     struct drms_s *p_drms = (struct drms_s *)_p_drms;
-     FILE *file;
-     int i_ret = -1;
--    char psz_path PATH_MAX ;
-+    char psz_path XMMS_PATH_MAX ;
- 
--    sprintf( psz_path, /* PATH_MAX - 1, */
-+    sprintf( psz_path, /* XMMS_PATH_MAX - 1, */
-               "%s/" DRMS_DIRNAME, p_drms->psz_homedir );
- 
- #if defined( HAVE_ERRNO_H )
-@@ -835,7 +835,7 @@ static int WriteUserKey( void *_p_drms, 
-     if( !mkdir( psz_path ) )
- #endif
-     {
--        sprintf( psz_path, /*PATH_MAX - 1,*/ "%s/" DRMS_DIRNAME "/%08X.%03d",
-+        sprintf( psz_path, /*XMMS_PATH_MAX - 1,*/ "%s/" DRMS_DIRNAME "/%08X.%03d",
-                   p_drms->psz_homedir, p_drms->i_user, p_drms->i_key );
- 
-         file = fopen( psz_path, "w" );
-@@ -860,9 +860,9 @@ static int ReadUserKey( void *_p_drms, u
-     struct drms_s *p_drms = (struct drms_s *)_p_drms;
-     FILE *file;
-     int i_ret = -1;
--    char psz_path PATH_MAX ;
-+    char psz_path XMMS_PATH_MAX ;
- 
--    sprintf( psz_path, /*PATH_MAX - 1,*/
-+    sprintf( psz_path, /*XMMS_PATH_MAX - 1,*/
-               "%s/" DRMS_DIRNAME "/%08X.%03d", p_drms->psz_homedir,
-               p_drms->i_user, p_drms->i_key );
- 
-@@ -1030,7 +1030,7 @@ static int GetSCIData( char *psz_ipod, u
- {
-     FILE *file;
-     char *psz_path = NULL;
--    char p_tmp PATH_MAX ;
-+    char p_tmp XMMS_PATH_MAX ;
-     int i_ret = -1;
- 
-     if( psz_ipod == NULL )
---- xmms2-0.7DrNo.orig/src/xmms/main.c
-+++ xmms2-0.7DrNo/src/xmms/main.c
-@@ -215,7 +215,7 @@ spawn_script_setup (gpointer data)
- static void
- load_config (void)
- {
--	gchar configdirPATH_MAX;
-+	gchar configdirXMMS_PATH_MAX;
- 
- 	if (!conffile) {
- 		conffile = XMMS_BUILD_PATH ("xmms2.conf");
-@@ -347,7 +347,7 @@ install_scripts (const gchar *into_dir)
- {
- 	GDir *dir;
- 	GError *err = NULL;
--	gchar pathPATH_MAX;
-+	gchar pathXMMS_PATH_MAX;
- 	const gchar *f;
- 	gchar *s;
- 
-@@ -357,7 +357,7 @@ install_scripts (const gchar *into_dir)
- 
- 	s++;
- 
--	g_snprintf (path, PATH_MAX, "%s/scripts/%s", SHAREDDIR, s);
-+	g_snprintf (path, XMMS_PATH_MAX, "%s/scripts/%s", SHAREDDIR, s);
- 	xmms_log_info ("Installing scripts from %s", path);
- 	dir = g_dir_open (path, 0, &err);
- 	if (!dir) {
---- xmms2-0.7DrNo.orig/src/xmms/utils.c
-+++ xmms2-0.7DrNo/src/xmms/utils.c
-@@ -38,12 +38,12 @@ char *
- xmms_build_path (const char *first, ...)
- {
- 	va_list ap;
--	gchar confdirPATH_MAX;
-+	gchar confdirXMMS_PATH_MAX;
- 	gchar *ret, **vargv, **argv;
- 
- 	g_return_val_if_fail (first, NULL);
- 
--	xmms_userconfdir_get (confdir, PATH_MAX);
-+	xmms_userconfdir_get (confdir, XMMS_PATH_MAX);
- 
- 	va_start (ap, first);
- 	vargv = xmms_valist_to_strlist (first, ap);

xmms2-0.7-rpath.patch Deleted

@@ -1,22 +0,0 @@
-Description: Fix binary-or-shlib-defines-rpath Lintian warning.
-Author: Benjamin Drung <bdrung@ubuntu.com>
-Forwarded: No
-
-Index: debian.git/src/plugins/sid/wscript
-===================================================================
---- debian.git.orig/src/plugins/sid/wscript	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/plugins/sid/wscript	2010-02-20 12:50:08.312900440 +0100
-@@ -14,13 +14,6 @@
-     # extract what's inside builders pkg-config variable
-     builders = conf.check_cfg(package="libsidplay2", args="--variable=builders").strip()
- 
--    # It looks funny that this is LIBPATH_sidplay but it is correct
--    # since we explcitly set the path to builders for resid it will
--    # find resid in the list even though we still need to -rpath it.
--    if not realpath(builders) in realpath(i) for i in conf.env'LIBPATH_sidplay':
--        conf.env'LINKFLAGS_resid' = "-Wl,-rpath=%s" % builders
--        conf.env"LIBPATH_resid" = builders
--
-     if not conf.check_cxx(lib="resid-builder", header_name="sidplay/builders/resid.h", uselib_store="resid", uselib="resid"):
-         return False
-

xmms2-0.7-silent-launcher.patch Deleted

@@ -1,79 +0,0 @@
-Description: This patch makes xmms2-launcher more smart and silent.
- All non error output is now turned off unless you run xmms2-launcher with
- the --verbose switch.
-Bug-Debian: http://bugs.debian.org/510375
-Author: Adam Flott <adam@npjh.com>
-Forwarded: No
-
-Index: debian.git/src/clients/launcher/xmms2-launcher.1
-===================================================================
---- debian.git.orig/src/clients/launcher/xmms2-launcher.1	2010-02-20 12:50:04.522899969 +0100
-+++ debian.git/src/clients/launcher/xmms2-launcher.1	2010-02-20 12:50:11.362899847 +0100
-@@ -51,6 +51,9 @@
- pidfile / 
- .B --pidfile=
- pidfile
-+
-+.B --verbose
-+
- .SH DESCRIPTION
- 
- .B XMMS2
-@@ -88,6 +91,11 @@
- .I pidfile
- .TP
- .I
-+\-\-verbose
-+Increases the vebosity of
-+.I xmms2-launcher
-+.TP
-+.I
- \-? / \-\-help
- Show help options
- .SH FILES
-Index: debian.git/src/clients/launcher/xmms2-launcher.c
-===================================================================
---- debian.git.orig/src/clients/launcher/xmms2-launcher.c	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/clients/launcher/xmms2-launcher.c	2010-02-20 12:50:11.362899847 +0100
-@@ -46,11 +46,13 @@
- 	int pipefd2;
- 	const gchar *logfile = NULL;
- 	const gchar *pidfile = NULL;
-+	static gboolean verbose = FALSE;
- 	GError *error = NULL;
- 	GOptionContext* context = NULL;
- 	GOptionEntry opts = {
- 		{"logfile", 'l', 0, G_OPTION_ARG_FILENAME, &logfile, "Redirect logs to <file>", "<file>"},
- 		{"pidfile", 'P', 0, G_OPTION_ARG_FILENAME, &pidfile, "Save xmms2d pid in <file>", "<file>"},
-+		{"verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "Verbose", NULL},
- 		{NULL}
- 	};
- 
-@@ -76,7 +78,9 @@
- 			g_mkdir_with_parents (cache, 0755);
- 		}
- 	}
--	g_print ("Log output will be stored in %s\n", logfile);
-+	if (verbose) {
-+		g_print ("Log output will be stored in %s\n", logfile);
-+	}
- 
- 	pid = fork ();
- 	if (pid) {
-@@ -92,10 +96,14 @@
- 		if (res == -1)
- 			perror ("read");
- 		if (res == 0) {
--			printf ("startup failed!\n");
-+			if (verbose) {
-+				printf ("startup failed!\n");
-+			}
- 			exit (1);
- 		}
--		printf("xmms2 started\n");
-+		if (verbose) {
-+			printf("xmms2 started\n");
-+		}
- 		exit(0);
- 	}
-

xmms2-0.7-spelling-error.patch Deleted

@@ -1,43 +0,0 @@
-Description: Correct spelling error found by Lintian.
-Author: Benjamin Drung <bdrung@ubuntu.com>
-Forwarded: No
-
-Index: debian.git/src/plugins/mp4/mp4ff/mp4meta.c
-===================================================================
---- debian.git.orig/src/plugins/mp4/mp4ff/mp4meta.c	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/plugins/mp4/mp4ff/mp4meta.c	2010-02-20 12:53:23.254149836 +0100
-@@ -123,7 +123,7 @@
-     "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk",
-     "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
-     "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
--    "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
-+    "New Wave", "Psychedelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
-     "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
-     "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing",
-     "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde",
-Index: debian.git/src/xmms/main.c
-===================================================================
---- debian.git.orig/src/xmms/main.c	2010-02-19 18:43:54.000000000 +0100
-+++ debian.git/src/xmms/main.c	2010-02-20 12:53:23.254149836 +0100
-@@ -254,10 +254,10 @@
- 
- 	plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname);
- 	if (!plugin) {
--		xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull");
-+		xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful");
- 	} else {
- 		if (!xmms_output_plugin_switch (mainobj->output, plugin)) {
--			xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull");
-+			xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful");
- 		}
- 	}
- }
-@@ -564,7 +564,7 @@
- 	o_plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname);
- 	if (!o_plugin) {
- 		xmms_log_error ("Baaaaad output plugin, try to change the"
--		                "output.plugin config variable to something usefull");
-+		                "output.plugin config variable to something useful");
- 	}
- 
- 	mainobj->output = xmms_output_new (o_plugin, playlist);

xmms2-0.7-vorbis-picture-support.patch Deleted

@@ -1,99 +0,0 @@
-Description: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
-Bug-Debian: http://bugs.debian.org/565479
-Author: anomie@users.sourceforge.net
-Forwarded: no
-
-Index: debian.git/src/plugins/vorbis_common/common.c
-===================================================================
---- debian.git.orig/src/plugins/vorbis_common/common.c	2010-02-20 13:02:52.314149734 +0100
-+++ debian.git/src/plugins/vorbis_common/common.c	2010-02-20 13:03:10.212899779 +0100
-@@ -243,6 +243,74 @@
- 	}
- }
- 
-+static void
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+{
-+	guint32 typ, mime_len, desc_len, img_len;
-+	guchar *pos, *end, *mime_data, *img_data;
-+	gchar hash33;
-+
-+	pos = value;
-+	end = value + len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	typ = GUINT32_FROM_BE (*(guint32 *)pos);
-+	if (typ != 0 && typ != 3) {
-+		XMMS_DBG ("Picture type %d not handled", typ);
-+		return;
-+	}
-+	pos += 4;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	mime_data = pos;
-+	pos += mime_len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	pos += desc_len;
-+
-+	pos += 4; /* width */
-+	pos += 4; /* height */
-+	pos += 4; /* depth */
-+	pos += 4; /* indexed palette length */
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	img_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	img_data = pos;
-+
-+	if (img_data + img_len > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+
-+	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+		const gchar *metakey;
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-+		xmms_xform_metadata_set_str (xform, metakey, hash);
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-+		mime_datamime_len = '\0';
-+		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+	}
-+}
-+
- /* note that "key" is NOT NUL-terminated here,
-  * but "value" is.
-  */
-@@ -253,6 +321,14 @@
- {
- 	gint i;
- 
-+	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
-+		gsize dlen;
-+		gchar *dvalue = g_base64_decode (value, &dlen);
-+		handle_image_comment (xform, dvalue, dlen);
-+		g_free (dvalue);
-+		return;
-+	}
-+
- 	for (i = 0; i < G_N_ELEMENTS (properties); i++) {
- 		if ((!g_ascii_strncasecmp (key, "MUSICBRAINZ_ALBUMARTISTID", key_len)) &&
- 		    (!g_ascii_strcasecmp (value, MUSICBRAINZ_VA_ID))) {

xmms2-0.8-add-lib-vorbis-and-ogg.patch Added

@@ -0,0 +1,30 @@
+Index: xmms2-0.8DrO_o/src/clients/vistest/wscript
+===================================================================
+--- xmms2-0.8DrO_o.orig/src/clients/vistest/wscript
++++ xmms2-0.8DrO_o/src/clients/vistest/wscript
+@@ -23,12 +23,12 @@ def build(bld):
+             t.install_path = None
+ 
+ 
+-    if bld.env.LIB_vorbisenc:
++    if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg:
+         t = bld(features = 'c cprogram',
+             target = 'xmms2-ripper',
+             source = 'ripper.c',
+             includes = '. ../../.. ../../include',
+-            uselib = 'vorbisenc',
++            uselib = 'vorbisenc vorbis ogg',
+             use = 'xmmsclient'
+             )
+         if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
+@@ -56,6 +56,10 @@ def configure(conf):
+     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
+             args='--cflags --libs', mandatory=False)
+ 
++    conf.check_cfg(package='vorbis', uselib_store='vorbis', args='--cflags --libs', mandatory=False)
++
++    conf.check_cfg(package='ogg', uselib_store='ogg', args='--cflags --libs', mandatory=False)
++
+     if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
+             args='--cflags --libs', mandatory=False):
+         conf.check_cfg(package='sdl', uselib_store='sdl',

xmms2-0.8-fix-cast-error.patch Added

xmms2-0.8-fixwarnings.patch Added

xmms2-0.8-linker-flags.patch Added

xmms2-0.7-no-O0.patch -> xmms2-0.8-no-O0.patch Changed

@@ -1,59 +1,26 @@
-diff -uNr old-xmms2-0.7DrNo//src/plugins/pulse/wscript xmms2-0.7DrNo/src/plugins/pulse/wscript
---- old-xmms2-0.7DrNo//src/plugins/pulse/wscript	2010-02-19 18:43:54.000000000 +0100
-+++ xmms2-0.7DrNo/src/plugins/pulse/wscript	2010-03-01 23:32:24.033756750 +0100
-@@ -7,4 +7,4 @@
+Index: xmms2-0.8DrO_o/src/plugins/pulse/wscript
+===================================================================
+--- xmms2-0.8DrO_o.orig/src/plugins/pulse/wscript
++++ xmms2-0.8DrO_o/src/plugins/pulse/wscript
+@@ -3,5 +3,5 @@ from waftools.plugin import plugin
+ def plugin_configure(conf):
+     conf.check_cfg(package="libpulse", args="--cflags --libs", uselib_store="pulse")
  
- configure, build = plugin("pulse", configure=plugin_configure,
-                           source="pulse.c", "backend.c",
--                          output_prio=25, libs="pulse")
-+                          output_prio=45, libs="pulse")
-diff -uNr old-xmms2-0.7DrNo//wscript xmms2-0.7DrNo/wscript
---- old-xmms2-0.7DrNo//wscript	2010-02-19 18:43:54.000000000 +0100
-+++ xmms2-0.7DrNo/wscript	2010-03-01 23:33:49.967756992 +0100
-@@ -275,27 +275,27 @@
-         conf.check_message("uncommitted changes", "", bool(changed))
-         conf.env"VERSION" = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+-configure, build = plugin("pulse", configure=plugin_configure, output_prio=25,
++configure, build = plugin("pulse", configure=plugin_configure, output_prio=45,
+         libs="pulse")
+Index: xmms2-0.8DrO_o/wscript
+===================================================================
+--- xmms2-0.8DrO_o.orig/wscript
++++ xmms2-0.8DrO_o/wscript
+@@ -295,8 +295,8 @@ def configure(conf):
+         conf.msg("uncommited changed", changed and "yes" or "no")
+         conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
  
--    conf.env"CCFLAGS" = Utils.to_list(conf.env"CCFLAGS") + '-g', '-O0'
--    for warning in ('all',
--                    'no-format-extra-args',
--                    'no-format-zero-length',
--                    'format-nonliteral',
--                    'format-security',
--                    'format=2',
--                    "missing-prototypes",
--                    "strict-prototypes",
--                    "empty-body",
--                    "ignored-qualifiers",
--                    "type-limits",
--                    "write-strings",
--                    ):
--        warnflag = "-W%s" % warning
--        if conf.check_cc(cflags=warnflag):
--            conf.env"CCFLAGS".append(warnflag)
-+#    conf.env"CCFLAGS" = Utils.to_list(conf.env"CCFLAGS") + '-g', '-O0'
-+#    for warning in ('all',
-+#                    'no-format-extra-args',
-+#                    'no-format-zero-length',
-+#                    'format-nonliteral',
-+#                    'format-security',
-+#                    'format=2',
-+#                    "missing-prototypes",
-+#                    "strict-prototypes",
-+#                    "empty-body",
-+#                    "ignored-qualifiers",
-+#                    "type-limits",
-+#                    "write-strings",
-+#                    ):
-+#        warnflag = "-W%s" % warning
-+#        if conf.check_cc(cflags=warnflag):
-+#            conf.env"CCFLAGS".append(warnflag)
-             # autogenerate uselib definitions to disable warnings
--            conf.env"CCFLAGS_NO%s" % warning.replace("-","").upper() = "-Wno-%s" % warning
-+#            conf.env"CCFLAGS_NO%s" % warning.replace("-","").upper() = "-Wno-%s" % warning
- 
--    conf.env"CXXFLAGS" = Utils.to_list(conf.env"CXXFLAGS") + '-g', '-O0'
-+#    conf.env"CXXFLAGS" = Utils.to_list(conf.env"CXXFLAGS") + '-g', '-O0'
-     conf.env'XMMS_PKGCONF_FILES' = 
-     conf.env'XMMS_OUTPUT_PLUGINS' = (-1, "NONE")
+-    conf.env.append_unique('CFLAGS', '-g', '-O0')
+-    conf.env.append_unique('CXXFLAGS', '-g', '-O0')
++    #conf.env.append_unique('CFLAGS', '-g', '-O0')
++    #conf.env.append_unique('CXXFLAGS', '-g', '-O0')
  
+     if conf.options.with_profiling:
+         conf.env.with_profiling = True

xmms2-0.8-rpath.patch Added

xmms2-0.8-spelling-error.patch Added

xmms2-pkgconfig.patch Changed

xmms2-0.7DrNo.tar.bz2 Deleted

xmms2-0.8DrO_o.tar.bz2 Added

Build Results
RPM Lint

Refresh

Comments for request 296 0

Request History

marguerite created request over 11 years ago

update to 0.8DrO_o. please enable build for all targets. we're smart enough :-)

pbleser accepted request about 12 years ago