Overview

Request 296 (accepted)

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

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

xmms2.changes Changed
x
 
1
@@ -1,4 +1,17 @@
2
 -------------------------------------------------------------------
3
+Sun Oct 14 19:03:00 UTC 2012 - i@margueirte.su
4
+
5
+- update to 0.8.0
6
+- remove no-return patch, upstream fixed.
7
+- remove vorbis-picture-support.patch, upstream implemented.
8
+- remove silent-launcher.patch, upstream implemented.
9
+- remove remove-path_max.patch, upstream fixed.
10
+- remove fix-typo.patch, upstream fixed.
11
+- remove escape-minus-signes.patch, upstream fixed.
12
+- remove cli-output-verbosity.patch, upstream code changed. 
13
+- new subpackage plugin-sndfile.
14
+
15
+-------------------------------------------------------------------
16
 Wed Feb 23 18:54:10 UTC 2011 - pascal.bleser@opensuse.org
17
 
18
 - remove cunit support, would be an annoying dependency in our repository
19
xmms2.spec Changed
1515
 
1
@@ -13,7 +13,7 @@
2
 # license that conforms to the Open Source Definition (Version 1.9)
3
 # published by the Open Source Initiative.
4
 
5
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
6
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
7
 #
8
 
9
 %if 0%{?suse_version} >= 1120
10
@@ -28,93 +28,126 @@
11
 %bcond_with    gme
12
 %endif
13
 
14
-%define codename DrNo
15
+%define codename DrO_o
16
 
17
-%define _ruby_sitedir %(ruby -rrbconfig -e 'puts Config::CONFIG"sitelibdir"')
18
+%define _ruby_sitedir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG"sitelibdir"')
19
 
20
-%{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
21
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
22
+%{!?python_sitelib:  %global python_sitelib  %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
23
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
24
 
25
 Name:           xmms2
26
-Summary:        A modular audio framework and plugin architecture
27
-Version:        0.7
28
-Release:        13
29
+Version:        0.8
30
+Release:        0
31
 # TODO: Make sure to update the verison number in xmms2-pkgconfig.patch.
32
-License:        LGPLv2+ and GPLv2+ and BSD
33
+License:        LGPL-2.0+ and GPL-2.0+ and BSD-3-Clause
34
+Summary:        A modular audio framework and plugin architecture
35
 Group:          Productivity/Multimedia/Sound/Players
36
 Source0:        http://prdownloads.sourceforge.net/xmms2/xmms2-%{version}%{codename}.tar.bz2
37
 Source1:        xmms2-client-launcher.sh
38
 Source2:        README.SuSE
39
-Source3:        %name-ripper.1
40
+Source3:        %{name}-ripper.1
41
 # Don't add extra CFLAGS, we're smart enough, thanks.
42
-Patch0:         %name-0.7-no-O0.patch
43
-Patch1:         %name-0.7-no-return.patch
44
-Patch2:         %name-0.7-cli-output-verbosity.patch
45
-Patch3:         %name-0.7-escape-minus-signes.patch
46
-Patch4:         %name-0.7-rpath.patch
47
-Patch5:         %name-0.7-silent-launcher.patch
48
-Patch6:         %name-0.7-spelling-error.patch
49
-Patch7:         %name-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch
50
-Patch8:         %name-0.7-vorbis-picture-support.patch
51
-Patch9:         %name-0.7-linker-flags.patch
52
-Patch10:        %name-0.7-fix-cast-error.patch
53
-Patch11:        %name-0.7-remove-path_max.patch
54
-# PATCH-FIX-UPSTREAM xmms2-pkgconfig.patch dimstar@opensuse.org -- pkg-config Version field contains illegal characters.
55
+Patch0:         %{name}-0.8-no-O0.patch
56
+# Remove rpath in sid plugin
57
+Patch4:         %{name}-0.8-rpath.patch
58
+Patch6:         %{name}-0.8-spelling-error.patch
59
+
60
+# Add -as-needed flag
61
+Patch9:         %{name}-0.8-linker-flags.patch
62
+Patch10:        %{name}-0.8-fix-cast-error.patch
63
 Patch13:        xmms2-pkgconfig.patch
64
-Patch14:        %name-0.7-fixwarnings.patch
65
-%if %suse_version > 1140
66
-Patch15:        %name-0.7-add-lib-vorbis.patch
67
+Patch14:        %{name}-0.8-fixwarnings.patch
68
+%if 0%{?suse_version} > 1140
69
+# Add vorbis and ogg to build env
70
+Patch15:        %{name}-0.8-add-lib-vorbis-and-ogg.patch
71
 %endif
72
-Url:            http://wiki.xmms2.xmms.se/
73
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
74
-Requires:       %name-plugin-base
75
-BuildRequires:  flac-devel libofa-devel libvorbis-devel speex-devel sqlite-devel
76
-BuildRequires:  libcdio-devel libdiscid-devel libsmbclient-devel wavpack-devel
77
-BuildRequires:  gnome-vfs2-devel jack-audio-connection-kit-devel libmpcdec-devel
78
-BuildRequires:  alsa-lib-devel fftw3-devel libsamplerate-devel libxml2-devel
79
-BuildRequires:  libao-devel libcurl-devel libshout-devel pyrex ruby ruby-devel
80
-BuildRequires:  boost-devel libavahi-glib-devel libpulse-devel perl python-devel
81
-BuildRequires:  avahi-compat-mDNSResponder-devel doxygen libmodplug-devel
82
-BuildRequires:  autoconf automake fdupes gcc gcc-c++ libogg-devel libopenssl-devel make
83
-BuildRequires:  mad-devel
84
+Url:            http://xmms2.org
85
+BuildRequires:  SDL-devel
86
+BuildRequires:  alsa-lib-devel
87
+BuildRequires:  autoconf
88
+BuildRequires:  automake
89
+BuildRequires:  avahi-compat-mDNSResponder-devel
90
+BuildRequires:  boost-devel
91
+BuildRequires:  doxygen
92
+BuildRequires:  fdupes
93
+BuildRequires:  fftw3-devel
94
+BuildRequires:  flac-devel
95
+BuildRequires:  gcc
96
+BuildRequires:  gcc-c++
97
+BuildRequires:  gnome-vfs2-devel
98
+BuildRequires:  jack-audio-connection-kit-devel
99
+BuildRequires:  libao-devel
100
+BuildRequires:  libavahi-glib-devel
101
+BuildRequires:  libcdio-devel
102
+%if 0%{?suse_version} >= 1220
103
+# for libcdio_cdda1
104
+BuildRequires:  libcdio-paranoia-devel
105
+%endif
106
+BuildRequires:  libcurl-devel
107
+BuildRequires:  libdiscid-devel
108
 BuildRequires:  libffmpeg_oldabi-devel
109
-BuildRequires:  SDL-devel libvisual-devel readline-devel
110
+BuildRequires:  libmodplug-devel
111
+BuildRequires:  libmpcdec-devel
112
+BuildRequires:  libofa-devel
113
+BuildRequires:  libogg-devel
114
+BuildRequires:  libopenssl-devel
115
+BuildRequires:  libpulse-devel
116
+BuildRequires:  libsamplerate-devel
117
+BuildRequires:  libshout-devel
118
+BuildRequires:  libsmbclient-devel
119
+BuildRequires: libsndfile-devel
120
+BuildRequires:  libvisual-devel
121
+BuildRequires:  libvorbis-devel
122
+BuildRequires:  mad-devel
123
+BuildRequires:  make
124
+BuildRequires:  perl
125
+BuildRequires:  pyrex
126
+BuildRequires:  python-devel
127
+BuildRequires:  readline-devel
128
+BuildRequires:  ruby
129
+BuildRequires:  ruby-devel
130
+BuildRequires:  speex-devel
131
+BuildRequires:  sqlite-devel
132
+BuildRequires:  wavpack-devel
133
+BuildRequires:  pkgconfig(libxml-2.0)
134
+Requires:       %{name}-plugin-base
135
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
136
 %ifarch %ix86 x86_64 ppc ppc64
137
 BuildRequires:  valgrind-devel
138
 %endif
139
 
140
 %if %{with libsidplay}
141
-%if %suse_version >= 1120
142
+%if 0%{?suse_version} >= 1120
143
 BuildRequires:  sidplay-libs-devel >= 2.0
144
 %else
145
 BuildRequires:  libsidplay-devel >= 2.0
146
 %endif
147
 %endif
148
 
149
-%if %suse_version >= 1120
150
+%if 0%{?suse_version} >= 1120
151
 %if %{with gme}
152
 BuildRequires:  libgme-devel
153
 %endif
154
 %endif
155
 
156
 %if %{with restricted}
157
-BuildRequires:  libfaad-devel libmms-devel libmpg123-devel
158
+BuildRequires:  libfaad-devel
159
+BuildRequires:  libmms-devel
160
+BuildRequires:  libmpg123-devel
161
 %endif
162
 
163
 %description
164
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
165
-will not play videos. It has a modular framework and plugin architecture for 
166
-audio processing, visualisation and output, but this framework has not been 
167
-designed to support video. Also the client-server design of XMMS2 (and the 
168
-daemon being independent of any graphics output) practically prevents direct 
169
-video output being implemented. It has support for a wide range of audio 
170
-formats, which is expandable via plugins. It includes a basic CLI interface 
171
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
172
+XMMS2 is an audio framework, but it is not a general multimedia player - it
173
+will not play videos. It has a modular framework and plugin architecture for
174
+audio processing, visualisation and output, but this framework has not been
175
+designed to support video. Also the client-server design of XMMS2 (and the
176
+daemon being independent of any graphics output) practically prevents direct
177
+video output being implemented. It has support for a wide range of audio
178
+formats, which is expandable via plugins. It includes a basic CLI interface
179
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
180
 client (such as gxmms2 or esperanza).
181
 
182
-
183
 %package -n libxmmsclient++-glib1
184
-License:        LGPLv2+ and GPLv2+ and BSD
185
 Summary:        Glib c++ client library for %{name}
186
 Group:          Productivity/Multimedia/Sound/Players
187
 
188
@@ -122,7 +155,6 @@
189
 A simple glib c++ client library for XMMS2
190
 
191
 %package -n libxmmsclient++4
192
-License:        LGPLv2+ and GPLv2+ and BSD
193
 Summary:        C++ client library for  %{name}
194
 Group:          Productivity/Multimedia/Sound/Players
195
 
196
@@ -130,7 +162,6 @@
197
 A simple C++ client library for XMMS2
198
 
199
 %package -n libxmmsclient-glib1
200
-License:        LGPLv2+ and GPLv2+ and BSD
201
 Summary:        Glib client library for  %{name}
202
 Group:          Productivity/Multimedia/Sound/Players
203
 
204
@@ -138,7 +169,6 @@
205
 A simple Glib client library for XMMS2
206
 
207
 %package -n libxmmsclient6
208
-License:        LGPLv2+ and GPLv2+ and BSD
209
 Summary:        Client library for  %{name}
210
 Group:          Productivity/Multimedia/Sound/Players
211
 
212
@@ -146,24 +176,22 @@
213
 A simple client library for XMMS2
214
 
215
 %package devel
216
-License:        LGPLv2+ and GPLv2+ and BSD
217
 Summary:        Development libraries and headers for XMMS2
218
 Group:          Development/Libraries/C and C++
219
-Requires:       glib2-devel
220
+Requires:       %{name} = %{version}
221
 Requires:       boost-devel
222
-Requires:       pkgconfig
223
-Requires:       libxmmsclient6
224
-Requires:       libxmmsclient-glib1
225
-Requires:       libxmmsclient++4
226
 Requires:       libxmmsclient++-glib1
227
-Requires:       %{name} = %{version}
228
+Requires:       libxmmsclient++4
229
+Requires:       libxmmsclient-glib1
230
+Requires:       libxmmsclient6
231
+Requires:       pkgconfig
232
+Requires:       pkgconfig(glib-2.0)
233
 
234
 %description devel
235
 Development libraries and headers for XMMS2. You probably need this to develop
236
 or build new plugins for XMMS2.
237
 
238
 %package docs
239
-License:        LGPLv2+ and GPLv2+ and BSD
240
 Summary:        Development documentation for XMMS2
241
 Group:          Documentation/Other
242
 Requires:       %{name} = %{version}
243
@@ -172,7 +200,6 @@
244
 API documentation for the XMMS2 modular audio framework architecture.
245
 
246
 %package -n python-xmms2
247
-License:        LGPLv2+ and GPLv2+ and BSD
248
 Summary:        Python support for XMMS2
249
 Group:          System/Libraries
250
 Requires:       %{name} = %{version}
251
@@ -182,8 +209,8 @@
252
 Python bindings for XMMS2.
253
 
254
 %package perl
255
+License:        GPL-2.0+ or Artistic-1.0
256
 Summary:        Perl support for XMMS2
257
-License:        GPL+ or Artistic
258
 Group:          System/Libraries
259
 Requires:       %{name} = %{version}
260
 Requires:       perl-base
261
@@ -192,7 +219,7 @@
262
 Perl bindings for XMMS2.
263
 
264
 %package ruby
265
-License:        GPL+ or Artistic
266
+License:        GPL-2.0+ or Artistic-1.0
267
 Summary:        Ruby support for XMMS2
268
 Group:          System/Libraries
269
 Requires:       %{name} = %{version}
270
@@ -201,250 +228,249 @@
271
 %description ruby
272
 Ruby bindings for XMMS2.
273
 
274
-
275
 %package plugin-base
276
-License:        GPL+ or Artistic
277
+License:        GPL-2.0+ or Artistic-1.0
278
 Summary:        Base plugins for %{name}
279
 Group:          Productivity/Multimedia/Sound/Players
280
 Requires:       %{name} = %{version}
281
 
282
 %description plugin-base
283
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
284
-will not play videos. It has a modular framework and plugin architecture for 
285
-audio processing, visualisation and output, but this framework has not been 
286
-designed to support video. Also the client-server design of XMMS2 (and the 
287
-daemon being independent of any graphics output) practically prevents direct 
288
-video output being implemented. It has support for a wide range of audio 
289
-formats, which is expandable via plugins. It includes a basic CLI interface 
290
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
291
+XMMS2 is an audio framework, but it is not a general multimedia player - it
292
+will not play videos. It has a modular framework and plugin architecture for
293
+audio processing, visualisation and output, but this framework has not been
294
+designed to support video. Also the client-server design of XMMS2 (and the
295
+daemon being independent of any graphics output) practically prevents direct
296
+video output being implemented. It has support for a wide range of audio
297
+formats, which is expandable via plugins. It includes a basic CLI interface
298
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
299
 client (such as gxmms2 or esperanza).
300
 
301
 %package plugin-airplay
302
-License:        GPL+ or Artistic
303
+License:        GPL-2.0+ or Artistic-1.0
304
 Summary:        Airplay Support for %{name}
305
 Group:          Productivity/Multimedia/Sound/Players
306
 Requires:       %{name} = %{version}
307
 
308
 %description plugin-airplay
309
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
310
-will not play videos. It has a modular framework and plugin architecture for 
311
-audio processing, visualisation and output, but this framework has not been 
312
-designed to support video. Also the client-server design of XMMS2 (and the 
313
-daemon being independent of any graphics output) practically prevents direct 
314
-video output being implemented. It has support for a wide range of audio 
315
-formats, which is expandable via plugins. It includes a basic CLI interface 
316
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
317
+XMMS2 is an audio framework, but it is not a general multimedia player - it
318
+will not play videos. It has a modular framework and plugin architecture for
319
+audio processing, visualisation and output, but this framework has not been
320
+designed to support video. Also the client-server design of XMMS2 (and the
321
+daemon being independent of any graphics output) practically prevents direct
322
+video output being implemented. It has support for a wide range of audio
323
+formats, which is expandable via plugins. It includes a basic CLI interface
324
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
325
 client (such as gxmms2 or esperanza).
326
 
327
 %package plugin-ao
328
-License:        GPL+ or Artistic
329
+License:        GPL-2.0+ or Artistic-1.0
330
 Summary:        Ao Support for %{name}
331
 Group:          Productivity/Multimedia/Sound/Players
332
 Requires:       %{name} = %{version}
333
 
334
 %description plugin-ao
335
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
336
-will not play videos. It has a modular framework and plugin architecture for 
337
-audio processing, visualisation and output, but this framework has not been 
338
-designed to support video. Also the client-server design of XMMS2 (and the 
339
-daemon being independent of any graphics output) practically prevents direct 
340
-video output being implemented. It has support for a wide range of audio 
341
-formats, which is expandable via plugins. It includes a basic CLI interface 
342
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
343
+XMMS2 is an audio framework, but it is not a general multimedia player - it
344
+will not play videos. It has a modular framework and plugin architecture for
345
+audio processing, visualisation and output, but this framework has not been
346
+designed to support video. Also the client-server design of XMMS2 (and the
347
+daemon being independent of any graphics output) practically prevents direct
348
+video output being implemented. It has support for a wide range of audio
349
+formats, which is expandable via plugins. It includes a basic CLI interface
350
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
351
 client (such as gxmms2 or esperanza).
352
 
353
 %package plugin-apefile
354
-License:        GPL+ or Artistic
355
+License:        GPL-2.0+ or Artistic-1.0
356
 Summary:        Apefile Support for %{name}
357
 Group:          Productivity/Multimedia/Sound/Players
358
 Requires:       %{name} = %{version}
359
 
360
 %description plugin-apefile
361
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
362
-will not play videos. It has a modular framework and plugin architecture for 
363
-audio processing, visualisation and output, but this framework has not been 
364
-designed to support video. Also the client-server design of XMMS2 (and the 
365
-daemon being independent of any graphics output) practically prevents direct 
366
-video output being implemented. It has support for a wide range of audio 
367
-formats, which is expandable via plugins. It includes a basic CLI interface 
368
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
369
+XMMS2 is an audio framework, but it is not a general multimedia player - it
370
+will not play videos. It has a modular framework and plugin architecture for
371
+audio processing, visualisation and output, but this framework has not been
372
+designed to support video. Also the client-server design of XMMS2 (and the
373
+daemon being independent of any graphics output) practically prevents direct
374
+video output being implemented. It has support for a wide range of audio
375
+formats, which is expandable via plugins. It includes a basic CLI interface
376
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
377
 client (such as gxmms2 or esperanza).
378
 
379
 %package plugin-asf
380
-License:        GPL+ or Artistic
381
+License:        GPL-2.0+ or Artistic-1.0
382
 Summary:        Asf Support for %{name}
383
 Group:          Productivity/Multimedia/Sound/Players
384
 Requires:       %{name} = %{version}
385
 
386
 %description plugin-asf
387
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
388
-will not play videos. It has a modular framework and plugin architecture for 
389
-audio processing, visualisation and output, but this framework has not been 
390
-designed to support video. Also the client-server design of XMMS2 (and the 
391
-daemon being independent of any graphics output) practically prevents direct 
392
-video output being implemented. It has support for a wide range of audio 
393
-formats, which is expandable via plugins. It includes a basic CLI interface 
394
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
395
+XMMS2 is an audio framework, but it is not a general multimedia player - it
396
+will not play videos. It has a modular framework and plugin architecture for
397
+audio processing, visualisation and output, but this framework has not been
398
+designed to support video. Also the client-server design of XMMS2 (and the
399
+daemon being independent of any graphics output) practically prevents direct
400
+video output being implemented. It has support for a wide range of audio
401
+formats, which is expandable via plugins. It includes a basic CLI interface
402
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
403
 client (such as gxmms2 or esperanza).
404
 
405
 %package plugin-asx
406
-License:        GPL+ or Artistic
407
+License:        GPL-2.0+ or Artistic-1.0
408
 Summary:        Asx Support for %{name}
409
 Group:          Productivity/Multimedia/Sound/Players
410
 Requires:       %{name} = %{version}
411
 
412
 %description plugin-asx
413
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
414
-will not play videos. It has a modular framework and plugin architecture for 
415
-audio processing, visualisation and output, but this framework has not been 
416
-designed to support video. Also the client-server design of XMMS2 (and the 
417
-daemon being independent of any graphics output) practically prevents direct 
418
-video output being implemented. It has support for a wide range of audio 
419
-formats, which is expandable via plugins. It includes a basic CLI interface 
420
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
421
+XMMS2 is an audio framework, but it is not a general multimedia player - it
422
+will not play videos. It has a modular framework and plugin architecture for
423
+audio processing, visualisation and output, but this framework has not been
424
+designed to support video. Also the client-server design of XMMS2 (and the
425
+daemon being independent of any graphics output) practically prevents direct
426
+video output being implemented. It has support for a wide range of audio
427
+formats, which is expandable via plugins. It includes a basic CLI interface
428
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
429
 client (such as gxmms2 or esperanza).
430
 
431
 %package plugin-cdda
432
-License:        GPL+ or Artistic
433
+License:        GPL-2.0+ or Artistic-1.0
434
 Summary:        Cdda Support for %{name}
435
 Group:          Productivity/Multimedia/Sound/Players
436
 Requires:       %{name} = %{version}
437
 
438
 %description plugin-cdda
439
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
440
-will not play videos. It has a modular framework and plugin architecture for 
441
-audio processing, visualisation and output, but this framework has not been 
442
-designed to support video. Also the client-server design of XMMS2 (and the 
443
-daemon being independent of any graphics output) practically prevents direct 
444
-video output being implemented. It has support for a wide range of audio 
445
-formats, which is expandable via plugins. It includes a basic CLI interface 
446
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
447
+XMMS2 is an audio framework, but it is not a general multimedia player - it
448
+will not play videos. It has a modular framework and plugin architecture for
449
+audio processing, visualisation and output, but this framework has not been
450
+designed to support video. Also the client-server design of XMMS2 (and the
451
+daemon being independent of any graphics output) practically prevents direct
452
+video output being implemented. It has support for a wide range of audio
453
+formats, which is expandable via plugins. It includes a basic CLI interface
454
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
455
 client (such as gxmms2 or esperanza).
456
 
457
 %package plugin-cue
458
-License:        GPL+ or Artistic
459
+License:        GPL-2.0+ or Artistic-1.0
460
 Summary:        Cue Support for %{name}
461
 Group:          Productivity/Multimedia/Sound/Players
462
 Requires:       %{name} = %{version}
463
 
464
 %description plugin-cue
465
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
466
-will not play videos. It has a modular framework and plugin architecture for 
467
-audio processing, visualisation and output, but this framework has not been 
468
-designed to support video. Also the client-server design of XMMS2 (and the 
469
-daemon being independent of any graphics output) practically prevents direct 
470
-video output being implemented. It has support for a wide range of audio 
471
-formats, which is expandable via plugins. It includes a basic CLI interface 
472
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
473
+XMMS2 is an audio framework, but it is not a general multimedia player - it
474
+will not play videos. It has a modular framework and plugin architecture for
475
+audio processing, visualisation and output, but this framework has not been
476
+designed to support video. Also the client-server design of XMMS2 (and the
477
+daemon being independent of any graphics output) practically prevents direct
478
+video output being implemented. It has support for a wide range of audio
479
+formats, which is expandable via plugins. It includes a basic CLI interface
480
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
481
 client (such as gxmms2 or esperanza).
482
 
483
 %package plugin-curl
484
-License:        GPL+ or Artistic
485
+License:        GPL-2.0+ or Artistic-1.0
486
 Summary:        Curl Support for %{name}
487
 Group:          Productivity/Multimedia/Sound/Players
488
 Requires:       %{name} = %{version}
489
 
490
 %description plugin-curl
491
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
492
-will not play videos. It has a modular framework and plugin architecture for 
493
-audio processing, visualisation and output, but this framework has not been 
494
-designed to support video. Also the client-server design of XMMS2 (and the 
495
-daemon being independent of any graphics output) practically prevents direct 
496
-video output being implemented. It has support for a wide range of audio 
497
-formats, which is expandable via plugins. It includes a basic CLI interface 
498
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
499
+XMMS2 is an audio framework, but it is not a general multimedia player - it
500
+will not play videos. It has a modular framework and plugin architecture for
501
+audio processing, visualisation and output, but this framework has not been
502
+designed to support video. Also the client-server design of XMMS2 (and the
503
+daemon being independent of any graphics output) practically prevents direct
504
+video output being implemented. It has support for a wide range of audio
505
+formats, which is expandable via plugins. It includes a basic CLI interface
506
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
507
 client (such as gxmms2 or esperanza).
508
 
509
 %package plugin-daap
510
-License:        GPL+ or Artistic
511
+License:        GPL-2.0+ or Artistic-1.0
512
 Summary:        Daap Support for %{name}
513
 Group:          Productivity/Multimedia/Sound/Players
514
 Requires:       %{name} = %{version}
515
 
516
-%description plugin-daap 
517
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
518
-will not play videos. It has a modular framework and plugin architecture for 
519
-audio processing, visualisation and output, but this framework has not been 
520
-designed to support video. Also the client-server design of XMMS2 (and the 
521
-daemon being independent of any graphics output) practically prevents direct 
522
-video output being implemented. It has support for a wide range of audio 
523
-formats, which is expandable via plugins. It includes a basic CLI interface 
524
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
525
+%description plugin-daap
526
+XMMS2 is an audio framework, but it is not a general multimedia player - it
527
+will not play videos. It has a modular framework and plugin architecture for
528
+audio processing, visualisation and output, but this framework has not been
529
+designed to support video. Also the client-server design of XMMS2 (and the
530
+daemon being independent of any graphics output) practically prevents direct
531
+video output being implemented. It has support for a wide range of audio
532
+formats, which is expandable via plugins. It includes a basic CLI interface
533
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
534
 client (such as gxmms2 or esperanza).
535
 
536
 %package plugin-ffmpeg
537
-License:        GPL+ or Artistic
538
+License:        GPL-2.0+ or Artistic-1.0
539
 Summary:        FFmpeg Support for %{name}
540
 Group:          Productivity/Multimedia/Sound/Players
541
 Requires:       %{name} = %{version}
542
 
543
 %description plugin-ffmpeg
544
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
545
-will not play videos. It has a modular framework and plugin architecture for 
546
-audio processing, visualisation and output, but this framework has not been 
547
-designed to support video. Also the client-server design of XMMS2 (and the 
548
-daemon being independent of any graphics output) practically prevents direct 
549
-video output being implemented. It has support for a wide range of audio 
550
-formats, which is expandable via plugins. It includes a basic CLI interface 
551
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
552
+XMMS2 is an audio framework, but it is not a general multimedia player - it
553
+will not play videos. It has a modular framework and plugin architecture for
554
+audio processing, visualisation and output, but this framework has not been
555
+designed to support video. Also the client-server design of XMMS2 (and the
556
+daemon being independent of any graphics output) practically prevents direct
557
+video output being implemented. It has support for a wide range of audio
558
+formats, which is expandable via plugins. It includes a basic CLI interface
559
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
560
 client (such as gxmms2 or esperanza).
561
 
562
 %package plugin-flac
563
-License:        GPL+ or Artistic
564
+License:        GPL-2.0+ or Artistic-1.0
565
 Summary:        Flac Support for %{name}
566
 Group:          Productivity/Multimedia/Sound/Players
567
 Requires:       %{name} = %{version}
568
 
569
 %description plugin-flac
570
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
571
-will not play videos. It has a modular framework and plugin architecture for 
572
-audio processing, visualisation and output, but this framework has not been 
573
-designed to support video. Also the client-server design of XMMS2 (and the 
574
-daemon being independent of any graphics output) practically prevents direct 
575
-video output being implemented. It has support for a wide range of audio 
576
-formats, which is expandable via plugins. It includes a basic CLI interface 
577
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
578
+XMMS2 is an audio framework, but it is not a general multimedia player - it
579
+will not play videos. It has a modular framework and plugin architecture for
580
+audio processing, visualisation and output, but this framework has not been
581
+designed to support video. Also the client-server design of XMMS2 (and the
582
+daemon being independent of any graphics output) practically prevents direct
583
+video output being implemented. It has support for a wide range of audio
584
+formats, which is expandable via plugins. It includes a basic CLI interface
585
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
586
 client (such as gxmms2 or esperanza).
587
 
588
 %package plugin-flv
589
-License:        GPL+ or Artistic
590
+License:        GPL-2.0+ or Artistic-1.0
591
 Summary:        Flv Support for %{name}
592
 Group:          Productivity/Multimedia/Sound/Players
593
 Requires:       %{name} = %{version}
594
 
595
 %description plugin-flv
596
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
597
-will not play videos. It has a modular framework and plugin architecture for 
598
-audio processing, visualisation and output, but this framework has not been 
599
-designed to support video. Also the client-server design of XMMS2 (and the 
600
-daemon being independent of any graphics output) practically prevents direct 
601
-video output being implemented. It has support for a wide range of audio 
602
-formats, which is expandable via plugins. It includes a basic CLI interface 
603
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
604
+XMMS2 is an audio framework, but it is not a general multimedia player - it
605
+will not play videos. It has a modular framework and plugin architecture for
606
+audio processing, visualisation and output, but this framework has not been
607
+designed to support video. Also the client-server design of XMMS2 (and the
608
+daemon being independent of any graphics output) practically prevents direct
609
+video output being implemented. It has support for a wide range of audio
610
+formats, which is expandable via plugins. It includes a basic CLI interface
611
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
612
 client (such as gxmms2 or esperanza).
613
 
614
 %package plugin-gvfs
615
-License:        GPL+ or Artistic
616
+License:        GPL-2.0+ or Artistic-1.0
617
 Summary:        Gvfs Support for %{name}
618
 Group:          Productivity/Multimedia/Sound/Players
619
 Requires:       %{name} = %{version}
620
 
621
-%description plugin-gvfs 
622
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
623
-will not play videos. It has a modular framework and plugin architecture for 
624
-audio processing, visualisation and output, but this framework has not been 
625
-designed to support video. Also the client-server design of XMMS2 (and the 
626
-daemon being independent of any graphics output) practically prevents direct 
627
-video output being implemented. It has support for a wide range of audio 
628
-formats, which is expandable via plugins. It includes a basic CLI interface 
629
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
630
+%description plugin-gvfs
631
+XMMS2 is an audio framework, but it is not a general multimedia player - it
632
+will not play videos. It has a modular framework and plugin architecture for
633
+audio processing, visualisation and output, but this framework has not been
634
+designed to support video. Also the client-server design of XMMS2 (and the
635
+daemon being independent of any graphics output) practically prevents direct
636
+video output being implemented. It has support for a wide range of audio
637
+formats, which is expandable via plugins. It includes a basic CLI interface
638
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
639
 client (such as gxmms2 or esperanza).
640
 
641
-%if %suse_version >= 1120
642
+%if 0%{?suse_version} >= 1120
643
 %if %{with gme}
644
 
645
 %package plugin-gme
646
-License:        GPL+ or Artistic
647
+License:        GPL-2.0+ or Artistic-1.0
648
 Summary:        Gme Support for %{name}
649
 Group:          Productivity/Multimedia/Sound/Players
650
 Requires:       %{name} = %{version}
651
@@ -463,109 +489,109 @@
652
 %endif
653
 
654
 %package plugin-html
655
-License:        GPL+ or Artistic
656
+License:        GPL-2.0+ or Artistic-1.0
657
 Summary:        Html Support for %{name}
658
 Group:          Productivity/Multimedia/Sound/Players
659
 Requires:       %{name} = %{version}
660
 
661
 %description plugin-html
662
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
663
-will not play videos. It has a modular framework and plugin architecture for 
664
-audio processing, visualisation and output, but this framework has not been 
665
-designed to support video. Also the client-server design of XMMS2 (and the 
666
-daemon being independent of any graphics output) practically prevents direct 
667
-video output being implemented. It has support for a wide range of audio 
668
-formats, which is expandable via plugins. It includes a basic CLI interface 
669
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
670
+XMMS2 is an audio framework, but it is not a general multimedia player - it
671
+will not play videos. It has a modular framework and plugin architecture for
672
+audio processing, visualisation and output, but this framework has not been
673
+designed to support video. Also the client-server design of XMMS2 (and the
674
+daemon being independent of any graphics output) practically prevents direct
675
+video output being implemented. It has support for a wide range of audio
676
+formats, which is expandable via plugins. It includes a basic CLI interface
677
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
678
 client (such as gxmms2 or esperanza).
679
 
680
 %package plugin-ices
681
-License:        GPL+ or Artistic
682
+License:        GPL-2.0+ or Artistic-1.0
683
 Summary:        Ices Support for %{name}
684
 Group:          Productivity/Multimedia/Sound/Players
685
 Requires:       %{name} = %{version}
686
 
687
 %description plugin-ices
688
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
689
-will not play videos. It has a modular framework and plugin architecture for 
690
-audio processing, visualisation and output, but this framework has not been 
691
-designed to support video. Also the client-server design of XMMS2 (and the 
692
-daemon being independent of any graphics output) practically prevents direct 
693
-video output being implemented. It has support for a wide range of audio 
694
-formats, which is expandable via plugins. It includes a basic CLI interface 
695
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
696
+XMMS2 is an audio framework, but it is not a general multimedia player - it
697
+will not play videos. It has a modular framework and plugin architecture for
698
+audio processing, visualisation and output, but this framework has not been
699
+designed to support video. Also the client-server design of XMMS2 (and the
700
+daemon being independent of any graphics output) practically prevents direct
701
+video output being implemented. It has support for a wide range of audio
702
+formats, which is expandable via plugins. It includes a basic CLI interface
703
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
704
 client (such as gxmms2 or esperanza).
705
 
706
 %package plugin-icymetaint
707
-License:        GPL+ or Artistic
708
+License:        GPL-2.0+ or Artistic-1.0
709
 Summary:        SDL Support for %{name}
710
 Group:          Productivity/Multimedia/Sound/Players
711
 Requires:       %{name} = %{version}
712
 
713
 %description plugin-icymetaint
714
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
715
-will not play videos. It has a modular framework and plugin architecture for 
716
-audio processing, visualisation and output, but this framework has not been 
717
-designed to support video. Also the client-server design of XMMS2 (and the 
718
-daemon being independent of any graphics output) practically prevents direct 
719
-video output being implemented. It has support for a wide range of audio 
720
-formats, which is expandable via plugins. It includes a basic CLI interface 
721
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
722
+XMMS2 is an audio framework, but it is not a general multimedia player - it
723
+will not play videos. It has a modular framework and plugin architecture for
724
+audio processing, visualisation and output, but this framework has not been
725
+designed to support video. Also the client-server design of XMMS2 (and the
726
+daemon being independent of any graphics output) practically prevents direct
727
+video output being implemented. It has support for a wide range of audio
728
+formats, which is expandable via plugins. It includes a basic CLI interface
729
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
730
 client (such as gxmms2 or esperanza).
731
 
732
 %package plugin-id3v2
733
-License:        GPL+ or Artistic
734
+License:        GPL-2.0+ or Artistic-1.0
735
 Summary:        Id3v2 Support for %{name}
736
 Group:          Productivity/Multimedia/Sound/Players
737
 Requires:       %{name} = %{version}
738
 
739
 %description plugin-id3v2
740
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
741
-will not play videos. It has a modular framework and plugin architecture for 
742
-audio processing, visualisation and output, but this framework has not been 
743
-designed to support video. Also the client-server design of XMMS2 (and the 
744
-daemon being independent of any graphics output) practically prevents direct 
745
-video output being implemented. It has support for a wide range of audio 
746
-formats, which is expandable via plugins. It includes a basic CLI interface 
747
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
748
+XMMS2 is an audio framework, but it is not a general multimedia player - it
749
+will not play videos. It has a modular framework and plugin architecture for
750
+audio processing, visualisation and output, but this framework has not been
751
+designed to support video. Also the client-server design of XMMS2 (and the
752
+daemon being independent of any graphics output) practically prevents direct
753
+video output being implemented. It has support for a wide range of audio
754
+formats, which is expandable via plugins. It includes a basic CLI interface
755
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
756
 client (such as gxmms2 or esperanza).
757
 
758
 %package plugin-jack
759
-License:        GPL+ or Artistic
760
+License:        GPL-2.0+ or Artistic-1.0
761
 Summary:        Jack Support for %{name}
762
 Group:          Productivity/Multimedia/Sound/Players
763
 Requires:       %{name} = %{version}
764
 
765
 %description plugin-jack
766
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
767
-will not play videos. It has a modular framework and plugin architecture for 
768
-audio processing, visualisation and output, but this framework has not been 
769
-designed to support video. Also the client-server design of XMMS2 (and the 
770
-daemon being independent of any graphics output) practically prevents direct 
771
-video output being implemented. It has support for a wide range of audio 
772
-formats, which is expandable via plugins. It includes a basic CLI interface 
773
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
774
+XMMS2 is an audio framework, but it is not a general multimedia player - it
775
+will not play videos. It has a modular framework and plugin architecture for
776
+audio processing, visualisation and output, but this framework has not been
777
+designed to support video. Also the client-server design of XMMS2 (and the
778
+daemon being independent of any graphics output) practically prevents direct
779
+video output being implemented. It has support for a wide range of audio
780
+formats, which is expandable via plugins. It includes a basic CLI interface
781
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
782
 client (such as gxmms2 or esperanza).
783
 
784
 %package plugin-karaoke
785
-License:        GPL+ or Artistic
786
+License:        GPL-2.0+ or Artistic-1.0
787
 Summary:        Karaoke Support for %{name}
788
 Group:          Productivity/Multimedia/Sound/Players
789
 Requires:       %{name} = %{version}
790
 
791
 %description plugin-karaoke
792
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
793
-will not play videos. It has a modular framework and plugin architecture for 
794
-audio processing, visualisation and output, but this framework has not been 
795
-designed to support video. Also the client-server design of XMMS2 (and the 
796
-daemon being independent of any graphics output) practically prevents direct 
797
-video output being implemented. It has support for a wide range of audio 
798
-formats, which is expandable via plugins. It includes a basic CLI interface 
799
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
800
+XMMS2 is an audio framework, but it is not a general multimedia player - it
801
+will not play videos. It has a modular framework and plugin architecture for
802
+audio processing, visualisation and output, but this framework has not been
803
+designed to support video. Also the client-server design of XMMS2 (and the
804
+daemon being independent of any graphics output) practically prevents direct
805
+video output being implemented. It has support for a wide range of audio
806
+formats, which is expandable via plugins. It includes a basic CLI interface
807
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
808
 client (such as gxmms2 or esperanza).
809
 
810
 %package plugin-m3u
811
-License:        GPL+ or Artistic
812
+License:        GPL-2.0+ or Artistic-1.0
813
 Summary:        M3u Support for %{name}
814
 Group:          Productivity/Multimedia/Sound/Players
815
 Requires:       %{name} = %{version}
816
@@ -582,7 +608,7 @@
817
 client (such as gxmms2 or esperanza).
818
 
819
 %package plugin-mad
820
-License:        GPL+ or Artistic
821
+License:        GPL-2.0+ or Artistic-1.0
822
 Summary:        Mad MP3 Support for %{name}
823
 Group:          Productivity/Multimedia/Sound/Players
824
 Requires:       %{name} = %{version}
825
@@ -599,213 +625,230 @@
826
 client (such as gxmms2 or esperanza).
827
 
828
 %package plugin-modplug
829
-License:        GPL+ or Artistic
830
+License:        GPL-2.0+ or Artistic-1.0
831
 Summary:        Modplug Support for %{name}
832
 Group:          Productivity/Multimedia/Sound/Players
833
 Requires:       %{name} = %{version}
834
 
835
 %description plugin-modplug
836
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
837
-will not play videos. It has a modular framework and plugin architecture for 
838
-audio processing, visualisation and output, but this framework has not been 
839
-designed to support video. Also the client-server design of XMMS2 (and the 
840
-daemon being independent of any graphics output) practically prevents direct 
841
-video output being implemented. It has support for a wide range of audio 
842
-formats, which is expandable via plugins. It includes a basic CLI interface 
843
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
844
+XMMS2 is an audio framework, but it is not a general multimedia player - it
845
+will not play videos. It has a modular framework and plugin architecture for
846
+audio processing, visualisation and output, but this framework has not been
847
+designed to support video. Also the client-server design of XMMS2 (and the
848
+daemon being independent of any graphics output) practically prevents direct
849
+video output being implemented. It has support for a wide range of audio
850
+formats, which is expandable via plugins. It includes a basic CLI interface
851
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
852
 client (such as gxmms2 or esperanza).
853
 
854
 %package plugin-mp4
855
-License:        GPL+ or Artistic
856
+License:        GPL-2.0+ or Artistic-1.0
857
 Summary:        Mp4 Support for %{name}
858
 Group:          Productivity/Multimedia/Sound/Players
859
 Requires:       %{name} = %{version}
860
 
861
 %description plugin-mp4
862
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
863
-will not play videos. It has a modular framework and plugin architecture for 
864
-audio processing, visualisation and output, but this framework has not been 
865
-designed to support video. Also the client-server design of XMMS2 (and the 
866
-daemon being independent of any graphics output) practically prevents direct 
867
-video output being implemented. It has support for a wide range of audio 
868
-formats, which is expandable via plugins. It includes a basic CLI interface 
869
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
870
+XMMS2 is an audio framework, but it is not a general multimedia player - it
871
+will not play videos. It has a modular framework and plugin architecture for
872
+audio processing, visualisation and output, but this framework has not been
873
+designed to support video. Also the client-server design of XMMS2 (and the
874
+daemon being independent of any graphics output) practically prevents direct
875
+video output being implemented. It has support for a wide range of audio
876
+formats, which is expandable via plugins. It includes a basic CLI interface
877
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
878
 client (such as gxmms2 or esperanza).
879
 
880
 %package plugin-musepack
881
-License:        GPL+ or Artistic
882
+License:        GPL-2.0+ or Artistic-1.0
883
 Summary:        Musepack Support for %{name}
884
 Group:          Productivity/Multimedia/Sound/Players
885
 Requires:       %{name} = %{version}
886
 
887
 %description plugin-musepack
888
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
889
-will not play videos. It has a modular framework and plugin architecture for 
890
-audio processing, visualisation and output, but this framework has not been 
891
-designed to support video. Also the client-server design of XMMS2 (and the 
892
-daemon being independent of any graphics output) practically prevents direct 
893
-video output being implemented. It has support for a wide range of audio 
894
-formats, which is expandable via plugins. It includes a basic CLI interface 
895
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
896
+XMMS2 is an audio framework, but it is not a general multimedia player - it
897
+will not play videos. It has a modular framework and plugin architecture for
898
+audio processing, visualisation and output, but this framework has not been
899
+designed to support video. Also the client-server design of XMMS2 (and the
900
+daemon being independent of any graphics output) practically prevents direct
901
+video output being implemented. It has support for a wide range of audio
902
+formats, which is expandable via plugins. It includes a basic CLI interface
903
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
904
 client (such as gxmms2 or esperanza).
905
 
906
 %package plugin-normalize
907
-License:        GPL+ or Artistic
908
+License:        GPL-2.0+ or Artistic-1.0
909
 Summary:        Normalize Support for %{name}
910
 Group:          Productivity/Multimedia/Sound/Players
911
 Requires:       %{name} = %{version}
912
 
913
 %description plugin-normalize
914
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
915
-will not play videos. It has a modular framework and plugin architecture for 
916
-audio processing, visualisation and output, but this framework has not been 
917
-designed to support video. Also the client-server design of XMMS2 (and the 
918
-daemon being independent of any graphics output) practically prevents direct 
919
-video output being implemented. It has support for a wide range of audio 
920
-formats, which is expandable via plugins. It includes a basic CLI interface 
921
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
922
+XMMS2 is an audio framework, but it is not a general multimedia player - it
923
+will not play videos. It has a modular framework and plugin architecture for
924
+audio processing, visualisation and output, but this framework has not been
925
+designed to support video. Also the client-server design of XMMS2 (and the
926
+daemon being independent of any graphics output) practically prevents direct
927
+video output being implemented. It has support for a wide range of audio
928
+formats, which is expandable via plugins. It includes a basic CLI interface
929
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
930
 client (such as gxmms2 or esperanza).
931
 
932
 %package plugin-ofa
933
-License:        GPL+ or Artistic
934
+License:        GPL-2.0+ or Artistic-1.0
935
 Summary:        Ofa Support for %{name}
936
 Group:          Productivity/Multimedia/Sound/Players
937
 Requires:       %{name} = %{version}
938
 
939
 %description plugin-ofa
940
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
941
-will not play videos. It has a modular framework and plugin architecture for 
942
-audio processing, visualisation and output, but this framework has not been 
943
-designed to support video. Also the client-server design of XMMS2 (and the 
944
-daemon being independent of any graphics output) practically prevents direct 
945
-video output being implemented. It has support for a wide range of audio 
946
-formats, which is expandable via plugins. It includes a basic CLI interface 
947
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
948
+XMMS2 is an audio framework, but it is not a general multimedia player - it
949
+will not play videos. It has a modular framework and plugin architecture for
950
+audio processing, visualisation and output, but this framework has not been
951
+designed to support video. Also the client-server design of XMMS2 (and the
952
+daemon being independent of any graphics output) practically prevents direct
953
+video output being implemented. It has support for a wide range of audio
954
+formats, which is expandable via plugins. It includes a basic CLI interface
955
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
956
 client (such as gxmms2 or esperanza).
957
 
958
 %package plugin-pulse
959
-License:        GPL+ or Artistic
960
+License:        GPL-2.0+ or Artistic-1.0
961
 Summary:        Pulse Support for %{name}
962
 Group:          Productivity/Multimedia/Sound/Players
963
 Requires:       %{name} = %{version}
964
 
965
 %description plugin-pulse
966
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
967
-will not play videos. It has a modular framework and plugin architecture for 
968
-audio processing, visualisation and output, but this framework has not been 
969
-designed to support video. Also the client-server design of XMMS2 (and the 
970
-daemon being independent of any graphics output) practically prevents direct 
971
-video output being implemented. It has support for a wide range of audio 
972
-formats, which is expandable via plugins. It includes a basic CLI interface 
973
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
974
+XMMS2 is an audio framework, but it is not a general multimedia player - it
975
+will not play videos. It has a modular framework and plugin architecture for
976
+audio processing, visualisation and output, but this framework has not been
977
+designed to support video. Also the client-server design of XMMS2 (and the
978
+daemon being independent of any graphics output) practically prevents direct
979
+video output being implemented. It has support for a wide range of audio
980
+formats, which is expandable via plugins. It includes a basic CLI interface
981
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
982
 client (such as gxmms2 or esperanza).
983
 
984
 %package plugin-samba
985
-License:        GPL+ or Artistic
986
+License:        GPL-2.0+ or Artistic-1.0
987
 Summary:        Samba Support for %{name}
988
 Group:          Productivity/Multimedia/Sound/Players
989
 Requires:       %{name} = %{version}
990
 
991
 %description plugin-samba
992
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
993
-will not play videos. It has a modular framework and plugin architecture for 
994
-audio processing, visualisation and output, but this framework has not been 
995
-designed to support video. Also the client-server design of XMMS2 (and the 
996
-daemon being independent of any graphics output) practically prevents direct 
997
-video output being implemented. It has support for a wide range of audio 
998
-formats, which is expandable via plugins. It includes a basic CLI interface 
999
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1000
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1001
+will not play videos. It has a modular framework and plugin architecture for
1002
+audio processing, visualisation and output, but this framework has not been
1003
+designed to support video. Also the client-server design of XMMS2 (and the
1004
+daemon being independent of any graphics output) practically prevents direct
1005
+video output being implemented. It has support for a wide range of audio
1006
+formats, which is expandable via plugins. It includes a basic CLI interface
1007
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1008
+client (such as gxmms2 or esperanza).
1009
+
1010
+%package plugin-sndfile
1011
+License:        GPL-2.0+ or Artistic-1.0
1012
+Summary:        Sndfile Support for %{name}
1013
+Group:          Productivity/Multimedia/Sound/Players
1014
+Requires:       %{name} = %{version}
1015
+
1016
+%description plugin-sndfile
1017
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1018
+will not play videos. It has a modular framework and plugin architecture for
1019
+audio processing, visualisation and output, but this framework has not been
1020
+designed to support video. Also the client-server design of XMMS2 (and the
1021
+daemon being independent of any graphics output) practically prevents direct
1022
+video output being implemented. It has support for a wide range of audio
1023
+formats, which is expandable via plugins. It includes a basic CLI interface
1024
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1025
 client (such as gxmms2 or esperanza).
1026
 
1027
 %package plugin-speex
1028
-License:        GPL+ or Artistic
1029
+License:        GPL-2.0+ or Artistic-1.0
1030
 Summary:        Speex Support for %{name}
1031
 Group:          Productivity/Multimedia/Sound/Players
1032
 Requires:       %{name} = %{version}
1033
 
1034
 %description plugin-speex
1035
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
1036
-will not play videos. It has a modular framework and plugin architecture for 
1037
-audio processing, visualisation and output, but this framework has not been 
1038
-designed to support video. Also the client-server design of XMMS2 (and the 
1039
-daemon being independent of any graphics output) practically prevents direct 
1040
-video output being implemented. It has support for a wide range of audio 
1041
-formats, which is expandable via plugins. It includes a basic CLI interface 
1042
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1043
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1044
+will not play videos. It has a modular framework and plugin architecture for
1045
+audio processing, visualisation and output, but this framework has not been
1046
+designed to support video. Also the client-server design of XMMS2 (and the
1047
+daemon being independent of any graphics output) practically prevents direct
1048
+video output being implemented. It has support for a wide range of audio
1049
+formats, which is expandable via plugins. It includes a basic CLI interface
1050
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1051
 client (such as gxmms2 or esperanza).
1052
 
1053
 %package plugin-tta
1054
-License:        GPL+ or Artistic
1055
+License:        GPL-2.0+ or Artistic-1.0
1056
 Summary:        Tta Support for %{name}
1057
 Group:          Productivity/Multimedia/Sound/Players
1058
 Requires:       %{name} = %{version}
1059
 
1060
 %description plugin-tta
1061
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
1062
-will not play videos. It has a modular framework and plugin architecture for 
1063
-audio processing, visualisation and output, but this framework has not been 
1064
-designed to support video. Also the client-server design of XMMS2 (and the 
1065
-daemon being independent of any graphics output) practically prevents direct 
1066
-video output being implemented. It has support for a wide range of audio 
1067
-formats, which is expandable via plugins. It includes a basic CLI interface 
1068
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1069
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1070
+will not play videos. It has a modular framework and plugin architecture for
1071
+audio processing, visualisation and output, but this framework has not been
1072
+designed to support video. Also the client-server design of XMMS2 (and the
1073
+daemon being independent of any graphics output) practically prevents direct
1074
+video output being implemented. It has support for a wide range of audio
1075
+formats, which is expandable via plugins. It includes a basic CLI interface
1076
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1077
 client (such as gxmms2 or esperanza).
1078
 
1079
 %package plugin-vocoder
1080
-License:        GPL+ or Artistic
1081
+License:        GPL-2.0+ or Artistic-1.0
1082
 Summary:        Vocoder Support for %{name}
1083
 Group:          Productivity/Multimedia/Sound/Players
1084
 Requires:       %{name} = %{version}
1085
 
1086
 %description plugin-vocoder
1087
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
1088
-will not play videos. It has a modular framework and plugin architecture for 
1089
-audio processing, visualisation and output, but this framework has not been 
1090
-designed to support video. Also the client-server design of XMMS2 (and the 
1091
-daemon being independent of any graphics output) practically prevents direct 
1092
-video output being implemented. It has support for a wide range of audio 
1093
-formats, which is expandable via plugins. It includes a basic CLI interface 
1094
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1095
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1096
+will not play videos. It has a modular framework and plugin architecture for
1097
+audio processing, visualisation and output, but this framework has not been
1098
+designed to support video. Also the client-server design of XMMS2 (and the
1099
+daemon being independent of any graphics output) practically prevents direct
1100
+video output being implemented. It has support for a wide range of audio
1101
+formats, which is expandable via plugins. It includes a basic CLI interface
1102
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1103
 client (such as gxmms2 or esperanza).
1104
 
1105
 %package plugin-wave
1106
-License:        GPL+ or Artistic
1107
+License:        GPL-2.0+ or Artistic-1.0
1108
 Summary:        Wave Support for %{name}
1109
 Group:          Productivity/Multimedia/Sound/Players
1110
 Requires:       %{name} = %{version}
1111
 
1112
 %description plugin-wave
1113
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
1114
-will not play videos. It has a modular framework and plugin architecture for 
1115
-audio processing, visualisation and output, but this framework has not been 
1116
-designed to support video. Also the client-server design of XMMS2 (and the 
1117
-daemon being independent of any graphics output) practically prevents direct 
1118
-video output being implemented. It has support for a wide range of audio 
1119
-formats, which is expandable via plugins. It includes a basic CLI interface 
1120
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1121
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1122
+will not play videos. It has a modular framework and plugin architecture for
1123
+audio processing, visualisation and output, but this framework has not been
1124
+designed to support video. Also the client-server design of XMMS2 (and the
1125
+daemon being independent of any graphics output) practically prevents direct
1126
+video output being implemented. It has support for a wide range of audio
1127
+formats, which is expandable via plugins. It includes a basic CLI interface
1128
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1129
 client (such as gxmms2 or esperanza).
1130
 
1131
 %package plugin-wavpack
1132
-License:        GPL+ or Artistic
1133
+License:        GPL-2.0+ or Artistic-1.0
1134
 Summary:        Wavpack Support for %{name}
1135
 Group:          Productivity/Multimedia/Sound/Players
1136
 Requires:       %{name} = %{version}
1137
 
1138
 %description plugin-wavpack
1139
-XMMS2 is an audio framework, but it is not a general multimedia player - it 
1140
-will not play videos. It has a modular framework and plugin architecture for 
1141
-audio processing, visualisation and output, but this framework has not been 
1142
-designed to support video. Also the client-server design of XMMS2 (and the 
1143
-daemon being independent of any graphics output) practically prevents direct 
1144
-video output being implemented. It has support for a wide range of audio 
1145
-formats, which is expandable via plugins. It includes a basic CLI interface 
1146
-to the XMMS2 framework, but most users will want to install a graphical XMMS2 
1147
+XMMS2 is an audio framework, but it is not a general multimedia player - it
1148
+will not play videos. It has a modular framework and plugin architecture for
1149
+audio processing, visualisation and output, but this framework has not been
1150
+designed to support video. Also the client-server design of XMMS2 (and the
1151
+daemon being independent of any graphics output) practically prevents direct
1152
+video output being implemented. It has support for a wide range of audio
1153
+formats, which is expandable via plugins. It includes a basic CLI interface
1154
+to the XMMS2 framework, but most users will want to install a graphical XMMS2
1155
 client (such as gxmms2 or esperanza).
1156
 
1157
 %if %{with restricted}
1158
 
1159
 %package plugin-restricted
1160
-License:        GPL+ or Artistic
1161
+License:        GPL-2.0+ or Artistic-1.0
1162
 Summary:        Restricted plugins Support for %{name}
1163
 Group:          Productivity/Multimedia/Sound/Players
1164
 Requires:       %{name} = %{version}
1165
@@ -825,34 +868,22 @@
1166
 %prep
1167
 %setup -q -n %{name}-%{version}%{codename}
1168
 %patch0 -p1
1169
-%patch1 -p1
1170
-%patch2 -p1
1171
-%patch3 -p1
1172
 %patch4 -p1
1173
-%patch5 -p1
1174
 %patch6 -p1
1175
-%patch7 -p1
1176
-%patch8 -p1
1177
 %patch9 -p1
1178
 %patch10 -p1
1179
-%patch11 -p1
1180
 %patch13 -p1
1181
 %patch14 -p1
1182
-%if %suse_version > 1140
1183
+%if 0%{?suse_version} > 1140
1184
 %patch15 -p1
1185
 %endif
1186
 # This header doesn't need to be executable
1187
 chmod -x src/include/xmmsclient/xmmsclient++/dict.h
1188
-# Clean up paths in wafadmin
1189
-WAFADMIN_FILES=`find wafadmin/ -type f`
1190
-for i in $WAFADMIN_FILES; do
1191
-    sed -i 's|/usr/lib|%{_libdir}|g' $i
1192
-done
1193
 
1194
 %build
1195
-%__cp %SOURCE2 .
1196
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
1197
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
1198
+cp %{SOURCE2} .
1199
+export CFLAGS="%{optflags} -fno-strict-aliasing"
1200
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
1201
 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
1202
 ./waf build -v %{?_smp_mflags}
1203
 # make the docs
1204
@@ -864,19 +895,19 @@
1205
 for i in %{buildroot}%{_mandir}/man1/*.gz; do
1206
     gunzip $i;
1207
 done
1208
-for i in %{buildroot}%{_mandir}/man1/*.1 ChangeLog; do
1209
+for i in %{buildroot}%{_mandir}/man1/*.1; do
1210
     iconv -o $i.iso88591 -f iso88591 -t utf8 $i
1211
     mv $i.iso88591 $i
1212
 done
1213
-install -m0755 %SOURCE1 %{buildroot}%{_bindir}
1214
+install -m0755 %{SOURCE1} %{buildroot}%{_bindir}
1215
 
1216
 #the libraries are built as 64bit, they are just installed in the wrong dir
1217
-%if "%_lib" == "lib64"
1218
-%__mv %buildroot/usr/lib/* %buildroot/%_libdir/
1219
-%__mv %buildroot/%_libdir/perl* %buildroot/usr/lib/
1220
+%if "%{_lib}" == "lib64"
1221
+mv %{buildroot}%{_prefix}/lib/* %{buildroot}/%{_libdir}/
1222
+mv %{buildroot}/%{_libdir}/perl* %{buildroot}%{_prefix}/lib/
1223
 %endif
1224
 
1225
-%__cp %{SOURCE3} %buildroot/%_mandir/man1/
1226
+cp %{SOURCE3} %{buildroot}/%{_mandir}/man1/
1227
 %fdupes -s %{buildroot}
1228
 
1229
 %clean
1230
@@ -900,40 +931,38 @@
1231
 
1232
 %files
1233
 %defattr(-,root,root,-)
1234
-%doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO README.SuSE
1235
-%_bindir/*
1236
-%dir %_libdir/%name
1237
-%_mandir/man1/*.gz
1238
-%_datadir/pixmaps/*
1239
-%dir %_datadir/%name
1240
-%_datadir/%name/*
1241
+%doc AUTHORS COPYING COPYING.GPL COPYING.LGPL README TODO README.SuSE
1242
+%{_bindir}/*
1243
+%dir %{_libdir}/%{name}
1244
+%{_mandir}/man1/*.gz
1245
+%{_datadir}/pixmaps/*
1246
+%{_datadir}/%{name}/
1247
 
1248
 %files -n libxmmsclient++-glib1
1249
 %defattr(-,root,root,-)
1250
-%_libdir/libxmmsclient++-glib.so.1
1251
-%_libdir/libxmmsclient++-glib.so.1.0.0
1252
+%{_libdir}/libxmmsclient++-glib.so.1
1253
+%{_libdir}/libxmmsclient++-glib.so.1.0.0
1254
 
1255
 %files -n libxmmsclient++4
1256
 %defattr(-,root,root,-)
1257
-%_libdir/libxmmsclient++.so.4
1258
-%_libdir/libxmmsclient++.so.4.0.0
1259
+%{_libdir}/libxmmsclient++.so.4
1260
+%{_libdir}/libxmmsclient++.so.4.0.0
1261
 
1262
 %files -n libxmmsclient-glib1
1263
 %defattr(-,root,root,-)
1264
-%_libdir/libxmmsclient-glib.so.1
1265
-%_libdir/libxmmsclient-glib.so.1.0.0
1266
+%{_libdir}/libxmmsclient-glib.so.1
1267
+%{_libdir}/libxmmsclient-glib.so.1.0.0
1268
 
1269
 %files -n libxmmsclient6
1270
 %defattr(-,root,root,-)
1271
-%_libdir/libxmmsclient.so.6
1272
-%_libdir/libxmmsclient.so.6.0.0
1273
+%{_libdir}/libxmmsclient.so.6
1274
+%{_libdir}/libxmmsclient.so.6.0.0
1275
 
1276
 %files devel
1277
 %defattr(-,root,root,-)
1278
-%dir %_includedir/%name
1279
-%_includedir/%name/*
1280
-%_libdir/libxmmsclient*.so
1281
-%_libdir/pkgconfig/%name-*.pc
1282
+%{_includedir}/%{name}/
1283
+%{_libdir}/libxmmsclient*.so
1284
+%{_libdir}/pkgconfig/%{name}-*.pc
1285
 
1286
 %files docs
1287
 %defattr(-,root,root,-)
1288
@@ -956,169 +985,173 @@
1289
 
1290
 %files plugin-base
1291
 %defattr(-,root,root,-)
1292
-%_libdir/xmms2/libxmms_alsa.so
1293
-%_libdir/xmms2/libxmms_diskwrite.so
1294
-%_libdir/xmms2/libxmms_equalizer.so
1295
-%_libdir/xmms2/libxmms_file.so
1296
-%_libdir/xmms2/libxmms_xml.so
1297
-%_libdir/xmms2/libxmms_vorbis.so
1298
-%_libdir/xmms2/libxmms_null.so
1299
-%_libdir/xmms2/libxmms_nulstripper.so
1300
-%_libdir/xmms2/libxmms_oss.so
1301
-%_libdir/xmms2/libxmms_pls.so
1302
-%_libdir/xmms2/libxmms_replaygain.so
1303
-%_libdir/xmms2/libxmms_rss.so
1304
-%_libdir/xmms2/libxmms_xspf.so
1305
+%{_libdir}/xmms2/libxmms_alsa.so
1306
+%{_libdir}/xmms2/libxmms_diskwrite.so
1307
+%{_libdir}/xmms2/libxmms_equalizer.so
1308
+%{_libdir}/xmms2/libxmms_file.so
1309
+%{_libdir}/xmms2/libxmms_xml.so
1310
+%{_libdir}/xmms2/libxmms_vorbis.so
1311
+%{_libdir}/xmms2/libxmms_null.so
1312
+%{_libdir}/xmms2/libxmms_nulstripper.so
1313
+%{_libdir}/xmms2/libxmms_oss.so
1314
+%{_libdir}/xmms2/libxmms_pls.so
1315
+%{_libdir}/xmms2/libxmms_replaygain.so
1316
+%{_libdir}/xmms2/libxmms_rss.so
1317
+%{_libdir}/xmms2/libxmms_xspf.so
1318
 
1319
 %files plugin-airplay
1320
 %defattr(-,root,root,-)
1321
-%_libdir/xmms2/libxmms_airplay.so
1322
+%{_libdir}/xmms2/libxmms_airplay.so
1323
 
1324
 %files plugin-ao
1325
 %defattr(-,root,root,-)
1326
-%_libdir/xmms2/libxmms_ao.so
1327
+%{_libdir}/xmms2/libxmms_ao.so
1328
 
1329
 %files plugin-apefile
1330
 %defattr(-,root,root,-)
1331
-%_libdir/xmms2/libxmms_apefile.so
1332
+%{_libdir}/xmms2/libxmms_apefile.so
1333
 
1334
 %files plugin-asf
1335
 %defattr(-,root,root,-)
1336
-%_libdir/xmms2/libxmms_asf.so
1337
+%{_libdir}/xmms2/libxmms_asf.so
1338
 
1339
 %files plugin-asx
1340
 %defattr(-,root,root,-)
1341
-%_libdir/xmms2/libxmms_asx.so
1342
+%{_libdir}/xmms2/libxmms_asx.so
1343
 
1344
 %files plugin-cdda
1345
 %defattr(-,root,root,-)
1346
-%_libdir/xmms2/libxmms_cdda.so
1347
+%{_libdir}/xmms2/libxmms_cdda.so
1348
 
1349
 %files plugin-cue
1350
 %defattr(-,root,root,-)
1351
-%_libdir/xmms2/libxmms_cue.so
1352
+%{_libdir}/xmms2/libxmms_cue.so
1353
 
1354
 %files plugin-curl
1355
 %defattr(-,root,root,-)
1356
-%_libdir/xmms2/libxmms_curl.so
1357
+%{_libdir}/xmms2/libxmms_curl.so
1358
 
1359
 %files plugin-daap
1360
 %defattr(-,root,root,-)
1361
-%_libdir/xmms2/libxmms_daap.so
1362
+%{_libdir}/xmms2/libxmms_daap.so
1363
 
1364
 %files plugin-ffmpeg
1365
 %defattr(-,root,root,-)
1366
-%_libdir/xmms2/libxmms_avcodec.so
1367
+%{_libdir}/xmms2/libxmms_avcodec.so
1368
 
1369
 %files plugin-flac
1370
 %defattr(-,root,root,-)
1371
-%_libdir/xmms2/libxmms_flac.so
1372
+%{_libdir}/xmms2/libxmms_flac.so
1373
 
1374
 %files plugin-flv
1375
 %defattr(-,root,root,-)
1376
-%_libdir/xmms2/libxmms_flv.so
1377
+%{_libdir}/xmms2/libxmms_flv.so
1378
 
1379
 %files plugin-gvfs
1380
 %defattr(-,root,root,-)
1381
-%_libdir/xmms2/libxmms_gvfs.so
1382
+%{_libdir}/xmms2/libxmms_gvfs.so
1383
 
1384
-%if %suse_version >= 1120
1385
+%if 0%{?suse_version} >= 1120
1386
 %if %{with gme}
1387
 
1388
 %files plugin-gme
1389
 %defattr(-,root,root,-)
1390
-%_libdir/xmms2/libxmms_gme.so
1391
+%{_libdir}/xmms2/libxmms_gme.so
1392
 %endif
1393
 %endif
1394
 
1395
 %files plugin-html
1396
 %defattr(-,root,root,-)
1397
-%_libdir/xmms2/libxmms_html.so
1398
+%{_libdir}/xmms2/libxmms_html.so
1399
 
1400
 %files plugin-ices
1401
 %defattr(-,root,root,-)
1402
-%_libdir/xmms2/libxmms_ices.so
1403
+%{_libdir}/xmms2/libxmms_ices.so
1404
 
1405
 %files plugin-icymetaint
1406
 %defattr(-,root,root,-)
1407
-%_libdir/xmms2/libxmms_icymetaint.so
1408
+%{_libdir}/xmms2/libxmms_icymetaint.so
1409
 
1410
 %files plugin-id3v2
1411
 %defattr(-,root,root,-)
1412
-%_libdir/xmms2/libxmms_id3v2.so
1413
+%{_libdir}/xmms2/libxmms_id3v2.so
1414
 
1415
 %files plugin-jack
1416
 %defattr(-,root,root,-)
1417
-%_libdir/xmms2/libxmms_jack.so
1418
+%{_libdir}/xmms2/libxmms_jack.so
1419
 
1420
 %files plugin-karaoke
1421
 %defattr(-,root,root,-)
1422
-%_libdir/xmms2/libxmms_karaoke.so
1423
+%{_libdir}/xmms2/libxmms_karaoke.so
1424
 
1425
 %files plugin-m3u
1426
 %defattr(-,root,root,-)
1427
-%_libdir/xmms2/libxmms_m3u.so
1428
+%{_libdir}/xmms2/libxmms_m3u.so
1429
 
1430
 %files plugin-mad
1431
 %defattr(-,root,root,-)
1432
-%_libdir/xmms2/libxmms_mad.so
1433
+%{_libdir}/xmms2/libxmms_mad.so
1434
 
1435
 
1436
 %files plugin-modplug
1437
 %defattr(-,root,root,-)
1438
-%_libdir/xmms2/libxmms_modplug.so
1439
+%{_libdir}/xmms2/libxmms_modplug.so
1440
 
1441
 %files plugin-mp4
1442
 %defattr(-,root,root,-)
1443
-%_libdir/xmms2/libxmms_mp4.so
1444
+%{_libdir}/xmms2/libxmms_mp4.so
1445
 
1446
 %files plugin-musepack
1447
 %defattr(-,root,root,-)
1448
-%_libdir/xmms2/libxmms_musepack.so
1449
+%{_libdir}/xmms2/libxmms_musepack.so
1450
 
1451
 %files plugin-normalize
1452
 %defattr(-,root,root,-)
1453
-%_libdir/xmms2/libxmms_normalize.so
1454
+%{_libdir}/xmms2/libxmms_normalize.so
1455
 
1456
 %files plugin-ofa
1457
 %defattr(-,root,root,-)
1458
-%_libdir/xmms2/libxmms_ofa.so
1459
+%{_libdir}/xmms2/libxmms_ofa.so
1460
 
1461
 %files plugin-pulse
1462
 %defattr(-,root,root,-)
1463
-%_libdir/xmms2/libxmms_pulse.so
1464
+%{_libdir}/xmms2/libxmms_pulse.so
1465
 
1466
 %files plugin-samba
1467
 %defattr(-,root,root,-)
1468
-%_libdir/xmms2/libxmms_samba.so
1469
+%{_libdir}/xmms2/libxmms_samba.so
1470
+
1471
+%files plugin-sndfile
1472
+%defattr(-,root,root,-)
1473
+%{_libdir}/xmms2/libxmms_sndfile.so
1474
 
1475
 %files plugin-speex
1476
 %defattr(-,root,root,-)
1477
-%_libdir/xmms2/libxmms_speex.so
1478
+%{_libdir}/xmms2/libxmms_speex.so
1479
 
1480
 %files plugin-tta
1481
 %defattr(-,root,root,-)
1482
-%_libdir/xmms2/libxmms_tta.so
1483
+%{_libdir}/xmms2/libxmms_tta.so
1484
 
1485
 %files plugin-vocoder
1486
 %defattr(-,root,root,-)
1487
-%_libdir/xmms2/libxmms_vocoder.so
1488
+%{_libdir}/xmms2/libxmms_vocoder.so
1489
 
1490
 %files plugin-wave
1491
 %defattr(-,root,root,-)
1492
-%_libdir/xmms2/libxmms_wave.so
1493
+%{_libdir}/xmms2/libxmms_wave.so
1494
 
1495
 %files plugin-wavpack
1496
 %defattr(-,root,root,-)
1497
-%_libdir/xmms2/libxmms_wavpack.so
1498
+%{_libdir}/xmms2/libxmms_wavpack.so
1499
 
1500
 %if %{with restricted}
1501
 
1502
 %files plugin-restricted
1503
 %defattr(-,root,root,-)
1504
-%_libdir/xmms2/libxmms_faad.so
1505
-%_libdir/xmms2/libxmms_mms.so
1506
-%_libdir/xmms2/libxmms_mpg123.so
1507
+%{_libdir}/xmms2/libxmms_faad.so
1508
+%{_libdir}/xmms2/libxmms_mms.so
1509
+%{_libdir}/xmms2/libxmms_mpg123.so
1510
 %endif
1511
 
1512
-%changelog
1513
+%changelog
1514
\ No newline at end of file
1515
xmms2-0.7-add-lib-vorbis.patch Deleted
28
 
1
@@ -1,26 +0,0 @@
2
---- xmms2-0.7DrNo/src/clients/vistest/wscript  2010-02-19 18:43:54.000000000 +0100
3
-+++ new/src/clients/vistest/wscript    2011-10-18 15:49:35.159111529 +0200
4
-@@ -15,13 +15,13 @@
5
-     obj.uselib_local = 'xmmsclient-glib xmmsclient'
6
-     obj.uselib = 'glib2 math'
7
- 
8
--    if bld.env'LIB_vorbisenc':
9
-+    if bld.env'LIB_vorbisenc' and bld.env'LIB_vorbis':
10
-         obj = bld.new_task_gen('cc', 'program')
11
-         obj.target = 'xmms2-ripper'
12
-         obj.source = 'ripper.c'
13
-         obj.includes = '. ../../.. ../../include'
14
-         obj.uselib_local = 'xmmsclient'
15
--        obj.uselib = 'vorbisenc'
16
-+        obj.uselib = 'vorbisenc vorbis'
17
- 
18
-     if bld.env'LIB_visual' and bld.env'LIB_sdl':
19
-         obj = bld.new_task_gen('cc', 'program')
20
-@@ -39,6 +39,7 @@
21
-     conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
22
-     conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
23
-     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
24
-+    conf.check_cfg(package='vorbis', uselib_store='vorbis', args='--cflags --libs')
25
- 
26
- def set_options(opt):
27
-     pass
28
xmms2-0.7-cli-output-verbosity.patch Deleted
86
 
1
@@ -1,84 +0,0 @@
2
-Description: respects now the common Unix convention for output verbosity
3
- Common unix convention for CLI programs is being silent for successful
4
- operations, and being verbose on errors. This patch adjust the output verbosity
5
- to match the unix conventions.
6
-Bug-Debian: http://bugs.debian.org/510374
7
-Author: Jan Braun <janbraun@gmx.net>
8
-Forwarded: No
9
-
10
-Index: debian.git/src/clients/cli/cmd_pls.c
11
-===================================================================
12
---- debian.git.orig/src/clients/cli/cmd_pls.c  2010-02-19 18:43:54.000000000 +0100
13
-+++ debian.git/src/clients/cli/cmd_pls.c   2010-02-20 12:49:57.302899620 +0100
14
-@@ -39,7 +39,7 @@
15
- 
16
-   url = format_url (item, G_FILE_TEST_IS_REGULAR);
17
-   if (!url) {
18
--      print_error ("Invalid url");
19
-+      print_error ("Invalid url: %s", item);
20
-   }
21
- 
22
-   res = xmmsc_playlist_add_url (conn, playlist, url);
23
-@@ -52,7 +52,9 @@
24
-   }
25
-   xmmsc_result_unref (res);
26
- 
27
--  print_info ("Added %s", item);
28
-+  if (verbose) {
29
-+        print_info ("Added %s", item);
30
-+    }
31
- }
32
- 
33
- 
34
-@@ -259,7 +261,7 @@
35
-   if (!url) {
36
-       url = format_url (argv3, G_FILE_TEST_IS_REGULAR);
37
-       if (!url) {
38
--          print_error ("Invalid url");
39
-+          print_error ("Invalid url: %s", argv3);
40
-       } else {
41
-           /* FIXME: Fulhack to check for optional playlist argument */
42
-           playlist = argv2;
43
-@@ -307,7 +309,7 @@
44
-   }
45
- 
46
-   if (!url) {
47
--      print_error ("Invalid url");
48
-+      print_error ("Invalid url: %s", (*endptr == '\0') ? argv3 : argv4 );
49
-   }
50
- 
51
-   res = xmmsc_playlist_insert_url (conn, playlist, pos, url);
52
-Index: debian.git/src/clients/cli/common.h
53
-===================================================================
54
---- debian.git.orig/src/clients/cli/common.h   2010-02-19 18:43:54.000000000 +0100
55
-+++ debian.git/src/clients/cli/common.h    2010-02-20 12:49:57.302899620 +0100
56
-@@ -31,6 +31,8 @@
57
-   void (*func) (xmmsc_connection_t *conn, int argc, char **argv);
58
- } cmds;
59
- 
60
-+gboolean verbose;
61
-+
62
- gboolean x_realpath (const gchar *item, gchar *rpath);
63
- gchar *x_path2url (gchar *path);
64
- gchar *format_url (gchar *item, GFileTest test);
65
-Index: debian.git/src/clients/cli/main.c
66
-===================================================================
67
---- debian.git.orig/src/clients/cli/main.c 2010-02-19 18:43:54.000000000 +0100
68
-+++ debian.git/src/clients/cli/main.c  2010-02-20 12:49:57.302899620 +0100
69
-@@ -254,6 +254,16 @@
70
- 
71
-   setlocale (LC_ALL, "");
72
- 
73
-+    verbose = FALSE;
74
-+    while ( argc >1 && ( !g_ascii_strcasecmp (argv1, "-v") ||
75
-+                    !g_ascii_strcasecmp (argv1, "--verbose") )
76
-+    ) {
77
-+        verbose = TRUE;
78
-+        argv1 = argv0;
79
-+        --argc;
80
-+        ++argv;
81
-+    }
82
-+
83
-   config = read_config ();
84
-   atexit (free_config);
85
- 
86
xmms2-0.7-escape-minus-signes.patch Deleted
271
 
1
@@ -1,269 +0,0 @@
2
-Description: Escape minus signes in man pages.
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-Bug: http://bugs.xmms2.xmms.se/view.php?id=2225
5
-
6
-Index: debian.git/src/clients/launcher/xmms2-launcher.1
7
-===================================================================
8
---- debian.git.orig/src/clients/launcher/xmms2-launcher.1  2010-02-19 18:43:54.000000000 +0100
9
-+++ debian.git/src/clients/launcher/xmms2-launcher.1   2010-02-20 12:50:04.522899969 +0100
10
-@@ -75,20 +75,20 @@
11
- These options are currently recognised:
12
- .TP
13
- .I
14
---l logfile / --logfile=logfile
15
-+\-l logfile / \-\-logfile=logfile
16
- Write log file to 
17
- .I logfile
18
- instead of the default log file location
19
- .TP
20
- .I
21
--- P pidfile / --pidfile=pidfile
22
-+\- P pidfile / \-\-pidfile=pidfile
23
- Write the pid of 
24
- .I xmms2d
25
- to the file specified by 
26
- .I pidfile
27
- .TP
28
- .I
29
---? / --help  
30
-+\-? / \-\-help
31
- Show help options
32
- .SH FILES
33
- .TP
34
-Index: debian.git/src/clients/nycli/nyxmms2.1
35
-===================================================================
36
---- debian.git.orig/src/clients/nycli/nyxmms2.1    2010-02-19 18:43:54.000000000 +0100
37
-+++ debian.git/src/clients/nycli/nyxmms2.1 2010-02-20 12:50:04.522899969 +0100
38
-@@ -80,7 +80,7 @@
39
- .PP
40
- 
41
- .TP
42
--\fBstop\fR -n <tracks> | -t <time>
43
-+\fBstop\fR \-n <tracks> | \-t <time>
44
- .PP
45
- .RS 4
46
- Stop playback.
47
-@@ -139,7 +139,7 @@
48
- .PP
49
- 
50
- .TP
51
--\fBstatus\fR -r <time> -f <format>
52
-+\fBstatus\fR \-r <time> \-f <format>
53
- .PP
54
- .RS 4
55
- Display playback status, either continuously or once.
56
-@@ -198,7 +198,7 @@
57
- .PP
58
- 
59
- .TP
60
--\fBjump\fR -b <pattern|positions>
61
-+\fBjump\fR \-b <pattern|positions>
62
- .PP
63
- .RS 4
64
- Jump to the first media maching the pattern.
65
-@@ -235,7 +235,7 @@
66
- .PP
67
- 
68
- .TP
69
--\fBsearch\fR -p <name> | -c <name> -o <prop1,prop2...> -l <prop1,prop2...> <pattern>
70
-+\fBsearch\fR \-p <name> | \-c <name> \-o <prop1,prop2...> \-l <prop1,prop2...> <pattern>
71
- .PP
72
- .RS 4
73
- Search and print all media matching the pattern. Search can be restricted
74
-@@ -279,7 +279,7 @@
75
- .PP
76
- 
77
- .TP
78
--\fBlist\fR -p <name> pattern
79
-+\fBlist\fR \-p <name> pattern
80
- .PP
81
- .RS 4
82
- List the contents of a playlist (the active playlist by default). If a
83
-@@ -303,7 +303,7 @@
84
- .PP
85
- 
86
- .TP
87
--\fBadd\fR -f -N -P -p <playlist> | -c <collection> -n | -a <pos|offset> pattern | paths
88
-+\fBadd\fR \-f \-N \-P \-p <playlist> | \-c <collection> \-n | \-a <pos|offset> pattern | paths
89
- .PP
90
- .RS 4
91
- Add the matching media or files to a playlist.
92
-@@ -320,7 +320,7 @@
93
- \-P | \-\-pls
94
- .RE
95
- .RS 8
96
--Treat the files as playlist files (implies --file.)
97
-+Treat the files as playlist files (implies \-\-file.)
98
- .RE
99
- .PP
100
- .RS 4
101
-@@ -367,7 +367,7 @@
102
- .PP
103
- 
104
- .TP
105
--\fBremove\fR -p <playlist> <pattern|positions>
106
-+\fBremove\fR \-p <playlist> <pattern|positions>
107
- .PP
108
- .RS 4
109
- Remove the matching media from a playlist.
110
-@@ -389,7 +389,7 @@
111
- .PP
112
- 
113
- .TP
114
--\fBmove\fR -p <playlist> -n | -a <pos|offset> <pattern|positions>
115
-+\fBmove\fR \-p <playlist> \-n | \-a <pos|offset> <pattern|positions>
116
- .PP
117
- .RS 4
118
- Move entries inside a playlist.
119
-@@ -440,7 +440,7 @@
120
- .PP
121
- 
122
- .TP
123
--\fBhelp\fR -a command
124
-+\fBhelp\fR \-a command
125
- .PP
126
- .RS 4
127
- List all commands, or help on one command.
128
-@@ -462,7 +462,7 @@
129
- .PP
130
- .SH PLAYLIST COMMANDS
131
- .TP
132
--\fBplaylist list\fR -a pattern
133
-+\fBplaylist list\fR \-a pattern
134
- .PP
135
- .RS 4
136
- List all playlists.
137
-@@ -514,7 +514,7 @@
138
- .PP
139
- 
140
- .TP
141
--\fBplaylist create\fR -p <playlist> <name>
142
-+\fBplaylist create\fR \-p <playlist> <name>
143
- .PP
144
- .RS 4
145
- Change the active playlist.
146
-@@ -536,7 +536,7 @@
147
- .PP
148
- 
149
- .TP
150
--\fBplaylist rename\fR -f -p <playlist> <newname>
151
-+\fBplaylist rename\fR \-f \-p <playlist> <newname>
152
- .PP
153
- .RS 4
154
- Rename a playlist.  By default, rename the active playlist.
155
-@@ -610,7 +610,7 @@
156
- .PP
157
- 
158
- .TP
159
--\fBplaylist sort\fR -o <order> playlist
160
-+\fBplaylist sort\fR \-o <order> playlist
161
- .PP
162
- .RS 4
163
- Sort a playlist.  By default, sort the active playlist.
164
-@@ -632,7 +632,7 @@
165
- .PP
166
- 
167
- .TP
168
--\fBplaylist config\fR -t <type> -s <history> -u <upcoming> -i <coll> playlist
169
-+\fBplaylist config\fR \-t <type> \-s <history> \-u <upcoming> \-i <coll> playlist
170
- .PP
171
- .RS 4
172
- Configure a playlist by changing its type, attributes, etc.
173
-@@ -721,7 +721,7 @@
174
- .PP
175
- 
176
- .TP
177
--\fBcollection create\fR -f -a | -e -c <collection> <name> pattern
178
-+\fBcollection create\fR \-f \-a | \-e \-c <collection> <name> pattern
179
- .PP
180
- .RS 4
181
- Create a new collection.
182
-@@ -759,7 +759,7 @@
183
- .PP
184
- 
185
- .TP
186
--\fBcollection rename\fR -f <oldname> <newname>
187
-+\fBcollection rename\fR \-f <oldname> <newname>
188
- .PP
189
- .RS 4
190
- Rename a collection.
191
-@@ -814,7 +814,7 @@
192
- .PP
193
- .SH SERVER COMMANDS
194
- .TP
195
--\fBserver import\fR -N <path>
196
-+\fBserver import\fR \-N <path>
197
- .PP
198
- .RS 4
199
- Import new files into the media library.
200
-@@ -901,7 +901,7 @@
201
- .PP
202
- 
203
- .TP
204
--\fBserver property\fR -i | -s | -D -S <mid> name value
205
-+\fBserver property\fR \-i | \-s | \-D \-S <mid> name value
206
- .PP
207
- .RS 4
208
- Get or set properties for a given media.
209
-@@ -910,10 +910,10 @@
210
- If both a name and a value are provided, set the new value of the property.
211
- 
212
- By default, set operations use client specific source and list, display operations use source-preference.
213
--Use the --source option to override this behaviour.
214
-+Use the \-\-source option to override this behaviour.
215
- 
216
- By default, the value will be used to determine whether it should be saved as a string or an integer.
217
--Use the --int or --string flag to override this behaviour.
218
-+Use the \-\-int or \-\-string flag to override this behaviour.
219
- .RE
220
- .PP
221
- .RS 4
222
-@@ -968,12 +968,12 @@
223
- .PP
224
- 
225
- .TP
226
--\fBserver volume\fR -c <name> value
227
-+\fBserver volume\fR \-c <name> value
228
- .PP
229
- .RS 4
230
- Get or set the audio volume (in a range of 0-100).
231
- If a value is provided, set the new value of the volume. Otherwise, display the current volume.
232
--By default, the command applies to all audio channels. Use the --channel flag to override this behaviour.
233
-+By default, the command applies to all audio channels. Use the \-\-channel flag to override this behaviour.
234
- .RE
235
- .PP
236
- .RS 4
237
-@@ -1053,7 +1053,7 @@
238
- \fBaddpls\fR 
239
- .PP
240
- .RS 4
241
--add -f -P $@
242
-+add \-f \-P $@
243
- .RE
244
- .PP
245
- .RS 4
246
-@@ -1068,7 +1068,7 @@
247
- \fBcurrent\fR 
248
- .PP
249
- .RS 4
250
--status -f $1
251
-+status \-f $1
252
- .RE
253
- .PP
254
- .RS 4
255
-@@ -1189,13 +1189,13 @@
256
- .RS 8
257
- An alias can use positional parameters, for example:
258
- .PP
259
--foo = add -f $1 $3
260
-+foo = add \-f $1 $3
261
- .PP
262
- foo ctkoz.ogg and slre.ogg
263
- .PP
264
- Will result in:
265
- .PP
266
--add -f ctkoz.ogg slre.ogg
267
-+add \-f ctkoz.ogg slre.ogg
268
- .PP
269
- .RE
270
- .RS 4
271
xmms2-0.7-fix-cast-error.patch Deleted
17
 
1
@@ -1,15 +0,0 @@
2
-Description: Fix cast to pointer from integer of different size error
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-Bug-Debian: http://bugs.debian.org/571539
5
-
6
---- xmms2-0.7DrNo.orig/src/clients/medialib-updater/main.c
7
-+++ xmms2-0.7DrNo/src/clients/medialib-updater/main.c
8
-@@ -457,6 +457,8 @@ updater_remove_directory_by_id (xmmsv_t 
9
-   return TRUE;
10
- }
11
- 
12
-+char *_xmmsc_medialib_encode_url (const char *url, xmmsv_t *args);
13
-+
14
- static void
15
- updater_remove_directory (updater_t *updater, GFile *file)
16
- {
17
xmms2-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch Deleted
19
 
1
@@ -1,17 +0,0 @@
2
-Description: Fix spelling mistake in xmms2-mdns-avahi manpage
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-Forwarded: No
5
-
6
-Index: debian.git/src/clients/mdns/avahi/xmms2-mdns-avahi.1
7
-===================================================================
8
---- debian.git.orig/src/clients/mdns/avahi/xmms2-mdns-avahi.1  2010-02-19 18:43:54.000000000 +0100
9
-+++ debian.git/src/clients/mdns/avahi/xmms2-mdns-avahi.1   2010-02-20 12:53:26.524149450 +0100
10
-@@ -56,7 +56,7 @@
11
- .SH ENVIRONMENTAL VARIABLES
12
- .TP
13
- .I XMMS_PATH_FULL
14
--A complete list of URL paths seperated by ';' pointed to the
15
-+A complete list of URL paths separated by ';' pointed to the
16
- .I xmms2d(1).
17
- See
18
- .B IPC SOCKET
19
xmms2-0.7-fixwarnings.patch Deleted
29
 
1
@@ -1,27 +0,0 @@
2
-Index: xmms2-0.7DrNo/src/xmms/compat/signal_unix.c
3
-===================================================================
4
---- xmms2-0.7DrNo.orig/src/xmms/compat/signal_unix.c
5
-+++ xmms2-0.7DrNo/src/xmms/compat/signal_unix.c
6
-@@ -64,8 +64,7 @@ sigwaiter (gpointer data)
7
-               break;
8
-       }
9
-   }
10
--
11
--return;
12
-+  return NULL;
13
- }
14
- 
15
- void
16
-Index: xmms2-0.7DrNo/src/xmms/visualization/unixshm.c
17
-===================================================================
18
---- xmms2-0.7DrNo.orig/src/xmms/visualization/unixshm.c
19
-+++ xmms2-0.7DrNo/src/xmms/visualization/unixshm.c
20
-@@ -13,7 +13,7 @@
21
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
22
-  *  Lesser General Public License for more details.
23
-  */
24
--
25
-+#define _GNU_SOURCE
26
- #include <sys/shm.h>
27
- #include <sys/sem.h>
28
- #include <sys/stat.h>
29
xmms2-0.7-linker-flags.patch Deleted
17
 
1
@@ -1,15 +0,0 @@
2
-Description: Do not link against unused libraries
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-
5
---- xmms2-0.7DrNo.orig/wscript
6
-+++ xmms2-0.7DrNo/wscript
7
-@@ -420,6 +420,9 @@ def configure(conf):
8
-                     enabled_optionals, disabled_optionals,
9
-                     output_plugins)
10
- 
11
-+    # Do not link against unused libraries (make dpkg-shlibdeps happy).
12
-+    conf.env.LINKFLAGS += '-Wl,--as-needed'
13
-+
14
-     return True
15
- 
16
- 
17
xmms2-0.7-no-return.patch Deleted
14
 
1
@@ -1,12 +0,0 @@
2
-diff -uNr old-xmms2-0.6DrMattDestruction//src/xmms/compat/signal_unix.c xmms2-0.6DrMattDestruction/src/xmms/compat/signal_unix.c
3
---- old-xmms2-0.6DrMattDestruction//src/xmms/compat/signal_unix.c  2009-04-21 19:51:11.000000000 +0200
4
-+++ xmms2-0.6DrMattDestruction/src/xmms/compat/signal_unix.c   2010-02-25 08:24:33.619287804 +0100
5
-@@ -63,6 +63,8 @@
6
-               break;
7
-       }
8
-   }
9
-+
10
-+return;
11
- }
12
- 
13
- void
14
xmms2-0.7-remove-path_max.patch Deleted
208
 
1
@@ -1,206 +0,0 @@
2
-Description: Replace PATH_MAX by XMMS_PATH_MAX to fix FTBFS on hurd-i386
3
- This is only a workaround. Fixing these issues usually boils down to replacing
4
- char fooPATH_MAX by char *foo, and using dynamic memory allocation.
5
-Author: Benjamin Drung <bdrung@ubuntu.com>
6
-Bug: http://bugs.xmms2.xmms.se/view.php?id=2347
7
-
8
---- xmms2-0.7DrNo.orig/src/clients/cli/main.c
9
-+++ xmms2-0.7DrNo/src/clients/cli/main.c
10
-@@ -128,17 +128,17 @@ parse_config (const gchar *buffer)
11
- 
12
- static gchar *
13
- get_config_dir (void) {
14
--  gchar userconfPATH_MAX;
15
-+  gchar userconfXMMS_PATH_MAX;
16
- 
17
--  xmmsc_userconfdir_get (userconf, PATH_MAX);
18
-+  xmmsc_userconfdir_get (userconf, XMMS_PATH_MAX);
19
-   return g_build_path (G_DIR_SEPARATOR_S, userconf, "clients", NULL);
20
- }
21
- 
22
- static gchar *
23
- get_config_path (void) {
24
--  gchar userconfPATH_MAX;
25
-+  gchar userconfXMMS_PATH_MAX;
26
- 
27
--  xmmsc_userconfdir_get (userconf, PATH_MAX);
28
-+  xmmsc_userconfdir_get (userconf, XMMS_PATH_MAX);
29
-   return g_build_path (G_DIR_SEPARATOR_S, userconf, "clients", "cli.conf",
30
-                        NULL);
31
- }
32
---- xmms2-0.7DrNo.orig/src/clients/cli/common.c
33
-+++ xmms2-0.7DrNo/src/clients/cli/common.c
34
-@@ -20,7 +20,7 @@
35
- gchar *
36
- format_url (gchar *item, GFileTest test)
37
- {
38
--  gchar *url, rpathPATH_MAX, *p;
39
-+  gchar *url, rpathXMMS_PATH_MAX, *p;
40
- 
41
-   p = strchr (item, ':');
42
-   if (!(p && p1 == '/' && p2 == '/')) {
43
---- xmms2-0.7DrNo.orig/src/clients/nycli/configuration.c
44
-+++ xmms2-0.7DrNo/src/clients/nycli/configuration.c
45
-@@ -125,9 +125,9 @@ configuration_init (const gchar *path)
46
- 
47
-   history_file = configuration_get_string (config, "HISTORY_FILE");
48
-   if (!history_file || !*history_file) {
49
--      gchar cfilePATH_MAX;
50
-+      gchar cfileXMMS_PATH_MAX;
51
- 
52
--      xmms_usercachedir_get (cfile, PATH_MAX);
53
-+      xmms_usercachedir_get (cfile, XMMS_PATH_MAX);
54
-       config->histpath = g_build_filename (cfile, HISTORY_FILE_BASE, NULL);
55
-   } else {
56
-       config->histpath = strdup (history_file);
57
---- xmms2-0.7DrNo.orig/src/clients/launcher/xmms2-launcher.c
58
-+++ xmms2-0.7DrNo/src/clients/launcher/xmms2-launcher.c
59
-@@ -71,8 +71,8 @@ main (int argc, char **argv)
60
-   }
61
-   
62
-   if (!logfile) {
63
--      char cachePATH_MAX;
64
--      xmms_usercachedir_get (cache, PATH_MAX);
65
-+      char cacheXMMS_PATH_MAX;
66
-+      xmms_usercachedir_get (cache, XMMS_PATH_MAX);
67
-       logfile = g_build_filename (cache, "xmms2d.log", NULL);
68
-       if (!g_file_test (cache, G_FILE_TEST_IS_DIR)) {
69
-           g_mkdir_with_parents (cache, 0755);
70
---- xmms2-0.7DrNo.orig/src/clients/lib/perl/XMMSClient.xs
71
-+++ xmms2-0.7DrNo/src/clients/lib/perl/XMMSClient.xs
72
-@@ -1408,9 +1408,9 @@ Get the absolute path to the user config
73
- const char *
74
- xmmsc_userconfdir_get (class)
75
-   PREINIT:
76
--      char pathPATH_MAX;
77
-+      char pathXMMS_PATH_MAX;
78
-   CODE:
79
--      RETVAL = xmmsc_userconfdir_get (path, PATH_MAX);
80
-+      RETVAL = xmmsc_userconfdir_get (path, XMMS_PATH_MAX);
81
-   OUTPUT:
82
-       RETVAL
83
- 
84
---- xmms2-0.7DrNo.orig/src/clients/lib/ruby/rb_xmmsclient_main.c
85
-+++ xmms2-0.7DrNo/src/clients/lib/ruby/rb_xmmsclient_main.c
86
-@@ -33,9 +33,9 @@ static VALUE
87
- m_userconfdir_get (VALUE self)
88
- {
89
-   const char *p;
90
--  char pathPATH_MAX;
91
-+  char pathXMMS_PATH_MAX;
92
- 
93
--  p = xmmsc_userconfdir_get (path, PATH_MAX);
94
-+  p = xmmsc_userconfdir_get (path, XMMS_PATH_MAX);
95
- 
96
-   return p ? rb_str_new2 (p) : Qnil;
97
- }
98
---- xmms2-0.7DrNo.orig/src/plugins/mp4/mp4ff/drms.c
99
-+++ xmms2-0.7DrNo/src/plugins/mp4/mp4ff/drms.c
100
-@@ -131,7 +131,7 @@ struct drms_s
101
-     uint32_t p_key 4 ;
102
-     struct aes_s aes;
103
- 
104
--    char     psz_homedir PATH_MAX ;
105
-+    char     psz_homedir XMMS_PATH_MAX ;
106
- };
107
- 
108
- /*****************************************************************************
109
-@@ -204,8 +204,8 @@ void *drms_alloc( char *psz_homedir )
110
- 
111
-     memset( p_drms, 0, sizeof(struct drms_s) );
112
- 
113
--    strncpy( p_drms->psz_homedir, psz_homedir, PATH_MAX );
114
--    p_drms->psz_homedir PATH_MAX - 1  = '\0';
115
-+    strncpy( p_drms->psz_homedir, psz_homedir, XMMS_PATH_MAX );
116
-+    p_drms->psz_homedir XMMS_PATH_MAX - 1  = '\0';
117
- 
118
-     return (void *)p_drms;
119
- }
120
-@@ -820,9 +820,9 @@ static int WriteUserKey( void *_p_drms, 
121
-     struct drms_s *p_drms = (struct drms_s *)_p_drms;
122
-     FILE *file;
123
-     int i_ret = -1;
124
--    char psz_path PATH_MAX ;
125
-+    char psz_path XMMS_PATH_MAX ;
126
- 
127
--    sprintf( psz_path, /* PATH_MAX - 1, */
128
-+    sprintf( psz_path, /* XMMS_PATH_MAX - 1, */
129
-               "%s/" DRMS_DIRNAME, p_drms->psz_homedir );
130
- 
131
- #if defined( HAVE_ERRNO_H )
132
-@@ -835,7 +835,7 @@ static int WriteUserKey( void *_p_drms, 
133
-     if( !mkdir( psz_path ) )
134
- #endif
135
-     {
136
--        sprintf( psz_path, /*PATH_MAX - 1,*/ "%s/" DRMS_DIRNAME "/%08X.%03d",
137
-+        sprintf( psz_path, /*XMMS_PATH_MAX - 1,*/ "%s/" DRMS_DIRNAME "/%08X.%03d",
138
-                   p_drms->psz_homedir, p_drms->i_user, p_drms->i_key );
139
- 
140
-         file = fopen( psz_path, "w" );
141
-@@ -860,9 +860,9 @@ static int ReadUserKey( void *_p_drms, u
142
-     struct drms_s *p_drms = (struct drms_s *)_p_drms;
143
-     FILE *file;
144
-     int i_ret = -1;
145
--    char psz_path PATH_MAX ;
146
-+    char psz_path XMMS_PATH_MAX ;
147
- 
148
--    sprintf( psz_path, /*PATH_MAX - 1,*/
149
-+    sprintf( psz_path, /*XMMS_PATH_MAX - 1,*/
150
-               "%s/" DRMS_DIRNAME "/%08X.%03d", p_drms->psz_homedir,
151
-               p_drms->i_user, p_drms->i_key );
152
- 
153
-@@ -1030,7 +1030,7 @@ static int GetSCIData( char *psz_ipod, u
154
- {
155
-     FILE *file;
156
-     char *psz_path = NULL;
157
--    char p_tmp PATH_MAX ;
158
-+    char p_tmp XMMS_PATH_MAX ;
159
-     int i_ret = -1;
160
- 
161
-     if( psz_ipod == NULL )
162
---- xmms2-0.7DrNo.orig/src/xmms/main.c
163
-+++ xmms2-0.7DrNo/src/xmms/main.c
164
-@@ -215,7 +215,7 @@ spawn_script_setup (gpointer data)
165
- static void
166
- load_config (void)
167
- {
168
--  gchar configdirPATH_MAX;
169
-+  gchar configdirXMMS_PATH_MAX;
170
- 
171
-   if (!conffile) {
172
-       conffile = XMMS_BUILD_PATH ("xmms2.conf");
173
-@@ -347,7 +347,7 @@ install_scripts (const gchar *into_dir)
174
- {
175
-   GDir *dir;
176
-   GError *err = NULL;
177
--  gchar pathPATH_MAX;
178
-+  gchar pathXMMS_PATH_MAX;
179
-   const gchar *f;
180
-   gchar *s;
181
- 
182
-@@ -357,7 +357,7 @@ install_scripts (const gchar *into_dir)
183
- 
184
-   s++;
185
- 
186
--  g_snprintf (path, PATH_MAX, "%s/scripts/%s", SHAREDDIR, s);
187
-+  g_snprintf (path, XMMS_PATH_MAX, "%s/scripts/%s", SHAREDDIR, s);
188
-   xmms_log_info ("Installing scripts from %s", path);
189
-   dir = g_dir_open (path, 0, &err);
190
-   if (!dir) {
191
---- xmms2-0.7DrNo.orig/src/xmms/utils.c
192
-+++ xmms2-0.7DrNo/src/xmms/utils.c
193
-@@ -38,12 +38,12 @@ char *
194
- xmms_build_path (const char *first, ...)
195
- {
196
-   va_list ap;
197
--  gchar confdirPATH_MAX;
198
-+  gchar confdirXMMS_PATH_MAX;
199
-   gchar *ret, **vargv, **argv;
200
- 
201
-   g_return_val_if_fail (first, NULL);
202
- 
203
--  xmms_userconfdir_get (confdir, PATH_MAX);
204
-+  xmms_userconfdir_get (confdir, XMMS_PATH_MAX);
205
- 
206
-   va_start (ap, first);
207
-   vargv = xmms_valist_to_strlist (first, ap);
208
xmms2-0.7-rpath.patch Deleted
24
 
1
@@ -1,22 +0,0 @@
2
-Description: Fix binary-or-shlib-defines-rpath Lintian warning.
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-Forwarded: No
5
-
6
-Index: debian.git/src/plugins/sid/wscript
7
-===================================================================
8
---- debian.git.orig/src/plugins/sid/wscript    2010-02-19 18:43:54.000000000 +0100
9
-+++ debian.git/src/plugins/sid/wscript 2010-02-20 12:50:08.312900440 +0100
10
-@@ -14,13 +14,6 @@
11
-     # extract what's inside builders pkg-config variable
12
-     builders = conf.check_cfg(package="libsidplay2", args="--variable=builders").strip()
13
- 
14
--    # It looks funny that this is LIBPATH_sidplay but it is correct
15
--    # since we explcitly set the path to builders for resid it will
16
--    # find resid in the list even though we still need to -rpath it.
17
--    if not realpath(builders) in realpath(i) for i in conf.env'LIBPATH_sidplay':
18
--        conf.env'LINKFLAGS_resid' = "-Wl,-rpath=%s" % builders
19
--        conf.env"LIBPATH_resid" = builders
20
--
21
-     if not conf.check_cxx(lib="resid-builder", header_name="sidplay/builders/resid.h", uselib_store="resid", uselib="resid"):
22
-         return False
23
- 
24
xmms2-0.7-silent-launcher.patch Deleted
81
 
1
@@ -1,79 +0,0 @@
2
-Description: This patch makes xmms2-launcher more smart and silent.
3
- All non error output is now turned off unless you run xmms2-launcher with
4
- the --verbose switch.
5
-Bug-Debian: http://bugs.debian.org/510375
6
-Author: Adam Flott <adam@npjh.com>
7
-Forwarded: No
8
-
9
-Index: debian.git/src/clients/launcher/xmms2-launcher.1
10
-===================================================================
11
---- debian.git.orig/src/clients/launcher/xmms2-launcher.1  2010-02-20 12:50:04.522899969 +0100
12
-+++ debian.git/src/clients/launcher/xmms2-launcher.1   2010-02-20 12:50:11.362899847 +0100
13
-@@ -51,6 +51,9 @@
14
- pidfile / 
15
- .B --pidfile=
16
- pidfile
17
-+
18
-+.B --verbose
19
-+
20
- .SH DESCRIPTION
21
- 
22
- .B XMMS2
23
-@@ -88,6 +91,11 @@
24
- .I pidfile
25
- .TP
26
- .I
27
-+\-\-verbose
28
-+Increases the vebosity of
29
-+.I xmms2-launcher
30
-+.TP
31
-+.I
32
- \-? / \-\-help
33
- Show help options
34
- .SH FILES
35
-Index: debian.git/src/clients/launcher/xmms2-launcher.c
36
-===================================================================
37
---- debian.git.orig/src/clients/launcher/xmms2-launcher.c  2010-02-19 18:43:54.000000000 +0100
38
-+++ debian.git/src/clients/launcher/xmms2-launcher.c   2010-02-20 12:50:11.362899847 +0100
39
-@@ -46,11 +46,13 @@
40
-   int pipefd2;
41
-   const gchar *logfile = NULL;
42
-   const gchar *pidfile = NULL;
43
-+  static gboolean verbose = FALSE;
44
-   GError *error = NULL;
45
-   GOptionContext* context = NULL;
46
-   GOptionEntry opts = {
47
-       {"logfile", 'l', 0, G_OPTION_ARG_FILENAME, &logfile, "Redirect logs to <file>", "<file>"},
48
-       {"pidfile", 'P', 0, G_OPTION_ARG_FILENAME, &pidfile, "Save xmms2d pid in <file>", "<file>"},
49
-+      {"verbose", 0, 0, G_OPTION_ARG_NONE, &verbose, "Verbose", NULL},
50
-       {NULL}
51
-   };
52
- 
53
-@@ -76,7 +78,9 @@
54
-           g_mkdir_with_parents (cache, 0755);
55
-       }
56
-   }
57
--  g_print ("Log output will be stored in %s\n", logfile);
58
-+  if (verbose) {
59
-+      g_print ("Log output will be stored in %s\n", logfile);
60
-+  }
61
- 
62
-   pid = fork ();
63
-   if (pid) {
64
-@@ -92,10 +96,14 @@
65
-       if (res == -1)
66
-           perror ("read");
67
-       if (res == 0) {
68
--          printf ("startup failed!\n");
69
-+          if (verbose) {
70
-+              printf ("startup failed!\n");
71
-+          }
72
-           exit (1);
73
-       }
74
--      printf("xmms2 started\n");
75
-+      if (verbose) {
76
-+          printf("xmms2 started\n");
77
-+      }
78
-       exit(0);
79
-   }
80
- 
81
xmms2-0.7-spelling-error.patch Deleted
45
 
1
@@ -1,43 +0,0 @@
2
-Description: Correct spelling error found by Lintian.
3
-Author: Benjamin Drung <bdrung@ubuntu.com>
4
-Forwarded: No
5
-
6
-Index: debian.git/src/plugins/mp4/mp4ff/mp4meta.c
7
-===================================================================
8
---- debian.git.orig/src/plugins/mp4/mp4ff/mp4meta.c    2010-02-19 18:43:54.000000000 +0100
9
-+++ debian.git/src/plugins/mp4/mp4ff/mp4meta.c 2010-02-20 12:53:23.254149836 +0100
10
-@@ -123,7 +123,7 @@
11
-     "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk",
12
-     "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
13
-     "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
14
--    "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
15
-+    "New Wave", "Psychedelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
16
-     "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
17
-     "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing",
18
-     "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde",
19
-Index: debian.git/src/xmms/main.c
20
-===================================================================
21
---- debian.git.orig/src/xmms/main.c    2010-02-19 18:43:54.000000000 +0100
22
-+++ debian.git/src/xmms/main.c 2010-02-20 12:53:23.254149836 +0100
23
-@@ -254,10 +254,10 @@
24
- 
25
-   plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname);
26
-   if (!plugin) {
27
--      xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull");
28
-+      xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful");
29
-   } else {
30
-       if (!xmms_output_plugin_switch (mainobj->output, plugin)) {
31
--          xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull");
32
-+          xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful");
33
-       }
34
-   }
35
- }
36
-@@ -564,7 +564,7 @@
37
-   o_plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname);
38
-   if (!o_plugin) {
39
-       xmms_log_error ("Baaaaad output plugin, try to change the"
40
--                      "output.plugin config variable to something usefull");
41
-+                      "output.plugin config variable to something useful");
42
-   }
43
- 
44
-   mainobj->output = xmms_output_new (o_plugin, playlist);
45
xmms2-0.7-vorbis-picture-support.patch Deleted
101
 
1
@@ -1,99 +0,0 @@
2
-Description: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
3
-Bug-Debian: http://bugs.debian.org/565479
4
-Author: anomie@users.sourceforge.net
5
-Forwarded: no
6
-
7
-Index: debian.git/src/plugins/vorbis_common/common.c
8
-===================================================================
9
---- debian.git.orig/src/plugins/vorbis_common/common.c 2010-02-20 13:02:52.314149734 +0100
10
-+++ debian.git/src/plugins/vorbis_common/common.c  2010-02-20 13:03:10.212899779 +0100
11
-@@ -243,6 +243,74 @@
12
-   }
13
- }
14
- 
15
-+static void
16
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
17
-+{
18
-+  guint32 typ, mime_len, desc_len, img_len;
19
-+  guchar *pos, *end, *mime_data, *img_data;
20
-+  gchar hash33;
21
-+
22
-+  pos = value;
23
-+  end = value + len;
24
-+
25
-+  if (pos + 4 > end) {
26
-+      XMMS_DBG ("Malformed picture comment");
27
-+      return;
28
-+  }
29
-+  typ = GUINT32_FROM_BE (*(guint32 *)pos);
30
-+  if (typ != 0 && typ != 3) {
31
-+      XMMS_DBG ("Picture type %d not handled", typ);
32
-+      return;
33
-+  }
34
-+  pos += 4;
35
-+
36
-+  if (pos + 4 > end) {
37
-+      XMMS_DBG ("Malformed picture comment");
38
-+      return;
39
-+  }
40
-+  mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
41
-+  pos += 4;
42
-+  mime_data = pos;
43
-+  pos += mime_len;
44
-+
45
-+  if (pos + 4 > end) {
46
-+      XMMS_DBG ("Malformed picture comment");
47
-+      return;
48
-+  }
49
-+  desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
50
-+  pos += 4;
51
-+  pos += desc_len;
52
-+
53
-+  pos += 4; /* width */
54
-+  pos += 4; /* height */
55
-+  pos += 4; /* depth */
56
-+  pos += 4; /* indexed palette length */
57
-+
58
-+  if (pos + 4 > end) {
59
-+      XMMS_DBG ("Malformed picture comment");
60
-+      return;
61
-+  }
62
-+  img_len = GUINT32_FROM_BE (*(guint32 *)pos);
63
-+  pos += 4;
64
-+  img_data = pos;
65
-+
66
-+  if (img_data + img_len > end) {
67
-+      XMMS_DBG ("Malformed picture comment");
68
-+      return;
69
-+  }
70
-+
71
-+  if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
72
-+      const gchar *metakey;
73
-+
74
-+      metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
75
-+      xmms_xform_metadata_set_str (xform, metakey, hash);
76
-+
77
-+      metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
78
-+      mime_datamime_len = '\0';
79
-+      xmms_xform_metadata_set_str (xform, metakey, mime_data);
80
-+  }
81
-+}
82
-+
83
- /* note that "key" is NOT NUL-terminated here,
84
-  * but "value" is.
85
-  */
86
-@@ -253,6 +321,14 @@
87
- {
88
-   gint i;
89
- 
90
-+  if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
91
-+      gsize dlen;
92
-+      gchar *dvalue = g_base64_decode (value, &dlen);
93
-+      handle_image_comment (xform, dvalue, dlen);
94
-+      g_free (dvalue);
95
-+      return;
96
-+  }
97
-+
98
-   for (i = 0; i < G_N_ELEMENTS (properties); i++) {
99
-       if ((!g_ascii_strncasecmp (key, "MUSICBRAINZ_ALBUMARTISTID", key_len)) &&
100
-           (!g_ascii_strcasecmp (value, MUSICBRAINZ_VA_ID))) {
101
xmms2-0.8-add-lib-vorbis-and-ogg.patch Added
32
 
1
@@ -0,0 +1,30 @@
2
+Index: xmms2-0.8DrO_o/src/clients/vistest/wscript
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/src/clients/vistest/wscript
5
++++ xmms2-0.8DrO_o/src/clients/vistest/wscript
6
+@@ -23,12 +23,12 @@ def build(bld):
7
+             t.install_path = None
8
+ 
9
+ 
10
+-    if bld.env.LIB_vorbisenc:
11
++    if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg:
12
+         t = bld(features = 'c cprogram',
13
+             target = 'xmms2-ripper',
14
+             source = 'ripper.c',
15
+             includes = '. ../../.. ../../include',
16
+-            uselib = 'vorbisenc',
17
++            uselib = 'vorbisenc vorbis ogg',
18
+             use = 'xmmsclient'
19
+             )
20
+         if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
21
+@@ -56,6 +56,10 @@ def configure(conf):
22
+     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
23
+             args='--cflags --libs', mandatory=False)
24
+ 
25
++    conf.check_cfg(package='vorbis', uselib_store='vorbis', args='--cflags --libs', mandatory=False)
26
++
27
++    conf.check_cfg(package='ogg', uselib_store='ogg', args='--cflags --libs', mandatory=False)
28
++
29
+     if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
30
+             args='--cflags --libs', mandatory=False):
31
+         conf.check_cfg(package='sdl', uselib_store='sdl',
32
xmms2-0.8-fix-cast-error.patch Added
15
 
1
@@ -0,0 +1,13 @@
2
+Index: xmms2-0.8DrO_o/src/clients/medialib-updater/main.c
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/src/clients/medialib-updater/main.c
5
++++ xmms2-0.8DrO_o/src/clients/medialib-updater/main.c
6
+@@ -489,6 +489,8 @@ updater_remove_directory_by_id (xmmsv_t
7
+   return TRUE;
8
+ }
9
+ 
10
++char *_xmmsc_medialib_encode_url (const char *url, xmmsv_t *args);
11
++
12
+ static void
13
+ updater_remove_directory (updater_t *updater, GFile *file)
14
+ {
15
xmms2-0.8-fixwarnings.patch Added
14
 
1
@@ -0,0 +1,12 @@
2
+Index: xmms2-0.8DrO_o/src/xmms/visualization/unixshm.c
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/src/xmms/visualization/unixshm.c
5
++++ xmms2-0.8DrO_o/src/xmms/visualization/unixshm.c
6
+@@ -14,6 +14,7 @@
7
+  *  Lesser General Public License for more details.
8
+  */
9
+ 
10
++#define _GNU_SOURCE
11
+ #include <sys/shm.h>
12
+ #include <sys/sem.h>
13
+ #include <sys/stat.h>
14
xmms2-0.8-linker-flags.patch Added
16
 
1
@@ -0,0 +1,14 @@
2
+Index: xmms2-0.8DrO_o/wscript
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/wscript
5
++++ xmms2-0.8DrO_o/wscript
6
+@@ -448,6 +448,9 @@ int main() { return 0; }
7
+             enabled_optionals, disabled_optionals,
8
+             output_plugins)
9
+ 
10
++    # Do not link against unused libraries (make dpkg-shlibdeps happy).
11
++    conf.env.LINKFLAGS += '-Wl,--as-needed'
12
++
13
+     return True
14
+ 
15
+ ####
16
xmms2-0.7-no-O0.patch -> xmms2-0.8-no-O0.patch Changed
84
 
1
@@ -1,59 +1,26 @@
2
-diff -uNr old-xmms2-0.7DrNo//src/plugins/pulse/wscript xmms2-0.7DrNo/src/plugins/pulse/wscript
3
---- old-xmms2-0.7DrNo//src/plugins/pulse/wscript   2010-02-19 18:43:54.000000000 +0100
4
-+++ xmms2-0.7DrNo/src/plugins/pulse/wscript    2010-03-01 23:32:24.033756750 +0100
5
-@@ -7,4 +7,4 @@
6
+Index: xmms2-0.8DrO_o/src/plugins/pulse/wscript
7
+===================================================================
8
+--- xmms2-0.8DrO_o.orig/src/plugins/pulse/wscript
9
++++ xmms2-0.8DrO_o/src/plugins/pulse/wscript
10
+@@ -3,5 +3,5 @@ from waftools.plugin import plugin
11
+ def plugin_configure(conf):
12
+     conf.check_cfg(package="libpulse", args="--cflags --libs", uselib_store="pulse")
13
  
14
- configure, build = plugin("pulse", configure=plugin_configure,
15
-                           source="pulse.c", "backend.c",
16
--                          output_prio=25, libs="pulse")
17
-+                          output_prio=45, libs="pulse")
18
-diff -uNr old-xmms2-0.7DrNo//wscript xmms2-0.7DrNo/wscript
19
---- old-xmms2-0.7DrNo//wscript 2010-02-19 18:43:54.000000000 +0100
20
-+++ xmms2-0.7DrNo/wscript  2010-03-01 23:33:49.967756992 +0100
21
-@@ -275,27 +275,27 @@
22
-         conf.check_message("uncommitted changes", "", bool(changed))
23
-         conf.env"VERSION" = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
24
+-configure, build = plugin("pulse", configure=plugin_configure, output_prio=25,
25
++configure, build = plugin("pulse", configure=plugin_configure, output_prio=45,
26
+         libs="pulse")
27
+Index: xmms2-0.8DrO_o/wscript
28
+===================================================================
29
+--- xmms2-0.8DrO_o.orig/wscript
30
++++ xmms2-0.8DrO_o/wscript
31
+@@ -295,8 +295,8 @@ def configure(conf):
32
+         conf.msg("uncommited changed", changed and "yes" or "no")
33
+         conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
34
  
35
--    conf.env"CCFLAGS" = Utils.to_list(conf.env"CCFLAGS") + '-g', '-O0'
36
--    for warning in ('all',
37
--                    'no-format-extra-args',
38
--                    'no-format-zero-length',
39
--                    'format-nonliteral',
40
--                    'format-security',
41
--                    'format=2',
42
--                    "missing-prototypes",
43
--                    "strict-prototypes",
44
--                    "empty-body",
45
--                    "ignored-qualifiers",
46
--                    "type-limits",
47
--                    "write-strings",
48
--                    ):
49
--        warnflag = "-W%s" % warning
50
--        if conf.check_cc(cflags=warnflag):
51
--            conf.env"CCFLAGS".append(warnflag)
52
-+#    conf.env"CCFLAGS" = Utils.to_list(conf.env"CCFLAGS") + '-g', '-O0'
53
-+#    for warning in ('all',
54
-+#                    'no-format-extra-args',
55
-+#                    'no-format-zero-length',
56
-+#                    'format-nonliteral',
57
-+#                    'format-security',
58
-+#                    'format=2',
59
-+#                    "missing-prototypes",
60
-+#                    "strict-prototypes",
61
-+#                    "empty-body",
62
-+#                    "ignored-qualifiers",
63
-+#                    "type-limits",
64
-+#                    "write-strings",
65
-+#                    ):
66
-+#        warnflag = "-W%s" % warning
67
-+#        if conf.check_cc(cflags=warnflag):
68
-+#            conf.env"CCFLAGS".append(warnflag)
69
-             # autogenerate uselib definitions to disable warnings
70
--            conf.env"CCFLAGS_NO%s" % warning.replace("-","").upper() = "-Wno-%s" % warning
71
-+#            conf.env"CCFLAGS_NO%s" % warning.replace("-","").upper() = "-Wno-%s" % warning
72
- 
73
--    conf.env"CXXFLAGS" = Utils.to_list(conf.env"CXXFLAGS") + '-g', '-O0'
74
-+#    conf.env"CXXFLAGS" = Utils.to_list(conf.env"CXXFLAGS") + '-g', '-O0'
75
-     conf.env'XMMS_PKGCONF_FILES' = 
76
-     conf.env'XMMS_OUTPUT_PLUGINS' = (-1, "NONE")
77
+-    conf.env.append_unique('CFLAGS', '-g', '-O0')
78
+-    conf.env.append_unique('CXXFLAGS', '-g', '-O0')
79
++    #conf.env.append_unique('CFLAGS', '-g', '-O0')
80
++    #conf.env.append_unique('CXXFLAGS', '-g', '-O0')
81
  
82
+     if conf.options.with_profiling:
83
+         conf.env.with_profiling = True
84
xmms2-0.8-rpath.patch Added
20
 
1
@@ -0,0 +1,18 @@
2
+Index: xmms2-0.8DrO_o/src/plugins/sid/wscript
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/src/plugins/sid/wscript
5
++++ xmms2-0.8DrO_o/src/plugins/sid/wscript
6
+@@ -19,13 +19,6 @@ def plugin_configure(conf):
7
+     builders = conf.check_cfg(package="libsidplay2",
8
+             args="--variable=builders").strip()
9
+ 
10
+-    # It looks funny that this is LIBPATH_sidplay but it is correct
11
+-    # since we explcitly set the path to builders for resid it will
12
+-    # find resid in the list even though we still need to -rpath it.
13
+-    if not realpath(builders) in realpath(i) for i in conf.env.LIBPATH_sidplay:
14
+-        conf.env.LINKFLAGS_resid = "-Wl,-rpath=%s" % builders
15
+-        conf.env.LIBPATH_resid = builders
16
+-
17
+     conf.check_cxx(lib="resid-builder", header_name="sidplay/builders/resid.h",
18
+             uselib_store="resid", uselib="resid")
19
+ 
20
xmms2-0.8-spelling-error.patch Added
15
 
1
@@ -0,0 +1,13 @@
2
+Index: xmms2-0.8DrO_o/src/plugins/mp4/mp4ff/mp4meta.c
3
+===================================================================
4
+--- xmms2-0.8DrO_o.orig/src/plugins/mp4/mp4ff/mp4meta.c
5
++++ xmms2-0.8DrO_o/src/plugins/mp4/mp4ff/mp4meta.c
6
+@@ -128,7 +128,7 @@ static const char* ID3v1GenreList = {
7
+     "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk",
8
+     "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
9
+     "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
10
+-    "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
11
++    "New Wave", "Psychedelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
12
+     "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
13
+     "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing",
14
+     "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde",
15
xmms2-pkgconfig.patch Changed
9
 
1
@@ -7,6 +7,6 @@
2
  Description: XMMS Generation 2
3
  Requires:
4
 -Version: @VERSION@
5
-+Version: 0.7
6
++Version: 0.8
7
  Libs: -L${libdir} @LIB@
8
  Cflags: -I${includedir}
9
xmms2-0.7DrNo.tar.bz2 Deleted
xmms2-0.8DrO_o.tar.bz2 Added
Refresh

No build results available

Refresh

No rpmlint results available

Request History
Marguerite Su's avatar

marguerite created request over 11 years ago

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


pbleser's avatar

pbleser accepted request over 12 years ago