Overview

Request 566 (accepted)

Remember to submit this to obs multimedia:libs/vlc when accepted.

- Drop support for < 12.2 as it does not build anyway
* Removal of pulseaudio subpackage and incorporating it to the
noX package.
* Cleanup of the dependencies and configure switches we don't
need to use anymore.
- Add lang subpackage as it was most of what was noX package
containing. This way we can reduce the size and use noarch there.
- Touch the ghosted file in %post to make rpmlint happy
- Fix __DATE__ and __TIME__ usage so we do not rebuild so often.
- Drop obsolete configure options which are no longer around
- Disable xcb switch as we no longer build for such old distros.

Submit package home:scarabeus / vlc to package Essentials / vlc

vlc.changes Changed
x
 
1
@@ -1,4 +1,19 @@
2
 -------------------------------------------------------------------
3
+Sat Oct 12 09:42:57 UTC 2013 - scarabeus@opensuse.org
4
+
5
+- Drop support for < 12.2 as it does not build anyway
6
+  * Removal of pulseaudio subpackage and incorporating it to the
7
+    noX package.
8
+  * Cleanup of the dependencies and configure switches we don't
9
+    need to use anymore.
10
+- Add lang subpackage as it was most of what was noX package
11
+  containing. This way we can reduce the size and use noarch there.
12
+- Touch the ghosted file in %post to make rpmlint happy
13
+- Fix __DATE__ and __TIME__ usage so we do not rebuild so often.
14
+- Drop obsolete configure options which are no longer around
15
+- Disable xcb switch as we no longer build for such old distros.
16
+
17
+-------------------------------------------------------------------
18
 Wed Oct  2 9:11:58 UTC 2013 - wbauer@tmo.at
19
 
20
 - Re-add and adapt 0001-no-return-in-non-void.patch: fixes build on
21
vlc.spec Changed
369
 
1
@@ -17,8 +17,6 @@
2
 #
3
 
4
 
5
-%define pulseplugin 0%{suse_version} > 1130
6
-%define withxcb 0%{suse_version} > 1131
7
 %define libvlc 5
8
 %define libvlccore 7
9
 %define conflicts vlc-beta
10
@@ -32,17 +30,19 @@
11
 %bcond_with opengles
12
 %endif
13
 
14
-Summary:        VLC - Video Lan Client
15
+Summary:        Video Lan Client multimedia player
16
 License:        GPL-2.0+ and LGPL-2.1+
17
 Group:          Productivity/Multimedia/Video/Players  
18
 Name:           vlc
19
 Version:        2.1.0
20
 Release:        0
21
 %define _version 2.1.0
22
+Url:            http://www.videolan.org/
23
 Source:         http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
24
 Patch1:         fix_font_path.patch
25
 Patch3:         0001-no-return-in-non-void.patch
26
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
27
+BuildRequires:  Mesa-devel
28
 BuildRequires:  aalib-devel
29
 BuildRequires:  alsa-devel
30
 BuildRequires:  avahi-devel
31
@@ -51,23 +51,19 @@
32
 BuildRequires:  freetype2-devel
33
 BuildRequires:  fribidi-devel
34
 BuildRequires:  gcc-c++
35
-%if 0%{?suse_version} >= 1140
36
 BuildRequires:  gdk-pixbuf-devel
37
-%endif
38
 BuildRequires:  gettext-devel
39
 BuildRequires:  git
40
 BuildRequires:  gnome-vfs2-devel
41
 BuildRequires:  gnutls-devel
42
 BuildRequires:  gtk2-devel
43
+BuildRequires:  libSDL-devel
44
 BuildRequires:  libass-devel
45
 BuildRequires:  libavc1394-devel
46
 BuildRequires:  libbluray-devel
47
 BuildRequires:  libcaca-devel
48
 BuildRequires:  libcddb-devel
49
 BuildRequires:  libcdio-devel
50
-%if 0%suse_version < 1140
51
-BuildRequires:  libdc1394_control12-devel
52
-%endif
53
 BuildRequires:  libdc1394-devel
54
 BuildRequires:  libdvbpsi-devel < 1.0
55
 BuildRequires:  libdvdnav-devel
56
@@ -81,13 +77,7 @@
57
 BuildRequires:  libnotify-devel
58
 BuildRequires:  libogg-devel
59
 BuildRequires:  libopus-devel
60
-BuildRequires:  pkgconfig(dirac) >= 0.10.0
61
-%if 0%{?suse_version} >= 1200
62
-BuildRequires:  pkgconfig(libgme)
63
-%endif
64
-%if 0%{suse_version} >= 1120
65
 BuildRequires:  libproxy-devel
66
-%endif
67
 BuildRequires:  libqt4-devel
68
 BuildRequires:  libraw1394-devel
69
 BuildRequires:  librsvg-devel
70
@@ -96,43 +86,26 @@
71
 BuildRequires:  libsmbclient-devel
72
 BuildRequires:  libtheora-devel
73
 BuildRequires:  libtool
74
-%if 0%{suse_version} > 1100 
75
 BuildRequires:  libudev-devel
76
-%endif
77
 BuildRequires:  libupnp-devel
78
-%if 0%{?suse_version} > 1130
79
 BuildRequires:  libv4l-devel
80
-%endif
81
-%if 0%{?suse_version} > 1130
82
 BuildRequires:  libva-devel
83
-%endif
84
 BuildRequires:  libvorbis-devel
85
 BuildRequires:  libxml2-devel
86
 BuildRequires:  lirc-devel
87
 BuildRequires:  live555-devel
88
-%if 0%{?suse_version} >= 1220
89
 BuildRequires:  lua51-devel
90
-%else
91
-BuildRequires:  lua-devel
92
-%endif
93
-BuildRequires:  Mesa-devel
94
-%if %{?with_ncurses}
95
-BuildRequires:  ncurses-devel
96
-%endif
97
 BuildRequires:  pcre-devel
98
 BuildRequires:  pulseaudio-devel
99
 BuildRequires:  schroedinger-devel
100
-%if 0%{suse_version} < 1120
101
-BuildRequires:  SDL-devel
102
-%else
103
-BuildRequires:  libSDL-devel
104
-%endif
105
 BuildRequires:  slang-devel
106
 BuildRequires:  speex-devel
107
 BuildRequires:  taglib-devel
108
 BuildRequires:  vcdimager-devel
109
 BuildRequires:  xosd-devel
110
 BuildRequires:  zvbi-devel
111
+BuildRequires:  pkgconfig(dirac) >= 0.10.0
112
+BuildRequires:  pkgconfig(libgme)
113
 # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations
114
 # and can favor one over the other.
115
 BuildRequires:  pkgconfig(libswscale)
116
@@ -141,6 +114,10 @@
117
 BuildRequires:  findutils
118
 BuildRequires:  update-desktop-files
119
 BuildRequires:  xz
120
+# ncurses are not ready so far
121
+%if %{?with_ncurses}
122
+BuildRequires:  ncurses-devel
123
+%endif
124
 # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
125
 %if 0%{?BUILD_ORIG}
126
 BuildRequires:  faad2-devel
127
@@ -200,6 +177,12 @@
128
 Requires:       libvlccore%{libvlccore} = %{version}-%{release}
129
 Conflicts:      %{conflicts}-noX
130
 Recommends:     libdvdcss
131
+# pulseaudio subpackage merge
132
+Supplements:    packageand(%{name}-noX:pulseaudio)
133
+Provides:       vlc-aout-pulse = %{version}
134
+Obsoletes:      vlc-aout-pulse < %{version}
135
+# lang subpackage
136
+Recommends:     vlc-noX-lang
137
 
138
 %description noX
139
 This Package of VLC contains the bare requirements you need to install.
140
@@ -209,6 +192,8 @@
141
 Should you decide to install the GUI modules, %{name}-noX will stay
142
 installed as a dependency.
143
 
144
+%lang_package -n vlc-noX
145
+
146
 %if 0%{?BUILD_ORIG}
147
 %package codecs
148
 Summary:        VLC: VideoLAN Client - Codec extension
149
@@ -245,26 +230,19 @@
150
 In order to integrate flawless into GNOME, there are some access modules
151
 for gnome-vfs2.
152
 
153
-%if 0%{pulseplugin}
154
-%package aout-pulse
155
-Summary:        VLC Audio Out for Pulse Audio
156
-License:        GPL-2.0+ and LGPL-2.1+
157
-Group:          System/Libraries
158
-Requires:       %{name} = %{version}-%{release}
159
-Supplements:    packageand(%{name}-noX:pulseaudio)
160
-Requires:       %{name}-noX = %{version}-%{release}
161
-Conflicts:      %{conflicts}-aout-pulse
162
-
163
-%description aout-pulse
164
-Extends VLC with Pulse Audio Support for Audio Out
165
-%endif
166
-
167
 %prep
168
 %setup -q -n %{name}-%{_version}
169
 %patch1 -p1
170
 %patch3 -p1
171
 rm -rf contrib
172
 
173
+# fix builddate info
174
+# Remove build time references so build-compare can do its work
175
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
176
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
177
+sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
178
+sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
179
+
180
 %build 
181
 pkg-config --exists smbclient && 
182
   smbclient=$(pkg-config --cflags smbclient)
183
@@ -281,9 +259,7 @@
184
    --disable-dependency-tracking        \
185
    --enable-aa                          \
186
    --enable-alsa                        \
187
-%if 0%{?suse_version} > 1120
188
    --enable-dvbpsi                      \
189
-%endif
190
    --enable-dvdnav                      \
191
    --enable-dvdread                     \
192
    --enable-fast-install                \
193
@@ -291,9 +267,7 @@
194
    --enable-freetype                    \
195
    --enable-fribidi                     \
196
    --enable-glx                         \
197
-%if 0%{?suse_version} >= 1200
198
    --enable-gme                         \
199
-%endif
200
    --enable-gnomevfs                    \
201
    --enable-gnutls                      \
202
    --enable-httpd                       \
203
@@ -301,9 +275,6 @@
204
    --enable-kate                        \
205
    --enable-libass                      \
206
    --enable-libcddb                     \
207
-%if 0%{suse_version} >= 1120
208
-   --enable-libproxy                    \
209
-%endif
210
    --enable-lirc                        \
211
    --enable-swscale                     \
212
    --enable-live555                     \
213
@@ -337,43 +308,28 @@
214
    --enable-opus                        \
215
    --disable-oss                        \
216
    --enable-png                         \
217
-%if 0%{pulseplugin}
218
    --enable-pulse                       \
219
-%endif
220
-   --enable-pvr                         \
221
-   --enable-real                        \
222
    --enable-realrtsp                    \
223
-   --enable-smb                         \
224
+   --enable-smbclient                   \
225
    --enable-sout                        \
226
    --enable-speex                       \
227
    --enable-taglib                      \
228
    --enable-theora                      \
229
-%if 0%{?suse_version} > 1130
230
    --enable-v4l2                        \
231
-%else
232
-   --disable-libv4l2                    \
233
-%endif
234
    --enable-vcd                         \
235
    --enable-vcdx                        \
236
-   --enable-visual                      \
237
    --enable-vorbis                      \
238
    --enable-waveout                     \
239
-%if 0%{?withxcb}
240
    --enable-xcb                         \
241
-%else
242
-   --disable-xcb                        \
243
-%endif
244
 %if %{with opengles}
245
   --enable-gles2                        \
246
   --enable-egl                         \
247
 %endif
248
    --enable-xvideo                     
249
-make %{?_smp_mflags}
250
+make %{?_smp_mflags} V=1
251
 
252
 %install
253
-echo '********* ENTERED INSTALL PHASE *********'
254
-date
255
-%makeinstall
256
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
257
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
258
 ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
259
 find %{buildroot} -name *.la -delete
260
@@ -387,38 +343,34 @@
261
 done
262
 %find_lang vlc
263
 
264
-%clean
265
-rm -rf "$RPM_BUILD_ROOT"
266
-
267
 %files 
268
 %defattr(-,root,root)
269
 %{_bindir}/svlc
270
-%{_datadir}/applications/vlc.desktop
271
-%{_datadir}/pixmaps/vlc.png
272
 %{_datadir}/icons/hicolor/*/apps/vlc*
273
 %dir %{_datadir}/kde4
274
 %dir %{_datadir}/kde4/apps
275
 %{_datadir}/kde4/apps/solid
276
-%if 0%{?suse_version} > 1130
277
 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
278
-%endif
279
 %{_libdir}/vlc/plugins//notify/libnotify_plugin.so
280
 %{_libdir}/vlc/plugins//video_filter/libremoteosd_plugin.so
281
 %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
282
-%if 0%{withxcb}
283
 %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
284
 %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
285
-%endif
286
 %if %{with opengles}
287
 %{_libdir}/vlc/plugins/video_output/libegl_plugin.so
288
 %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
289
 %endif
290
 %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
291
 
292
-%files noX -f vlc.lang
293
+%files noX-lang -f vlc.lang
294
+%defattr(-,root,root)
295
+
296
+%files noX
297
 %defattr(-,root,root)
298
 %doc %{_datadir}/doc/vlc/
299
 %doc NEWS AUTHORS COPYING THANKS README 
300
+%{_datadir}/applications/vlc.desktop
301
+%{_datadir}/pixmaps/vlc.png
302
 %{_bindir}/cvlc
303
 %if %{?with_ncurses}
304
 %{_bindir}/nvlc
305
@@ -427,14 +379,6 @@
306
 %{_bindir}/vlc
307
 %{_bindir}/vlc-wrapper
308
 %{_datadir}/vlc/
309
-%if 0%{?suse_version} <= 1130
310
-%dir %{_datadir}/locale/co
311
-%dir %{_datadir}/locale/co/LC_MESSAGES
312
-%endif
313
-%if 0%{?suse_version} <= 1140
314
- %dir %{_datadir}/locale/tet
315
- %dir %{_datadir}/locale/tet/LC_MESSAGES
316
-%endif
317
 %{_mandir}/*/vlc*
318
 # Own the file.. but it's an auto-generated file, so ghost it.
319
 %ghost %{_libdir}/vlc/plugins/plugins.dat
320
@@ -615,6 +559,7 @@
321
 %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
322
 %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
323
 %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
324
+%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
325
 %{_libdir}/vlc/plugins/codec/liba52_plugin.so
326
 %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
327
 %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
328
@@ -653,9 +598,6 @@
329
 %{_libdir}/vlc/plugins/control/libdbus_plugin.so
330
 %{_libdir}/vlc/plugins/control/libdummy_plugin.so
331
 %{_libdir}/vlc/plugins/control/libgestures_plugin.so
332
-%if 0%{?suse_version} < 1220
333
-%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
334
-%endif
335
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
336
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
337
 %{_libdir}/vlc/plugins/control/libmotion_plugin.so
338
@@ -671,9 +613,7 @@
339
 %{_libdir}/vlc/plugins/demux/libdirac_plugin.so
340
 %{_libdir}/vlc/plugins/demux/libes_plugin.so
341
 %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
342
-%if 0%{?suse_version} >= 1200
343
 %{_libdir}/vlc/plugins/demux/libgme_plugin.so
344
-%endif
345
 %{_libdir}/vlc/plugins/demux/libh264_plugin.so
346
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
347
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
348
@@ -890,16 +830,11 @@
349
 %{_libdir}/libvlc.so
350
 %{_libdir}/pkgconfig/libvlc.pc
351
 %{_libdir}/pkgconfig/vlc-plugin.pc
352
-#%{_bindir}/vlc-config
353
-
354
-%if 0%{pulseplugin}
355
-%files aout-pulse
356
-%defattr(-,root,root)
357
-%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
358
-%endif
359
 
360
-%post -n %{name}-noX -p /sbin/ldconfig
361
-%postun -n %{name}-noX -p /sbin/ldconfig
362
+%post noX
363
+/sbin/ldconfig
364
+touch %{_libdir}/vlc/plugins/plugins.dat
365
+%postun noX -p /sbin/ldconfig
366
 
367
 %post -n libvlc%{libvlc} -p /sbin/ldconfig
368
 %postun -n libvlc%{libvlc} -p /sbin/ldconfig
369
Refresh
Refresh
Request History
Tomáš Chvátal's avatar

scarabeus created request over 11 years ago

Remember to submit this to obs multimedia:libs/vlc when accepted.

- Drop support for < 12.2 as it does not build anyway
* Removal of pulseaudio subpackage and incorporating it to the
noX package.
* Cleanup of the dependencies and configure switches we don't
need to use anymore.
- Add lang subpackage as it was most of what was noX package
containing. This way we can reduce the size and use noarch there.
- Touch the ghosted file in %post to make rpmlint happy
- Fix __DATE__ and __TIME__ usage so we do not rebuild so often.
- Drop obsolete configure options which are no longer around
- Disable xcb switch as we no longer build for such old distros.


Raymond Wooninck's avatar

raywoo accepted request over 11 years ago

Ok