unconditionally enable swscale

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

vlc.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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

@@ -124,6 +124,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
@@ -280,25 +283,24 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse"
    --enable-libproxy                    \
 %endif
    --enable-lirc                        \
+   --enable-swscale                     \
 %if 0%{?BUILD_ORIG}
    --enable-libmpeg2                    \
    --enable-live555                     \
    --enable-mad                         \
-   --enable-avcodec \
+   --enable-avcodec                     \
-   --enable-swscale \
+   --enable-postproc                    \
-   --enable-postproc \
+   --enable-faad                        \
-   --enable-faad \
+   --enable-a52                         \
-   --enable-a52 \
    --enable-dca                         \
 %else
-   --disable-libmpeg2 \
+   --disable-libmpeg2                   \
-   --disable-live555 \
+   --disable-live555                    \
-   --disable-mad \
+   --disable-mad                        \
-   --disable-avcodec \
+   --disable-avcodec                    \
-   --disable-swscale \
+   --disable-postproc                   \
-   --disable-postproc \
+   --disable-faad                       \
-   --disable-faad \
+   --disable-a52                        \
-   --disable-a52 \
    --disable-dca                        \
 %endif
    --enable-lua                         \
@@ -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
@@ -813,7 +816,6 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_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}