From 9ad992db1f2b4dc4b523ca7df4f0530b915ca79e10e16d40b2a5bc6e5ba033ce Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 1 Mar 2018 11:02:08 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 79.0

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=2b5510c1dae6691d081f5c37f503e2db
---
 vlc.changes | 16 ++++++++++++++++
 vlc.spec    | 20 +++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/vlc.changes b/vlc.changes
index 5f9299b..b02a186 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Feb 24 13:02:40 UTC 2018 - bjorn.lie@gmail.com
+
+- Add conditional pkgconfig(x265) BuildRequires and pass
+  conditional --enable-x265 or --disable-x265, package resulting
+  plugin in vlc-codecs subpackage (boo#1081608).
+- Add conditional pkgconfig(fdk-aac) BuildRequires and pass
+  conditional --enable-fdkaac or --disable-fdkaac, package
+  resulting plugin in vlc-codecs subpackage.
+
+-------------------------------------------------------------------
+Thu Feb 22 17:14:17 UTC 2018 - dimstar@opensuse.org
+
+- Move libmpeg2 dependency/plugin out of the BUILD_ORIG condition,
+  as openSUSE now contains/ships the library.
+
 -------------------------------------------------------------------
 Sun Feb 18 10:01:28 UTC 2018 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index da6b0bb..73e9ec2 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -120,6 +120,7 @@ BuildRequires:  pkgconfig(libavutil) >= 52.4.0
 BuildRequires:  pkgconfig(libbluray) >= 0.3.0
 BuildRequires:  pkgconfig(libgme)
 BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
+BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
 BuildRequires:  pkgconfig(libmtp) >= 1.0.0
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
@@ -194,11 +195,12 @@ BuildRequires:  pkgconfig(ncursesw)
 BuildRequires:  faad2-devel
 BuildRequires:  libfaac-devel
 BuildRequires:  libxvidcore-devel
+BuildRequires:  pkgconfig(fdk-aac)
 BuildRequires:  pkgconfig(libdca) >= 0.0.5
-BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
 BuildRequires:  pkgconfig(libpostproc)
 BuildRequires:  pkgconfig(vdpau) >= 0.6
 BuildRequires:  pkgconfig(x264) >= 0.8.6
+BuildRequires:  pkgconfig(x265)
 %endif
 
 %description
@@ -291,7 +293,7 @@ using GStreamer and its submodules as a backend to decode streams.
 %package codecs
 Summary:        Additional codecs for the VLC media player
 # We require the unrestricted libavcodec - same ABI version we linked
-# FIXME: Use %requires_eq macro instead
+# FIXME: Use %%requires_eq macro instead
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-noX = %{version}
 Requires:       %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted)
@@ -357,6 +359,7 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
    --enable-libass                      \
    --enable-libcddb                     \
    --enable-mad                         \
+   --enable-libmpeg2                    \
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
    --enable-opencv                      \
 %endif
@@ -368,15 +371,17 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
    --disable-swscale                    \
 %endif
 %if 0%{?BUILD_ORIG}
-   --enable-libmpeg2                    \
    --enable-postproc                    \
    --enable-faad                        \
+   --enable-fdkaac                      \
    --enable-dca                         \
+   --enable-x265                        \
 %else
-   --disable-libmpeg2                   \
    --disable-postproc                   \
    --disable-faad                       \
+   --disable-fdkaac                     \
    --disable-dca                        \
+   --disable-x265                       \
 %endif
    --enable-avcodec                     \
    --enable-lirc                        \
@@ -396,7 +401,6 @@ sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/
    --enable-v4l2                        \
    --enable-vcd                         \
    --enable-vorbis                      \
-   --disable-x265                       \
    --enable-xcb                         \
 %if %{with opengles}
   --enable-gles2                        \
@@ -766,6 +770,7 @@ done
 %{_libdir}/vlc/plugins/codec/libjpeg_plugin.so
 %{_libdir}/vlc/plugins/codec/libg711_plugin.so
 %{_libdir}/vlc/plugins/codec/libkate_plugin.so
+%{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
 %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
 %{_libdir}/vlc/plugins/codec/libopus_plugin.so
 %{_libdir}/vlc/plugins/codec/libpng_plugin.so
@@ -1002,9 +1007,10 @@ done
 %if 0%{?BUILD_ORIG}
 %files codecs
 %{_libdir}/vlc/plugins/codec/libfaad_plugin.so
-%{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
-%{_libdir}/vlc/plugins/codec/libx264_plugin.so
+%{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so
 %{_libdir}/vlc/plugins/codec/libdca_plugin.so
+%{_libdir}/vlc/plugins/codec/libx264_plugin.so
+%{_libdir}/vlc/plugins/codec/libx265_plugin.so
 
 %{_libdir}/vlc/libvlc_vdpau.so.0
 %{_libdir}/vlc/libvlc_vdpau.so.0.0.0