- release 3 (by relup.sh)

[packages/vlc.git] / vlc.spec

diff --git a/vlc.spec b/vlc.spec
index 4e6b8a7ce14989352e4e8a055ae9673463610f67..5aa20027ef57ee176cbababa17a6327eb340e867 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -24,6 +24,7 @@
 %bcond_without directfb        # directfb video output plugin
 %bcond_without dv              # dv access plugins
 %bcond_with    fdk_aac         # FDK-AAC encoder plugin (GPL 3 incompatible; enable as subpackage?)
+%bcond_with    freerdp         # RDP/Remote Desktop client support
 %bcond_with    glesv1          # OpenGL ES v1 support
 %bcond_with    glesv2          # OpenGL ES v2 support
 %bcond_without gnomevfs        # gnomevfs access plugin
@@ -63,18 +64,18 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       2.2.1
+Version:       2.2.4
 Release:       3
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 42273945758b521c408fabc7fd6d9946
+# Source0-md5: 55666c9898f658c7fcca12725bf7dd1b
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-system-minizip.patch
 Patch3:                xmas-sucks.patch
-
-Patch7:                no-cache.patch
+Patch4:                ffmpeg3.patch
+Patch5:                no-cache.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
@@ -103,7 +104,7 @@ BuildRequires:      ffmpeg-devel >= 0.4.9-4.20080131.1
 BuildRequires: flac-devel >= 1.1.3
 BuildRequires: fluidsynth-devel >= 1.1.2
 BuildRequires: fontconfig-devel
-BuildRequires: freerdp-devel >= 1.0.1
+%{?with_freerdp:BuildRequires: freerdp-devel >= 1.0.1}
 BuildRequires: freetype-devel >= 2
 BuildRequires: fribidi-devel
 BuildRequires: game-music-emu-devel
@@ -341,8 +342,8 @@ Akcje klienta VLC dla Solid.
 %if %{without xmas}
 %patch3 -p1
 %endif
-
-%patch7 -p1
+%patch4 -p1
+%patch5 -p1
 
 sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
 
@@ -382,6 +383,7 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        %{?with_fdk_aac:--enable-fdkaac} \
        --enable-faad \
        --enable-flac \
+       %{?with_freerdp:--enable-freerdp}%{!?with_freerdp:--disable-freerdp} \
        --enable-freetype \
        --enable-fribidi \
        %{?with_glesv1:--enable-gles1} \
@@ -423,7 +425,7 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        %{!?with_vsxu:--disable-vsxu} \
        %{!?with_x264:--disable-x264} \
        %{!?with_x265:--disable-x265} \
-       %{!?with_kde:--without-kde-solid}
+       %{!?with_kde:--without-kde-solid}%{?with_kde:--with-kde-solid=%{_datadir}/apps/solid/actions}
 
 %{__make}
 
@@ -446,6 +448,7 @@ ln -sf %{_libdir}/vlc $RPM_BUILD_ROOT%{_prefix}/lib
 find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.l?a$' | xargs %{__rm}
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks_IN,ks}
 # unsupported:
 # ach (Acoli)
 # cgg (Chiga)
@@ -568,7 +571,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libsdp_plugin.so
 # R: freerdp >= 1.0.1
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/librdp_plugin.so
+%{?with_freerdp:%attr(755,root,root) %{_libdir}/vlc/plugins/access/librdp_plugin.so}
 # R: libgcrypt >= 1.1.94 (optional, for srtp functionality)
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/librtp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libtimecode_plugin.so