Updating link to change in openSUSE:Factory/vlc revision 93.0

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=bb98c4ecd1b690c93214f60d1bcc28f2

0001-codec-vpx-Detect-libvpx-1.8.0.patch

@@ -9,11 +9,11 @@ Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
  modules/codec/vpx.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
+Index: vlc-3.0.6/modules/codec/vpx.c
-index f03c7fae625..59b3acdef74 100644
+===================================================================
---- a/modules/codec/vpx.c
+--- vlc-3.0.6.orig/modules/codec/vpx.c	2018-03-29 14:04:52.000000000 +0200
-+++ b/modules/codec/vpx.c
++++ vlc-3.0.6/modules/codec/vpx.c	2019-02-18 12:14:23.944856133 +0100
-@@ -117,6 +117,7 @@ static const struct
+@@ -116,6 +116,7 @@ static const struct
      { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 },
  
      { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 },
@@ -21,7 +21,7 @@ index f03c7fae625..59b3acdef74 100644
      { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 },
      { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 },
      { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 },
-@@ -129,7 +130,7 @@ static const struct
+@@ -128,7 +129,7 @@ static const struct
  
      { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 },
      { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 },

vlc-projectM-qt5.patch

@@ -1,8 +1,8 @@
-Index: vlc-3.0.0/configure.ac
+Index: vlc-3.0.6/configure.ac
 ===================================================================
---- vlc-3.0.0.orig/configure.ac
+--- vlc-3.0.6.orig/configure.ac	2018-12-27 11:51:11.000000000 +0100
-+++ vlc-3.0.0/configure.ac
++++ vlc-3.0.6/configure.ac	2019-02-18 12:14:23.580851808 +0100
-@@ -3950,12 +3950,12 @@ AC_ARG_ENABLE(projectm,
+@@ -3973,12 +3973,12 @@ AC_ARG_ENABLE(projectm,
    [  --enable-projectm       projectM visualization plugin (default enabled)])
  AS_IF([test "${enable_projectm}" != "no"],
    [
@@ -19,10 +19,10 @@ Index: vlc-3.0.0/configure.ac
        ])
      ],[
        AC_MSG_WARN([${PROJECTM_PKG_ERRORS}.])
-Index: vlc-3.0.0/modules/visualization/projectm.cpp
+Index: vlc-3.0.6/modules/visualization/projectm.cpp
 ===================================================================
---- vlc-3.0.0.orig/modules/visualization/projectm.cpp
+--- vlc-3.0.6.orig/modules/visualization/projectm.cpp	2017-11-24 16:29:18.000000000 +0100
-+++ vlc-3.0.0/modules/visualization/projectm.cpp
++++ vlc-3.0.6/modules/visualization/projectm.cpp	2019-02-18 12:14:23.580851808 +0100
 @@ -34,7 +34,7 @@
  #include <vlc_filter.h>
  #include <vlc_rand.h>

vlc.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Mar  5 08:07:41 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Limit the use of projectM-qt5 to suse_version > 1320 < 1550.
+  On Tumbleweed, we now have projectM 3.1.0, which is equivalent
+  to what our projectM-qt5 used to be.
+
+-------------------------------------------------------------------
+Mon Feb 18 10:57:23 UTC 2019 - bjorn.lie@gmail.com
+
+- Move vdpau sub-package and it's dependencies out of BUILD_ORIG
+  conditional, everything it needs is provided by openSUSE.
+- Refresh patches with refresh_patches service.
+- Drop BUILD_ORIG guarded faad2-devel and libfaac-devel
+  BuildRequires and stop passing conditional --enable-faad to
+  configure, libfdkaac is sufficient for aac encoding/decoding.
+- Add pkgconfig(aom), pkgconfig(libnfs) and pkgconfig(soxr)
+  BuildRequires, build the codecs/filters/plugins.
+
 -------------------------------------------------------------------
 Tue Feb 12 16:19:01 UTC 2019 - Antonio Larrosa <alarrosa@suse.com>
 

vlc.spec

@@ -118,6 +118,7 @@ BuildRequires:  pkgconfig(Qt5Core) >= 5.5.0
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(aom)
 BuildRequires:  pkgconfig(caca) >= 0.99.beta14
 BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
 BuildRequires:  pkgconfig(dvdnav) > 4.9.0
@@ -133,16 +134,21 @@ BuildRequires:  pkgconfig(libgme)
 BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
 BuildRequires:  pkgconfig(libmpeg2) > 0.3.2
 BuildRequires:  pkgconfig(libmtp) >= 1.0.0
+BuildRequires:  pkgconfig(libnfs)
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpostproc)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(libsecret-1) >= 0.18
+BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(libva-x11)
 BuildRequires:  pkgconfig(protobuf-lite) >= 2.5.0
+BuildRequires:  pkgconfig(soxr)
 BuildRequires:  pkgconfig(speexdsp)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(twolame)
+BuildRequires:  pkgconfig(vdpau) >= 0.6
 BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(xcb-composite)
 BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
@@ -182,15 +188,12 @@ BuildRequires:  pkgconfig(Qt5X11Extras)
 # for some reason libXi-devel is explicitly needed on Leap 42.1, otherwise the build fails...
 BuildRequires:  pkgconfig(xi)
 %endif
-%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
-BuildRequires:  pkgconfig(libswscale)
-%endif
 %if 0%{?is_opensuse}
 BuildRequires:  pkgconfig(SDL_image) >= 1.2.10
 BuildRequires:  pkgconfig(libupnp)
 BuildRequires:  pkgconfig(opencv) > 2.0
 %ifarch %{ix86} x86_64
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550
 BuildRequires:  pkgconfig(libprojectM-qt5) >= 2.0.0
 %else
 BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
@@ -214,13 +217,9 @@ BuildRequires:  pkgconfig(ncursesw)
 %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
 BuildRequires:  pkgconfig(fdk-aac)
 BuildRequires:  pkgconfig(libdca) >= 0.0.5
-BuildRequires:  pkgconfig(libpostproc)
-BuildRequires:  pkgconfig(vdpau) >= 0.6
 BuildRequires:  pkgconfig(x264) >= 0.8.6
 BuildRequires:  pkgconfig(x265)
 %endif
@@ -242,9 +241,7 @@ Summary:        Development files for the VLC media player system
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       %{name}-jack = %{version}
- %if 0%{?BUILD_ORIG}
 Requires:       %{name}-vdpau = %{version}
-%endif
 
 %description devel
 These development headers are required if you plan on coding against VLC.
@@ -330,10 +327,10 @@ This package adds jack support to vlc via plugins.
 %if 0%{?BUILD_ORIG}
 %package codecs
 Summary:        Additional codecs for the VLC media player
-# We require the unrestricted libavcodec - same ABI version we linked
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted)
 Requires:       %{name}-noX = %{version}
+# We require the unrestricted libavcodec - same ABI version we linked
+Requires:       %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted)
 # We need the noX package first, as it contains vlc-cache-gen
 Requires(post): %{name}-noX
 Supplements:    %{name}-noX
@@ -342,12 +339,12 @@ Supplements:    %{name}-noX
 This package enhances the functionality of the VLC media player by
 codecs that are not available in the stock openSUSE distribution.
 
+%endif
+
 %package vdpau
 Summary:        Additional vdpau codecs for the VLC media player
 # We require the unrestricted libavcodec - same ABI version we linked
 Group:          Productivity/Multimedia/Video/Players
-Requires:       %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted)
-Requires:       %{name}-codecs = %{version}
 Requires:       %{name}-noX = %{version}
 # We need the noX package first, as it contains vlc-cache-gen
 Requires(post): %{name}-noX
@@ -357,8 +354,6 @@ Supplements:    %{name}-noX
 This package enhances the functionality of the VLC media player by
 vdpau codecs that are not available in the stock openSUSE distribution.
 
-%endif
-
 %package qt
 Summary:        Qt interface for the VLC media player
 Group:          Productivity/Multimedia/Video/Players
@@ -377,7 +372,7 @@ default when `vlc` is invoked from an X session.
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550
 %patch100 -p1
 %endif
 %patch101 -p1
@@ -408,15 +403,18 @@ export CXX=%{_bindir}/g++-7
 autoreconf -fiv
 %configure \
    --disable-dependency-tracking        \
-   --enable-aa                          \
+   --disable-oss                        \
+   --disable-svgdec                     \
    --enable-a52                         \
+   --enable-aa                          \
    --enable-alsa                        \
+   --enable-avcodec                     \
    --enable-chromecast                  \
    --enable-dvbpsi                      \
    --enable-dvdnav                      \
    --enable-dvdread                     \
-   --enable-flac                        \
    --enable-fast-install                \
+   --enable-flac                        \
    --enable-freetype                    \
    --enable-fribidi                     \
    --enable-gnutls                      \
@@ -424,64 +422,54 @@ autoreconf -fiv
    --enable-kate                        \
    --enable-libass                      \
    --enable-libcddb                     \
-   --enable-mad                         \
    --enable-libmpeg2                    \
-%if 0%{?is_opensuse}
-   --enable-opencv                      \
-%endif
-   --enable-sftp                        \
-   --disable-svgdec                     \
-%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
-   --enable-swscale                     \
-%else
-   --disable-swscale                    \
-%endif
-%if 0%{?BUILD_ORIG}
-   --enable-postproc                    \
-   --enable-faad                        \
-   --enable-fdkaac                      \
-   --enable-dca                         \
-   --enable-x265                        \
-%else
-   --disable-postproc                   \
-   --disable-faad                       \
-   --disable-fdkaac                     \
-   --disable-dca                        \
-   --disable-x265                       \
-%endif
-   --enable-avcodec                     \
    --enable-lirc                        \
    --enable-live555                     \
    --enable-lua                         \
+   --enable-mad                         \
    --enable-mod                         \
    --enable-ogg                         \
    --enable-optimizations               \
-   --disable-oss                        \
+   --enable-postproc                    \
    --enable-pulse                       \
    --enable-realrtsp                    \
+   --enable-sftp                        \
    --enable-sout                        \
    --enable-speex                       \
+   --enable-swscale                     \
    --enable-taglib                      \
    --enable-theora                      \
    --enable-twolame                     \
    --enable-v4l2                        \
    --enable-vcd                         \
+   --enable-vdpau                       \
    --enable-vorbis                      \
+   --enable-xcb                         \
+   --enable-xvideo                      \
+   --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
+   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf \
+%if %{with opengles}
+  --enable-gles2                        \
+%endif
+%if 0%{?is_opensuse}
+   --enable-opencv                      \
+%endif
 %if 0%{?suse_version} >= 1500 && 0%{?is_opensuse}
   --enable-wayland                      \
 %else
   --disable-wayland                     \
-%endif
-   --enable-xcb                         \
-%if %{with opengles}
-  --enable-gles2                        \
 %endif
 %if 0%{?BUILD_ORIG}
-   --enable-vdpau                       \
+   --enable-fdkaac                      \
+   --enable-dca                         \
+   --enable-x265                        \
+%else
+   --disable-faad                       \
+   --disable-fdkaac                     \
+   --disable-dca                        \
+   --disable-x265                       \
 %endif
-   --enable-xvideo                      \
+	%{nil}
-   --with-default-font=%{_datadir}/fonts/truetype/FreeSerifBold.ttf \
-   --with-default-monospace-font=%{_datadir}/fonts/truetype/FreeMono.ttf
 
 # make sure the build hostname is not embedded in the binaries -- or we'll
 # continuously republish packages -- seife
@@ -552,13 +540,13 @@ done
 
 %postun -n %{name}-codecs
 %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
+%endif
 
 %post -n %{name}-vdpau
 %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
 
 %postun -n %{name}-vdpau
 %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
-%endif
 
 %files
 %exclude %{_libdir}/vlc/libcompat.a
@@ -604,9 +592,7 @@ done
 %endif
 %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
 %{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so
-%if 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
 %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so
-%endif
 %if 0%{?is_opensuse}
 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
@@ -756,6 +742,7 @@ done
 %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
 %{_libdir}/vlc/plugins/access/liblive555_plugin.so
+%{_libdir}/vlc/plugins/access/libnfs_plugin.so
 %if 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 )
 %{_libdir}/vlc/plugins/access/librdp_plugin.so
 %endif
@@ -804,6 +791,7 @@ done
 %{_libdir}/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libscaletempo_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
+%{_libdir}/vlc/plugins/audio_filter/libsoxr_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
 %{_libdir}/vlc/plugins/audio_filter/libstereo_widen_plugin.so
@@ -819,6 +807,7 @@ done
 %{_libdir}/vlc/plugins/codec/liba52_plugin.so
 %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
 %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
+%{_libdir}/vlc/plugins/codec/libaom_plugin.so
 %{_libdir}/vlc/plugins/codec/libaraw_plugin.so
 %{_libdir}/vlc/plugins/codec/libcc_plugin.so
 %{_libdir}/vlc/plugins/codec/libcdg_plugin.so
@@ -1065,6 +1054,7 @@ done
 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
 %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libripple_plugin.so
@@ -1105,16 +1095,6 @@ done
 %{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so
 %endif
 
-%if 0%{?BUILD_ORIG}
-%files codecs
-%{_libdir}/vlc/plugins/codec/libdca_plugin.so
-%{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so
-%{_libdir}/vlc/plugins/codec/libfaad_plugin.so
-%{_libdir}/vlc/plugins/codec/libx264_plugin.so
-%{_libdir}/vlc/plugins/codec/libx26410b_plugin.so
-%{_libdir}/vlc/plugins/codec/libx265_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
-
 %files vdpau
 %dir %{_libdir}/vlc/plugins/vdpau
 %{_libdir}/vlc/libvlc_vdpau.so.0
@@ -1126,7 +1106,6 @@ done
 %{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so
 %{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
 %{_libdir}/vlc/plugins/video_output/libglconv_vdpau_plugin.so
-%endif
 
 %files -n libvlc%{libvlc}
 %{_libdir}/libvlc.so.%{libvlc}*
@@ -1146,8 +1125,15 @@ done
 %{_libdir}/pkgconfig/libvlc.pc
 %{_libdir}/pkgconfig/vlc-plugin.pc
 %{_libdir}/vlc/libcompat.a
-%if 0%{?BUILD_ORIG}
 %{_libdir}/vlc/libvlc_vdpau.so
+
+%if 0%{?BUILD_ORIG}
+%files codecs
+%{_libdir}/vlc/plugins/codec/libdca_plugin.so
+%{_libdir}/vlc/plugins/codec/libfdkaac_plugin.so
+%{_libdir}/vlc/plugins/codec/libx264_plugin.so
+%{_libdir}/vlc/plugins/codec/libx26410b_plugin.so
+%{_libdir}/vlc/plugins/codec/libx265_plugin.so
 %endif
 
 %changelog