Accepting request 174758 from multimedia:libs

Forward latest fixes - unconditionally use libswscale and live555, as they entered Factory

OBS-URL: https://build.opensuse.org/request/show/174758
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=4

vlc.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue May  7 13:22:21 UTC 2013 - dimstar@opensuse.org
+
+- Move live555-devel BuildRequires to the unconditional area:
+  live555 has been added to Factory and is safe for distribution.
+- Move the live555 demuxer from vlc-codecs to vlc-noX.
+- Add unconditional --enable-live555 parameter to configure, and
+  remove the conditional enable/remove-live555, based on BUILD_ORIG.
+
+-------------------------------------------------------------------
+Thu May  2 18:19:13 UTC 2013 - dimstar@opensuse.org
+
+- Add pkgconfig(libswscale) BuildRequires: improve the quality of
+  the video filters.
+- Unconditionally pass --enable-swscale to configure.
+- Move the swscale videofilter out of the -codecs package to the
+  -noX package.
+
 -------------------------------------------------------------------
 Thu Apr 25 09:45:55 UTC 2013 - dimstar@opensuse.org
 

vlc.spec

@@ -101,6 +101,7 @@ BuildRequires:  libva-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  lirc-devel
+BuildRequires:  live555-devel
 %if 0%{?suse_version} >= 1220
 BuildRequires:  lua51-devel
 %else
@@ -124,6 +125,9 @@ BuildRequires:  taglib-devel
 BuildRequires:  vcdimager-devel
 BuildRequires:  xosd-devel
 BuildRequires:  zvbi-devel
+# This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations
+# and can favor one over the other.
+BuildRequires:  pkgconfig(libswscale)
 
 # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly
 BuildRequires:  findutils
@@ -141,7 +145,6 @@ BuildRequires:  libmpeg2-devel
 BuildRequires:  libtwolame-devel
 BuildRequires:  libx264-devel
 BuildRequires:  libxvidcore-devel
-BuildRequires:  live555-devel
 %endif
 
 Requires:       %{name}-noX = %{version}-%{release}
@@ -280,25 +283,23 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse"
    --enable-libproxy                    \
 %endif
    --enable-lirc                        \
+   --enable-swscale                     \
+   --enable-live555                     \
 %if 0%{?BUILD_ORIG}
    --enable-libmpeg2                    \
-   --enable-live555                     \
    --enable-mad                         \
-   --enable-avcodec \
-   --enable-swscale \
-   --enable-postproc \
-   --enable-faad \
-   --enable-a52 \
+   --enable-avcodec                     \
+   --enable-postproc                    \
+   --enable-faad                        \
+   --enable-a52                         \
    --enable-dca                         \
 %else
-   --disable-libmpeg2 \
-   --disable-live555 \
-   --disable-mad \
-   --disable-avcodec \
-   --disable-swscale \
-   --disable-postproc \
-   --disable-faad \
-   --disable-a52 \
+   --disable-libmpeg2                   \
+   --disable-mad                        \
+   --disable-avcodec                    \
+   --disable-postproc                   \
+   --disable-faad                       \
+   --disable-a52                        \
    --disable-dca                        \
 %endif
    --enable-lua                         \
@@ -629,6 +630,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
 %{_libdir}/vlc/plugins/demux/libh264_plugin.so
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
+%{_libdir}/vlc/plugins/demux/liblive555_plugin.so
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
@@ -783,6 +785,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libwall_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
@@ -811,9 +814,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
 %{_libdir}/vlc/plugins/codec/libx264_plugin.so
 %{_libdir}/vlc/plugins/demux/libavformat_plugin.so
-%{_libdir}/vlc/plugins/demux/liblive555_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so
 %endif
 
 %files -n libvlc%{libvlc}