Overview

Request 3168 (accepted)

hackish way to avoid the zero day exploit for libgme

Submit package home:mrdocs:branches:Essentials / vlc to package Essentials / vlc
View file
vlc.changes Changed
​x
 
1
@@ -1,4 +1,217 @@
2
 -------------------------------------------------------------------
3
+Fri Oct 28 17:58:28 UTC 2016 - olaf@aepfle.de
4
+
5
+- Enable libfdk_aac
6
+
7
+-------------------------------------------------------------------
8
+Wed Aug 10 20:08:55 UTC 2016 - olaf@aepfle.de
9
+
10
+- Fix build using old GCC intrinsics
11
+- text: fix decoding of 4-bytes UTF-8 sequences
12
+
13
+-------------------------------------------------------------------
14
+Sun Aug  7 18:14:35 UTC 2016 - olaf@aepfle.de
15
+
16
+- Provide/Obsolete vlc-codec-gstreamer
17
+
18
+-------------------------------------------------------------------
19
+Tue Jun 21 09:11:47 UTC 2016 - olaf@aepfle.de
20
+
21
+- Disable atmo plugin in Tumbleweed
22
+
23
+-------------------------------------------------------------------
24
+Sun Jun 05 12:06:21 UTC 2016 - joerg.lorenzen@ki.tng.de
25
+
26
+- Update to version 2.2.4:
27
+  + Decoder:
28
+    - Fix crash in G.711 wav files
29
+    - Fix mp3 crash in libmad
30
+    - Fix out-of-bound write in adpcm QT IMA codec (CVE-2016-5108)
31
+  + Qt:
32
+    - Fix resizing issues
33
+  + Win32:
34
+    - Fix overlay creation on Windows XP for DirectDraw video output
35
+  + Misc:
36
+    - Build fixes for Hurd
37
+  + Translations:
38
+    - Update of Bulgarian, Catalan, German, French, Italian,
39
+      Marathi, Norwegian Bokmål, Norwegian Nynorsk, Portuguese,
40
+      Slovak, Spanish (Mexico), Swedish, Simplified Chinese, and
41
+      Traditional Chinese translations
42
+
43
+-------------------------------------------------------------------
44
+Mon May 02 21:37:41 UTC 2016 - joerg.lorenzen@ki.tng.de
45
+
46
+- Update to version 2.2.3:
47
+  + Demux:
48
+    - Fix HLS quality selection and a potential stack overflow
49
+    - Fix potential MKV infinite loop and improve MKV tags support
50
+    - Fix WMV regression
51
+  + Decoder:
52
+    - Fix hardware decoding with libvdpau-va-gl
53
+    - Fix crashes with libvpx
54
+    - Use libass without caching dialog
55
+  + Video Ouptut:
56
+    - Fix green lines on Direct3D output
57
+  + Skins2:
58
+    - Fix maximizing Window in multi-screen context
59
+  + Qt:
60
+    - Fix resume where you left off
61
+    - Fix infinite recursion in the customize dialog
62
+    - Fix size when switching to/from the minimal interface
63
+    - Fix size after resume toolbar is displayed
64
+  + MacOS X:
65
+    - Fix crashes in media information panel
66
+    - Correctly respect the disable-screensaver option
67
+  + Win32:
68
+    - Allow opening more than 15 elements in Explorer
69
+  + Translations:
70
+    - Update of most translations
71
+
72
+-------------------------------------------------------------------
73
+Thu Mar 24 09:29:03 UTC 2016 - olaf@aepfle.de
74
+
75
+- Add Requires(post): vlc-noX for codecs, qt, gnome subpackage
76
+
77
+-------------------------------------------------------------------
78
+Sat Feb 06 22:39:23 UTC 2016 - joerg.lorenzen@ki.tng.de
79
+
80
+- Update to version 2.2.2:
81
+  + Access:
82
+    - Fix SetupFormat for continuous framesize in v4l2
83
+    - Fix off-by-one buffer overflow in RealRtsp module
84
+    - Fix screen recording aspect-ratio, framerate and potential
85
+      crash
86
+    - Fix Windows directshow input freeze
87
+    - Fix MMS segmentation fault/abort when server forces a large
88
+      allocation
89
+  + Demux:
90
+    - Fix support for ms-dvr files
91
+    - Fix time detection in AVI files over HTTP
92
+    - HLS: fix hang on stop, crashes and small improvements
93
+    - Fix mp4 NULL dereference reported by by Fortinet's FortiGuard
94
+      Labs
95
+    - Fix regression for VC-1 in WMV
96
+    - Fix MXF crashes on stop
97
+    - Fix EAC3 detection in some TS files
98
+  + Decoders:
99
+    - Fix importing surface from main memory in VDPAU
100
+    - Fix possible double-free in ADPCM decoder
101
+    - Support 9-bit and 10-bit GBR planar formats
102
+    - Support GoToMeeting 2 and GoToMeeting 3 codecs
103
+    - Fix crash in teletext (zvbi) decoder
104
+    - Fix Bluray subtitles (PGS) timestamps
105
+  + Audio output:
106
+    - Fix audio drop after a flush with pulseaudio
107
+    - Fix audio initialization on iOS
108
+    - Fix audio stuttering with AirPlay devices on OS X (2 sec
109
+      delay needs to
110
+      be set manually by the user)
111
+    - Fix pulseaudio latency computation
112
+    - Fix alsa default device selection
113
+  + Skins2:
114
+    - Fix video control that fails to show up
115
+    - Fix UTF-8 conversion issues
116
+    - Fix Unicode folders location failing to open the skins
117
+    - Fix crash over malformed skins bitmaps
118
+    - Fix fullscreen for Gnome3/Unity Window Managers
119
+  + OS X:
120
+    - Support for OS X El Capitan
121
+    - Fix code signature for releases on El Capitan
122
+    - Improve resume dialog, starting time, preferences, lua
123
+      extensions
124
+    - Fix threads ordering, preferences crashes, URL drag'n drops
125
+  + Qt:
126
+    - Fix crash when opening multiple items on Windows
127
+    - Fix recent items appending when using a playlist
128
+    - Improve addons manager dialog, playlist
129
+    - Fix changing the audio-device in the menu
130
+    - Fix key and mouse event support for Qt >= 5.5 under X11
131
+    - Fix memory leaks
132
+  + Video Output:
133
+    - Fix build if one disables XCB but activate VDPAU on Unix
134
+    - Fix Direct3D plane allocation size to avoid colour bleeding
135
+    - Fix some crashes in swscale resizing
136
+  + Misc:
137
+    - Fix build with recent FreeRDP versions
138
+    - Fix interface crashes when input-title-format option is empty
139
+    - Fix MP4 mux divide-by-zero crash
140
+    - Improve PNG encoding time
141
+    - Fix some UPnP initialization lag
142
+    - Rewrite of the Jamendo Service Discovery
143
+    - Fix snapshot aspect ratio for anamorphic contents
144
+    - Fix custom snapshot sizes
145
+    - Dynamic generation of GnuTLS Diffie-Hellman parameters
146
+    - Fix "vb" transcoding parameter
147
+    - Fix superfluous audio channel extraction in the core
148
+    - Fix miscellaneous crashes, double-frees, integer overflows,
149
+      infinite loops, read overflow, invalid frees and division
150
+      by zero issues
151
+    - Fix support for lua 5.2 and fix XSS in the http interface
152
+    - Update and improve Soundcloud, Vimeo and Youtube scripts
153
+    - Update of codecs and libraries to fix 3rd party security issues
154
+     (like TALOS-CAN-0036, TALOS-CAN-0037, CVE-2015-7981, CVE-2015-8126)
155
+  + Translations:
156
+    - Add Kashmiri and Maithili languages
157
+    - Update of most translations
158
+  + libVLC:
159
+    - Expose audio mute, cork and volume change events:
160
+      libvlc_MediaPlayerCorked, libvlc_MediaPlayerUncorked,
161
+      libvlc_MediaPlayerMuted, libvlc_MediaPlayerUnmuted and
162
+      libvlc_MediaPlayerAudioVolume
163
+    - Fix propagation of libvlc_MediaPlayerTitleChanged event
164
+  + Translations:
165
+    - Update of most translations
166
+- Removed vlc-qt5.5-mousepointer.patch, fixed upstream
167
+- Removed vlc-2.2.0-fix_deinterlace_mmx.patch because it's not used
168
+- Added vlc-qt-5.5.0-version-check.patch to enable build against
169
+  qt5 >= 5.5.1
170
+
171
+-------------------------------------------------------------------
172
+Wed Jan 20 11:56:21 UTC 2016 - olaf@aepfle.de
173
+
174
+- Recommend gnu-free-fonts to install fonts wich get specified as default
175
+
176
+-------------------------------------------------------------------
177
+Fri Jan  8 11:25:02 UTC 2016 - olaf@aepfle.de
178
+
179
+- Remove --started-from-file from vlc.desktop if built without dbus
180
+
181
+-------------------------------------------------------------------
182
+Mon Jan  4 08:50:53 UTC 2016 - ctrippe@opensuse.org
183
+
184
+- Install the solid action desktop files also in /usr/share/solid/actions
185
+  to make them available in Plasma5 (boo#960621)
186
+
187
+-------------------------------------------------------------------
188
+Mon Jan  4 10:42:43 UTC 2016 - olaf@aepfle.de
189
+
190
+- Require codecs subpackage to make vlc usable.
191
+
192
+-------------------------------------------------------------------
193
+Wed Dec 16 10:49:48 UTC 2015 - olaf@aepfle.de
194
+
195
+- Use bcond instead of suse_version/BUILD_ORIG to refer to features
196
+  This makes it easier to enable features because they depend on
197
+  the availibilty in the build project instead of a given release
198
+- Remove vlc-2.2.0-fix_deinterlace_mmx.patch
199
+  x86 failures in SLE_11 and 11.4 are handled by bcond
200
+- Remove vlc-2.1.5-fix-skins2-default-skin-creation.patch
201
+  tar changes are handled by build-compare
202
+
203
+-------------------------------------------------------------------
204
+Tue Dec 15 09:30:13 UTC 2015 - dimstar@opensuse.org
205
+
206
+- Enable libupnp support on Leap 42.1: the library is available
207
+  (boo#959100).
208
+
209
+-------------------------------------------------------------------
210
+Mon Dec  7 03:07:12 UTC 2015 - dimstar@opensuse.org
211
+
212
+- Add vlc-qt5.5-mousepointer.patch: Fix mouse cursor in video
213
+  interface (boo#956769).
214
+
215
+-------------------------------------------------------------------
216
 Tue Dec  1 10:37:35 UTC 2015 - lnussel@suse.de
217
218
 - libvlc_vdpau needs to be in codecs package to avoid dependency issue
219
​
View file
vlc.spec Changed
1863
 
1
@@ -1,7 +1,7 @@
2
 #
3
 # spec file for package vlc
4
 #
5
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
6
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
7
 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
8
 #
9
 # All modifications and additions to the file contributed by third parties
10
@@ -21,9 +21,111 @@
11
 %define libvlccore 8
12
 %define conflicts vlc-beta
13
14
+# external dependencies
15
+%bcond_with    a52
16
+%bcond_with    faad
17
+%bcond_with    fdk_aac
18
+%bcond_with    libdca
19
+%bcond_with    libmpeg2
20
+%bcond_with    mad
21
+%bcond_with    shine
22
+%bcond_with    twolame
23
+%bcond_with    x264
24
+%bcond_with    x265
25
+#
26
+%bcond_without SDL_image
27
+%bcond_without avahi
28
+%bcond_without bluray
29
+%bcond_without caca
30
+%bcond_without cdda
31
+%bcond_without chromaprint
32
+%bcond_without dc1394
33
+%bcond_without dv1394
34
+%bcond_without dvbpsi
35
+%bcond_without dvdnav
36
+%bcond_without dvdread
37
+%bcond_without ffmpeg
38
+%bcond_without flac
39
+%bcond_without freerdp
40
+%bcond_without freetype2
41
+%bcond_without gcrypt
42
+%bcond_without gnomevfs
43
+%bcond_without gnutls
44
+%bcond_without idn
45
+%bcond_without kate
46
+%bcond_without libass
47
+%bcond_without libgme
48
+%bcond_without libnotify
49
+%bcond_without libssh2
50
+%bcond_without libvncclient
51
+%bcond_without libxml2
52
+%bcond_without live555
53
+%bcond_without matroska
54
+%bcond_without modplug
55
+%bcond_without ogg
56
+%bcond_without opencv
57
+%bcond_without opus
58
+%bcond_without projectM
59
+%bcond_without samplerate
60
+%bcond_without schroedinger
61
+%bcond_without sdl
62
+%bcond_without shout
63
+%bcond_without smbclient
64
+%bcond_without speex
65
+%bcond_without taglib
66
+%bcond_without theora
67
+%bcond_without udev
68
+%bcond_without upnp
69
+%bcond_without vlc_aa
70
+%bcond_without vlc_alsa
71
+%bcond_with    vlc_atmo
72
+%bcond_without vlc_bootstrap
73
+%bcond_without vlc_dbus
74
 # Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar)
75
-%bcond_with fluidsynth
76
-
77
+%bcond_with    vlc_fluidsynth
78
+%bcond_without vlc_gst
79
+%bcond_without vlc_jack
80
+%bcond_without vlc_jpeg
81
+%bcond_without vlc_kde4
82
+%bcond_with    vlc_libsidplay2
83
+%bcond_without vlc_lirc
84
+%bcond_without vlc_lua
85
+%bcond_without vlc_mmx_sse
86
+%bcond_without vlc_mtp
87
+%bcond_without vlc_ncurses
88
+%bcond_without vlc_optimization
89
+%bcond_without vlc_png
90
+%bcond_without vlc_pulse
91
+%bcond_with    vlc_qt4
92
+%bcond_without vlc_qt5
93
+%bcond_without vlc_qt5_x11extra
94
+%bcond_without vlc_svg
95
+%bcond_without vlc_svgdec
96
+%bcond_without vlc_vcdx
97
+%bcond_without vlc_xcb
98
+%bcond_without vlc_xcb_keysyms
99
+%bcond_without vorbis
100
+%bcond_without vpx
101
+%bcond_without zvbi
102
+
103
+%if %{with ffmpeg}
104
+%bcond_without vdpau
105
+%bcond_without libva
106
+%bcond_without libva_drm
107
+%else
108
+%bcond_with    vdpau
109
+%bcond_with    libva
110
+%bcond_with    libva_drm
111
+%endif
112
+# sdl requires gl, and vlc has not configure knob to disable gl
113
+%if %{with sdl}
114
+%bcond_without vlc_egl
115
+%bcond_without vlc_gl
116
+%else
117
+%bcond_with    vlc_egl
118
+%bcond_with    vlc_gl
119
+%endif
120
+#
121
 %ifarch %arm
122
 %bcond_without opengles
123
 %else
124
@@ -31,7 +133,7 @@
125
 %endif
126
127
 Name:           vlc
128
-Version:        2.2.1
129
+Version:        2.2.4
130
 Release:        0
131
 Summary:        Video Lan Client multimedia player
132
 License:        GPL-2.0+ and LGPL-2.1+
133
@@ -41,163 +143,397 @@
134
 # Add vlc.changes as source, so we can reproducibly extract the date from it during build
135
 Source1:        %{name}.changes
136
 Source2:        %{name}-rpmlintrc
137
-# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header
138
 Patch1:         vlc-2.1.5-fix-skins2-default-skin-creation.patch
139
 Patch3:         0001-no-return-in-non-void.patch
140
-Patch4:         vlc-2.2.0-fix_deinterlace_mmx.patch
141
-BuildRequires:  Mesa-devel
142
-BuildRequires:  SDL-devel >= 1.2.10
143
-BuildRequires:  aalib-devel
144
-BuildRequires:  alsa-devel >= 1.0.24
145
-BuildRequires:  avahi-devel >= 0.6
146
-BuildRequires:  dirac-devel
147
+Patch4:         vlc-qt-5.5.0-version-check.patch
148
+#
149
+Patch1001:      0001-text-fix-decoding-of-4-bytes-UTF-8-sequences.patch
150
+Patch1030:      0030-Fix-build-using-old-GCC-intrinsics.patch
151
+#
152
+Requires:       %{name}-noX = %{version}-%{release}
153
+Requires(post): %{name}-noX
154
+Requires:       %{name}-qt = %{version}-%{release}
155
+Conflicts:      %{conflicts}
156
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
157
+#
158
 BuildRequires:  fdupes
159
-BuildRequires:  findutils
160
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
161
-BuildRequires:  flac-devel
162
-%endif
163
-BuildRequires:  freetype2
164
-BuildRequires:  fribidi-devel
165
+BuildRequires:  gcc-c++
166
 BuildRequires:  gettext-devel
167
-BuildRequires:  git
168
-BuildRequires:  gnome-vfs2-devel
169
-BuildRequires:  gtk2-devel
170
-BuildRequires:  libavc1394-devel >= 0.5.3
171
-BuildRequires:  libcddb-devel >= 0.9.5
172
-BuildRequires:  libcdio-devel >= 0.78.2
173
-BuildRequires:  libdc1394-devel >= 2.1.0
174
-BuildRequires:  libdvbpsi-devel >= 1.0.0
175
-BuildRequires:  libgcrypt-devel
176
-BuildRequires:  libidn-devel
177
-BuildRequires:  libjack-devel >= 1.9.7
178
-BuildRequires:  libkate-devel >= 0.3.0
179
-BuildRequires:  libmodplug-devel >= 0.8.4
180
-BuildRequires:  libnotify-devel
181
-BuildRequires:  libogg-devel >= 1.0
182
-BuildRequires:  libopus-devel >= 1.0.3
183
-
184
-#sb56637 force build against Qt4
185
-BuildRequires:  libqt4-devel >= 4.6.0
186
-
187
-BuildRequires:  libjpeg-devel
188
-BuildRequires:  libraw1394 >= 2.0.1
189
-BuildRequires:  librsvg-devel >= 2.9.0
190
-BuildRequires:  libsamplerate-devel
191
-BuildRequires:  libshout-devel >= 2.1
192
-BuildRequires:  libsmbclient-devel
193
-BuildRequires:  libssh2-devel
194
-BuildRequires:  libtheora-devel >= 1.0
195
 BuildRequires:  libtool
196
-BuildRequires:  libudev-devel >= 142
197
-BuildRequires:  libvorbis-devel >= 1.1
198
-BuildRequires:  libvpx-devel
199
-BuildRequires:  libxml2-devel >= 2.5
200
-BuildRequires:  lirc-devel
201
-BuildRequires:  live555-devel >= 2015.01.27
202
-BuildRequires:  lua-devel >= 5.1
203
-BuildRequires:  pcre-devel
204
-BuildRequires:  schroedinger-devel >= 1.0.10
205
-BuildRequires:  slang-devel
206
-BuildRequires:  speex-devel >= 1.0.5
207
+BuildRequires:  pkg-config
208
 BuildRequires:  update-desktop-files
209
-BuildRequires:  vcdimager-devel
210
-BuildRequires:  xosd-devel
211
 BuildRequires:  xz
212
-Requires:       %{name}-noX = %{version}-%{release}
213
-# We need the noX package first, as it contains vlc-cache-gen
214
-PreReq:         %{name}-noX
215
-Requires:       %{name}-qt = %{version}-%{release}
216
-Conflicts:      %{conflicts}
217
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
218
-
219
-%if 0%{?suse_version} > 1110
220
-BuildRequires:  gdk-pixbuf-devel
221
-BuildRequires:  libv4l-devel
222
-BuildRequires:  pkgconfig(caca) >= 0.99.beta14
223
+BuildRequires:  pkgconfig(zlib)
224
+#
225
+%if %{with vlc_bootstrap}
226
+BuildRequires:  autoconf >= 2.68
227
+BuildRequires:  automake
228
+%endif
229
+#
230
+%if %{with idn}
231
+BuildRequires:  pkgconfig(libidn)
232
+%endif
233
+#
234
+%if %{with vlc_dbus}
235
+BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
236
+%endif
237
+#
238
+%if %{with vlc_lua}
239
+BuildRequires:  pkgconfig(lua) >= 5.1
240
+%endif
241
+#
242
+%if %{with live555}
243
+BuildRequires:  pkgconfig(live555) >= 5.1
244
+%endif
245
+#
246
+%if %{with dc1394}
247
+BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0
248
+%endif
249
+#
250
+%if %{with dv1394}
251
+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
252
+BuildRequires:  pkgconfig(libraw1394) >= 2.0.1
253
+%endif
254
+#
255
+%if %{with zvbi}
256
+BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
257
+%endif
258
+#
259
+%if %{with dvdread}
260
+BuildRequires:  pkgconfig(dvdread) > 4.9.0
261
+%endif
262
+#
263
+%if %{with dvdnav}
264
+BuildRequires:  pkgconfig(dvdnav) > 4.9.0
265
+%endif
266
+#
267
+%if %{with bluray}
268
+BuildRequires:  pkgconfig(libbluray) >= 0.3.0
269
+%endif
270
+#
271
+%if %{with opencv}
272
+BuildRequires:  pkgconfig(opencv) > 2.0
273
+%endif
274
+#
275
+%if %{with smbclient}
276
+BuildRequires:  pkgconfig(smbclient)
277
+%endif
278
+#
279
+%if %{with libssh2}
280
+BuildRequires:  pkgconfig(libssh2)
281
+%endif
282
+#
283
+%if %{with gnomevfs}
284
+BuildRequires:  pkgconfig(gnome-vfs-2.0)
285
+%endif
286
+#
287
+%if %{with vlc_vcdx}
288
+BuildRequires:  pkgconfig(libcdio) >= 0.78.2
289
+BuildRequires:  pkgconfig(libiso9660) >= 0.72
290
+BuildRequires:  pkgconfig(libvcdinfo) >= 0.7.22
291
+%endif
292
+#
293
+%if %{with cdda}
294
+BuildRequires:  pkgconfig(libcddb) >= 0.9.5
295
+%endif
296
+#
297
+%if %{with libvncclient}
298
+BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
299
+%endif
300
+#
301
+%if %{with freerdp}
302
+BuildRequires:  pkgconfig(freerdp) >= 1.0.1
303
+%endif
304
+#
305
+%if %{with libgme}
306
+BuildRequires:  pkgconfig(libgme)
307
+%endif
308
+#
309
+%if %{with vlc_libsidplay2}
310
+BuildRequires:  pkgconfig(libsidplay2)
311
+%endif
312
+#
313
+%if %{with ogg}
314
+BuildRequires:  pkgconfig(ogg) >= 1.0
315
+%endif
316
+#
317
+%if %{with vorbis}
318
+BuildRequires:  pkgconfig(vorbis) >= 1.1
319
+BuildRequires:  pkgconfig(vorbisenc) >= 1.1
320
+%endif
321
+#
322
+%if %{with shout}
323
+BuildRequires:  pkgconfig(shout) >= 2.1
324
+%endif
325
+#
326
+%if %{with matroska}
327
+BuildRequires:  libmatroska-devel
328
+%endif
329
+#
330
+%if %{with modplug}
331
+BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
332
+%endif
333
+#
334
+%if %{with dvbpsi}
335
+# Prefer libdvbpsi.src.rpm instead of libdvbpsi-0.src.rpm
336
+BuildRequires:  pkgconfig(libdvbpsi) > 1
337
+%endif
338
+#
339
+%if %{with shine}
340
+BuildRequires:  pkgconfig(shine) >= 3.0.0
341
+%endif
342
+#
343
+%if %{with mad}
344
+BuildRequires:  pkgconfig(mad)
345
+%endif
346
+#
347
+%if %{with vlc_gst}
348
+BuildRequires:  pkgconfig(gstreamer-app-1.0)
349
+BuildRequires:  pkgconfig(gstreamer-video-1.0)
350
+%endif
351
+#
352
+%if %{with ffmpeg}
353
+BuildRequires:  pkgconfig(libavcodec) = 56.60.100
354
+BuildRequires:  pkgconfig(libavformat) = 56.40.101
355
+BuildRequires:  pkgconfig(libavutil) = 54.31.100
356
+BuildRequires:  pkgconfig(libpostproc) = 53.3.100
357
+BuildRequires:  pkgconfig(libswscale) = 3.1.101
358
+%endif
359
+#
360
+%if %{with libva}
361
+BuildRequires:  pkgconfig(libva)
362
+%if %{with libva_drm}
363
+BuildRequires:  pkgconfig(libva-drm)
364
+%endif
365
+BuildRequires:  pkgconfig(libva-x11)
366
+%endif
367
+#
368
+%if %{with faad}
369
+BuildRequires:  faad2-devel
370
+%endif
371
+#
372
+%if %{with vpx}
373
+BuildRequires:  pkgconfig(vpx)
374
+%endif
375
+#
376
+%if %{with twolame}
377
+BuildRequires:  pkgconfig(twolame)
378
+%endif
379
+#
380
+%if %{with fdk_aac}
381
+BuildRequires:  pkgconfig(fdk-aac)
382
+%endif
383
+#
384
+%if %{with a52}
385
+BuildRequires:  liba52-devel
386
+%endif
387
+#
388
+%if %{with libdca}
389
+BuildRequires:  pkgconfig(libdca) >= 0.0.5
390
+%endif
391
+#
392
+%if %{with flac}
393
+BuildRequires:  flac-devel
394
+%endif
395
+#
396
+%if %{with libmpeg2}
397
+BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
398
+%endif
399
+#
400
+%if %{with speex}
401
+BuildRequires:  pkgconfig(speex) >= 1.0.5
402
 BuildRequires:  pkgconfig(speexdsp)
403
+%endif
404
+#
405
+%if %{with opus}
406
+BuildRequires:  pkgconfig(opus) >= 1.0.3
407
+%endif
408
+#
409
+%if %{with theora}
410
+BuildRequires:  pkgconfig(theoradec) >= 1.0
411
+BuildRequires:  pkgconfig(theoraenc)
412
+%endif
413
+#
414
+%if %{with schroedinger}
415
+BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10
416
+%endif
417
+#
418
+%if %{with vlc_png}
419
+BuildRequires:  pkgconfig(libpng)
420
+%endif
421
+#
422
+%if %{with vlc_jpeg}
423
+BuildRequires:  libjpeg-devel
424
+%endif
425
+#
426
+%if %{with x265}
427
+BuildRequires:  pkgconfig(x265)
428
+%endif
429
+#
430
+%if %{with x264}
431
+BuildRequires:  pkgconfig(x264) >= 0.86
432
+%endif
433
+#
434
+%if %{with vlc_fluidsynth}
435
+BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
436
+%endif
437
+#
438
+%if %{with libass}
439
+BuildRequires:  pkgconfig(libass) >= 0.9.8
440
+%endif
441
+#
442
+%if %{with kate}
443
+BuildRequires:  pkgconfig(kate) >= 0.3.0
444
+%endif
445
+#
446
+%if %{with vlc_egl}
447
+BuildRequires:  pkgconfig(egl)
448
+%endif
449
+#
450
+%if %{with vlc_gl}
451
+BuildRequires:  pkgconfig(gl)
452
+%endif
453
+#
454
+%if %{with vlc_xcb}
455
 BuildRequires:  pkgconfig(xcb) >= 1.6
456
 BuildRequires:  pkgconfig(xcb-composite)
457
 BuildRequires:  pkgconfig(xcb-randr) >= 1.3
458
 BuildRequires:  pkgconfig(xcb-shm)
459
 BuildRequires:  pkgconfig(xcb-xv) >= 1.1.90.1
460
-BuildRequires:  pkgconfig(xext)
461
 BuildRequires:  pkgconfig(xproto)
462
-BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
463
+%if %{with vlc_xcb_keysyms}
464
+BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
465
 %endif
466
-
467
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
468
-BuildRequires:  pkgconfig(libswscale)
469
 %endif
470
-%if 0%{?suse_version} > 1110
471
-%if 0%{?suse_version} != 1315
472
-BuildRequires:  pkgconfig(SDL_image) >= 1.2.10
473
-BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
474
-BuildRequires:  pkgconfig(libupnp)
475
-BuildRequires:  pkgconfig(opencv) > 2.0
476
+#
477
+%if %{with ffmpeg}
478
+%if %{with vdpau}
479
+BuildRequires:  pkgconfig(vdpau) >= 0.6
480
 %endif
481
 %endif
482
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
483
-BuildRequires:  libmatroska-devel
484
-BuildRequires:  pkgconfig(dvdnav) > 4.9.0
485
-BuildRequires:  pkgconfig(dvdread) > 4.9.0
486
-BuildRequires:  pkgconfig(libass) >= 0.9.8
487
-BuildRequires:  pkgconfig(libgme)
488
-BuildRequires:  pkgconfig(libmtp) >= 1.0.0
489
-BuildRequires:  pkgconfig(libva)
490
-BuildRequires:  pkgconfig(libva-x11)
491
-BuildRequires:  pkgconfig(taglib) >= 1.9
492
+#
493
+%if %{with sdl}
494
+BuildRequires:  pkgconfig(sdl) >= 1.2.10
495
+%if %{with SDL_image}
496
+BuildRequires:  pkgconfig(SDL_image) >= 1.2.10
497
 %endif
498
-%if 0%{?suse_version} > 1140
499
-BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
500
-BuildRequires:  pkgconfig(freerdp) >= 1.0.1
501
-BuildRequires:  pkgconfig(gnutls) >= 3.2.0
502
-BuildRequires:  pkgconfig(libbluray) >= 0.3.0
503
-BuildRequires:  pkgconfig(libpulse) >= 1.0
504
-BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
505
-BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
506
+%endif
507
+#
508
+%if %{with freetype2}
509
+Recommends:     gnu-free-fonts
510
+BuildRequires:  pkgconfig(freetype2)
511
+BuildRequires:  pkgconfig(fribidi)
512
+BuildRequires:  pkgconfig(xext)
513
 BuildRequires:  pkgconfig(xinerama)
514
 BuildRequires:  pkgconfig(xpm)
515
-%if %{with fluidsynth}
516
-BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
517
 %endif
518
-%if 0%{?suse_version} != 1315
519
+#
520
+%if %{with vlc_svg}
521
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
522
+%endif
523
+#
524
+%if %{with vlc_svgdec}
525
+BuildRequires:  pkgconfig(cairo) >= 1.13.1
526
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
527
+%endif
528
+#
529
+%if %{with vlc_aa}
530
+BuildRequires:  aalib-devel
531
+%endif
532
+#
533
+%if %{with caca}
534
+BuildRequires:  pkgconfig(caca) >= 0.99.beta14
535
+%endif
536
+#
537
+%if %{with vlc_pulse}
538
+BuildRequires:  pkgconfig(libpulse) >= 1.0
539
+%endif
540
+#
541
+%if %{with vlc_alsa}
542
+BuildRequires:  pkgconfig(alsa) >= 1.0.24
543
+%endif
544
+#
545
+%if %{with vlc_jack}
546
+BuildRequires:  pkgconfig(jack) >= 1.9.7
547
+%endif
548
+#
549
+%if %{with samplerate}
550
+BuildRequires:  pkgconfig(samplerate)
551
+%endif
552
+#
553
+%if %{with chromaprint}
554
 BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
555
 %endif
556
+#
557
+%if %{with vlc_qt5}
558
+BuildRequires:  pkgconfig(Qt5Core) >= 5.1.0
559
+BuildRequires:  pkgconfig(Qt5Gui)
560
+BuildRequires:  pkgconfig(Qt5Widgets)
561
+%if %{with vlc_qt5_x11extra}
562
+BuildRequires:  pkgconfig(Qt5X11Extras)
563
 %endif
564
-%if 0%{?suse_version} != 1315
565
-BuildRequires:  libkde4-devel
566
 %endif
567
-%if 0%{?suse_version} >= 1320
568
+#
569
+%if %{with vlc_qt4}
570
+BuildRequires:  pkgconfig(QtCore) >= 4.6.0
571
+BuildRequires:  pkgconfig(QtGui)
572
+%endif
573
+#
574
+%if %{with vlc_ncurses}
575
+# its TW only. 13.2 has it, but does not announce it
576
 BuildRequires:  pkgconfig(ncursesw)
577
 %endif
578
-%if 0%{?suse_version} >= 1321
579
-BuildRequires:  pkgconfig(libavcodec) >= 55.26.0
580
-BuildRequires:  pkgconfig(libavformat) >= 53.21.0
581
-BuildRequires:  pkgconfig(libavutil) >= 52.4.0
582
+#
583
+%if %{with vlc_lirc}
584
+BuildRequires:  lirc-devel
585
 %endif
586
-# Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
587
-%if 0%{?BUILD_ORIG}
588
-BuildRequires:  faad2-devel
589
-BuildRequires:  libfaac-devel
590
-BuildRequires:  libxvidcore-devel
591
-# Disabled for now - VideoLAN repo needs to catch up
592
-BuildRequires:  liba52-devel
593
-BuildRequires:  pkgconfig(libavcodec) >= 55.26.0
594
-BuildRequires:  pkgconfig(libavformat) >= 53.21.0
595
-BuildRequires:  pkgconfig(libavutil) >= 52.4.0
596
-BuildRequires:  pkgconfig(libdca) >= 0.0.5
597
-BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
598
-BuildRequires:  pkgconfig(libpostproc)
599
-# Disabled for now - VideoLAN repo needs to catch up
600
-BuildRequires:  libmad-devel
601
-BuildRequires:  pkgconfig(twolame)
602
-BuildRequires:  pkgconfig(x264) >= 0.8.6
603
-# Disabled for now - VideoLAN repo needs to catch up
604
-#BuildRequires:  pkgconfig(x265)
605
-%if 0%{?suse_version} > 1140
606
-BuildRequires:  pkgconfig(vdpau) >= 0.6
607
+#
608
+%if %{with projectM}
609
+BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
610
+%endif
611
+#
612
+%if %{with avahi}
613
+BuildRequires:  pkgconfig(avahi-client) >= 0.6
614
+%endif
615
+#
616
+%if %{with udev}
617
+BuildRequires:  pkgconfig(libudev) >= 142
618
+%endif
619
+#
620
+%if %{with vlc_mtp}
621
+BuildRequires:  pkgconfig(libmtp) >= 1.0.0
622
+%endif
623
+#
624
+%if %{with upnp}
625
+BuildRequires:  pkgconfig(libupnp)
626
+%endif
627
+#
628
+%if %{with libxml2}
629
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.5
630
+%endif
631
+#
632
+%if %{with gcrypt}
633
+BuildRequires:  libgcrypt-devel
634
+%endif
635
+#
636
+%if %{with gnutls}
637
+BuildRequires:  pkgconfig(gnutls) >= 3.2.0
638
+%endif
639
+#
640
+%if %{with taglib}
641
+BuildRequires:  pkgconfig(taglib) >= 1.9
642
+%endif
643
+#
644
+%if %{with libnotify}
645
+BuildRequires:  gdk-pixbuf-devel
646
+BuildRequires:  pkgconfig(gtk+-2.0)
647
+BuildRequires:  pkgconfig(libnotify)
648
 %endif
649
+#
650
+%if %{with vlc_kde4}
651
+BuildRequires:  libkde4-devel
652
 %endif
653
+#
654
655
 %description
656
 VLC media player is a highly portable multimedia player for various
657
@@ -209,7 +545,7 @@
658
 %package devel
659
 Summary:        Video Lan Client Development system
660
 Group:          Development/Libraries/C and C++
661
-Requires:       %{name} = %{version}
662
+Requires:       %{name} = %{version}-%{release}
663
664
 %description devel
665
 Those development headers are required if you plan on coding against VLC
666
@@ -234,8 +570,8 @@
667
 Requires:       libvlc%{libvlc} = %{version}-%{release}
668
 Requires:       libvlccore%{libvlccore} = %{version}-%{release}
669
 # lang subpackage
670
-Recommends:     %{name}-noX-lang
671
-Recommends:     %{name}-codecs
672
+Recommends:     %{name}-noX-lang = %{version}-%{release}
673
+Requires:       %{name}-codecs
674
 Recommends:     libdvdcss
675
 # This is a hack only due to libbluray not having versioned symbols as well as
676
 # having a strange ABI/API break between 0.3 and 0.7
677
@@ -252,57 +588,61 @@
678
679
 %lang_package -n %{name}-noX
680
681
-%if 0%{?BUILD_ORIG}
682
 %package codecs
683
 Summary:        VLC: VideoLAN Client - Codec extension
684
 Group:          Productivity/Multimedia/Video/Players
685
-Requires:       %{name}-noX = %{version}
686
-Supplements:    %{name}-noX
687
+Requires(post): %{name}-noX = %{version}-%{release}
688
+Provides:       vlc-codec-gstreamer = %{version}-%{release}
689
+Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
690
691
 %description codecs
692
 This Package enhances the functionality of the VLC VideoLAN Client with
693
 Codecs that are not available in a stock openSUSE distribution.
694
-%endif
695
696
+%if %{with vlc_qt4} || %{with vlc_qt5}
697
 %package qt
698
 Summary:        VLC: VideoLAN Client - Qt interface
699
 Group:          Productivity/Multimedia/Video/Players
700
-Requires:       %{name}-noX = %{version}-%{release}
701
-%if 0%{?suse_version} >= 1310
702
+Requires(post): %{name}-noX = %{version}-%{release}
703
+%if %{with vlc_qt5}
704
 Supplements:    packageand(%{name}-noX:libqt5)
705
-%else
706
+%endif
707
+%if %{with vlc_qt4}
708
 Supplements:    packageand(%{name}-noX:libqt4)
709
 %endif
710
 Conflicts:      %{conflicts}-qt
711
712
 %description qt
713
 The all new Qt interface for the VLC VideoLAN Client.
714
+%endif
715
716
+%if %{with gnomevfs}
717
 %package gnome
718
 Summary:        VLC: VideoLAN Client - Gnome Access Modules
719
 Group:          Productivity/Multimedia/Video/Players
720
-Requires:       %{name}-noX = %{version}-%{release}
721
+Requires(post): %{name}-noX = %{version}-%{release}
722
 Supplements:    packageand(%{name}-noX:gnome-vfs2)
723
 Conflicts:      %{conflicts}-gnome
724
725
 %description gnome
726
 In order to integrate flawless into GNOME, there are some access modules
727
 for gnome-vfs2.
728
+%endif
729
730
 %prep
731
 echo '********* ENTERED PREP PHASE ********'
732
 date
733
 %setup -q
734
-%if 0%{?suse_version} >=1140
735
+touch -r configure.ac NEWS
736
 %patch1 -p1
737
-%endif
738
 %patch3 -p1
739
-%if 0%{?suse_version} == 1110
740
-%ifarch %ix86
741
-%patch4
742
-%endif
743
-%endif
744
+%patch4 -p0
745
+%patch1001 -p1
746
+%patch1030 -p1
747
+touch -r NEWS configure.ac
748
+echo %{version} > src/revision.txt
749
750
+%if %{with vlc_lua}
751
 ### Fix up sources for LUA 5.3
752
 if pkg-config --atleast-version 5.3 lua; then
753
   sed -i 's/luaL_optint/(int)&eger/'         modules/lua/libs/{net,osd,volume}.c
754
@@ -313,9 +653,8 @@
755
   sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
756
     modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c
757
 fi
758
+%endif
759
760
-# We do not rely on contrib but make use of system libraries
761
-rm -rf contrib
762
 # fix builddate info
763
 # Remove build time references so build-compare can do its work
764
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M')
765
@@ -329,126 +668,257 @@
766
 %build
767
 echo '********* BOOTSTRAPPING *********'
768
 date
769
+%if %{without vlc_dbus}
770
+sed -i~ 's@--started-from-file@@' share/vlc.desktop.in
771
+if diff -u share/vlc.desktop.in~ share/vlc.desktop.in
772
+then
773
+   :
774
+fi
775
+%endif
776
 export CFLAGS="%{optflags}"
777
 export CXXFLAGS="%{optflags}"
778
-%if 0%{?suse_version} > 1140
779
+%if %{without vlc_mmx_sse}
780
+export ac_cv_3dnow_inline=no
781
+%endif
782
+%if %{with vlc_bootstrap}
783
 ./bootstrap
784
 %endif
785
 %configure \
786
-   --disable-dependency-tracking        \
787
-   --enable-aa                          \
788
-   --enable-alsa                        \
789
-%if ! 0%{?BUILD_ORIG}
790
+   --without-contrib                    \
791
+                                        \
792
+   --disable-a52                        \
793
+   --disable-alsa                       \
794
+   --disable-atmo                       \
795
    --disable-avcodec                    \
796
+   --disable-chromaprint                \
797
+   --disable-dbus                       \
798
+   --disable-fdkaac                     \
799
+   --disable-freetype                   \
800
+   --disable-jpeg                       \
801
+   --disable-libgcrypt                  \
802
+   --disable-libva                      \
803
+   --disable-lua                        \
804
+   --disable-mad                        \
805
+   --disable-mtp                        \
806
+   --disable-mux_ogg                    \
807
+   --disable-ogg                        \
808
+   --disable-optimizations              \
809
+   --disable-postproc                   \
810
+   --disable-qt                         \
811
+   --disable-svg                        \
812
+   --disable-svgdec                     \
813
+   --disable-swscale                    \
814
+   --disable-vdpau                      \
815
+   --disable-xcb                        \
816
+   --without-kde-solid                  \
817
+                                        \
818
+   --enable-httpd                       \
819
+   --enable-linsys                      \
820
+   --enable-realrtsp                    \
821
+   --enable-sout                        \
822
+   --enable-v4l2                        \
823
+   --enable-vcd                         \
824
+                                        \
825
+%if %{with vlc_optimization}
826
+   --enable-optimizations               \
827
 %endif
828
-   --enable-dvbpsi                      \
829
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
830
-   --enable-dvdnav                      \
831
+%if %{without vlc_mmx_sse}
832
+   --disable-mmx                        \
833
+   --disable-sse                        \
834
+%endif
835
+%if %{with vlc_atmo}
836
+   --enable-atmo                        \
837
+%endif
838
+%if %{with vlc_dbus}
839
+   --enable-dbus                        \
840
+%endif
841
+%if %{with vlc_lua}
842
+   --enable-lua                         \
843
+%endif
844
+%if %{with live555}
845
+   --enable-live555                     \
846
+%endif
847
+%if %{with dvdread}
848
    --enable-dvdread                     \
849
-   --enable-flac                        \
850
 %endif
851
-   --enable-fast-install                \
852
-%if 0%{?suse_version} > 1140
853
-   --enable-freerdp                     \
854
+%if %{with dvdnav}
855
+   --enable-dvdnav                      \
856
 %endif
857
-   --enable-freetype                    \
858
-   --enable-fribidi                     \
859
-   --enable-gnomevfs                    \
860
-%if 0%{?suse_version} > 1140
861
-   --enable-gnutls                      \
862
+%if %{with opencv}
863
+   --enable-opencv                      \
864
 %endif
865
-   --enable-httpd                       \
866
-   --enable-jack                        \
867
-%if 0%{?suse_version} <= 1140
868
-   --disable-jpeg                       \
869
+%if %{with chromaprint}
870
+   --enable-chromaprint                 \
871
 %endif
872
-   --enable-kate                        \
873
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
874
-   --enable-libass                      \
875
+%if %{with libssh2}
876
+   --enable-sftp                        \
877
+%endif
878
+%if %{with gnomevfs}
879
+   --enable-gnomevfs                    \
880
+%endif
881
+%if %{with vlc_vcdx}
882
+   --enable-vcdx                        \
883
 %endif
884
+%if %{with cdda}
885
    --enable-libcddb                     \
886
-%if 0%{?suse_version} > 1110
887
-%if 0%{?suse_version} != 1315
888
-   --enable-opencv                      \
889
 %endif
890
+%if %{with freerdp}
891
+   --enable-freerdp                     \
892
 %endif
893
-%if 0%{?suse_version} <= 1140
894
-   --disable-mmx                        \
895
-   --disable-sse                        \
896
+%if %{with ogg}
897
+   --enable-ogg                         \
898
+   --enable-mux_ogg                     \
899
 %endif
900
-   --enable-sftp                        \
901
-   --disable-svgdec                     \
902
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
903
-   --enable-swscale                     \
904
-%else
905
-   --disable-swscale                    \
906
+%if %{with vlc_mtp}
907
+   --enable-mtp                         \
908
 %endif
909
-%if 0%{?BUILD_ORIG}
910
-   --enable-libmpeg2                    \
911
+%if %{with vorbis}
912
+   --enable-vorbis                      \
913
+%endif
914
+%if %{with matroska}
915
+   --enable-mkv                         \
916
+%endif
917
+%if %{with modplug}
918
+   --enable-mod                         \
919
+%endif
920
+%if %{with dvbpsi}
921
+   --enable-dvbpsi                      \
922
+%endif
923
+%if %{with shine}
924
+   --enable-shine                       \
925
+%endif
926
+%if %{with mad}
927
    --enable-mad                         \
928
+%endif
929
+%if %{with vlc_gst}
930
+   --enable-gst-decode                  \
931
+%endif
932
+%if %{with ffmpeg}
933
    --enable-avcodec                     \
934
    --enable-postproc                    \
935
+   --enable-swscale                     \
936
+%if %{with libva}
937
+   --enable-libva                       \
938
+%endif
939
+%if %{with vdpau}
940
+   --enable-vdpau                       \
941
+%endif
942
+%endif
943
+%if %{with faad}
944
    --enable-faad                        \
945
+%endif
946
+%if %{with vpx}
947
+   --enable-vpx                         \
948
+%endif
949
+%if %{with a52}
950
    --enable-a52                         \
951
+%endif
952
+%if %{with libdca}
953
    --enable-dca                         \
954
-%else
955
-   --disable-libmpeg2                   \
956
-   --disable-mad                        \
957
-   --disable-avcodec                    \
958
-   --disable-postproc                   \
959
-   --disable-faad                       \
960
-   --disable-a52                        \
961
-   --disable-dca                        \
962
 %endif
963
-   --enable-lirc                        \
964
-   --enable-live555                     \
965
-   --enable-lua                         \
966
-   --enable-mkv                         \
967
-   --enable-mod                         \
968
-   --enable-ogg                         \
969
-   --enable-optimizations               \
970
-   --disable-oss                        \
971
-%if 0%{?suse_version} > 1140
972
-   --enable-pulse                       \
973
+%if %{with fdk_aac}
974
+   --enable-fdkaac                      \
975
 %endif
976
-   --enable-realrtsp                    \
977
-   --enable-sout                        \
978
+%if %{with flac}
979
+   --enable-flac                        \
980
+%endif
981
+%if %{with libmpeg2}
982
+   --enable-libmpeg2                    \
983
+%endif
984
+%if %{with speex}
985
    --enable-speex                       \
986
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
987
-   --enable-taglib                      \
988
 %endif
989
+%if %{with theora}
990
    --enable-theora                      \
991
-   --enable-v4l2                        \
992
-   --enable-vcd                         \
993
-   --enable-vcdx                        \
994
-   --enable-vorbis                      \
995
-   --disable-x265                       \
996
-%if 0%{?suse_version} > 1110
997
+%endif
998
+%if %{with vlc_jpeg}
999
+   --enable-jpeg                       \
1000
+%endif
1001
+%if %{with x265}
1002
+   --enable-x265                        \
1003
+%endif
1004
+%if %{with x264}
1005
+   --enable-x264                        \
1006
+%endif
1007
+%if %{with vlc_fluidsynth}
1008
+   --enable-fluidsynth                  \
1009
+%endif
1010
+%if %{with libass}
1011
+   --enable-libass                      \
1012
+%endif
1013
+%if %{with kate}
1014
+   --enable-kate                        \
1015
+%endif
1016
+%if %{with vlc_xcb}
1017
    --enable-xcb                         \
1018
-%else
1019
-   --disable-xcb                        \
1020
 %endif
1021
 %if %{with opengles}
1022
   --enable-gles2                        \
1023
 %endif
1024
-%if 0%{?suse_version} > 1140 && 0%{?BUILD_ORIG}
1025
-   --enable-vdpau                       \
1026
-%else
1027
-   --disable-vdpau                      \
1028
+%if %{with sdl}
1029
+   --enable-sdl                         \
1030
+%endif
1031
+%if %{with SDL_image}
1032
+   --enable-sdl-image                   \
1033
 %endif
1034
-   --enable-xvideo                      \
1035
+%if %{with freetype2}
1036
+   --enable-skins2                      \
1037
+   --enable-freetype                    \
1038
+   --enable-fribidi                     \
1039
    --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
1040
-   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf
1041
+   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
1042
+%endif
1043
+%if %{with vlc_aa}
1044
+   --enable-aa                          \
1045
+%endif
1046
+%if %{with vlc_pulse}
1047
+   --enable-pulse                       \
1048
+%endif
1049
+%if %{with vlc_alsa}
1050
+   --enable-alsa                        \
1051
+%endif
1052
+%if %{with vlc_jack}
1053
+   --enable-jack                        \
1054
+%endif
1055
+%if %{with vlc_qt4} || %{with vlc_qt5}
1056
+   --enable-qt                          \
1057
+%if %{with vlc_kde4}
1058
+   --with-kde-solid                     \
1059
+%endif
1060
+%endif
1061
+%if %{with vlc_lirc}
1062
+   --enable-lirc                        \
1063
+%endif
1064
+%if %{with projectM}
1065
+   --enable-projectm                    \
1066
+%endif
1067
+%if %{with gcrypt}
1068
+   --enable-libgcrypt                   \
1069
+%endif
1070
+%if %{with gnutls}
1071
+   --enable-gnutls                      \
1072
+%endif
1073
+%if %{with taglib}
1074
+   --enable-taglib                      \
1075
+%endif
1076
+%if %{with vlc_svg}
1077
+   --enable-svg                         \
1078
+%endif
1079
+%if %{with vlc_svgdec}
1080
+   --enable-svgdec                      \
1081
+%endif
1082
+                   \
1083
+                   \
1084
+                   \
1085
+                   \
1086
+   --disable-dependency-tracking        \
1087
+   --enable-fast-install                \
1088
+   --disable-oss
1089
 echo '********* FINISHED CONFIGURE *********'
1090
 date
1091
1092
 # post config patches, not very nice but we don't have automake
1093
1094
-%if 0%{?suse_version} == 1110
1095
-# replaces ustar patch
1096
-sed -e 's/tar cvv/tar cvv --format=ustar/' -i share/Makefile
1097
-%endif
1098
-
1099
 # make sure the build hostname is not embedded in the binaries -- or we'll
1100
 # continuously republish packages -- seife
1101
 ### ONLY REMOVE THIS IF YOU KNOW WHAT YOU ARE DOING!
1102
@@ -467,7 +937,9 @@
1103
 %suse_update_desktop_file vlc AudioVideo Audio Video Player
1104
 %fdupes %{buildroot}%{_datadir}/vlc
1105
 # remove duplicate file
1106
+%if %{with vlc_lua}
1107
 rm %{buildroot}/%{_datadir}/vlc/lua/http/requests/README.txt
1108
+%endif
1109
 # add missing manfiles
1110
 for i in ?vlc; do
1111
     pushd %{buildroot}/%{_mandir}/man1
1112
@@ -475,17 +947,14 @@
1113
     popd
1114
 done
1115
1116
-# don't ship hevc-related modules even if probably overkill for legal purposes
1117
-%if ! 0%{?BUILD_ORIG}
1118
-rm %{buildroot}/%{_libdir}/vlc/plugins/demux/libhevc_plugin.so
1119
-rm %{buildroot}/%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
1120
-%endif
1121
-
1122
 # clean up some lang issues...
1123
 for lang in ach an cgg co ff tet; do
1124
   rm -rf %{buildroot}%{_datadir}/locale/$lang
1125
 done
1126
 %find_lang vlc
1127
+%if %{with vlc_kde4}
1128
+cp -avl %{buildroot}%{_datadir}/kde4/apps/solid %{buildroot}%{_datadir}
1129
+%endif
1130
1131
 %post
1132
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
1133
@@ -502,16 +971,18 @@
1134
 %post -n libvlccore%{libvlccore} -p /sbin/ldconfig
1135
 %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig
1136
1137
+%if %{with vlc_qt4} || %{with vlc_qt5}
1138
 %post -n %{name}-qt
1139
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
1140
+%endif
1141
1142
+%if %{with gnomevfs}
1143
 %post -n %{name}-gnome
1144
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
1145
+%endif
1146
1147
-%if 0%{?BUILD_ORIG}
1148
 %post -n %{name}-codecs
1149
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
1150
-%endif
1151
1152
 %files
1153
 %defattr(-,root,root)
1154
@@ -520,51 +991,74 @@
1155
 %{_datadir}/applications/vlc.desktop
1156
 # The icon is the one referenced by the .desktop file
1157
 %{_datadir}/pixmaps/vlc.png
1158
+%if %{with freetype2}
1159
 %{_bindir}/svlc
1160
-%{_datadir}/icons/hicolor/*/apps/vlc*
1161
+%endif
1162
+%{_datadir}/icons/hicolor
1163
+%if %{with vlc_qt4} || %{with vlc_qt5}
1164
+%if %{with vlc_kde4}
1165
 %dir %{_datadir}/kde4
1166
 %dir %{_datadir}/kde4/apps
1167
 %{_datadir}/kde4/apps/solid
1168
+%{_datadir}/solid
1169
+%endif
1170
+%endif
1171
 %exclude %{_libdir}/vlc/libcompat.a
1172
+%if %{with freetype2}
1173
 %{_mandir}/man1/svlc*
1174
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1175
+%endif
1176
+%if %{with libass}
1177
 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
1178
 %endif
1179
-%if 0%{?suse_version} > 1110
1180
-%if 0%{?suse_version} != 1315
1181
+%if %{with SDL_image}
1182
 %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
1183
 %endif
1184
-%endif
1185
-%{_libdir}/vlc/plugins/notify/libnotify_plugin.so
1186
+%if %{with gcrypt}
1187
 %{_libdir}/vlc/plugins/video_filter/libremoteosd_plugin.so
1188
+%endif
1189
+%if %{with freetype2}
1190
 %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
1191
-%if 0%{?suse_version} > 1110
1192
+%endif
1193
+%if %{with libnotify}
1194
+%{_libdir}/vlc/plugins/notify/libnotify_plugin.so
1195
+%endif
1196
+%if %{with vlc_xcb}
1197
 %{_libdir}/vlc/plugins/video_splitter/libpanoramix_plugin.so
1198
-%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
1199
 %endif
1200
 %if %{with opengles}
1201
 %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
1202
 %endif
1203
-%if 0%{?suse_version} > 1110
1204
+%if %{with vlc_xcb}
1205
+%if %{with vlc_gl}
1206
+%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
1207
+%endif
1208
+%if %{with vlc_egl}
1209
 %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
1210
 %endif
1211
+%endif
1212
+%if %{with vlc_gl}
1213
 %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
1214
+%endif
1215
+%if %{with vlc_aa}
1216
 %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
1217
-%if 0%{?suse_version} > 1110
1218
-%if 0%{?suse_version} != 1315
1219
-%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
1220
 %endif
1221
+%if %{with projectM}
1222
+%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
1223
 %endif
1224
1225
 %files noX-lang -f vlc.lang
1226
 %defattr(-,root,root)
1227
+%if 0%{?sles_version}
1228
+%dir %{_datadir}/locale/ks_IN
1229
+%dir %{_datadir}/locale/ks_IN/LC_MESSAGES
1230
+%endif
1231
1232
 %files noX
1233
 %defattr(-,root,root)
1234
 %doc %{_datadir}/doc/vlc/
1235
 %doc NEWS AUTHORS COPYING THANKS README
1236
 %{_bindir}/cvlc
1237
-%if 0%{?suse_version} >= 1320
1238
+%if %{with vlc_ncurses}
1239
 %{_bindir}/nvlc
1240
 %{_mandir}/man1/nvlc*
1241
 %endif
1242
@@ -578,6 +1072,7 @@
1243
 # Own the file.. but it's an auto-generated file, so ghost it.
1244
 %ghost %{_libdir}/vlc/plugins/plugins.dat
1245
 %dir %{_libdir}/vlc
1246
+%if %{with vlc_lua}
1247
 %dir %{_libdir}/vlc/lua
1248
 %dir %{_libdir}/vlc/lua/extensions
1249
 %dir %{_libdir}/vlc/lua/intf
1250
@@ -589,6 +1084,7 @@
1251
 %dir %{_libdir}/vlc/lua/modules
1252
 %dir %{_libdir}/vlc/lua/playlist
1253
 %dir %{_libdir}/vlc/lua/sd
1254
+%endif
1255
 %dir %{_libdir}/vlc/plugins
1256
 %dir %{_libdir}/vlc/plugins/access
1257
 %dir %{_libdir}/vlc/plugins/access_output
1258
@@ -598,12 +1094,18 @@
1259
 %dir %{_libdir}/vlc/plugins/codec
1260
 %dir %{_libdir}/vlc/plugins/control
1261
 %dir %{_libdir}/vlc/plugins/demux
1262
+%if %{with freetype2}
1263
 %dir %{_libdir}/vlc/plugins/gui
1264
+%endif
1265
+%if %{with vlc_lua}
1266
 %dir %{_libdir}/vlc/plugins/lua
1267
+%endif
1268
 %dir %{_libdir}/vlc/plugins/meta_engine
1269
 %dir %{_libdir}/vlc/plugins/misc
1270
 %dir %{_libdir}/vlc/plugins/mux
1271
+%if %{with libnotify}
1272
 %dir %{_libdir}/vlc/plugins/notify
1273
+%endif
1274
 %dir %{_libdir}/vlc/plugins/packetizer
1275
 %dir %{_libdir}/vlc/plugins/services_discovery
1276
 %dir %{_libdir}/vlc/plugins/stream_filter
1277
@@ -616,6 +1118,7 @@
1278
 %dir %{_libdir}/vlc/plugins/visualization
1279
 # Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
1280
 %{_libdir}/vlc/vlc-cache-gen
1281
+%if %{with vlc_lua}
1282
 %{_libdir}/vlc/lua/extensions/VLSub.luac
1283
 %{_libdir}/vlc/lua/intf/cli.luac
1284
 %{_libdir}/vlc/lua/intf/dummy.luac
1285
@@ -668,49 +1171,70 @@
1286
 %{_libdir}/vlc/lua/sd/icecast.luac
1287
 %{_libdir}/vlc/lua/sd/jamendo.luac
1288
 %{_libdir}/vlc/lua/sd/metachannels.luac
1289
+%endif
1290
+%if %{with vlc_alsa}
1291
 %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so
1292
+%endif
1293
 %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so
1294
 %{_libdir}/vlc/plugins/access/libftp_plugin.so
1295
 %{_libdir}/vlc/plugins/access/libhttp_plugin.so
1296
 %{_libdir}/vlc/plugins/access/libimem_plugin.so
1297
+%if %{with vlc_jack}
1298
 %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
1299
+%endif
1300
 %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so
1301
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1302
+%if %{with vlc_mtp}
1303
 %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so
1304
 %endif
1305
 %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
1306
 %{_libdir}/vlc/plugins/access/libattachment_plugin.so
1307
 %{_libdir}/vlc/plugins/access/libcdda_plugin.so
1308
 %{_libdir}/vlc/plugins/access/libdtv_plugin.so
1309
+%if %{with dvbpsi}
1310
 %{_libdir}/vlc/plugins/access/libdvb_plugin.so
1311
+%endif
1312
 %{_libdir}/vlc/plugins/access/librar_plugin.so
1313
+%if %{with libssh2}
1314
 %{_libdir}/vlc/plugins/access/libsftp_plugin.so
1315
+%endif
1316
+%if %{with smbclient}
1317
 %{_libdir}/vlc/plugins/access/libsmb_plugin.so
1318
+%endif
1319
 %{_libdir}/vlc/plugins/access/libtcp_plugin.so
1320
 %{_libdir}/vlc/plugins/access/libudp_plugin.so
1321
 %{_libdir}/vlc/plugins/access/libvdr_plugin.so
1322
+%if %{with dc1394}
1323
 %{_libdir}/vlc/plugins/access/libdc1394_plugin.so
1324
+%endif
1325
+%if %{with dv1394}
1326
 %{_libdir}/vlc/plugins/access/libdv1394_plugin.so
1327
+%endif
1328
1329
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1330
+%if %{with dvdnav}
1331
 %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
1332
+%endif
1333
+%if %{with dvdread}
1334
 %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
1335
 %endif
1336
1337
 %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
1338
 %{_libdir}/vlc/plugins/access/libidummy_plugin.so
1339
1340
-%if 0%{?suse_version} > 1140
1341
+%if %{with bluray}
1342
 %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
1343
 %endif
1344
+%if %{with live555}
1345
 %{_libdir}/vlc/plugins/access/liblive555_plugin.so
1346
+%endif
1347
 %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
1348
-%if 0%{?suse_version} > 1110
1349
+%if %{with zvbi}
1350
 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
1351
 %endif
1352
1353
-%if 0%{?suse_version} > 1140
1354
+%if %{with vlc_pulse}
1355
 %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
1356
+%endif
1357
+%if %{with freerdp}
1358
 %{_libdir}/vlc/plugins/access/librdp_plugin.so
1359
 %endif
1360
 %{_libdir}/vlc/plugins/access/librtp_plugin.so
1361
@@ -719,20 +1243,26 @@
1362
 %{_libdir}/vlc/plugins/access/libtimecode_plugin.so
1363
 %{_libdir}/vlc/plugins/access/libv4l2_plugin.so
1364
 %{_libdir}/vlc/plugins/access/libvcd_plugin.so
1365
+%if %{with vlc_vcdx}
1366
 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
1367
+%endif
1368
1369
-%if 0%{?suse_version} > 1140
1370
+%if %{with libvncclient}
1371
 %{_libdir}/vlc/plugins/access/libvnc_plugin.so
1372
 %endif
1373
-%if 0%{?suse_version} > 1110
1374
+%if %{with vlc_xcb}
1375
 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
1376
 %endif
1377
 %{_libdir}/vlc/plugins/access/libzip_plugin.so
1378
 %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
1379
 %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so
1380
 %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so
1381
+%if %{with gcrypt}
1382
 %{_libdir}/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
1383
+%endif
1384
+%if %{with shout}
1385
 %{_libdir}/vlc/plugins/access_output/libaccess_output_shout_plugin.so
1386
+%endif
1387
 %{_libdir}/vlc/plugins/access_output/libaccess_output_udp_plugin.so
1388
 %{_libdir}/vlc/plugins/audio_filter/liba52tospdif_plugin.so
1389
 %{_libdir}/vlc/plugins/audio_filter/libaudio_format_plugin.so
1390
@@ -749,23 +1279,31 @@
1391
 %{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so
1392
 %{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so
1393
 %{_libdir}/vlc/plugins/audio_filter/libremap_plugin.so
1394
+%if %{with samplerate}
1395
 %{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so
1396
+%endif
1397
 %{_libdir}/vlc/plugins/audio_filter/libscaletempo_plugin.so
1398
 %{_libdir}/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
1399
 %{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so
1400
+%if %{with speex}
1401
 %{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
1402
+%endif
1403
 %{_libdir}/vlc/plugins/audio_filter/libstereo_widen_plugin.so
1404
 %{_libdir}/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
1405
 %{_libdir}/vlc/plugins/audio_filter/libugly_resampler_plugin.so
1406
 %{_libdir}/vlc/plugins/audio_mixer/libfloat_mixer_plugin.so
1407
 %{_libdir}/vlc/plugins/audio_mixer/libinteger_mixer_plugin.so
1408
 %{_libdir}/vlc/plugins/audio_output/libadummy_plugin.so
1409
+%if %{with vlc_alsa}
1410
 %{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so
1411
+%endif
1412
 %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
1413
 %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
1414
+%if %{with vlc_jack}
1415
 %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
1416
+%endif
1417
1418
-%if 0%{?suse_version} > 1140
1419
+%if %{with vlc_pulse}
1420
 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
1421
 %endif
1422
 %{_libdir}/vlc/plugins/codec/liba52_plugin.so
1423
@@ -780,30 +1318,43 @@
1424
 %{_libdir}/vlc/plugins/codec/libdts_plugin.so
1425
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
1426
 %{_libdir}/vlc/plugins/codec/libedummy_plugin.so
1427
+%if %{with vpx}
1428
 %{_libdir}/vlc/plugins/codec/libvpx_plugin.so
1429
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1430
+%endif
1431
+%if %{with flac}
1432
 %{_libdir}/vlc/plugins/codec/libflac_plugin.so
1433
 %endif
1434
1435
-%if %{with fluidsynth}
1436
+%if %{with vlc_fluidsynth}
1437
 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
1438
 %endif
1439
1440
-%if 0%{?suse_version} > 1140
1441
-%if 0%{?BUILD_ORIG}
1442
-%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so
1443
-%endif
1444
+%if %{with vlc_jpeg}
1445
 %{_libdir}/vlc/plugins/codec/libjpeg_plugin.so
1446
 %endif
1447
+
1448
+%if %{with vdpau}
1449
+%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so
1450
+%endif
1451
 %{_libdir}/vlc/plugins/codec/libg711_plugin.so
1452
+%if %{with kate}
1453
 %{_libdir}/vlc/plugins/codec/libkate_plugin.so
1454
+%endif
1455
 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
1456
 %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so
1457
+%if %{with opus}
1458
 %{_libdir}/vlc/plugins/codec/libopus_plugin.so
1459
+%endif
1460
+%if %{with vlc_png}
1461
 %{_libdir}/vlc/plugins/codec/libpng_plugin.so
1462
+%endif
1463
 %{_libdir}/vlc/plugins/codec/librawvideo_plugin.so
1464
+%if %{with schroedinger}
1465
 %{_libdir}/vlc/plugins/codec/libschroedinger_plugin.so
1466
+%endif
1467
+%if %{with speex}
1468
 %{_libdir}/vlc/plugins/codec/libspeex_plugin.so
1469
+%endif
1470
 %{_libdir}/vlc/plugins/codec/libspudec_plugin.so
1471
 %{_libdir}/vlc/plugins/codec/libstl_plugin.so
1472
 %{_libdir}/vlc/plugins/codec/libscte27_plugin.so
1473
@@ -813,24 +1364,37 @@
1474
 %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
1475
 %{_libdir}/vlc/plugins/codec/libt140_plugin.so
1476
 %{_libdir}/vlc/plugins/codec/libtelx_plugin.so
1477
+%if %{with vlc_svgdec}
1478
+%{_libdir}/vlc/plugins/codec/libsvgdec_plugin.so
1479
+%endif
1480
+%if %{with theora}
1481
 %{_libdir}/vlc/plugins/codec/libtheora_plugin.so
1482
+%endif
1483
 %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
1484
+%if %{with vorbis}
1485
 %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
1486
-%if 0%{?suse_version} > 1110
1487
+%endif
1488
+%if %{with vlc_xcb}
1489
 %{_libdir}/vlc/plugins/codec/libxwd_plugin.so
1490
+%endif
1491
+%if %{with zvbi}
1492
 %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so
1493
 %endif
1494
1495
-%if 0%{?suse_version} > 1140
1496
+%if %{with vlc_dbus}
1497
 %{_libdir}/vlc/plugins/control/libdbus_plugin.so
1498
 %endif
1499
 %{_libdir}/vlc/plugins/control/libdummy_plugin.so
1500
 %{_libdir}/vlc/plugins/control/libgestures_plugin.so
1501
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
1502
-%if 0%{?suse_version} > 1110
1503
+%if %{with vlc_xcb}
1504
+%if %{with vlc_xcb_keysyms}
1505
 %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
1506
 %endif
1507
+%endif
1508
+%if %{with vlc_lirc}
1509
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
1510
+%endif
1511
 %{_libdir}/vlc/plugins/control/libmotion_plugin.so
1512
 %{_libdir}/vlc/plugins/control/libnetsync_plugin.so
1513
 %{_libdir}/vlc/plugins/control/liboldrc_plugin.so
1514
@@ -844,22 +1408,26 @@
1515
 %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
1516
 %{_libdir}/vlc/plugins/demux/libes_plugin.so
1517
 %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
1518
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1519
+%if %{with libgme}
1520
 %{_libdir}/vlc/plugins/demux/libgme_plugin.so
1521
 %endif
1522
 %{_libdir}/vlc/plugins/demux/libh264_plugin.so
1523
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
1524
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
1525
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1526
+%if %{with matroska}
1527
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
1528
 %endif
1529
+%if %{with modplug}
1530
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
1531
+%endif
1532
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
1533
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
1534
 %{_libdir}/vlc/plugins/demux/libnsc_plugin.so
1535
 %{_libdir}/vlc/plugins/demux/libnsv_plugin.so
1536
 %{_libdir}/vlc/plugins/demux/libnuv_plugin.so
1537
+%if %{with ogg}
1538
 %{_libdir}/vlc/plugins/demux/libogg_plugin.so
1539
+%endif
1540
 %{_libdir}/vlc/plugins/demux/libplaylist_plugin.so
1541
 %{_libdir}/vlc/plugins/demux/libps_plugin.so
1542
 %{_libdir}/vlc/plugins/demux/libpva_plugin.so
1543
@@ -869,7 +1437,12 @@
1544
 %{_libdir}/vlc/plugins/demux/libreal_plugin.so
1545
 %{_libdir}/vlc/plugins/demux/libsmf_plugin.so
1546
 %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so
1547
+%if %{with vlc_libsidplay2}
1548
+%{_libdir}/vlc/plugins/demux/libsid_plugin.so
1549
+%endif
1550
+%if %{with dvbpsi}
1551
 %{_libdir}/vlc/plugins/demux/libts_plugin.so
1552
+%endif
1553
 %{_libdir}/vlc/plugins/demux/libtta_plugin.so
1554
 %{_libdir}/vlc/plugins/demux/libty_plugin.so
1555
 %{_libdir}/vlc/plugins/demux/libvc1_plugin.so
1556
@@ -877,46 +1450,56 @@
1557
 %{_libdir}/vlc/plugins/demux/libvoc_plugin.so
1558
 %{_libdir}/vlc/plugins/demux/libwav_plugin.so
1559
 %{_libdir}/vlc/plugins/demux/libxa_plugin.so
1560
+%if %{with freetype2}
1561
 %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
1562
+%endif
1563
+%if %{with vlc_lua}
1564
 %{_libdir}/vlc/plugins/lua/liblua_plugin.so
1565
+%endif
1566
1567
-%if 0%{?suse_version} >= 1320
1568
+%if %{with vlc_ncurses}
1569
 %{_libdir}/vlc/plugins/gui/libncurses_plugin.so
1570
 %endif
1571
 %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so
1572
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1573
+%if %{with taglib}
1574
 %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so
1575
 %endif
1576
 %{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so
1577
 %{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so
1578
 %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
1579
1580
-%if 0%{?suse_version} > 1140
1581
+%if %{with vlc_dbus}
1582
 %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
1583
 %endif
1584
 %{_libdir}/vlc/plugins/misc/libexport_plugin.so
1585
 %{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so
1586
1587
-%if 0%{?suse_version} > 1140
1588
+%if %{with gnutls}
1589
 %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so
1590
 %endif
1591
 %{_libdir}/vlc/plugins/misc/liblogger_plugin.so
1592
 %{_libdir}/vlc/plugins/misc/libstats_plugin.so
1593
 %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so
1594
-%if 0%{?suse_version} > 1110
1595
+%if %{with vlc_xcb}
1596
 %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so
1597
 %endif
1598
+%if %{with libxml2}
1599
 %{_libdir}/vlc/plugins/misc/libxml_plugin.so
1600
+%endif
1601
 %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so
1602
 %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so
1603
 %{_libdir}/vlc/plugins/mux/libmux_dummy_plugin.so
1604
 %{_libdir}/vlc/plugins/mux/libmux_mp4_plugin.so
1605
 %{_libdir}/vlc/plugins/mux/libmux_mpjpeg_plugin.so
1606
+%if %{with ogg}
1607
 %{_libdir}/vlc/plugins/mux/libmux_ogg_plugin.so
1608
+%endif
1609
 %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
1610
+%if %{with dvbpsi}
1611
 %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
1612
+%endif
1613
 %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
1614
-%if 0%{?BUILD_ORIG}
1615
+%if %{with ffmpeg}
1616
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
1617
 %endif
1618
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
1619
@@ -928,35 +1511,39 @@
1620
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
1621
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
1622
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
1623
+%if %{with avahi}
1624
 %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so
1625
+%endif
1626
 %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so
1627
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
1628
+%if %{with vlc_mtp}
1629
 %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so
1630
 %endif
1631
 %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so
1632
1633
-%if 0%{?suse_version} > 1140
1634
+%if %{with vlc_pulse}
1635
 %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so
1636
 %endif
1637
 %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so
1638
+%if %{with udev}
1639
 %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so
1640
-%if 0%{?suse_version} > 1110
1641
-%if 0%{?suse_version} != 1315
1642
-%{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
1643
 %endif
1644
+%if %{with upnp}
1645
+%{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
1646
 %endif
1647
-%if 0%{?suse_version} > 1110
1648
+%if %{with vlc_xcb}
1649
 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
1650
 %endif
1651
 %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so
1652
 %{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so
1653
+%if %{with gcrypt}
1654
 %{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so
1655
+%endif
1656
 %{_libdir}/vlc/plugins/stream_filter/librecord_plugin.so
1657
 %{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so
1658
 %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
1659
 %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
1660
1661
-%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
1662
+%if %{with chromaprint}
1663
 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
1664
 %endif
1665
 %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
1666
@@ -968,7 +1555,9 @@
1667
 %{_libdir}/vlc/plugins/stream_out/libstream_out_gather_plugin.so
1668
 %{_libdir}/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.so
1669
 %{_libdir}/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
1670
+%if %{with gcrypt}
1671
 %{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so
1672
+%endif
1673
 %{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so
1674
 %{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
1675
 %{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so
1676
@@ -976,7 +1565,9 @@
1677
 %{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so
1678
 %{_libdir}/vlc/plugins/stream_out/libstream_out_stats_plugin.so
1679
 %{_libdir}/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
1680
+%if %{with vlc_svg}
1681
 %{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so
1682
+%endif
1683
 %{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so
1684
 %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
1685
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so
1686
@@ -985,7 +1576,7 @@
1687
 %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
1688
1689
 %ifarch %ix86 x86_64
1690
-%if 0%{?suse_version} > 1140
1691
+%if %{with vlc_mmx_sse}
1692
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
1693
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
1694
 %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
1695
@@ -1004,7 +1595,9 @@
1696
 %{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so
1697
 %{_libdir}/vlc/plugins/video_filter/libanaglyph_plugin.so
1698
 %{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so
1699
+%if %{with vlc_atmo}
1700
 %{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so
1701
+%endif
1702
 %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
1703
 %{_libdir}/vlc/plugins/video_filter/libball_plugin.so
1704
 %{_libdir}/vlc/plugins/video_filter/libblend_plugin.so
1705
@@ -1034,12 +1627,10 @@
1706
 %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
1707
 %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
1708
 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
1709
-%if 0%{?suse_version} > 1110
1710
-%if 0%{?suse_version} != 1315
1711
+%if %{with opencv}
1712
 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
1713
 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
1714
 %endif
1715
-%endif
1716
 %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
1717
 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
1718
 %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
1719
@@ -1051,7 +1642,7 @@
1720
 %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so
1721
 %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
1722
 %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so
1723
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
1724
+%if %{with ffmpeg}
1725
 %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so
1726
 %endif
1727
 %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
1728
@@ -1059,18 +1650,24 @@
1729
 %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so
1730
 %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
1731
 %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so
1732
-%if 0%{?suse_version} > 1110
1733
+%if %{with caca}
1734
 %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
1735
 %endif
1736
 %{_libdir}/vlc/plugins/video_output/libfb_plugin.so
1737
+%if %{with vlc_gl}
1738
 %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
1739
-%if 0%{?suse_version} > 1110
1740
+%endif
1741
+%if %{with vlc_xcb}
1742
+%if %{with vlc_gl}
1743
 %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
1744
 %endif
1745
+%endif
1746
 %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so
1747
 %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so
1748
+%if %{with sdl}
1749
 %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so
1750
-%if 0%{?suse_version} > 1110
1751
+%endif
1752
+%if %{with vlc_xcb}
1753
 %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
1754
 %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
1755
 %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
1756
@@ -1078,29 +1675,58 @@
1757
 %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so
1758
 %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so
1759
1760
-%if 0%{?BUILD_ORIG}
1761
 %files codecs
1762
 %defattr(-,root,root)
1763
+%if %{with ffmpeg}
1764
 %{_libdir}/vlc/plugins/access/libavio_plugin.so
1765
+%endif
1766
+%if %{with a52}
1767
 %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so
1768
+%endif
1769
+%if %{with libdca}
1770
 %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
1771
+%endif
1772
+%if %{with mad}
1773
 %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so
1774
+%endif
1775
+%if %{with ffmpeg}
1776
 %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
1777
+%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
1778
+%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
1779
+%endif
1780
+%if %{with faad}
1781
 %{_libdir}/vlc/plugins/codec/libfaad_plugin.so
1782
+%endif
1783
+%if %{with fdk_aac}
1784
+%{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so
1785
+%endif
1786
+%if %{with libmpeg2}
1787
 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
1788
+%endif
1789
+%if %{with shine}
1790
+%{_libdir}/vlc/plugins/codec/libshine_plugin.so
1791
+%endif
1792
+%if %{with twolame}
1793
 %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
1794
+%endif
1795
+%if %{with x264}
1796
 %{_libdir}/vlc/plugins/codec/libx264_plugin.so
1797
-#{_libdir}/vlc/plugins/codec/libx265_plugin.so
1798
-%if 0%{?suse_version} > 1140
1799
+%endif
1800
+%if %{with x265}
1801
+%{_libdir}/vlc/plugins/codec/libx265_plugin.so
1802
+%endif
1803
+%if %{with vlc_gst}
1804
+%{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so
1805
+%endif
1806
+%if %{with libva}
1807
+%if %{with libva_drm}
1808
 %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
1809
 %endif
1810
 %{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so
1811
-%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
1812
-%if 0%{?BUILD_ORIG}
1813
+%endif
1814
 %{_libdir}/vlc/plugins/demux/libhevc_plugin.so
1815
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
1816
-%endif
1817
-%if 0%{?suse_version} > 1140
1818
+%if %{with vdpau}
1819
 %{_libdir}/vlc/libvlc_vdpau.so.0
1820
 %{_libdir}/vlc/libvlc_vdpau.so.0.0.0
1821
 %dir %{_libdir}/vlc/plugins/vdpau
1822
@@ -1111,8 +1737,6 @@
1823
 %{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so
1824
 %{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
1825
 %endif
1826
-%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
1827
-%endif
1828
1829
 %files -n libvlc%{libvlc}
1830
 %defattr(-,root,root)
1831
@@ -1122,15 +1746,19 @@
1832
 %defattr(-,root,root)
1833
 %{_libdir}/libvlccore.so.%{libvlccore}*
1834
1835
+%if %{with vlc_qt4} || %{with vlc_qt5}
1836
 %files qt
1837
 %defattr(-,root,root)
1838
 %{_bindir}/qvlc
1839
 %{_mandir}/man1/qvlc*
1840
 %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
1841
+%endif
1842
1843
+%if %{with gnomevfs}
1844
 %files gnome
1845
 %defattr(-,root,root)
1846
 %{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so
1847
+%endif
1848
1849
 %files devel
1850
 %defattr(-,root,root)
1851
@@ -1140,10 +1768,8 @@
1852
 %{_libdir}/pkgconfig/libvlc.pc
1853
 %{_libdir}/pkgconfig/vlc-plugin.pc
1854
 %{_libdir}/vlc/libcompat.a
1855
-%if 0%{?BUILD_ORIG}
1856
-%if 0%{?suse_version} > 1140
1857
+%if %{with vdpau}
1858
 %{_libdir}/vlc/libvlc_vdpau.so
1859
 %endif
1860
-%endif
1861
1862
 %changelog
1863
​
View file
0001-no-return-in-non-void.patch Changed
141
 
1
@@ -1,8 +1,8 @@
2
-diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
3
-index 73af8ce..8ffad6f 100644
4
---- a/modules/access/v4l2/demux.c
5
-+++ b/modules/access/v4l2/demux.c
6
-@@ -629,6 +629,7 @@ static void *MmapThread (void *data)
7
+Index: vlc-2.2.1/modules/access/v4l2/demux.c
8
+===================================================================
9
+--- vlc-2.2.1.orig/modules/access/v4l2/demux.c
10
++++ vlc-2.2.1/modules/access/v4l2/demux.c
11
+@@ -632,6 +632,7 @@ static void *MmapThread (void *data)
12
      }
13
14
      assert (0);
15
@@ -10,7 +10,7 @@
16
  }
17
18
  static void *ReadThread (void *data)
19
-@@ -691,6 +692,7 @@ static void *ReadThread (void *data)
20
+@@ -694,6 +695,7 @@ static void *ReadThread (void *data)
21
  #endif
22
      }
23
      assert (0);
24
@@ -18,11 +18,11 @@
25
  }
26
27
  static int DemuxControl( demux_t *demux, int query, va_list args )
28
-diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
29
-index 8d7dc6e..cc924aa 100644
30
---- a/modules/control/dbus/dbus.c
31
-+++ b/modules/control/dbus/dbus.c
32
-@@ -880,6 +880,7 @@ static void *Run( void *data )
33
+Index: vlc-2.2.1/modules/control/dbus/dbus.c
34
+===================================================================
35
+--- vlc-2.2.1.orig/modules/control/dbus/dbus.c
36
++++ vlc-2.2.1/modules/control/dbus/dbus.c
37
+@@ -891,6 +891,7 @@ static void *Run( void *data )
38
          vlc_restorecancel( canc );
39
      }
40
      assert(0);
41
@@ -30,11 +30,11 @@
42
  }
43
44
  static void   wakeup_main_loop( void *p_data )
45
-diff --git a/modules/control/motion.c b/modules/control/motion.c
46
-index 72d7ec6..49c5620 100644
47
---- a/modules/control/motion.c
48
-+++ b/modules/control/motion.c
49
-@@ -190,6 +190,7 @@ static void *RunIntf( void *data )
50
+Index: vlc-2.2.1/modules/control/motion.c
51
+===================================================================
52
+--- vlc-2.2.1.orig/modules/control/motion.c
53
++++ vlc-2.2.1/modules/control/motion.c
54
+@@ -188,6 +188,7 @@ static void *RunIntf( void *data )
55
          vlc_restorecancel( canc );
56
      }
57
      assert(0);
58
@@ -42,11 +42,11 @@
59
  }
60
  #undef LOW_THRESHOLD
61
  #undef HIGH_THRESHOLD
62
-diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c
63
-index 9d24ced..b087410 100644
64
---- a/modules/control/motionlib.c
65
-+++ b/modules/control/motionlib.c
66
-@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensors_t *motion )
67
+Index: vlc-2.2.1/modules/control/motionlib.c
68
+===================================================================
69
+--- vlc-2.2.1.orig/modules/control/motionlib.c
70
++++ vlc-2.2.1/modules/control/motionlib.c
71
+@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensor
72
      default:
73
          assert( 0 );
74
      }
75
@@ -54,11 +54,11 @@
76
  }
77
78
  /*****************************************************************************
79
-diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
80
-index 62c89b7..81f884a 100644
81
---- a/modules/stream_out/rtp.c
82
-+++ b/modules/stream_out/rtp.c
83
-@@ -1501,6 +1501,7 @@ static void *rtp_listen_thread( void *data )
84
+Index: vlc-2.2.1/modules/stream_out/rtp.c
85
+===================================================================
86
+--- vlc-2.2.1.orig/modules/stream_out/rtp.c
87
++++ vlc-2.2.1/modules/stream_out/rtp.c
88
+@@ -1499,6 +1499,7 @@ static void *rtp_listen_thread( void *da
89
      }
90
91
      assert( 0 );
92
@@ -66,11 +66,11 @@
93
  }
94
95
96
-diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
97
-index 0baa2bc..6b788cb 100644
98
---- a/modules/visualization/visual/visual.c
99
-+++ b/modules/visualization/visual/visual.c
100
-@@ -366,6 +366,7 @@ static void *Thread( void *data )
101
+Index: vlc-2.2.1/modules/visualization/visual/visual.c
102
+===================================================================
103
+--- vlc-2.2.1.orig/modules/visualization/visual/visual.c
104
++++ vlc-2.2.1/modules/visualization/visual/visual.c
105
+@@ -382,6 +382,7 @@ static void *Thread( void *data )
106
          vlc_restorecancel( canc );
107
      }
108
      assert(0);
109
@@ -78,11 +78,11 @@
110
  }
111
112
  static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
113
-diff --git a/src/misc/events.c b/src/misc/events.c
114
-index b430ee5..29c387f 100644
115
---- a/src/misc/events.c
116
-+++ b/src/misc/events.c
117
-@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em,
118
+Index: vlc-2.2.1/src/misc/events.c
119
+===================================================================
120
+--- vlc-2.2.1.orig/src/misc/events.c
121
++++ vlc-2.2.1/src/misc/events.c
122
+@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_
123
      FOREACH_END()
124
      /* Unknown event = BUG */
125
      assert( 0 );
126
@@ -90,9 +90,11 @@
127
  }
128
129
  /**
130
---- a/modules/demux/mp4/mp4.c.orig 2015-04-13 16:35:15.220228877 +0200
131
-+++ b/modules/demux/mp4/mp4.c  2015-04-13 16:35:15.255228142 +0200
132
-@@ -277,6 +277,7 @@
133
+Index: vlc-2.2.1/modules/demux/mp4/mp4.c
134
+===================================================================
135
+--- vlc-2.2.1.orig/modules/demux/mp4/mp4.c
136
++++ vlc-2.2.1/modules/demux/mp4/mp4.c
137
+@@ -277,6 +277,7 @@ static inline int64_t MP4_TrackGetPTSDel
138
139
          i_sample -= ck->p_sample_count_pts[i_index];
140
      }
141
​
View file
0001-text-fix-decoding-of-4-bytes-UTF-8-sequences.patch Added
60
 
1
@@ -0,0 +1,58 @@
2
+From b6e93c1cdf2087aeba99b634235212a39bfa5952 Mon Sep 17 00:00:00 2001
3
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
4
+Date: Mon, 13 Jun 2016 20:31:15 +0300
5
+Subject: text: fix decoding of 4-bytes UTF-8 sequences
6
+
7
+(cherry picked from commit 221462198b2e32c74cfcb0d0b5645042d7fb3c79)
8
+---
9
+ src/text/unicode.c | 14 +++++++-------
10
+ 1 file changed, 7 insertions(+), 7 deletions(-)
11
+
12
+diff --git a/src/text/unicode.c b/src/text/unicode.c
13
+index 25215d7..64c8573 100644
14
+--- a/src/text/unicode.c
15
++++ b/src/text/unicode.c
16
+@@ -151,7 +151,7 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
17
+             break;
18
+
19
+         case 4:
20
+-            cp = (c & 0x07) << 16;
21
++            cp = (c & 0x07) << 18;
22
+             break;
23
+
24
+         default:
25
+@@ -163,18 +163,18 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
26
+     {
27
+         case 4:
28
+             c = *++ptr;
29
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
30
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
31
+                 return -1;
32
+-            cp |= (c & 0x3f) << 12;
33
++            cp |= (c & 0x3F) << 12;
34
+
35
+             if (unlikely(cp >= 0x110000)) // beyond Unicode range
36
+                 return -1;
37
+             /* fall through */
38
+         case 3:
39
+             c = *++ptr;
40
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
41
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
42
+                 return -1;
43
+-            cp |= (c & 0x3f) << 6;
44
++            cp |= (c & 0x3F) << 6;
45
+
46
+             if (unlikely(cp >= 0xD800 && cp < 0xE000)) // UTF-16 surrogate
47
+                 return -1;
48
+@@ -183,9 +183,9 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
49
+             /* fall through */
50
+         case 2:
51
+             c = *++ptr;
52
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
53
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
54
+                 return -1;
55
+-            cp |= (c & 0x3f);
56
++            cp |= (c & 0x3F);
57
+             break;
58
+     }
59
+
60
​
View file
0030-Fix-build-using-old-GCC-intrinsics.patch Added
291
 
1
@@ -0,0 +1,289 @@
2
+From 8b0a359be21c8b66c7f7f5d34b85df3cf6689035 Mon Sep 17 00:00:00 2001
3
+From: Francois Cartegnie <fcvlcdev@free.fr>
4
+Date: Sun, 24 Jul 2016 12:59:20 +0200
5
+Subject: Fix build using old GCC intrinsics
6
+
7
+As the 2.2 headers are still using vlc_atomics (picture)
8
+we cannot have a way to avoid collisions with early
9
+or late <atomic> inclusion when using GCC >= 4.7
10
+
11
+Conditionals in vlc_atomic won't work.
12
+
13
+Happens in ProjectM and Qt5.
14
+
15
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
16
+---
17
+ modules/gui/qt4/actions_manager.cpp                |  2 ++
18
+ modules/gui/qt4/adapters/seekpoints.cpp            |  4 +--
19
+ modules/gui/qt4/adapters/seekpoints.hpp            |  4 +--
20
+ modules/gui/qt4/components/controller.cpp          |  2 ++
21
+ .../gui/qt4/components/playlist/playlist_model.hpp |  4 +--
22
+ modules/gui/qt4/components/playlist/views.cpp      |  6 ++++
23
+ modules/gui/qt4/dialogs/messages.cpp               |  2 ++
24
+ modules/gui/qt4/dialogs/vlm.cpp                    |  4 ---
25
+ modules/gui/qt4/dialogs/vlm.hpp                    |  4 ++-
26
+ modules/gui/qt4/input_manager.cpp                  |  2 ++
27
+ modules/gui/qt4/input_manager.hpp                  |  3 +-
28
+ modules/gui/qt4/menus.cpp                          |  2 ++
29
+ modules/gui/qt4/qt4.hpp                            | 32 ++++++++++++++++++----
30
+ modules/gui/qt4/util/pictureflow.cpp               |  2 ++
31
+ modules/visualization/projectm.cpp                 |  4 +++
32
+ 15 files changed, 56 insertions(+), 21 deletions(-)
33
+
34
+diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
35
+index eff40d9..b7ca967 100644
36
+--- a/modules/gui/qt4/actions_manager.cpp
37
++++ b/modules/gui/qt4/actions_manager.cpp
38
+@@ -25,6 +25,8 @@
39
+ # include "config.h"
40
+ #endif
41
+
42
++#include "qt4.hpp"
43
++
44
+ #include <vlc_vout.h>
45
+ #include <vlc_keys.h>
46
+
47
+diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
48
+index fbf2957..a3564bb 100644
49
+--- a/modules/gui/qt4/adapters/seekpoints.cpp
50
++++ b/modules/gui/qt4/adapters/seekpoints.cpp
51
+@@ -19,14 +19,12 @@
52
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
53
+  *****************************************************************************/
54
+
55
++#include "seekpoints.hpp"
56
+
57
+ #include "recents.hpp"
58
+ #include "dialogs_provider.hpp"
59
+ #include "menus.hpp"
60
+
61
+-#include "seekpoints.hpp"
62
+-
63
+-#include "qt4.hpp"
64
+ #include "input_manager.hpp"
65
+
66
+ SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
67
+diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
68
+index 0083989..bbb9214 100644
69
+--- a/modules/gui/qt4/adapters/seekpoints.hpp
70
++++ b/modules/gui/qt4/adapters/seekpoints.hpp
71
+@@ -22,9 +22,7 @@
72
+ #ifndef SEEKPOINTS_HPP
73
+ #define SEEKPOINTS_HPP
74
+
75
+-#ifdef HAVE_CONFIG_H
76
+-#include "config.h"
77
+-#endif
78
++#include "qt4.hpp"
79
+
80
+ #include <vlc_common.h>
81
+ #include <vlc_interface.h>
82
+diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
83
+index d93e0db..c43d929 100644
84
+--- a/modules/gui/qt4/components/controller.cpp
85
++++ b/modules/gui/qt4/components/controller.cpp
86
+@@ -26,6 +26,8 @@
87
+ # include "config.h"
88
+ #endif
89
+
90
++#include "qt4.hpp"
91
++
92
+ #include <vlc_vout.h>                       /* vout_thread_t for FSC */
93
+
94
+ /* Widgets */
95
+diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
96
+index f9d1d0c..1f71ac9 100644
97
+--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
98
++++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
99
+@@ -25,9 +25,7 @@
100
+ #ifndef _PLAYLIST_MODEL_H_
101
+ #define _PLAYLIST_MODEL_H_
102
+
103
+-#ifdef HAVE_CONFIG_H
104
+-# include "config.h"
105
+-#endif
106
++#include "qt4.hpp"
107
+
108
+ #include <vlc_input.h>
109
+ #include <vlc_playlist.h>
110
+diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
111
+index 59f6535..0066205 100644
112
+--- a/modules/gui/qt4/components/playlist/views.cpp
113
++++ b/modules/gui/qt4/components/playlist/views.cpp
114
+@@ -21,6 +21,12 @@
115
+  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
116
+  *****************************************************************************/
117
+
118
++#ifdef HAVE_CONFIG_H
119
++#include "config.h"
120
++#endif
121
++
122
++#include "qt4.hpp"
123
++
124
+ #include "components/playlist/views.hpp"
125
+ #include "components/playlist/vlc_model.hpp"      /* VLCModel */
126
+ #include "components/playlist/sorting.h"          /* Columns List */
127
+diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
128
+index 30793a2..9c79c99 100644
129
+--- a/modules/gui/qt4/dialogs/messages.cpp
130
++++ b/modules/gui/qt4/dialogs/messages.cpp
131
+@@ -24,6 +24,8 @@
132
+ # include "config.h"
133
+ #endif
134
+
135
++#include "qt4.hpp"
136
++
137
+ #include "dialogs/messages.hpp"
138
+
139
+ #include <QPlainTextEdit>
140
+diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
141
+index 0da88cc..595f015 100644
142
+--- a/modules/gui/qt4/dialogs/vlm.cpp
143
++++ b/modules/gui/qt4/dialogs/vlm.cpp
144
+@@ -23,10 +23,6 @@
145
+  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
146
+  *****************************************************************************/
147
+
148
+-#ifdef HAVE_CONFIG_H
149
+-# include "config.h"
150
+-#endif
151
+-
152
+ #include "dialogs/vlm.hpp"
153
+
154
+ #ifdef ENABLE_VLM
155
+diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
156
+index a3c6e5d..dcf7110 100644
157
+--- a/modules/gui/qt4/dialogs/vlm.hpp
158
++++ b/modules/gui/qt4/dialogs/vlm.hpp
159
+@@ -25,8 +25,10 @@
160
+ #ifndef QVLC_VLM_DIALOG_H_
161
+ #define QVLC_VLM_DIALOG_H_ 1
162
+
163
++#include "qt4.hpp"
164
++
165
+ #ifdef HAVE_CONFIG_H
166
+-# include "config.h"
167
++#include "config.h"
168
+ #endif
169
+
170
+ #ifdef ENABLE_VLM
171
+diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
172
+index fd45f4a..c50cb6c 100644
173
+--- a/modules/gui/qt4/input_manager.cpp
174
++++ b/modules/gui/qt4/input_manager.cpp
175
+@@ -30,6 +30,8 @@
176
+ # include "config.h"
177
+ #endif
178
+
179
++#include "qt4.hpp"
180
++
181
+ #include "input_manager.hpp"
182
+ #include "recents.hpp"
183
+
184
+diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
185
+index 7d3b76a..4fbecbb 100644
186
+--- a/modules/gui/qt4/input_manager.hpp
187
++++ b/modules/gui/qt4/input_manager.hpp
188
+@@ -29,9 +29,10 @@
189
+ # include "config.h"
190
+ #endif
191
+
192
++#include "qt4.hpp"
193
++
194
+ #include <vlc_input.h>
195
+
196
+-#include "qt4.hpp"
197
+ #include "util/singleton.hpp"
198
+ #include "adapters/variables.hpp"
199
+
200
+diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
201
+index 116e98c..46240b0 100644
202
+--- a/modules/gui/qt4/menus.cpp
203
++++ b/modules/gui/qt4/menus.cpp
204
+@@ -34,6 +34,8 @@
205
+ # include "config.h"
206
+ #endif
207
+
208
++#include "qt4.hpp"
209
++
210
+ #include <vlc_common.h>
211
+ #include <vlc_intf_strings.h>
212
+ #include <vlc_vout.h>                             /* vout_thread_t */
213
+diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
214
+index 44d7db6..5aec957 100644
215
+--- a/modules/gui/qt4/qt4.hpp
216
++++ b/modules/gui/qt4/qt4.hpp
217
+@@ -29,12 +29,7 @@
218
+ # include "config.h"
219
+ #endif
220
+
221
+-#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
222
+-#include <vlc_interface.h> /* intf_thread_t */
223
+-#include <vlc_playlist.h>  /* playlist_t */
224
+-
225
+-#define QT_NO_CAST_TO_ASCII
226
+-#include <QString>
227
++#include <QtGlobal>
228
+
229
+ #if ( QT_VERSION < 0x040600 )
230
+ # error Update your Qt version to at least 4.6.0
231
+@@ -43,6 +38,31 @@
232
+ #define HAS_QT47 ( QT_VERSION >= 0x040700 )
233
+ #define HAS_QT5  ( QT_VERSION >= 0x050000 )
234
+
235
++#if HAS_QT5
236
++  #include <QtCore/qcompilerdetection.h>
237
++  #if defined(Q_COMPILER_ATOMICS) && \
238
++             ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
239
++   #define VLC_ATOMIC_H
240
++   #include <atomic>
241
++   using namespace std;
242
++   #  define atomic_store(object,desired) \
243
++      do { \
244
++          *(object) = (desired); \
245
++          __sync_synchronize(); \
246
++      } while (0)
247
++
248
++   #  define atomic_load(object) \
249
++       (__sync_synchronize(), *(object))
250
++  #endif
251
++#endif
252
++
253
++#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
254
++#include <vlc_interface.h> /* intf_thread_t */
255
++#include <vlc_playlist.h>  /* playlist_t */
256
++
257
++#define QT_NO_CAST_TO_ASCII
258
++#include <QString>
259
++
260
+ enum {
261
+     DialogEventTypeOffset = 0,
262
+     IMEventTypeOffset     = 100,
263
+diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
264
+index 9318953..a7e6a01 100644
265
+--- a/modules/gui/qt4/util/pictureflow.cpp
266
++++ b/modules/gui/qt4/util/pictureflow.cpp
267
+@@ -29,6 +29,8 @@
268
+   THE SOFTWARE.
269
+ */
270
+
271
++#include "qt4.hpp"
272
++
273
+ #include "pictureflow.hpp"
274
+
275
+ #include <QApplication>
276
+diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
277
+index e80fbf4..96d532d 100644
278
+--- a/modules/visualization/projectm.cpp
279
++++ b/modules/visualization/projectm.cpp
280
+@@ -30,6 +30,10 @@
281
+ #endif
282
+
283
+ #include <assert.h>
284
++#if defined(__GNUC__) && \
285
++           ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
286
++  #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
287
++#endif
288
+
289
+ #include <vlc_common.h>
290
+ #include <vlc_plugin.h>
291
​
View file
vlc-2.2.0-fix_deinterlace_mmx.patch Deleted
121
 
1
@@ -1,119 +0,0 @@
2
---- modules/video_filter/deinterlace/merge.c.orig  2015-03-04 07:55:02.021482260 +0100
3
-+++ modules/video_filter/deinterlace/merge.c   2015-03-04 07:56:33.975885612 +0100
4
-@@ -68,116 +68,6 @@
5
-         *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
6
- }
7
-
8
--#if defined(CAN_COMPILE_MMXEXT)
9
--VLC_MMX
10
--void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2,
11
--                  size_t i_bytes )
12
--{
13
--    uint8_t *p_dest = _p_dest;
14
--    const uint8_t *p_s1 = _p_s1;
15
--    const uint8_t *p_s2 = _p_s2;
16
--
17
--    for( ; i_bytes >= 8; i_bytes -= 8 )
18
--    {
19
--        __asm__  __volatile__( "movq %2,%%mm1;"
20
--                               "pavgb %1, %%mm1;"
21
--                               "movq %%mm1, %0" :"=m" (*p_dest):
22
--                                                 "m" (*p_s1),
23
--                                                 "m" (*p_s2) : "mm1" );
24
--        p_dest += 8;
25
--        p_s1 += 8;
26
--        p_s2 += 8;
27
--    }
28
--
29
--    for( ; i_bytes > 0; i_bytes-- )
30
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
31
--}
32
--#endif
33
--
34
--#if defined(CAN_COMPILE_3DNOW)
35
--VLC_MMX
36
--void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2,
37
--                 size_t i_bytes )
38
--{
39
--    uint8_t *p_dest = _p_dest;
40
--    const uint8_t *p_s1 = _p_s1;
41
--    const uint8_t *p_s2 = _p_s2;
42
--
43
--    for( ; i_bytes >= 8; i_bytes -= 8 )
44
--    {
45
--        __asm__  __volatile__( "movq %2,%%mm1;"
46
--                               "pavgusb %1, %%mm1;"
47
--                               "movq %%mm1, %0" :"=m" (*p_dest):
48
--                                                 "m" (*p_s1),
49
--                                                 "m" (*p_s2) : "mm1" );
50
--        p_dest += 8;
51
--        p_s1 += 8;
52
--        p_s2 += 8;
53
--    }
54
--
55
--    for( ; i_bytes > 0; i_bytes-- )
56
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
57
--}
58
--#endif
59
--
60
--#if defined(CAN_COMPILE_SSE)
61
--VLC_SSE
62
--void Merge8BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
63
--                    size_t i_bytes )
64
--{
65
--    uint8_t *p_dest = _p_dest;
66
--    const uint8_t *p_s1 = _p_s1;
67
--    const uint8_t *p_s2 = _p_s2;
68
--
69
--    for( ; i_bytes > 0 && ((uintptr_t)p_s1 & 15); i_bytes-- )
70
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
71
--
72
--    for( ; i_bytes >= 16; i_bytes -= 16 )
73
--    {
74
--        __asm__  __volatile__( "movdqu %2,%%xmm1;"
75
--                               "pavgb %1, %%xmm1;"
76
--                               "movdqu %%xmm1, %0" :"=m" (*p_dest):
77
--                                                 "m" (*p_s1),
78
--                                                 "m" (*p_s2) : "xmm1" );
79
--        p_dest += 16;
80
--        p_s1 += 16;
81
--        p_s2 += 16;
82
--    }
83
--
84
--    for( ; i_bytes > 0; i_bytes-- )
85
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
86
--}
87
--
88
--VLC_SSE
89
--void Merge16BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
90
--                     size_t i_bytes )
91
--{
92
--    uint16_t *p_dest = _p_dest;
93
--    const uint16_t *p_s1 = _p_s1;
94
--    const uint16_t *p_s2 = _p_s2;
95
--
96
--    size_t i_words = i_bytes / 2;
97
--    for( ; i_words > 0 && ((uintptr_t)p_s1 & 15); i_words-- )
98
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
99
--
100
--    for( ; i_words >= 8; i_words -= 8 )
101
--    {
102
--        __asm__  __volatile__( "movdqu %2,%%xmm1;"
103
--                               "pavgw %1, %%xmm1;"
104
--                               "movdqu %%xmm1, %0" :"=m" (*p_dest):
105
--                                                 "m" (*p_s1),
106
--                                                 "m" (*p_s2) : "xmm1" );
107
--        p_dest += 8;
108
--        p_s1 += 8;
109
--        p_s2 += 8;
110
--    }
111
--
112
--    for( ; i_words > 0; i_words-- )
113
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
114
--}
115
--
116
--#endif
117
--
118
- #ifdef CAN_COMPILE_C_ALTIVEC
119
- void MergeAltivec( void *_p_dest, const void *_p_s1,
120
-                    const void *_p_s2, size_t i_bytes )
121
​
View file
vlc-qt-5.5.0-version-check.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+--- configure.ac.orig  2016-02-06 23:34:55.363978687 +0100
3
++++ configure.ac   2016-02-06 23:34:55.383978278 +0100
4
+@@ -3754,7 +3754,7 @@
5
+           AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
6
+       ])
7
+
8
+-      PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
9
++      PKG_CHECK_EXISTS([Qt5Core = 5.5.0], [
10
+         AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
11
+       ])
12
+
13
​
View file
vlc-2.2.1.tar.xz -> vlc-2.2.4.tar.xz Changed
View file
vlc-rpmlintrc Changed
30
 
1
@@ -4,3 +4,28 @@
2
 # there's a good reason for packaging vlc and vlc.desktop separately
3
 addFilter("desktopfile-without-binary")
4
5
+
6
+
7
+
8
+
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
22
+
23
+
24
+
25
+
26
+
27
+
28
+
29
+
30
​
Refresh

No build results available

Refresh

No rpmlint results available

Mentioned Issues (6)

CVE-2015-7981
CVE-2015-8126
CVE-2016-5108
boo#956769
boo#959100
boo#960621
Request History
Peter Linnell's avatar

mrdocs created request over 8 years ago

hackish way to avoid the zero day exploit for libgme

Peter Linnell's avatar

mrdocs accepted request over 8 years ago

self accepting because of the security issue with libgme

Locations
Help
Contact