Request 3168 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

You're not reviewing the full diff of request 3168 , but the diff to the superseded request 2266 (Show full diff)

Overview

Request 3168 (accepted)

hackish way to avoid the zero day exploit for libgme

Created by mrdocs about 8 years ago
In state accepted
Supersedes 2266

Submit vlc

Submit package home:mrdocs:branches:Essentials / vlc to package Essentials / vlc

vlc.changes Changed

@@ -1,4 +1,217 @@
 -------------------------------------------------------------------
+Fri Oct 28 17:58:28 UTC 2016 - olaf@aepfle.de
+
+- Enable libfdk_aac
+
+-------------------------------------------------------------------
+Wed Aug 10 20:08:55 UTC 2016 - olaf@aepfle.de
+
+- Fix build using old GCC intrinsics
+- text: fix decoding of 4-bytes UTF-8 sequences
+
+-------------------------------------------------------------------
+Sun Aug  7 18:14:35 UTC 2016 - olaf@aepfle.de
+
+- Provide/Obsolete vlc-codec-gstreamer
+
+-------------------------------------------------------------------
+Tue Jun 21 09:11:47 UTC 2016 - olaf@aepfle.de
+
+- Disable atmo plugin in Tumbleweed
+
+-------------------------------------------------------------------
+Sun Jun 05 12:06:21 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.2.4:
+  + Decoder:
+    - Fix crash in G.711 wav files
+    - Fix mp3 crash in libmad
+    - Fix out-of-bound write in adpcm QT IMA codec (CVE-2016-5108)
+  + Qt:
+    - Fix resizing issues
+  + Win32:
+    - Fix overlay creation on Windows XP for DirectDraw video output
+  + Misc:
+    - Build fixes for Hurd
+  + Translations:
+    - Update of Bulgarian, Catalan, German, French, Italian,
+      Marathi, Norwegian Bokmål, Norwegian Nynorsk, Portuguese,
+      Slovak, Spanish (Mexico), Swedish, Simplified Chinese, and
+      Traditional Chinese translations
+
+-------------------------------------------------------------------
+Mon May 02 21:37:41 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.2.3:
+  + Demux:
+    - Fix HLS quality selection and a potential stack overflow
+    - Fix potential MKV infinite loop and improve MKV tags support
+    - Fix WMV regression
+  + Decoder:
+    - Fix hardware decoding with libvdpau-va-gl
+    - Fix crashes with libvpx
+    - Use libass without caching dialog
+  + Video Ouptut:
+    - Fix green lines on Direct3D output
+  + Skins2:
+    - Fix maximizing Window in multi-screen context
+  + Qt:
+    - Fix resume where you left off
+    - Fix infinite recursion in the customize dialog
+    - Fix size when switching to/from the minimal interface
+    - Fix size after resume toolbar is displayed
+  + MacOS X:
+    - Fix crashes in media information panel
+    - Correctly respect the disable-screensaver option
+  + Win32:
+    - Allow opening more than 15 elements in Explorer
+  + Translations:
+    - Update of most translations
+
+-------------------------------------------------------------------
+Thu Mar 24 09:29:03 UTC 2016 - olaf@aepfle.de
+
+- Add Requires(post): vlc-noX for codecs, qt, gnome subpackage
+
+-------------------------------------------------------------------
+Sat Feb 06 22:39:23 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.2.2:
+  + Access:
+    - Fix SetupFormat for continuous framesize in v4l2
+    - Fix off-by-one buffer overflow in RealRtsp module
+    - Fix screen recording aspect-ratio, framerate and potential
+      crash
+    - Fix Windows directshow input freeze
+    - Fix MMS segmentation fault/abort when server forces a large
+      allocation
+  + Demux:
+    - Fix support for ms-dvr files
+    - Fix time detection in AVI files over HTTP
+    - HLS: fix hang on stop, crashes and small improvements
+    - Fix mp4 NULL dereference reported by by Fortinet's FortiGuard
+      Labs
+    - Fix regression for VC-1 in WMV
+    - Fix MXF crashes on stop
+    - Fix EAC3 detection in some TS files
+  + Decoders:
+    - Fix importing surface from main memory in VDPAU
+    - Fix possible double-free in ADPCM decoder
+    - Support 9-bit and 10-bit GBR planar formats
+    - Support GoToMeeting 2 and GoToMeeting 3 codecs
+    - Fix crash in teletext (zvbi) decoder
+    - Fix Bluray subtitles (PGS) timestamps
+  + Audio output:
+    - Fix audio drop after a flush with pulseaudio
+    - Fix audio initialization on iOS
+    - Fix audio stuttering with AirPlay devices on OS X (2 sec
+      delay needs to
+      be set manually by the user)
+    - Fix pulseaudio latency computation
+    - Fix alsa default device selection
+  + Skins2:
+    - Fix video control that fails to show up
+    - Fix UTF-8 conversion issues
+    - Fix Unicode folders location failing to open the skins
+    - Fix crash over malformed skins bitmaps
+    - Fix fullscreen for Gnome3/Unity Window Managers
+  + OS X:
+    - Support for OS X El Capitan
+    - Fix code signature for releases on El Capitan
+    - Improve resume dialog, starting time, preferences, lua
+      extensions
+    - Fix threads ordering, preferences crashes, URL drag'n drops
+  + Qt:
+    - Fix crash when opening multiple items on Windows
+    - Fix recent items appending when using a playlist
+    - Improve addons manager dialog, playlist
+    - Fix changing the audio-device in the menu
+    - Fix key and mouse event support for Qt >= 5.5 under X11
+    - Fix memory leaks
+  + Video Output:
+    - Fix build if one disables XCB but activate VDPAU on Unix
+    - Fix Direct3D plane allocation size to avoid colour bleeding
+    - Fix some crashes in swscale resizing
+  + Misc:
+    - Fix build with recent FreeRDP versions
+    - Fix interface crashes when input-title-format option is empty
+    - Fix MP4 mux divide-by-zero crash
+    - Improve PNG encoding time
+    - Fix some UPnP initialization lag
+    - Rewrite of the Jamendo Service Discovery
+    - Fix snapshot aspect ratio for anamorphic contents
+    - Fix custom snapshot sizes
+    - Dynamic generation of GnuTLS Diffie-Hellman parameters
+    - Fix "vb" transcoding parameter
+    - Fix superfluous audio channel extraction in the core
+    - Fix miscellaneous crashes, double-frees, integer overflows,
+      infinite loops, read overflow, invalid frees and division
+      by zero issues
+    - Fix support for lua 5.2 and fix XSS in the http interface
+    - Update and improve Soundcloud, Vimeo and Youtube scripts
+    - Update of codecs and libraries to fix 3rd party security issues
+     (like TALOS-CAN-0036, TALOS-CAN-0037, CVE-2015-7981, CVE-2015-8126)
+  + Translations:
+    - Add Kashmiri and Maithili languages
+    - Update of most translations
+  + libVLC:
+    - Expose audio mute, cork and volume change events:
+      libvlc_MediaPlayerCorked, libvlc_MediaPlayerUncorked,
+      libvlc_MediaPlayerMuted, libvlc_MediaPlayerUnmuted and
+      libvlc_MediaPlayerAudioVolume
+    - Fix propagation of libvlc_MediaPlayerTitleChanged event
+  + Translations:
+    - Update of most translations
+- Removed vlc-qt5.5-mousepointer.patch, fixed upstream
+- Removed vlc-2.2.0-fix_deinterlace_mmx.patch because it's not used
+- Added vlc-qt-5.5.0-version-check.patch to enable build against
+  qt5 >= 5.5.1
+
+-------------------------------------------------------------------
+Wed Jan 20 11:56:21 UTC 2016 - olaf@aepfle.de
+
+- Recommend gnu-free-fonts to install fonts wich get specified as default
+
+-------------------------------------------------------------------
+Fri Jan  8 11:25:02 UTC 2016 - olaf@aepfle.de
+
+- Remove --started-from-file from vlc.desktop if built without dbus
+
+-------------------------------------------------------------------
+Mon Jan  4 08:50:53 UTC 2016 - ctrippe@opensuse.org
+
+- Install the solid action desktop files also in /usr/share/solid/actions
+  to make them available in Plasma5 (boo#960621)
+
+-------------------------------------------------------------------
+Mon Jan  4 10:42:43 UTC 2016 - olaf@aepfle.de
+
+- Require codecs subpackage to make vlc usable.
+
+-------------------------------------------------------------------
+Wed Dec 16 10:49:48 UTC 2015 - olaf@aepfle.de
+
+- Use bcond instead of suse_version/BUILD_ORIG to refer to features
+  This makes it easier to enable features because they depend on
+  the availibilty in the build project instead of a given release
+- Remove vlc-2.2.0-fix_deinterlace_mmx.patch
+  x86 failures in SLE_11 and 11.4 are handled by bcond
+- Remove vlc-2.1.5-fix-skins2-default-skin-creation.patch
+  tar changes are handled by build-compare
+
+-------------------------------------------------------------------
+Tue Dec 15 09:30:13 UTC 2015 - dimstar@opensuse.org
+
+- Enable libupnp support on Leap 42.1: the library is available
+  (boo#959100).
+
+-------------------------------------------------------------------
+Mon Dec  7 03:07:12 UTC 2015 - dimstar@opensuse.org
+
+- Add vlc-qt5.5-mousepointer.patch: Fix mouse cursor in video
+  interface (boo#956769).
+
+-------------------------------------------------------------------
 Tue Dec  1 10:37:35 UTC 2015 - lnussel@suse.de
 
 - libvlc_vdpau needs to be in codecs package to avoid dependency issue

vlc.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package vlc
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
 #
 # All modifications and additions to the file contributed by third parties
@@ -21,9 +21,111 @@
 %define libvlccore 8
 %define conflicts vlc-beta
 
+# external dependencies
+%bcond_with    a52
+%bcond_with    faad
+%bcond_with    fdk_aac
+%bcond_with    libdca
+%bcond_with    libmpeg2
+%bcond_with    mad
+%bcond_with    shine
+%bcond_with    twolame
+%bcond_with    x264
+%bcond_with    x265
+#
+%bcond_without SDL_image
+%bcond_without avahi
+%bcond_without bluray
+%bcond_without caca
+%bcond_without cdda
+%bcond_without chromaprint
+%bcond_without dc1394
+%bcond_without dv1394
+%bcond_without dvbpsi
+%bcond_without dvdnav
+%bcond_without dvdread
+%bcond_without ffmpeg
+%bcond_without flac
+%bcond_without freerdp
+%bcond_without freetype2
+%bcond_without gcrypt
+%bcond_without gnomevfs
+%bcond_without gnutls
+%bcond_without idn
+%bcond_without kate
+%bcond_without libass
+%bcond_without libgme
+%bcond_without libnotify
+%bcond_without libssh2
+%bcond_without libvncclient
+%bcond_without libxml2
+%bcond_without live555
+%bcond_without matroska
+%bcond_without modplug
+%bcond_without ogg
+%bcond_without opencv
+%bcond_without opus
+%bcond_without projectM
+%bcond_without samplerate
+%bcond_without schroedinger
+%bcond_without sdl
+%bcond_without shout
+%bcond_without smbclient
+%bcond_without speex
+%bcond_without taglib
+%bcond_without theora
+%bcond_without udev
+%bcond_without upnp
+%bcond_without vlc_aa
+%bcond_without vlc_alsa
+%bcond_with    vlc_atmo
+%bcond_without vlc_bootstrap
+%bcond_without vlc_dbus
 # Fluidsynth plugin is known to cause strange crashes here and there - disable it for now (2014-10-07, DimStar)
-%bcond_with fluidsynth
-
+%bcond_with    vlc_fluidsynth
+%bcond_without vlc_gst
+%bcond_without vlc_jack
+%bcond_without vlc_jpeg
+%bcond_without vlc_kde4
+%bcond_with    vlc_libsidplay2
+%bcond_without vlc_lirc
+%bcond_without vlc_lua
+%bcond_without vlc_mmx_sse
+%bcond_without vlc_mtp
+%bcond_without vlc_ncurses
+%bcond_without vlc_optimization
+%bcond_without vlc_png
+%bcond_without vlc_pulse
+%bcond_with    vlc_qt4
+%bcond_without vlc_qt5
+%bcond_without vlc_qt5_x11extra
+%bcond_without vlc_svg
+%bcond_without vlc_svgdec
+%bcond_without vlc_vcdx
+%bcond_without vlc_xcb
+%bcond_without vlc_xcb_keysyms
+%bcond_without vorbis
+%bcond_without vpx
+%bcond_without zvbi
+
+%if %{with ffmpeg}
+%bcond_without vdpau
+%bcond_without libva
+%bcond_without libva_drm
+%else
+%bcond_with    vdpau
+%bcond_with    libva
+%bcond_with    libva_drm
+%endif
+# sdl requires gl, and vlc has not configure knob to disable gl
+%if %{with sdl}
+%bcond_without vlc_egl
+%bcond_without vlc_gl
+%else
+%bcond_with    vlc_egl
+%bcond_with    vlc_gl
+%endif
+#
 %ifarch %arm
 %bcond_without opengles
 %else
@@ -31,7 +133,7 @@
 %endif
 
 Name:           vlc
-Version:        2.2.1
+Version:        2.2.4
 Release:        0
 Summary:        Video Lan Client multimedia player
 License:        GPL-2.0+ and LGPL-2.1+
@@ -41,163 +143,397 @@
 # Add vlc.changes as source, so we can reproducibly extract the date from it during build
 Source1:        %{name}.changes
 Source2:        %{name}-rpmlintrc
-# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header
 Patch1:         vlc-2.1.5-fix-skins2-default-skin-creation.patch
 Patch3:         0001-no-return-in-non-void.patch
-Patch4:         vlc-2.2.0-fix_deinterlace_mmx.patch
-BuildRequires:  Mesa-devel
-BuildRequires:  SDL-devel >= 1.2.10
-BuildRequires:  aalib-devel
-BuildRequires:  alsa-devel >= 1.0.24
-BuildRequires:  avahi-devel >= 0.6
-BuildRequires:  dirac-devel
+Patch4:         vlc-qt-5.5.0-version-check.patch
+#
+Patch1001:      0001-text-fix-decoding-of-4-bytes-UTF-8-sequences.patch
+Patch1030:      0030-Fix-build-using-old-GCC-intrinsics.patch
+#
+Requires:       %{name}-noX = %{version}-%{release}
+Requires(post): %{name}-noX
+Requires:       %{name}-qt = %{version}-%{release}
+Conflicts:      %{conflicts}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#
 BuildRequires:  fdupes
-BuildRequires:  findutils
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
-BuildRequires:  flac-devel
-%endif
-BuildRequires:  freetype2
-BuildRequires:  fribidi-devel
+BuildRequires:  gcc-c++
 BuildRequires:  gettext-devel
-BuildRequires:  git
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  libavc1394-devel >= 0.5.3
-BuildRequires:  libcddb-devel >= 0.9.5
-BuildRequires:  libcdio-devel >= 0.78.2
-BuildRequires:  libdc1394-devel >= 2.1.0
-BuildRequires:  libdvbpsi-devel >= 1.0.0
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libidn-devel
-BuildRequires:  libjack-devel >= 1.9.7
-BuildRequires:  libkate-devel >= 0.3.0
-BuildRequires:  libmodplug-devel >= 0.8.4
-BuildRequires:  libnotify-devel
-BuildRequires:  libogg-devel >= 1.0
-BuildRequires:  libopus-devel >= 1.0.3
-
-#sb56637 force build against Qt4
-BuildRequires:  libqt4-devel >= 4.6.0
-
-BuildRequires:  libjpeg-devel
-BuildRequires:  libraw1394 >= 2.0.1
-BuildRequires:  librsvg-devel >= 2.9.0
-BuildRequires:  libsamplerate-devel
-BuildRequires:  libshout-devel >= 2.1
-BuildRequires:  libsmbclient-devel
-BuildRequires:  libssh2-devel
-BuildRequires:  libtheora-devel >= 1.0
 BuildRequires:  libtool
-BuildRequires:  libudev-devel >= 142
-BuildRequires:  libvorbis-devel >= 1.1
-BuildRequires:  libvpx-devel
-BuildRequires:  libxml2-devel >= 2.5
-BuildRequires:  lirc-devel
-BuildRequires:  live555-devel >= 2015.01.27
-BuildRequires:  lua-devel >= 5.1
-BuildRequires:  pcre-devel
-BuildRequires:  schroedinger-devel >= 1.0.10
-BuildRequires:  slang-devel
-BuildRequires:  speex-devel >= 1.0.5
+BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
-BuildRequires:  vcdimager-devel
-BuildRequires:  xosd-devel
 BuildRequires:  xz
-Requires:       %{name}-noX = %{version}-%{release}
-# We need the noX package first, as it contains vlc-cache-gen
-PreReq:         %{name}-noX
-Requires:       %{name}-qt = %{version}-%{release}
-Conflicts:      %{conflicts}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version} > 1110
-BuildRequires:  gdk-pixbuf-devel
-BuildRequires:  libv4l-devel
-BuildRequires:  pkgconfig(caca) >= 0.99.beta14
+BuildRequires:  pkgconfig(zlib)
+#
+%if %{with vlc_bootstrap}
+BuildRequires:  autoconf >= 2.68
+BuildRequires:  automake
+%endif
+#
+%if %{with idn}
+BuildRequires:  pkgconfig(libidn)
+%endif
+#
+%if %{with vlc_dbus}
+BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
+%endif
+#
+%if %{with vlc_lua}
+BuildRequires:  pkgconfig(lua) >= 5.1
+%endif
+#
+%if %{with live555}
+BuildRequires:  pkgconfig(live555) >= 5.1
+%endif
+#
+%if %{with dc1394}
+BuildRequires:  pkgconfig(libdc1394-2) >= 2.1.0
+%endif
+#
+%if %{with dv1394}
+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
+BuildRequires:  pkgconfig(libraw1394) >= 2.0.1
+%endif
+#
+%if %{with zvbi}
+BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
+%endif
+#
+%if %{with dvdread}
+BuildRequires:  pkgconfig(dvdread) > 4.9.0
+%endif
+#
+%if %{with dvdnav}
+BuildRequires:  pkgconfig(dvdnav) > 4.9.0
+%endif
+#
+%if %{with bluray}
+BuildRequires:  pkgconfig(libbluray) >= 0.3.0
+%endif
+#
+%if %{with opencv}
+BuildRequires:  pkgconfig(opencv) > 2.0
+%endif
+#
+%if %{with smbclient}
+BuildRequires:  pkgconfig(smbclient)
+%endif
+#
+%if %{with libssh2}
+BuildRequires:  pkgconfig(libssh2)
+%endif
+#
+%if %{with gnomevfs}
+BuildRequires:  pkgconfig(gnome-vfs-2.0)
+%endif
+#
+%if %{with vlc_vcdx}
+BuildRequires:  pkgconfig(libcdio) >= 0.78.2
+BuildRequires:  pkgconfig(libiso9660) >= 0.72
+BuildRequires:  pkgconfig(libvcdinfo) >= 0.7.22
+%endif
+#
+%if %{with cdda}
+BuildRequires:  pkgconfig(libcddb) >= 0.9.5
+%endif
+#
+%if %{with libvncclient}
+BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
+%endif
+#
+%if %{with freerdp}
+BuildRequires:  pkgconfig(freerdp) >= 1.0.1
+%endif
+#
+%if %{with libgme}
+BuildRequires:  pkgconfig(libgme)
+%endif
+#
+%if %{with vlc_libsidplay2}
+BuildRequires:  pkgconfig(libsidplay2)
+%endif
+#
+%if %{with ogg}
+BuildRequires:  pkgconfig(ogg) >= 1.0
+%endif
+#
+%if %{with vorbis}
+BuildRequires:  pkgconfig(vorbis) >= 1.1
+BuildRequires:  pkgconfig(vorbisenc) >= 1.1
+%endif
+#
+%if %{with shout}
+BuildRequires:  pkgconfig(shout) >= 2.1
+%endif
+#
+%if %{with matroska}
+BuildRequires:  libmatroska-devel
+%endif
+#
+%if %{with modplug}
+BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
+%endif
+#
+%if %{with dvbpsi}
+# Prefer libdvbpsi.src.rpm instead of libdvbpsi-0.src.rpm
+BuildRequires:  pkgconfig(libdvbpsi) > 1
+%endif
+#
+%if %{with shine}
+BuildRequires:  pkgconfig(shine) >= 3.0.0
+%endif
+#
+%if %{with mad}
+BuildRequires:  pkgconfig(mad)
+%endif
+#
+%if %{with vlc_gst}
+BuildRequires:  pkgconfig(gstreamer-app-1.0)
+BuildRequires:  pkgconfig(gstreamer-video-1.0)
+%endif
+#
+%if %{with ffmpeg}
+BuildRequires:  pkgconfig(libavcodec) = 56.60.100
+BuildRequires:  pkgconfig(libavformat) = 56.40.101
+BuildRequires:  pkgconfig(libavutil) = 54.31.100
+BuildRequires:  pkgconfig(libpostproc) = 53.3.100
+BuildRequires:  pkgconfig(libswscale) = 3.1.101
+%endif
+#
+%if %{with libva}
+BuildRequires:  pkgconfig(libva)
+%if %{with libva_drm}
+BuildRequires:  pkgconfig(libva-drm)
+%endif
+BuildRequires:  pkgconfig(libva-x11)
+%endif
+#
+%if %{with faad}
+BuildRequires:  faad2-devel
+%endif
+#
+%if %{with vpx}
+BuildRequires:  pkgconfig(vpx)
+%endif
+#
+%if %{with twolame}
+BuildRequires:  pkgconfig(twolame)
+%endif
+#
+%if %{with fdk_aac}
+BuildRequires:  pkgconfig(fdk-aac)
+%endif
+#
+%if %{with a52}
+BuildRequires:  liba52-devel
+%endif
+#
+%if %{with libdca}
+BuildRequires:  pkgconfig(libdca) >= 0.0.5
+%endif
+#
+%if %{with flac}
+BuildRequires:  flac-devel
+%endif
+#
+%if %{with libmpeg2}
+BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
+%endif
+#
+%if %{with speex}
+BuildRequires:  pkgconfig(speex) >= 1.0.5
 BuildRequires:  pkgconfig(speexdsp)
+%endif
+#
+%if %{with opus}
+BuildRequires:  pkgconfig(opus) >= 1.0.3
+%endif
+#
+%if %{with theora}
+BuildRequires:  pkgconfig(theoradec) >= 1.0
+BuildRequires:  pkgconfig(theoraenc)
+%endif
+#
+%if %{with schroedinger}
+BuildRequires:  pkgconfig(schroedinger-1.0) >= 1.0.10
+%endif
+#
+%if %{with vlc_png}
+BuildRequires:  pkgconfig(libpng)
+%endif
+#
+%if %{with vlc_jpeg}
+BuildRequires:  libjpeg-devel
+%endif
+#
+%if %{with x265}
+BuildRequires:  pkgconfig(x265)
+%endif
+#
+%if %{with x264}
+BuildRequires:  pkgconfig(x264) >= 0.86
+%endif
+#
+%if %{with vlc_fluidsynth}
+BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
+%endif
+#
+%if %{with libass}
+BuildRequires:  pkgconfig(libass) >= 0.9.8
+%endif
+#
+%if %{with kate}
+BuildRequires:  pkgconfig(kate) >= 0.3.0
+%endif
+#
+%if %{with vlc_egl}
+BuildRequires:  pkgconfig(egl)
+%endif
+#
+%if %{with vlc_gl}
+BuildRequires:  pkgconfig(gl)
+%endif
+#
+%if %{with vlc_xcb}
 BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(xcb-composite)
 BuildRequires:  pkgconfig(xcb-randr) >= 1.3
 BuildRequires:  pkgconfig(xcb-shm)
 BuildRequires:  pkgconfig(xcb-xv) >= 1.1.90.1
-BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xproto)
-BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
+%if %{with vlc_xcb_keysyms}
+BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
 %endif
-
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
-BuildRequires:  pkgconfig(libswscale)
 %endif
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
-BuildRequires:  pkgconfig(SDL_image) >= 1.2.10
-BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
-BuildRequires:  pkgconfig(libupnp)
-BuildRequires:  pkgconfig(opencv) > 2.0
+#
+%if %{with ffmpeg}
+%if %{with vdpau}
+BuildRequires:  pkgconfig(vdpau) >= 0.6
 %endif
 %endif
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
-BuildRequires:  libmatroska-devel
-BuildRequires:  pkgconfig(dvdnav) > 4.9.0
-BuildRequires:  pkgconfig(dvdread) > 4.9.0
-BuildRequires:  pkgconfig(libass) >= 0.9.8
-BuildRequires:  pkgconfig(libgme)
-BuildRequires:  pkgconfig(libmtp) >= 1.0.0
-BuildRequires:  pkgconfig(libva)
-BuildRequires:  pkgconfig(libva-x11)
-BuildRequires:  pkgconfig(taglib) >= 1.9
+#
+%if %{with sdl}
+BuildRequires:  pkgconfig(sdl) >= 1.2.10
+%if %{with SDL_image}
+BuildRequires:  pkgconfig(SDL_image) >= 1.2.10
 %endif
-%if 0%{?suse_version} > 1140
-BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
-BuildRequires:  pkgconfig(freerdp) >= 1.0.1
-BuildRequires:  pkgconfig(gnutls) >= 3.2.0
-BuildRequires:  pkgconfig(libbluray) >= 0.3.0
-BuildRequires:  pkgconfig(libpulse) >= 1.0
-BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
-BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
+%endif
+#
+%if %{with freetype2}
+Recommends:     gnu-free-fonts
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xpm)
-%if %{with fluidsynth}
-BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
 %endif
-%if 0%{?suse_version} != 1315
+#
+%if %{with vlc_svg}
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
+%endif
+#
+%if %{with vlc_svgdec}
+BuildRequires:  pkgconfig(cairo) >= 1.13.1
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.9.0
+%endif
+#
+%if %{with vlc_aa}
+BuildRequires:  aalib-devel
+%endif
+#
+%if %{with caca}
+BuildRequires:  pkgconfig(caca) >= 0.99.beta14
+%endif
+#
+%if %{with vlc_pulse}
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+%endif
+#
+%if %{with vlc_alsa}
+BuildRequires:  pkgconfig(alsa) >= 1.0.24
+%endif
+#
+%if %{with vlc_jack}
+BuildRequires:  pkgconfig(jack) >= 1.9.7
+%endif
+#
+%if %{with samplerate}
+BuildRequires:  pkgconfig(samplerate)
+%endif
+#
+%if %{with chromaprint}
 BuildRequires:  pkgconfig(libchromaprint) >= 0.6.0
 %endif
+#
+%if %{with vlc_qt5}
+BuildRequires:  pkgconfig(Qt5Core) >= 5.1.0
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+%if %{with vlc_qt5_x11extra}
+BuildRequires:  pkgconfig(Qt5X11Extras)
 %endif
-%if 0%{?suse_version} != 1315
-BuildRequires:  libkde4-devel
 %endif
-%if 0%{?suse_version} >= 1320
+#
+%if %{with vlc_qt4}
+BuildRequires:  pkgconfig(QtCore) >= 4.6.0
+BuildRequires:  pkgconfig(QtGui)
+%endif
+#
+%if %{with vlc_ncurses}
+# its TW only. 13.2 has it, but does not announce it
 BuildRequires:  pkgconfig(ncursesw)
 %endif
-%if 0%{?suse_version} >= 1321
-BuildRequires:  pkgconfig(libavcodec) >= 55.26.0
-BuildRequires:  pkgconfig(libavformat) >= 53.21.0
-BuildRequires:  pkgconfig(libavutil) >= 52.4.0
+#
+%if %{with vlc_lirc}
+BuildRequires:  lirc-devel
 %endif
-# Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
-%if 0%{?BUILD_ORIG}
-BuildRequires:  faad2-devel
-BuildRequires:  libfaac-devel
-BuildRequires:  libxvidcore-devel
-# Disabled for now - VideoLAN repo needs to catch up
-BuildRequires:  liba52-devel
-BuildRequires:  pkgconfig(libavcodec) >= 55.26.0
-BuildRequires:  pkgconfig(libavformat) >= 53.21.0
-BuildRequires:  pkgconfig(libavutil) >= 52.4.0
-BuildRequires:  pkgconfig(libdca) >= 0.0.5
-BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
-BuildRequires:  pkgconfig(libpostproc)
-# Disabled for now - VideoLAN repo needs to catch up
-BuildRequires:  libmad-devel
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264) >= 0.8.6
-# Disabled for now - VideoLAN repo needs to catch up
-#BuildRequires:  pkgconfig(x265)
-%if 0%{?suse_version} > 1140
-BuildRequires:  pkgconfig(vdpau) >= 0.6
+#
+%if %{with projectM}
+BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
+%endif
+#
+%if %{with avahi}
+BuildRequires:  pkgconfig(avahi-client) >= 0.6
+%endif
+#
+%if %{with udev}
+BuildRequires:  pkgconfig(libudev) >= 142
+%endif
+#
+%if %{with vlc_mtp}
+BuildRequires:  pkgconfig(libmtp) >= 1.0.0
+%endif
+#
+%if %{with upnp}
+BuildRequires:  pkgconfig(libupnp)
+%endif
+#
+%if %{with libxml2}
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.5
+%endif
+#
+%if %{with gcrypt}
+BuildRequires:  libgcrypt-devel
+%endif
+#
+%if %{with gnutls}
+BuildRequires:  pkgconfig(gnutls) >= 3.2.0
+%endif
+#
+%if %{with taglib}
+BuildRequires:  pkgconfig(taglib) >= 1.9
+%endif
+#
+%if %{with libnotify}
+BuildRequires:  gdk-pixbuf-devel
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libnotify)
 %endif
+#
+%if %{with vlc_kde4}
+BuildRequires:  libkde4-devel
 %endif
+#
 
 %description
 VLC media player is a highly portable multimedia player for various
@@ -209,7 +545,7 @@
 %package devel
 Summary:        Video Lan Client Development system
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Those development headers are required if you plan on coding against VLC
@@ -234,8 +570,8 @@
 Requires:       libvlc%{libvlc} = %{version}-%{release}
 Requires:       libvlccore%{libvlccore} = %{version}-%{release}
 # lang subpackage
-Recommends:     %{name}-noX-lang
-Recommends:     %{name}-codecs
+Recommends:     %{name}-noX-lang = %{version}-%{release}
+Requires:       %{name}-codecs
 Recommends:     libdvdcss
 # This is a hack only due to libbluray not having versioned symbols as well as
 # having a strange ABI/API break between 0.3 and 0.7
@@ -252,57 +588,61 @@
 
 %lang_package -n %{name}-noX
 
-%if 0%{?BUILD_ORIG}
 %package codecs
 Summary:        VLC: VideoLAN Client - Codec extension
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-noX = %{version}
-Supplements:    %{name}-noX
+Requires(post): %{name}-noX = %{version}-%{release}
+Provides:       vlc-codec-gstreamer = %{version}-%{release}
+Obsoletes:      vlc-codec-gstreamer < %{version}-%{release}
 
 %description codecs
 This Package enhances the functionality of the VLC VideoLAN Client with
 Codecs that are not available in a stock openSUSE distribution.
-%endif
 
+%if %{with vlc_qt4} || %{with vlc_qt5}
 %package qt
 Summary:        VLC: VideoLAN Client - Qt interface
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-noX = %{version}-%{release}
-%if 0%{?suse_version} >= 1310
+Requires(post): %{name}-noX = %{version}-%{release}
+%if %{with vlc_qt5}
 Supplements:    packageand(%{name}-noX:libqt5)
-%else
+%endif
+%if %{with vlc_qt4}
 Supplements:    packageand(%{name}-noX:libqt4)
 %endif
 Conflicts:      %{conflicts}-qt
 
 %description qt
 The all new Qt interface for the VLC VideoLAN Client.
+%endif
 
+%if %{with gnomevfs}
 %package gnome
 Summary:        VLC: VideoLAN Client - Gnome Access Modules
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-noX = %{version}-%{release}
+Requires(post): %{name}-noX = %{version}-%{release}
 Supplements:    packageand(%{name}-noX:gnome-vfs2)
 Conflicts:      %{conflicts}-gnome
 
 %description gnome
 In order to integrate flawless into GNOME, there are some access modules
 for gnome-vfs2.
+%endif
 
 %prep
 echo '********* ENTERED PREP PHASE ********'
 date
 %setup -q
-%if 0%{?suse_version} >=1140
+touch -r configure.ac NEWS
 %patch1 -p1
-%endif
 %patch3 -p1
-%if 0%{?suse_version} == 1110
-%ifarch %ix86
-%patch4
-%endif
-%endif
+%patch4 -p0
+%patch1001 -p1
+%patch1030 -p1
+touch -r NEWS configure.ac
+echo %{version} > src/revision.txt
 
+%if %{with vlc_lua}
 ### Fix up sources for LUA 5.3
 if pkg-config --atleast-version 5.3 lua; then
   sed -i 's/luaL_optint/(int)&eger/'         modules/lua/libs/{net,osd,volume}.c
@@ -313,9 +653,8 @@
   sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
     modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c
 fi
+%endif
 
-# We do not rely on contrib but make use of system libraries
-rm -rf contrib
 # fix builddate info
 # Remove build time references so build-compare can do its work
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M')
@@ -329,126 +668,257 @@
 %build
 echo '********* BOOTSTRAPPING *********'
 date
+%if %{without vlc_dbus}
+sed -i~ 's@--started-from-file@@' share/vlc.desktop.in
+if diff -u share/vlc.desktop.in~ share/vlc.desktop.in
+then
+	:
+fi
+%endif
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
-%if 0%{?suse_version} > 1140
+%if %{without vlc_mmx_sse}
+export ac_cv_3dnow_inline=no
+%endif
+%if %{with vlc_bootstrap}
 ./bootstrap
 %endif
 %configure \
-   --disable-dependency-tracking        \
-   --enable-aa                          \
-   --enable-alsa                        \
-%if ! 0%{?BUILD_ORIG}
+   --without-contrib                    \
+                                        \
+   --disable-a52                        \
+   --disable-alsa                       \
+   --disable-atmo                       \
    --disable-avcodec                    \
+   --disable-chromaprint                \
+   --disable-dbus                       \
+   --disable-fdkaac                     \
+   --disable-freetype                   \
+   --disable-jpeg                       \
+   --disable-libgcrypt                  \
+   --disable-libva                      \
+   --disable-lua                        \
+   --disable-mad                        \
+   --disable-mtp                        \
+   --disable-mux_ogg                    \
+   --disable-ogg                        \
+   --disable-optimizations              \
+   --disable-postproc                   \
+   --disable-qt                         \
+   --disable-svg                        \
+   --disable-svgdec                     \
+   --disable-swscale                    \
+   --disable-vdpau                      \
+   --disable-xcb                        \
+   --without-kde-solid                  \
+                                        \
+   --enable-httpd                       \
+   --enable-linsys                      \
+   --enable-realrtsp                    \
+   --enable-sout                        \
+   --enable-v4l2                        \
+   --enable-vcd                         \
+                                        \
+%if %{with vlc_optimization}
+   --enable-optimizations               \
 %endif
-   --enable-dvbpsi                      \
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
-   --enable-dvdnav                      \
+%if %{without vlc_mmx_sse}
+   --disable-mmx                        \
+   --disable-sse                        \
+%endif
+%if %{with vlc_atmo}
+   --enable-atmo                        \
+%endif
+%if %{with vlc_dbus}
+   --enable-dbus                        \
+%endif
+%if %{with vlc_lua}
+   --enable-lua                         \
+%endif
+%if %{with live555}
+   --enable-live555                     \
+%endif
+%if %{with dvdread}
    --enable-dvdread                     \
-   --enable-flac                        \
 %endif
-   --enable-fast-install                \
-%if 0%{?suse_version} > 1140
-   --enable-freerdp                     \
+%if %{with dvdnav}
+   --enable-dvdnav                      \
 %endif
-   --enable-freetype                    \
-   --enable-fribidi                     \
-   --enable-gnomevfs                    \
-%if 0%{?suse_version} > 1140
-   --enable-gnutls                      \
+%if %{with opencv}
+   --enable-opencv                      \
 %endif
-   --enable-httpd                       \
-   --enable-jack                        \
-%if 0%{?suse_version} <= 1140
-   --disable-jpeg                       \
+%if %{with chromaprint}
+   --enable-chromaprint                 \
 %endif
-   --enable-kate                        \
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
-   --enable-libass                      \
+%if %{with libssh2}
+   --enable-sftp                        \
+%endif
+%if %{with gnomevfs}
+   --enable-gnomevfs                    \
+%endif
+%if %{with vlc_vcdx}
+   --enable-vcdx                        \
 %endif
+%if %{with cdda}
    --enable-libcddb                     \
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
-   --enable-opencv                      \
 %endif
+%if %{with freerdp}
+   --enable-freerdp                     \
 %endif
-%if 0%{?suse_version} <= 1140
-   --disable-mmx                        \
-   --disable-sse                        \
+%if %{with ogg}
+   --enable-ogg                         \
+   --enable-mux_ogg                     \
 %endif
-   --enable-sftp                        \
-   --disable-svgdec                     \
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
-   --enable-swscale                     \
-%else
-   --disable-swscale                    \
+%if %{with vlc_mtp}
+   --enable-mtp                         \
 %endif
-%if 0%{?BUILD_ORIG}
-   --enable-libmpeg2                    \
+%if %{with vorbis}
+   --enable-vorbis                      \
+%endif
+%if %{with matroska}
+   --enable-mkv                         \
+%endif
+%if %{with modplug}
+   --enable-mod                         \
+%endif
+%if %{with dvbpsi}
+   --enable-dvbpsi                      \
+%endif
+%if %{with shine}
+   --enable-shine                       \
+%endif
+%if %{with mad}
    --enable-mad                         \
+%endif
+%if %{with vlc_gst}
+   --enable-gst-decode                  \
+%endif
+%if %{with ffmpeg}
    --enable-avcodec                     \
    --enable-postproc                    \
+   --enable-swscale                     \
+%if %{with libva}
+   --enable-libva                       \
+%endif
+%if %{with vdpau}
+   --enable-vdpau                       \
+%endif
+%endif
+%if %{with faad}
    --enable-faad                        \
+%endif
+%if %{with vpx}
+   --enable-vpx                         \
+%endif
+%if %{with a52}
    --enable-a52                         \
+%endif
+%if %{with libdca}
    --enable-dca                         \
-%else
-   --disable-libmpeg2                   \
-   --disable-mad                        \
-   --disable-avcodec                    \
-   --disable-postproc                   \
-   --disable-faad                       \
-   --disable-a52                        \
-   --disable-dca                        \
 %endif
-   --enable-lirc                        \
-   --enable-live555                     \
-   --enable-lua                         \
-   --enable-mkv                         \
-   --enable-mod                         \
-   --enable-ogg                         \
-   --enable-optimizations               \
-   --disable-oss                        \
-%if 0%{?suse_version} > 1140
-   --enable-pulse                       \
+%if %{with fdk_aac}
+   --enable-fdkaac                      \
 %endif
-   --enable-realrtsp                    \
-   --enable-sout                        \
+%if %{with flac}
+   --enable-flac                        \
+%endif
+%if %{with libmpeg2}
+   --enable-libmpeg2                    \
+%endif
+%if %{with speex}
    --enable-speex                       \
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
-   --enable-taglib                      \
 %endif
+%if %{with theora}
    --enable-theora                      \
-   --enable-v4l2                        \
-   --enable-vcd                         \
-   --enable-vcdx                        \
-   --enable-vorbis                      \
-   --disable-x265                       \
-%if 0%{?suse_version} > 1110
+%endif
+%if %{with vlc_jpeg}
+   --enable-jpeg                       \
+%endif
+%if %{with x265}
+   --enable-x265                        \
+%endif
+%if %{with x264}
+   --enable-x264                        \
+%endif
+%if %{with vlc_fluidsynth}
+   --enable-fluidsynth                  \
+%endif
+%if %{with libass}
+   --enable-libass                      \
+%endif
+%if %{with kate}
+   --enable-kate                        \
+%endif
+%if %{with vlc_xcb}
    --enable-xcb                         \
-%else
-   --disable-xcb                        \
 %endif
 %if %{with opengles}
   --enable-gles2                        \
 %endif
-%if 0%{?suse_version} > 1140 && 0%{?BUILD_ORIG}
-   --enable-vdpau                       \
-%else
-   --disable-vdpau                      \
+%if %{with sdl}
+   --enable-sdl                         \
+%endif
+%if %{with SDL_image}
+   --enable-sdl-image                   \
 %endif
-   --enable-xvideo                      \
+%if %{with freetype2}
+   --enable-skins2                      \
+   --enable-freetype                    \
+   --enable-fribidi                     \
    --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
-   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf
+   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
+%endif
+%if %{with vlc_aa}
+   --enable-aa                          \
+%endif
+%if %{with vlc_pulse}
+   --enable-pulse                       \
+%endif
+%if %{with vlc_alsa}
+   --enable-alsa                        \
+%endif
+%if %{with vlc_jack}
+   --enable-jack                        \
+%endif
+%if %{with vlc_qt4} || %{with vlc_qt5}
+   --enable-qt                          \
+%if %{with vlc_kde4}
+   --with-kde-solid                     \
+%endif
+%endif
+%if %{with vlc_lirc}
+   --enable-lirc                        \
+%endif
+%if %{with projectM}
+   --enable-projectm                    \
+%endif
+%if %{with gcrypt}
+   --enable-libgcrypt                   \
+%endif
+%if %{with gnutls}
+   --enable-gnutls                      \
+%endif
+%if %{with taglib}
+   --enable-taglib                      \
+%endif
+%if %{with vlc_svg}
+   --enable-svg                         \
+%endif
+%if %{with vlc_svgdec}
+   --enable-svgdec                      \
+%endif
+					\
+					\
+					\
+					\
+   --disable-dependency-tracking        \
+   --enable-fast-install                \
+   --disable-oss
 echo '********* FINISHED CONFIGURE *********'
 date
 
 # post config patches, not very nice but we don't have automake
 
-%if 0%{?suse_version} == 1110
-# replaces ustar patch
-sed -e 's/tar cvv/tar cvv --format=ustar/' -i share/Makefile
-%endif
-
 # make sure the build hostname is not embedded in the binaries -- or we'll
 # continuously republish packages -- seife
 ### ONLY REMOVE THIS IF YOU KNOW WHAT YOU ARE DOING!
@@ -467,7 +937,9 @@
 %suse_update_desktop_file vlc AudioVideo Audio Video Player
 %fdupes %{buildroot}%{_datadir}/vlc
 # remove duplicate file
+%if %{with vlc_lua}
 rm %{buildroot}/%{_datadir}/vlc/lua/http/requests/README.txt
+%endif
 # add missing manfiles
 for i in ?vlc; do
     pushd %{buildroot}/%{_mandir}/man1
@@ -475,17 +947,14 @@
     popd
 done
 
-# don't ship hevc-related modules even if probably overkill for legal purposes
-%if ! 0%{?BUILD_ORIG}
-rm %{buildroot}/%{_libdir}/vlc/plugins/demux/libhevc_plugin.so
-rm %{buildroot}/%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
-%endif
-
 # clean up some lang issues...
 for lang in ach an cgg co ff tet; do
   rm -rf %{buildroot}%{_datadir}/locale/$lang
 done
 %find_lang vlc
+%if %{with vlc_kde4}
+cp -avl %{buildroot}%{_datadir}/kde4/apps/solid %{buildroot}%{_datadir}
+%endif
 
 %post
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
@@ -502,16 +971,18 @@
 %post -n libvlccore%{libvlccore} -p /sbin/ldconfig
 %postun -n libvlccore%{libvlccore} -p /sbin/ldconfig
 
+%if %{with vlc_qt4} || %{with vlc_qt5}
 %post -n %{name}-qt
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
+%endif
 
+%if %{with gnomevfs}
 %post -n %{name}-gnome
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
+%endif
 
-%if 0%{?BUILD_ORIG}
 %post -n %{name}-codecs 
 %{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins
-%endif
 
 %files
 %defattr(-,root,root)
@@ -520,51 +991,74 @@
 %{_datadir}/applications/vlc.desktop
 # The icon is the one referenced by the .desktop file
 %{_datadir}/pixmaps/vlc.png
+%if %{with freetype2}
 %{_bindir}/svlc
-%{_datadir}/icons/hicolor/*/apps/vlc*
+%endif
+%{_datadir}/icons/hicolor
+%if %{with vlc_qt4} || %{with vlc_qt5}
+%if %{with vlc_kde4}
 %dir %{_datadir}/kde4
 %dir %{_datadir}/kde4/apps
 %{_datadir}/kde4/apps/solid
+%{_datadir}/solid
+%endif
+%endif
 %exclude %{_libdir}/vlc/libcompat.a
+%if %{with freetype2}
 %{_mandir}/man1/svlc*
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%endif
+%if %{with libass}
 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
 %endif
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
+%if %{with SDL_image}
 %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
 %endif
-%endif
-%{_libdir}/vlc/plugins/notify/libnotify_plugin.so
+%if %{with gcrypt}
 %{_libdir}/vlc/plugins/video_filter/libremoteosd_plugin.so
+%endif
+%if %{with freetype2}
 %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
-%if 0%{?suse_version} > 1110
+%endif
+%if %{with libnotify}
+%{_libdir}/vlc/plugins/notify/libnotify_plugin.so
+%endif
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/video_splitter/libpanoramix_plugin.so
-%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
 %endif
 %if %{with opengles}
 %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
 %endif
-%if 0%{?suse_version} > 1110
+%if %{with vlc_xcb}
+%if %{with vlc_gl}
+%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
+%endif
+%if %{with vlc_egl}
 %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
 %endif
+%endif
+%if %{with vlc_gl}
 %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
+%endif
+%if %{with vlc_aa}
 %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
-%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
 %endif
+%if %{with projectM}
+%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
 %endif
 
 %files noX-lang -f vlc.lang
 %defattr(-,root,root)
+%if 0%{?sles_version}
+%dir %{_datadir}/locale/ks_IN
+%dir %{_datadir}/locale/ks_IN/LC_MESSAGES
+%endif
 
 %files noX
 %defattr(-,root,root)
 %doc %{_datadir}/doc/vlc/
 %doc NEWS AUTHORS COPYING THANKS README
 %{_bindir}/cvlc
-%if 0%{?suse_version} >= 1320
+%if %{with vlc_ncurses}
 %{_bindir}/nvlc
 %{_mandir}/man1/nvlc*
 %endif
@@ -578,6 +1072,7 @@
 # Own the file.. but it's an auto-generated file, so ghost it.
 %ghost %{_libdir}/vlc/plugins/plugins.dat
 %dir %{_libdir}/vlc
+%if %{with vlc_lua}
 %dir %{_libdir}/vlc/lua
 %dir %{_libdir}/vlc/lua/extensions
 %dir %{_libdir}/vlc/lua/intf
@@ -589,6 +1084,7 @@
 %dir %{_libdir}/vlc/lua/modules
 %dir %{_libdir}/vlc/lua/playlist
 %dir %{_libdir}/vlc/lua/sd
+%endif
 %dir %{_libdir}/vlc/plugins
 %dir %{_libdir}/vlc/plugins/access
 %dir %{_libdir}/vlc/plugins/access_output
@@ -598,12 +1094,18 @@
 %dir %{_libdir}/vlc/plugins/codec
 %dir %{_libdir}/vlc/plugins/control
 %dir %{_libdir}/vlc/plugins/demux
+%if %{with freetype2}
 %dir %{_libdir}/vlc/plugins/gui
+%endif
+%if %{with vlc_lua}
 %dir %{_libdir}/vlc/plugins/lua
+%endif
 %dir %{_libdir}/vlc/plugins/meta_engine
 %dir %{_libdir}/vlc/plugins/misc
 %dir %{_libdir}/vlc/plugins/mux
+%if %{with libnotify}
 %dir %{_libdir}/vlc/plugins/notify
+%endif
 %dir %{_libdir}/vlc/plugins/packetizer
 %dir %{_libdir}/vlc/plugins/services_discovery
 %dir %{_libdir}/vlc/plugins/stream_filter
@@ -616,6 +1118,7 @@
 %dir %{_libdir}/vlc/plugins/visualization
 # Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
 %{_libdir}/vlc/vlc-cache-gen
+%if %{with vlc_lua}
 %{_libdir}/vlc/lua/extensions/VLSub.luac
 %{_libdir}/vlc/lua/intf/cli.luac
 %{_libdir}/vlc/lua/intf/dummy.luac
@@ -668,49 +1171,70 @@
 %{_libdir}/vlc/lua/sd/icecast.luac
 %{_libdir}/vlc/lua/sd/jamendo.luac
 %{_libdir}/vlc/lua/sd/metachannels.luac
+%endif
+%if %{with vlc_alsa}
 %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so
 %{_libdir}/vlc/plugins/access/libftp_plugin.so
 %{_libdir}/vlc/plugins/access/libhttp_plugin.so
 %{_libdir}/vlc/plugins/access/libimem_plugin.so
+%if %{with vlc_jack}
 %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with vlc_mtp}
 %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so
 %endif
 %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
 %{_libdir}/vlc/plugins/access/libattachment_plugin.so
 %{_libdir}/vlc/plugins/access/libcdda_plugin.so
 %{_libdir}/vlc/plugins/access/libdtv_plugin.so
+%if %{with dvbpsi}
 %{_libdir}/vlc/plugins/access/libdvb_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access/librar_plugin.so
+%if %{with libssh2}
 %{_libdir}/vlc/plugins/access/libsftp_plugin.so
+%endif
+%if %{with smbclient}
 %{_libdir}/vlc/plugins/access/libsmb_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access/libtcp_plugin.so
 %{_libdir}/vlc/plugins/access/libudp_plugin.so
 %{_libdir}/vlc/plugins/access/libvdr_plugin.so
+%if %{with dc1394}
 %{_libdir}/vlc/plugins/access/libdc1394_plugin.so
+%endif
+%if %{with dv1394}
 %{_libdir}/vlc/plugins/access/libdv1394_plugin.so
+%endif
 
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with dvdnav}
 %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
+%endif
+%if %{with dvdread}
 %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
 %endif
 
 %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
 %{_libdir}/vlc/plugins/access/libidummy_plugin.so
 
-%if 0%{?suse_version} > 1140
+%if %{with bluray}
 %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
 %endif
+%if %{with live555}
 %{_libdir}/vlc/plugins/access/liblive555_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
-%if 0%{?suse_version} > 1110
+%if %{with zvbi}
 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
 %endif
 
-%if 0%{?suse_version} > 1140
+%if %{with vlc_pulse}
 %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
+%endif
+%if %{with freerdp}
 %{_libdir}/vlc/plugins/access/librdp_plugin.so
 %endif
 %{_libdir}/vlc/plugins/access/librtp_plugin.so
@@ -719,20 +1243,26 @@
 %{_libdir}/vlc/plugins/access/libtimecode_plugin.so
 %{_libdir}/vlc/plugins/access/libv4l2_plugin.so
 %{_libdir}/vlc/plugins/access/libvcd_plugin.so
+%if %{with vlc_vcdx}
 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
+%endif
 
-%if 0%{?suse_version} > 1140
+%if %{with libvncclient}
 %{_libdir}/vlc/plugins/access/libvnc_plugin.so
 %endif
-%if 0%{?suse_version} > 1110
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
 %endif
 %{_libdir}/vlc/plugins/access/libzip_plugin.so
 %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
 %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so
 %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so
+%if %{with gcrypt}
 %{_libdir}/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
+%endif
+%if %{with shout}
 %{_libdir}/vlc/plugins/access_output/libaccess_output_shout_plugin.so
+%endif
 %{_libdir}/vlc/plugins/access_output/libaccess_output_udp_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/liba52tospdif_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libaudio_format_plugin.so
@@ -749,23 +1279,31 @@
 %{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libremap_plugin.so
+%if %{with samplerate}
 %{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so
+%endif
 %{_libdir}/vlc/plugins/audio_filter/libscaletempo_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so
+%if %{with speex}
 %{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
+%endif
 %{_libdir}/vlc/plugins/audio_filter/libstereo_widen_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libugly_resampler_plugin.so
 %{_libdir}/vlc/plugins/audio_mixer/libfloat_mixer_plugin.so
 %{_libdir}/vlc/plugins/audio_mixer/libinteger_mixer_plugin.so
 %{_libdir}/vlc/plugins/audio_output/libadummy_plugin.so
+%if %{with vlc_alsa}
 %{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so
+%endif
 %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
 %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
+%if %{with vlc_jack}
 %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%endif
 
-%if 0%{?suse_version} > 1140
+%if %{with vlc_pulse}
 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
 %endif
 %{_libdir}/vlc/plugins/codec/liba52_plugin.so
@@ -780,30 +1318,43 @@
 %{_libdir}/vlc/plugins/codec/libdts_plugin.so
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libedummy_plugin.so
+%if %{with vpx}
 %{_libdir}/vlc/plugins/codec/libvpx_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%endif
+%if %{with flac}
 %{_libdir}/vlc/plugins/codec/libflac_plugin.so
 %endif
 
-%if %{with fluidsynth}
+%if %{with vlc_fluidsynth}
 %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
 %endif
 
-%if 0%{?suse_version} > 1140
-%if 0%{?BUILD_ORIG}
-%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so
-%endif
+%if %{with vlc_jpeg}
 %{_libdir}/vlc/plugins/codec/libjpeg_plugin.so
 %endif
+
+%if %{with vdpau}
+%{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/libg711_plugin.so
+%if %{with kate}
 %{_libdir}/vlc/plugins/codec/libkate_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
 %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so
+%if %{with opus}
 %{_libdir}/vlc/plugins/codec/libopus_plugin.so
+%endif
+%if %{with vlc_png}
 %{_libdir}/vlc/plugins/codec/libpng_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/librawvideo_plugin.so
+%if %{with schroedinger}
 %{_libdir}/vlc/plugins/codec/libschroedinger_plugin.so
+%endif
+%if %{with speex}
 %{_libdir}/vlc/plugins/codec/libspeex_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/libspudec_plugin.so
 %{_libdir}/vlc/plugins/codec/libstl_plugin.so
 %{_libdir}/vlc/plugins/codec/libscte27_plugin.so
@@ -813,24 +1364,37 @@
 %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libt140_plugin.so
 %{_libdir}/vlc/plugins/codec/libtelx_plugin.so
+%if %{with vlc_svgdec}
+%{_libdir}/vlc/plugins/codec/libsvgdec_plugin.so
+%endif
+%if %{with theora}
 %{_libdir}/vlc/plugins/codec/libtheora_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
+%if %{with vorbis}
 %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
-%if 0%{?suse_version} > 1110
+%endif
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/codec/libxwd_plugin.so
+%endif
+%if %{with zvbi}
 %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so
 %endif
 
-%if 0%{?suse_version} > 1140
+%if %{with vlc_dbus}
 %{_libdir}/vlc/plugins/control/libdbus_plugin.so
 %endif
 %{_libdir}/vlc/plugins/control/libdummy_plugin.so
 %{_libdir}/vlc/plugins/control/libgestures_plugin.so
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
-%if 0%{?suse_version} > 1110
+%if %{with vlc_xcb}
+%if %{with vlc_xcb_keysyms}
 %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
 %endif
+%endif
+%if %{with vlc_lirc}
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
+%endif
 %{_libdir}/vlc/plugins/control/libmotion_plugin.so
 %{_libdir}/vlc/plugins/control/libnetsync_plugin.so
 %{_libdir}/vlc/plugins/control/liboldrc_plugin.so
@@ -844,22 +1408,26 @@
 %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
 %{_libdir}/vlc/plugins/demux/libes_plugin.so
 %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with libgme}
 %{_libdir}/vlc/plugins/demux/libgme_plugin.so
 %endif
 %{_libdir}/vlc/plugins/demux/libh264_plugin.so
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with matroska}
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
 %endif
+%if %{with modplug}
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
+%endif
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
 %{_libdir}/vlc/plugins/demux/libnsc_plugin.so
 %{_libdir}/vlc/plugins/demux/libnsv_plugin.so
 %{_libdir}/vlc/plugins/demux/libnuv_plugin.so
+%if %{with ogg}
 %{_libdir}/vlc/plugins/demux/libogg_plugin.so
+%endif
 %{_libdir}/vlc/plugins/demux/libplaylist_plugin.so
 %{_libdir}/vlc/plugins/demux/libps_plugin.so
 %{_libdir}/vlc/plugins/demux/libpva_plugin.so
@@ -869,7 +1437,12 @@
 %{_libdir}/vlc/plugins/demux/libreal_plugin.so
 %{_libdir}/vlc/plugins/demux/libsmf_plugin.so
 %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so
+%if %{with vlc_libsidplay2}
+%{_libdir}/vlc/plugins/demux/libsid_plugin.so
+%endif
+%if %{with dvbpsi}
 %{_libdir}/vlc/plugins/demux/libts_plugin.so
+%endif
 %{_libdir}/vlc/plugins/demux/libtta_plugin.so
 %{_libdir}/vlc/plugins/demux/libty_plugin.so
 %{_libdir}/vlc/plugins/demux/libvc1_plugin.so
@@ -877,46 +1450,56 @@
 %{_libdir}/vlc/plugins/demux/libvoc_plugin.so
 %{_libdir}/vlc/plugins/demux/libwav_plugin.so
 %{_libdir}/vlc/plugins/demux/libxa_plugin.so
+%if %{with freetype2}
 %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%endif
+%if %{with vlc_lua}
 %{_libdir}/vlc/plugins/lua/liblua_plugin.so
+%endif
 
-%if 0%{?suse_version} >= 1320
+%if %{with vlc_ncurses}
 %{_libdir}/vlc/plugins/gui/libncurses_plugin.so
 %endif
 %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with taglib}
 %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so
 %endif
 %{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so
 %{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so
 %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
 
-%if 0%{?suse_version} > 1140
+%if %{with vlc_dbus}
 %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
 %endif
 %{_libdir}/vlc/plugins/misc/libexport_plugin.so
 %{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so
 
-%if 0%{?suse_version} > 1140
+%if %{with gnutls}
 %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so
 %endif
 %{_libdir}/vlc/plugins/misc/liblogger_plugin.so
 %{_libdir}/vlc/plugins/misc/libstats_plugin.so
 %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so
-%if 0%{?suse_version} > 1110
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so
 %endif
+%if %{with libxml2}
 %{_libdir}/vlc/plugins/misc/libxml_plugin.so
+%endif
 %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_dummy_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_mp4_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_mpjpeg_plugin.so
+%if %{with ogg}
 %{_libdir}/vlc/plugins/mux/libmux_ogg_plugin.so
+%endif
 %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
+%if %{with dvbpsi}
 %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
+%endif
 %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
-%if 0%{?BUILD_ORIG}
+%if %{with ffmpeg}
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
 %endif
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
@@ -928,35 +1511,39 @@
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
+%if %{with avahi}
 %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so
+%endif
 %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so
-%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
+%if %{with vlc_mtp}
 %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so
 %endif
 %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so
 
-%if 0%{?suse_version} > 1140
+%if %{with vlc_pulse}
 %{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so
 %endif
 %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so
+%if %{with udev}
 %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
-%{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
 %endif
+%if %{with upnp}
+%{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
 %endif
-%if 0%{?suse_version} > 1110
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
 %endif
 %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so
 %{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so
+%if %{with gcrypt}
 %{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so
+%endif
 %{_libdir}/vlc/plugins/stream_filter/librecord_plugin.so
 %{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
 
-%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
+%if %{with chromaprint}
 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
 %endif
 %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
@@ -968,7 +1555,9 @@
 %{_libdir}/vlc/plugins/stream_out/libstream_out_gather_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
+%if %{with gcrypt}
 %{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so
+%endif
 %{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so
@@ -976,7 +1565,9 @@
 %{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_stats_plugin.so
 %{_libdir}/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
+%if %{with vlc_svg}
 %{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so
+%endif
 %{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so
 %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so
@@ -985,7 +1576,7 @@
 %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
 
 %ifarch %ix86 x86_64
-%if 0%{?suse_version} > 1140
+%if %{with vlc_mmx_sse}
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
 %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
 %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
@@ -1004,7 +1595,9 @@
 %{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libanaglyph_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so
+%if %{with vlc_atmo}
 %{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so
+%endif
 %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libball_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libblend_plugin.so
@@ -1034,12 +1627,10 @@
 %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
-%if 0%{?suse_version} > 1110
-%if 0%{?suse_version} != 1315
+%if %{with opencv}
 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
 %endif
-%endif
 %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
@@ -1051,7 +1642,7 @@
 %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so
-%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
+%if %{with ffmpeg}
 %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so
 %endif
 %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
@@ -1059,18 +1650,24 @@
 %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so
-%if 0%{?suse_version} > 1110
+%if %{with caca}
 %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
 %endif
 %{_libdir}/vlc/plugins/video_output/libfb_plugin.so
+%if %{with vlc_gl}
 %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
-%if 0%{?suse_version} > 1110
+%endif
+%if %{with vlc_xcb}
+%if %{with vlc_gl}
 %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
 %endif
+%endif
 %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so
 %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so
+%if %{with sdl}
 %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so
-%if 0%{?suse_version} > 1110
+%endif
+%if %{with vlc_xcb}
 %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
 %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
 %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
@@ -1078,29 +1675,58 @@
 %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so
 %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so
 
-%if 0%{?BUILD_ORIG}
 %files codecs
 %defattr(-,root,root)
+%if %{with ffmpeg}
 %{_libdir}/vlc/plugins/access/libavio_plugin.so
+%endif
+%if %{with a52}
 %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so
+%endif
+%if %{with libdca}
 %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
+%endif
+%if %{with mad}
 %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so
+%endif
+%if %{with ffmpeg}
 %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
+%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
+%endif
+%if %{with faad}
 %{_libdir}/vlc/plugins/codec/libfaad_plugin.so
+%endif
+%if %{with fdk_aac}
+%{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so
+%endif
+%if %{with libmpeg2}
 %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
+%endif
+%if %{with shine}
+%{_libdir}/vlc/plugins/codec/libshine_plugin.so
+%endif
+%if %{with twolame}
 %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
+%endif
+%if %{with x264}
 %{_libdir}/vlc/plugins/codec/libx264_plugin.so
-#{_libdir}/vlc/plugins/codec/libx265_plugin.so
-%if 0%{?suse_version} > 1140
+%endif
+%if %{with x265}
+%{_libdir}/vlc/plugins/codec/libx265_plugin.so
+%endif
+%if %{with vlc_gst}
+%{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so
+%endif
+%if %{with libva}
+%if %{with libva_drm}
 %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
 %endif
 %{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so
-%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
-%if 0%{?BUILD_ORIG}
+%endif
 %{_libdir}/vlc/plugins/demux/libhevc_plugin.so
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
-%endif
-%if 0%{?suse_version} > 1140
+%if %{with vdpau}
 %{_libdir}/vlc/libvlc_vdpau.so.0
 %{_libdir}/vlc/libvlc_vdpau.so.0.0.0
 %dir %{_libdir}/vlc/plugins/vdpau
@@ -1111,8 +1737,6 @@
 %{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so
 %{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
 %endif
-%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
-%endif
 
 %files -n libvlc%{libvlc}
 %defattr(-,root,root)
@@ -1122,15 +1746,19 @@
 %defattr(-,root,root)
 %{_libdir}/libvlccore.so.%{libvlccore}*
 
+%if %{with vlc_qt4} || %{with vlc_qt5}
 %files qt
 %defattr(-,root,root)
 %{_bindir}/qvlc
 %{_mandir}/man1/qvlc*
 %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%endif
 
+%if %{with gnomevfs}
 %files gnome
 %defattr(-,root,root)
 %{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -1140,10 +1768,8 @@
 %{_libdir}/pkgconfig/libvlc.pc
 %{_libdir}/pkgconfig/vlc-plugin.pc
 %{_libdir}/vlc/libcompat.a
-%if 0%{?BUILD_ORIG}
-%if 0%{?suse_version} > 1140
+%if %{with vdpau}
 %{_libdir}/vlc/libvlc_vdpau.so
 %endif
-%endif
 
 %changelog

0001-no-return-in-non-void.patch Changed

@@ -1,8 +1,8 @@
-diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
-index 73af8ce..8ffad6f 100644
---- a/modules/access/v4l2/demux.c
-+++ b/modules/access/v4l2/demux.c
-@@ -629,6 +629,7 @@ static void *MmapThread (void *data)
+Index: vlc-2.2.1/modules/access/v4l2/demux.c
+===================================================================
+--- vlc-2.2.1.orig/modules/access/v4l2/demux.c
++++ vlc-2.2.1/modules/access/v4l2/demux.c
+@@ -632,6 +632,7 @@ static void *MmapThread (void *data)
      }
  
      assert (0);
@@ -10,7 +10,7 @@
  }
  
  static void *ReadThread (void *data)
-@@ -691,6 +692,7 @@ static void *ReadThread (void *data)
+@@ -694,6 +695,7 @@ static void *ReadThread (void *data)
  #endif
      }
      assert (0);
@@ -18,11 +18,11 @@
  }
  
  static int DemuxControl( demux_t *demux, int query, va_list args )
-diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
-index 8d7dc6e..cc924aa 100644
---- a/modules/control/dbus/dbus.c
-+++ b/modules/control/dbus/dbus.c
-@@ -880,6 +880,7 @@ static void *Run( void *data )
+Index: vlc-2.2.1/modules/control/dbus/dbus.c
+===================================================================
+--- vlc-2.2.1.orig/modules/control/dbus/dbus.c
++++ vlc-2.2.1/modules/control/dbus/dbus.c
+@@ -891,6 +891,7 @@ static void *Run( void *data )
          vlc_restorecancel( canc );
      }
      assert(0);
@@ -30,11 +30,11 @@
  }
  
  static void   wakeup_main_loop( void *p_data )
-diff --git a/modules/control/motion.c b/modules/control/motion.c
-index 72d7ec6..49c5620 100644
---- a/modules/control/motion.c
-+++ b/modules/control/motion.c
-@@ -190,6 +190,7 @@ static void *RunIntf( void *data )
+Index: vlc-2.2.1/modules/control/motion.c
+===================================================================
+--- vlc-2.2.1.orig/modules/control/motion.c
++++ vlc-2.2.1/modules/control/motion.c
+@@ -188,6 +188,7 @@ static void *RunIntf( void *data )
          vlc_restorecancel( canc );
      }
      assert(0);
@@ -42,11 +42,11 @@
  }
  #undef LOW_THRESHOLD
  #undef HIGH_THRESHOLD
-diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c
-index 9d24ced..b087410 100644
---- a/modules/control/motionlib.c
-+++ b/modules/control/motionlib.c
-@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensors_t *motion )
+Index: vlc-2.2.1/modules/control/motionlib.c
+===================================================================
+--- vlc-2.2.1.orig/modules/control/motionlib.c
++++ vlc-2.2.1/modules/control/motionlib.c
+@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensor
      default:
          assert( 0 );
      }
@@ -54,11 +54,11 @@
  }
  
  /*****************************************************************************
-diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
-index 62c89b7..81f884a 100644
---- a/modules/stream_out/rtp.c
-+++ b/modules/stream_out/rtp.c
-@@ -1501,6 +1501,7 @@ static void *rtp_listen_thread( void *data )
+Index: vlc-2.2.1/modules/stream_out/rtp.c
+===================================================================
+--- vlc-2.2.1.orig/modules/stream_out/rtp.c
++++ vlc-2.2.1/modules/stream_out/rtp.c
+@@ -1499,6 +1499,7 @@ static void *rtp_listen_thread( void *da
      }
  
      assert( 0 );
@@ -66,11 +66,11 @@
  }
  
  
-diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
-index 0baa2bc..6b788cb 100644
---- a/modules/visualization/visual/visual.c
-+++ b/modules/visualization/visual/visual.c
-@@ -366,6 +366,7 @@ static void *Thread( void *data )
+Index: vlc-2.2.1/modules/visualization/visual/visual.c
+===================================================================
+--- vlc-2.2.1.orig/modules/visualization/visual/visual.c
++++ vlc-2.2.1/modules/visualization/visual/visual.c
+@@ -382,6 +382,7 @@ static void *Thread( void *data )
          vlc_restorecancel( canc );
      }
      assert(0);
@@ -78,11 +78,11 @@
  }
  
  static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
-diff --git a/src/misc/events.c b/src/misc/events.c
-index b430ee5..29c387f 100644
---- a/src/misc/events.c
-+++ b/src/misc/events.c
-@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em,
+Index: vlc-2.2.1/src/misc/events.c
+===================================================================
+--- vlc-2.2.1.orig/src/misc/events.c
++++ vlc-2.2.1/src/misc/events.c
+@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_
      FOREACH_END()
      /* Unknown event = BUG */
      assert( 0 );
@@ -90,9 +90,11 @@
  }
  
  /**
---- a/modules/demux/mp4/mp4.c.orig	2015-04-13 16:35:15.220228877 +0200
-+++ b/modules/demux/mp4/mp4.c	2015-04-13 16:35:15.255228142 +0200
-@@ -277,6 +277,7 @@
+Index: vlc-2.2.1/modules/demux/mp4/mp4.c
+===================================================================
+--- vlc-2.2.1.orig/modules/demux/mp4/mp4.c
++++ vlc-2.2.1/modules/demux/mp4/mp4.c
+@@ -277,6 +277,7 @@ static inline int64_t MP4_TrackGetPTSDel
  
          i_sample -= ck->p_sample_count_pts[i_index];
      }

0001-text-fix-decoding-of-4-bytes-UTF-8-sequences.patch Added

@@ -0,0 +1,58 @@
+From b6e93c1cdf2087aeba99b634235212a39bfa5952 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Mon, 13 Jun 2016 20:31:15 +0300
+Subject: text: fix decoding of 4-bytes UTF-8 sequences
+
+(cherry picked from commit 221462198b2e32c74cfcb0d0b5645042d7fb3c79)
+---
+ src/text/unicode.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/text/unicode.c b/src/text/unicode.c
+index 25215d7..64c8573 100644
+--- a/src/text/unicode.c
++++ b/src/text/unicode.c
+@@ -151,7 +151,7 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
+             break;
+ 
+         case 4:
+-            cp = (c & 0x07) << 16;
++            cp = (c & 0x07) << 18;
+             break;
+ 
+         default:
+@@ -163,18 +163,18 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
+     {
+         case 4:
+             c = *++ptr;
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
+                 return -1;
+-            cp |= (c & 0x3f) << 12;
++            cp |= (c & 0x3F) << 12;
+ 
+             if (unlikely(cp >= 0x110000)) // beyond Unicode range
+                 return -1;
+             /* fall through */
+         case 3:
+             c = *++ptr;
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
+                 return -1;
+-            cp |= (c & 0x3f) << 6;
++            cp |= (c & 0x3F) << 6;
+ 
+             if (unlikely(cp >= 0xD800 && cp < 0xE000)) // UTF-16 surrogate
+                 return -1;
+@@ -183,9 +183,9 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc)
+             /* fall through */
+         case 2:
+             c = *++ptr;
+-            if (unlikely((c >> 6) != 2)) // not a continuation byte
++            if (unlikely((c & 0xC0) != 0x80)) // not a continuation byte
+                 return -1;
+-            cp |= (c & 0x3f);
++            cp |= (c & 0x3F);
+             break;
+     }
+

0030-Fix-build-using-old-GCC-intrinsics.patch Added

@@ -0,0 +1,289 @@
+From 8b0a359be21c8b66c7f7f5d34b85df3cf6689035 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcvlcdev@free.fr>
+Date: Sun, 24 Jul 2016 12:59:20 +0200
+Subject: Fix build using old GCC intrinsics
+
+As the 2.2 headers are still using vlc_atomics (picture)
+we cannot have a way to avoid collisions with early
+or late <atomic> inclusion when using GCC >= 4.7
+
+Conditionals in vlc_atomic won't work.
+
+Happens in ProjectM and Qt5.
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/gui/qt4/actions_manager.cpp                |  2 ++
+ modules/gui/qt4/adapters/seekpoints.cpp            |  4 +--
+ modules/gui/qt4/adapters/seekpoints.hpp            |  4 +--
+ modules/gui/qt4/components/controller.cpp          |  2 ++
+ .../gui/qt4/components/playlist/playlist_model.hpp |  4 +--
+ modules/gui/qt4/components/playlist/views.cpp      |  6 ++++
+ modules/gui/qt4/dialogs/messages.cpp               |  2 ++
+ modules/gui/qt4/dialogs/vlm.cpp                    |  4 ---
+ modules/gui/qt4/dialogs/vlm.hpp                    |  4 ++-
+ modules/gui/qt4/input_manager.cpp                  |  2 ++
+ modules/gui/qt4/input_manager.hpp                  |  3 +-
+ modules/gui/qt4/menus.cpp                          |  2 ++
+ modules/gui/qt4/qt4.hpp                            | 32 ++++++++++++++++++----
+ modules/gui/qt4/util/pictureflow.cpp               |  2 ++
+ modules/visualization/projectm.cpp                 |  4 +++
+ 15 files changed, 56 insertions(+), 21 deletions(-)
+
+diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
+index eff40d9..b7ca967 100644
+--- a/modules/gui/qt4/actions_manager.cpp
++++ b/modules/gui/qt4/actions_manager.cpp
+@@ -25,6 +25,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_vout.h>
+ #include <vlc_keys.h>
+ 
+diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp
+index fbf2957..a3564bb 100644
+--- a/modules/gui/qt4/adapters/seekpoints.cpp
++++ b/modules/gui/qt4/adapters/seekpoints.cpp
+@@ -19,14 +19,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
++#include "seekpoints.hpp"
+ 
+ #include "recents.hpp"
+ #include "dialogs_provider.hpp"
+ #include "menus.hpp"
+ 
+-#include "seekpoints.hpp"
+-
+-#include "qt4.hpp"
+ #include "input_manager.hpp"
+ 
+ SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
+diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp
+index 0083989..bbb9214 100644
+--- a/modules/gui/qt4/adapters/seekpoints.hpp
++++ b/modules/gui/qt4/adapters/seekpoints.hpp
+@@ -22,9 +22,7 @@
+ #ifndef SEEKPOINTS_HPP
+ #define SEEKPOINTS_HPP
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
++#include "qt4.hpp"
+ 
+ #include <vlc_common.h>
+ #include <vlc_interface.h>
+diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
+index d93e0db..c43d929 100644
+--- a/modules/gui/qt4/components/controller.cpp
++++ b/modules/gui/qt4/components/controller.cpp
+@@ -26,6 +26,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_vout.h>                       /* vout_thread_t for FSC */
+ 
+ /* Widgets */
+diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
+index f9d1d0c..1f71ac9 100644
+--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
++++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
+@@ -25,9 +25,7 @@
+ #ifndef _PLAYLIST_MODEL_H_
+ #define _PLAYLIST_MODEL_H_
+ 
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
++#include "qt4.hpp"
+ 
+ #include <vlc_input.h>
+ #include <vlc_playlist.h>
+diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
+index 59f6535..0066205 100644
+--- a/modules/gui/qt4/components/playlist/views.cpp
++++ b/modules/gui/qt4/components/playlist/views.cpp
+@@ -21,6 +21,12 @@
+  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "qt4.hpp"
++
+ #include "components/playlist/views.hpp"
+ #include "components/playlist/vlc_model.hpp"      /* VLCModel */
+ #include "components/playlist/sorting.h"          /* Columns List */
+diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
+index 30793a2..9c79c99 100644
+--- a/modules/gui/qt4/dialogs/messages.cpp
++++ b/modules/gui/qt4/dialogs/messages.cpp
+@@ -24,6 +24,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include "dialogs/messages.hpp"
+ 
+ #include <QPlainTextEdit>
+diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
+index 0da88cc..595f015 100644
+--- a/modules/gui/qt4/dialogs/vlm.cpp
++++ b/modules/gui/qt4/dialogs/vlm.cpp
+@@ -23,10 +23,6 @@
+  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
+  *****************************************************************************/
+ 
+-#ifdef HAVE_CONFIG_H
+-# include "config.h"
+-#endif
+-
+ #include "dialogs/vlm.hpp"
+ 
+ #ifdef ENABLE_VLM
+diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
+index a3c6e5d..dcf7110 100644
+--- a/modules/gui/qt4/dialogs/vlm.hpp
++++ b/modules/gui/qt4/dialogs/vlm.hpp
+@@ -25,8 +25,10 @@
+ #ifndef QVLC_VLM_DIALOG_H_
+ #define QVLC_VLM_DIALOG_H_ 1
+ 
++#include "qt4.hpp"
++
+ #ifdef HAVE_CONFIG_H
+-# include "config.h"
++#include "config.h"
+ #endif
+ 
+ #ifdef ENABLE_VLM
+diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
+index fd45f4a..c50cb6c 100644
+--- a/modules/gui/qt4/input_manager.cpp
++++ b/modules/gui/qt4/input_manager.cpp
+@@ -30,6 +30,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include "input_manager.hpp"
+ #include "recents.hpp"
+ 
+diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
+index 7d3b76a..4fbecbb 100644
+--- a/modules/gui/qt4/input_manager.hpp
++++ b/modules/gui/qt4/input_manager.hpp
+@@ -29,9 +29,10 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_input.h>
+ 
+-#include "qt4.hpp"
+ #include "util/singleton.hpp"
+ #include "adapters/variables.hpp"
+ 
+diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
+index 116e98c..46240b0 100644
+--- a/modules/gui/qt4/menus.cpp
++++ b/modules/gui/qt4/menus.cpp
+@@ -34,6 +34,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include <vlc_common.h>
+ #include <vlc_intf_strings.h>
+ #include <vlc_vout.h>                             /* vout_thread_t */
+diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
+index 44d7db6..5aec957 100644
+--- a/modules/gui/qt4/qt4.hpp
++++ b/modules/gui/qt4/qt4.hpp
+@@ -29,12 +29,7 @@
+ # include "config.h"
+ #endif
+ 
+-#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
+-#include <vlc_interface.h> /* intf_thread_t */
+-#include <vlc_playlist.h>  /* playlist_t */
+-
+-#define QT_NO_CAST_TO_ASCII
+-#include <QString>
++#include <QtGlobal>
+ 
+ #if ( QT_VERSION < 0x040600 )
+ # error Update your Qt version to at least 4.6.0
+@@ -43,6 +38,31 @@
+ #define HAS_QT47 ( QT_VERSION >= 0x040700 )
+ #define HAS_QT5  ( QT_VERSION >= 0x050000 )
+ 
++#if HAS_QT5
++  #include <QtCore/qcompilerdetection.h>
++  #if defined(Q_COMPILER_ATOMICS) && \
++             ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
++   #define VLC_ATOMIC_H
++   #include <atomic>
++   using namespace std;
++   #  define atomic_store(object,desired) \
++      do { \
++          *(object) = (desired); \
++          __sync_synchronize(); \
++      } while (0)
++
++   #  define atomic_load(object) \
++       (__sync_synchronize(), *(object))
++  #endif
++#endif
++
++#include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
++#include <vlc_interface.h> /* intf_thread_t */
++#include <vlc_playlist.h>  /* playlist_t */
++
++#define QT_NO_CAST_TO_ASCII
++#include <QString>
++
+ enum {
+     DialogEventTypeOffset = 0,
+     IMEventTypeOffset     = 100,
+diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
+index 9318953..a7e6a01 100644
+--- a/modules/gui/qt4/util/pictureflow.cpp
++++ b/modules/gui/qt4/util/pictureflow.cpp
+@@ -29,6 +29,8 @@
+   THE SOFTWARE.
+ */
+ 
++#include "qt4.hpp"
++
+ #include "pictureflow.hpp"
+ 
+ #include <QApplication>
+diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
+index e80fbf4..96d532d 100644
+--- a/modules/visualization/projectm.cpp
++++ b/modules/visualization/projectm.cpp
+@@ -30,6 +30,10 @@
+ #endif
+ 
+ #include <assert.h>
++#if defined(__GNUC__) && \
++           ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) )
++  #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */
++#endif
+ 
+ #include <vlc_common.h>
+ #include <vlc_plugin.h>

vlc-2.2.0-fix_deinterlace_mmx.patch Deleted

@@ -1,119 +0,0 @@
---- modules/video_filter/deinterlace/merge.c.orig	2015-03-04 07:55:02.021482260 +0100
-+++ modules/video_filter/deinterlace/merge.c	2015-03-04 07:56:33.975885612 +0100
-@@ -68,116 +68,6 @@
-         *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
- }
- 
--#if defined(CAN_COMPILE_MMXEXT)
--VLC_MMX
--void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2,
--                  size_t i_bytes )
--{
--    uint8_t *p_dest = _p_dest;
--    const uint8_t *p_s1 = _p_s1;
--    const uint8_t *p_s2 = _p_s2;
--
--    for( ; i_bytes >= 8; i_bytes -= 8 )
--    {
--        __asm__  __volatile__( "movq %2,%%mm1;"
--                               "pavgb %1, %%mm1;"
--                               "movq %%mm1, %0" :"=m" (*p_dest):
--                                                 "m" (*p_s1),
--                                                 "m" (*p_s2) : "mm1" );
--        p_dest += 8;
--        p_s1 += 8;
--        p_s2 += 8;
--    }
--
--    for( ; i_bytes > 0; i_bytes-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--}
--#endif
--
--#if defined(CAN_COMPILE_3DNOW)
--VLC_MMX
--void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2,
--                 size_t i_bytes )
--{
--    uint8_t *p_dest = _p_dest;
--    const uint8_t *p_s1 = _p_s1;
--    const uint8_t *p_s2 = _p_s2;
--
--    for( ; i_bytes >= 8; i_bytes -= 8 )
--    {
--        __asm__  __volatile__( "movq %2,%%mm1;"
--                               "pavgusb %1, %%mm1;"
--                               "movq %%mm1, %0" :"=m" (*p_dest):
--                                                 "m" (*p_s1),
--                                                 "m" (*p_s2) : "mm1" );
--        p_dest += 8;
--        p_s1 += 8;
--        p_s2 += 8;
--    }
--
--    for( ; i_bytes > 0; i_bytes-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--}
--#endif
--
--#if defined(CAN_COMPILE_SSE)
--VLC_SSE
--void Merge8BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
--                    size_t i_bytes )
--{
--    uint8_t *p_dest = _p_dest;
--    const uint8_t *p_s1 = _p_s1;
--    const uint8_t *p_s2 = _p_s2;
--
--    for( ; i_bytes > 0 && ((uintptr_t)p_s1 & 15); i_bytes-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--
--    for( ; i_bytes >= 16; i_bytes -= 16 )
--    {
--        __asm__  __volatile__( "movdqu %2,%%xmm1;"
--                               "pavgb %1, %%xmm1;"
--                               "movdqu %%xmm1, %0" :"=m" (*p_dest):
--                                                 "m" (*p_s1),
--                                                 "m" (*p_s2) : "xmm1" );
--        p_dest += 16;
--        p_s1 += 16;
--        p_s2 += 16;
--    }
--
--    for( ; i_bytes > 0; i_bytes-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--}
--
--VLC_SSE
--void Merge16BitSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
--                     size_t i_bytes )
--{
--    uint16_t *p_dest = _p_dest;
--    const uint16_t *p_s1 = _p_s1;
--    const uint16_t *p_s2 = _p_s2;
--
--    size_t i_words = i_bytes / 2;
--    for( ; i_words > 0 && ((uintptr_t)p_s1 & 15); i_words-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--
--    for( ; i_words >= 8; i_words -= 8 )
--    {
--        __asm__  __volatile__( "movdqu %2,%%xmm1;"
--                               "pavgw %1, %%xmm1;"
--                               "movdqu %%xmm1, %0" :"=m" (*p_dest):
--                                                 "m" (*p_s1),
--                                                 "m" (*p_s2) : "xmm1" );
--        p_dest += 8;
--        p_s1 += 8;
--        p_s2 += 8;
--    }
--
--    for( ; i_words > 0; i_words-- )
--        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
--}
--
--#endif
--
- #ifdef CAN_COMPILE_C_ALTIVEC
- void MergeAltivec( void *_p_dest, const void *_p_s1,
-                    const void *_p_s2, size_t i_bytes )

vlc-qt-5.5.0-version-check.patch Added

vlc-2.2.1.tar.xz -> vlc-2.2.4.tar.xz Changed

vlc-rpmlintrc Changed

Build Results
RPM Lint

Refresh

Mentioned Issues (6)

CVE-2015-7981
CVE-2015-8126
CVE-2016-5108
boo#956769
boo#959100
boo#960621

Comments for request 3168 0

Request History

mrdocs created request about 8 years ago

hackish way to avoid the zero day exploit for libgme

mrdocs accepted request about 8 years ago

self accepting because of the security issue with libgme