Accepting request 200846 from home:dimstar:branches:multimedia:libs

- Update to version 2.1.0:
  + Important changes:
    - The licenses of numerous modules have changed from GPLv2+ to
      LGPLv2.1+.
    - Discontinued support for PowerPC-based Macs; VLC now requires
      Mac OS X 10.6+.
    - The --with-tuning and --without-tuning options are removed;
      to tune compilation for a specific processor type, set CFLAGS
      manually.
  + LOTS of updates all over. See NEWS for a full overview.
- Rebase fix_font_path.patch.
- Rebase 0001-no-return-in-non-void.patch.
- Drop vlc-avcodec-encoder-single-threaded.patch: fixed upstream.
- Drop ppc64_altivec.patch: fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/200846
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=41
This commit is contained in:
Marcus Rückert 2013-09-26 16:41:07 +00:00 committed by Git OBS Bridge
parent 910bbdad05
commit 851922f51f
8 changed files with 86 additions and 108 deletions

View File

@ -10,10 +10,10 @@ index 15586cc..c1a16b7 100644
} }
static void KeepAliveStart( access_t *p_access ) static void KeepAliveStart( access_t *p_access )
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index a3357d6..1ede179 100644 index a3357d6..1ede179 100644
--- a/modules/demux/live555.cpp --- a/modules/access/live555.cpp
+++ b/modules/demux/live555.cpp +++ b/modules/access/live555.cpp
@@ -1975,6 +1975,7 @@ static void* TimeoutPrevention( void *p_data ) @@ -1975,6 +1975,7 @@ static void* TimeoutPrevention( void *p_data )
msleep (((int64_t)p_timeout->p_sys->i_timeout - 2) * CLOCK_FREQ); msleep (((int64_t)p_timeout->p_sys->i_timeout - 2) * CLOCK_FREQ);
} }

View File

@ -1,13 +1,16 @@
diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c Index: vlc-2.1.0/modules/text_renderer/freetype.c
index fcfe9a8..dfea2e7 100644 ===================================================================
--- a/modules/text_renderer/freetype.c --- vlc-2.1.0.orig/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c +++ vlc-2.1.0/modules/text_renderer/freetype.c
@@ -52,7 +52,7 @@ @@ -67,9 +67,9 @@
# define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" # define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf"
# define DEFAULT_FAMILY "Nokia Sans Bold" # define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Droid Sans Mono"
#else #else
-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" -# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf" +# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf"
# define DEFAULT_FAMILY "Serif Bold" # define SYSTEM_DEFAULT_FAMILY "Serif Bold"
-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
+# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/FreeMono.ttf"
# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monospace"
#endif #endif

View File

@ -1,11 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1371,7 +1371,7 @@ AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_arm_neon}" = "yes"])
AC_ARG_ENABLE(altivec,
[AS_HELP_STRING([--disable-altivec],
[disable AltiVec optimizations (default auto)])],, [
- AS_IF([test "${host_cpu}" = "powerpc"],
+ AS_CASE(["${host_cpu}"], [powerpc*],
[enable_altivec=yes], [enable_altivec=no])
])
have_altivec="no"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05215f34c487723c84ebb54ab43b836fc70fb466326f7c601847141a499034d2
size 18859964

3
vlc-2.1.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7
size 19571224

View File

@ -1,23 +0,0 @@
From 5a43de506f31e1fa5460f8b62e25a1d640136597 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Tue, 28 May 2013 11:29:07 +0200
Subject: [PATCH] avcodec encoder: disable multithreading
More work is needed before we can support it
Close #8544
---
modules/codec/avcodec/encoder.c | 1 +
1 file changed, 1 insertion(+)
Index: vlc-2.0.8/modules/codec/avcodec/encoder.c
===================================================================
--- vlc-2.0.8.orig/modules/codec/avcodec/encoder.c
+++ vlc-2.0.8/modules/codec/avcodec/encoder.c
@@ -354,6 +354,7 @@ int OpenEncoder( vlc_object_t *p_this )
#endif
p_sys->p_context = p_context;
p_sys->p_context->codec_id = p_sys->p_codec->id;
+ p_context->thread_type = 0;
p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
p_context->opaque = (void *)p_this;

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Sep 25 19:38:09 UTC 2013 - dimstar@opensuse.org
- Update to version 2.1.0:
+ Important changes:
- The licenses of numerous modules have changed from GPLv2+ to
LGPLv2.1+.
- Discontinued support for PowerPC-based Macs; VLC now requires
Mac OS X 10.6+.
- The --with-tuning and --without-tuning options are removed;
to tune compilation for a specific processor type, set CFLAGS
manually.
+ LOTS of updates all over. See NEWS for a full overview.
- Rebase fix_font_path.patch.
- Rebase 0001-no-return-in-non-void.patch.
- Drop vlc-avcodec-encoder-single-threaded.patch: fixed upstream.
- Drop ppc64_altivec.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 21 13:08:45 UTC 2013 - dimstar@opensuse.org Sat Sep 21 13:08:45 UTC 2013 - dimstar@opensuse.org

107
vlc.spec
View File

@ -20,25 +20,22 @@
%define pulseplugin 0%{suse_version} > 1130 %define pulseplugin 0%{suse_version} > 1130
%define withxcb 0%{suse_version} > 1131 %define withxcb 0%{suse_version} > 1131
%define libvlc 5 %define libvlc 5
%define libvlccore 5 %define libvlccore 7
%define conflicts vlc-beta %define conflicts vlc-beta
# Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse) # Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse)
%define with_ncurses 0 %define with_ncurses 0
Summary: VLC - Video Lan Client Summary: VLC - Video Lan Client
License: GPL-2.0+ License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Name: vlc Name: vlc
Version: 2.0.8a Version: 2.1.0
Release: 0 Release: 0
%define _version 2.0.8 %define _version 2.1.0
Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}a.tar.xz Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
Patch1: fix_font_path.patch Patch1: fix_font_path.patch
Patch3: 0001-no-return-in-non-void.patch Patch3: 0001-no-return-in-non-void.patch
# PATCH-FIX-UPSTREAM vlc-avcodec-encoder-single-threaded.patch dimstar@opensuse.org -- Disable avcodec encoder multithreading for now, taken from git.
Patch4: vlc-avcodec-encoder-single-threaded.patch
Patch5: ppc64_altivec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: aalib-devel BuildRequires: aalib-devel
BuildRequires: alsa-devel BuildRequires: alsa-devel
@ -163,6 +160,7 @@ in IPv4 or IPv6 on a high-bandwidth network.
%package devel %package devel
Summary: VLC Development system Summary: VLC Development system
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -171,6 +169,7 @@ Those development headers are required if you plan on coding against VLC
%package -n libvlc%{libvlc} %package -n libvlc%{libvlc}
Summary: Shared library libvlc Summary: Shared library libvlc
License: LGPL-2.1+
Group: System/Libraries Group: System/Libraries
%description -n libvlc%{libvlc} %description -n libvlc%{libvlc}
@ -178,6 +177,7 @@ Shared library libvlc. To be installed by system dependencies
%package -n libvlccore%{libvlccore} %package -n libvlccore%{libvlccore}
Summary: Shared library libvlc Summary: Shared library libvlc
License: LGPL-2.1+
Group: System/Libraries Group: System/Libraries
%description -n libvlccore%{libvlccore} %description -n libvlccore%{libvlccore}
@ -185,6 +185,7 @@ Shared library libvlc. To be installed by system dependencies
%package noX %package noX
Summary: VLC: VideoLAN Client - without X dependencies Summary: VLC: VideoLAN Client - without X dependencies
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Requires: libvlc%{libvlc} = %{version}-%{release} Requires: libvlc%{libvlc} = %{version}-%{release}
Requires: libvlccore%{libvlccore} = %{version}-%{release} Requires: libvlccore%{libvlccore} = %{version}-%{release}
@ -202,6 +203,7 @@ installed as a dependency.
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%package codecs %package codecs
Summary: VLC: VideoLAN Client - Codec extension Summary: VLC: VideoLAN Client - Codec extension
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Requires: vlc-noX = %{version} Requires: vlc-noX = %{version}
Supplements: vlc-noX Supplements: vlc-noX
@ -213,6 +215,7 @@ Codecs that are not available in a stock openSUSE distribution.
%package qt %package qt
Summary: VLC: VideoLAN Client - Qt interface Summary: VLC: VideoLAN Client - Qt interface
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Supplements: packageand(%{name}-noX:libqt4) Supplements: packageand(%{name}-noX:libqt4)
Requires: %{name}-noX = %{version}-%{release} Requires: %{name}-noX = %{version}-%{release}
@ -223,6 +226,7 @@ The all new Qt interface for the VLC VideoLAN Client.
%package gnome %package gnome
Summary: VLC: VideoLAN Client - Gnome Access Modules Summary: VLC: VideoLAN Client - Gnome Access Modules
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
Supplements: packageand(%{name}-noX:gnome-vfs2) Supplements: packageand(%{name}-noX:gnome-vfs2)
Requires: %{name}-noX = %{version}-%{release} Requires: %{name}-noX = %{version}-%{release}
@ -235,6 +239,7 @@ for gnome-vfs2.
%if 0%{pulseplugin} %if 0%{pulseplugin}
%package aout-pulse %package aout-pulse
Summary: VLC Audio Out for Pulse Audio Summary: VLC Audio Out for Pulse Audio
License: GPL-2.0+ and LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Supplements: packageand(%{name}-noX:pulseaudio) Supplements: packageand(%{name}-noX:pulseaudio)
@ -246,33 +251,24 @@ Extends VLC with Pulse Audio Support for Audio Out
%endif %endif
%prep %prep
echo '********* ENTERED PREP PHASE ********'
date
%setup -q -n %{name}-%{_version} %setup -q -n %{name}-%{_version}
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
rm -rf contrib rm -rf contrib
echo '********* ENDED PREP PHASE *********'
date
%build %build
echo '********* BOOTSTRAPPING *********'
date
pkg-config --exists smbclient && pkg-config --exists smbclient &&
smbclient=$(pkg-config --cflags smbclient) smbclient=$(pkg-config --cflags smbclient)
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
export CFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient"
%else %else
export CFLAGS="%{optflags} -L%{_libdir}/live $smbclient" export CFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
export CXXFLAGS="%{optflags} -L%{_libdir}/live $smbclient" export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
%endif %endif
# Needed for patch5
autoreconf -fi
%configure \ %configure \
--disable-static \
--disable-dependency-tracking \ --disable-dependency-tracking \
--enable-aa \ --enable-aa \
--enable-alsa \ --enable-alsa \
@ -328,7 +324,7 @@ autoreconf -fi
--enable-ogg \ --enable-ogg \
--enable-optimizations \ --enable-optimizations \
--enable-opus \ --enable-opus \
--enable-oss \ --disable-oss \
--enable-png \ --enable-png \
%if 0%{pulseplugin} %if 0%{pulseplugin}
--enable-pulse \ --enable-pulse \
@ -357,9 +353,7 @@ autoreconf -fi
--disable-xcb \ --disable-xcb \
%endif %endif
--enable-xvideo --enable-xvideo
echo '********* FINISHED CONFIGURE *********' make %{?_smp_mflags}
date
%{__make} %{?jobs:-j %jobs} V=1
%install %install
echo '********* ENTERED INSTALL PHASE *********' echo '********* ENTERED INSTALL PHASE *********'
@ -368,6 +362,7 @@ date
mkdir -p %{buildroot}/%{_datadir}/pixmaps mkdir -p %{buildroot}/%{_datadir}/pixmaps
ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
find %{buildroot} -name *.la -delete find %{buildroot} -name *.la -delete
rm %{buildroot}%{_libdir}/vlc/libcompat.a
%suse_update_desktop_file vlc AudioPlayer VideoPlayer Player %suse_update_desktop_file vlc AudioPlayer VideoPlayer Player
%fdupes %{buildroot}%{_datadir}/vlc %fdupes %{buildroot}%{_datadir}/vlc
@ -426,6 +421,7 @@ rm -rf "$RPM_BUILD_ROOT"
%ghost %{_libdir}/vlc/plugins/plugins.dat %ghost %{_libdir}/vlc/plugins/plugins.dat
%dir %{_libdir}/vlc %dir %{_libdir}/vlc
%dir %{_libdir}/vlc/lua %dir %{_libdir}/vlc/lua
%dir %{_libdir}/vlc/lua/extensions
%dir %{_libdir}/vlc/lua/intf %dir %{_libdir}/vlc/lua/intf
%dir %{_libdir}/vlc/lua/intf/modules %dir %{_libdir}/vlc/lua/intf/modules
%dir %{_libdir}/vlc/lua/meta %dir %{_libdir}/vlc/lua/meta
@ -436,9 +432,6 @@ rm -rf "$RPM_BUILD_ROOT"
%dir %{_libdir}/vlc/lua/playlist %dir %{_libdir}/vlc/lua/playlist
%dir %{_libdir}/vlc/lua/sd %dir %{_libdir}/vlc/lua/sd
%dir %{_libdir}/vlc/plugins %dir %{_libdir}/vlc/plugins
%ifarch %{ix86} x86_64
%dir %{_libdir}/vlc/plugins/3dnow
%endif
%ifarch ppc ppc64 %ifarch ppc ppc64
%dir %{_libdir}/vlc/plugins/altivec %dir %{_libdir}/vlc/plugins/altivec
%endif %endif
@ -456,7 +449,6 @@ rm -rf "$RPM_BUILD_ROOT"
%dir %{_libdir}/vlc/plugins/misc %dir %{_libdir}/vlc/plugins/misc
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%dir %{_libdir}/vlc/plugins/mmx %dir %{_libdir}/vlc/plugins/mmx
%dir %{_libdir}/vlc/plugins/mmxext
%endif %endif
%dir %{_libdir}/vlc/plugins/mux %dir %{_libdir}/vlc/plugins/mux
%dir %{_libdir}/vlc/plugins/notify %dir %{_libdir}/vlc/plugins/notify
@ -474,10 +466,10 @@ rm -rf "$RPM_BUILD_ROOT"
%dir %{_libdir}/vlc/plugins/visualization %dir %{_libdir}/vlc/plugins/visualization
# Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg. # Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/vlc-cache-gen
%{_libdir}/vlc/lua/extensions/VLSub.luac
%{_libdir}/vlc/lua/intf/cli.luac %{_libdir}/vlc/lua/intf/cli.luac
%{_libdir}/vlc/lua/intf/dummy.luac %{_libdir}/vlc/lua/intf/dummy.luac
%{_libdir}/vlc/lua/intf/dumpmeta.luac %{_libdir}/vlc/lua/intf/dumpmeta.luac
%{_libdir}/vlc/lua/intf/hotkeys.luac
%{_libdir}/vlc/lua/intf/http.luac %{_libdir}/vlc/lua/intf/http.luac
%{_libdir}/vlc/lua/intf/luac.luac %{_libdir}/vlc/lua/intf/luac.luac
%{_libdir}/vlc/lua/intf/modules/common.luac %{_libdir}/vlc/lua/intf/modules/common.luac
@ -509,6 +501,7 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/lua/playlist/katsomo.luac %{_libdir}/vlc/lua/playlist/katsomo.luac
%{_libdir}/vlc/lua/playlist/koreus.luac %{_libdir}/vlc/lua/playlist/koreus.luac
%{_libdir}/vlc/lua/playlist/lelombrik.luac %{_libdir}/vlc/lua/playlist/lelombrik.luac
%{_libdir}/vlc/lua/playlist/liveleak.luac
%{_libdir}/vlc/lua/playlist/metacafe.luac %{_libdir}/vlc/lua/playlist/metacafe.luac
%{_libdir}/vlc/lua/playlist/metachannels.luac %{_libdir}/vlc/lua/playlist/metachannels.luac
%{_libdir}/vlc/lua/playlist/mpora.luac %{_libdir}/vlc/lua/playlist/mpora.luac
@ -521,13 +514,9 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/lua/playlist/youtube_homepage.luac %{_libdir}/vlc/lua/playlist/youtube_homepage.luac
%{_libdir}/vlc/lua/playlist/zapiks.luac %{_libdir}/vlc/lua/playlist/zapiks.luac
%{_libdir}/vlc/lua/sd/fmc.luac %{_libdir}/vlc/lua/sd/fmc.luac
%{_libdir}/vlc/lua/sd/freebox.luac
%{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/icecast.luac
%{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/lua/sd/jamendo.luac
%{_libdir}/vlc/lua/sd/metachannels.luac %{_libdir}/vlc/lua/sd/metachannels.luac
%ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/3dnow/libmemcpy3dn_plugin.so
%endif
%ifarch ppc ppc64 %ifarch ppc ppc64
%{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so %{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so
%{_libdir}/vlc/plugins/altivec/libmemcpyaltivec_plugin.so %{_libdir}/vlc/plugins/altivec/libmemcpyaltivec_plugin.so
@ -535,17 +524,14 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_attachment_plugin.so %{_libdir}/vlc/plugins/access/libaccess_attachment_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_dv_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_ftp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_ftp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_http_plugin.so %{_libdir}/vlc/plugins/access/libaccess_http_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so %{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_oss_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_rar_plugin.so %{_libdir}/vlc/plugins/access/libaccess_rar_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_shm_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so %{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so
@ -553,18 +539,22 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/access/libcdda_plugin.so %{_libdir}/vlc/plugins/access/libcdda_plugin.so
%{_libdir}/vlc/plugins/access/libdc1394_plugin.so %{_libdir}/vlc/plugins/access/libdc1394_plugin.so
%{_libdir}/vlc/plugins/access/libdtv_plugin.so %{_libdir}/vlc/plugins/access/libdtv_plugin.so
%{_libdir}/vlc/plugins/access/libdv1394_plugin.so
%{_libdir}/vlc/plugins/access/libdvb_plugin.so
%{_libdir}/vlc/plugins/access/libdvdnav_plugin.so %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
%{_libdir}/vlc/plugins/access/libdvdread_plugin.so %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
%{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
%{_libdir}/vlc/plugins/access/libidummy_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so
%{_libdir}/vlc/plugins/access/liblibbluray_plugin.so %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
%{_libdir}/vlc/plugins/access/liblive555_plugin.so
%{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
%{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
%{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
%{_libdir}/vlc/plugins/access/libpvr_plugin.so
%{_libdir}/vlc/plugins/access/librtp_plugin.so %{_libdir}/vlc/plugins/access/librtp_plugin.so
%{_libdir}/vlc/plugins/access/libsdp_plugin.so %{_libdir}/vlc/plugins/access/libsdp_plugin.so
%{_libdir}/vlc/plugins/access/libshm_plugin.so
%{_libdir}/vlc/plugins/access/libstream_filter_rar_plugin.so %{_libdir}/vlc/plugins/access/libstream_filter_rar_plugin.so
%{_libdir}/vlc/plugins/access/libtimecode_plugin.so
%{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libv4l2_plugin.so
%{_libdir}/vlc/plugins/access/libvcd_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
@ -581,30 +571,31 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so %{_libdir}/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libchorus_flanger_plugin.so %{_libdir}/vlc/plugins/audio_filter/libchorus_flanger_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libcompressor_plugin.so %{_libdir}/vlc/plugins/audio_filter/libcompressor_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libconverter_fixed_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so %{_libdir}/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libdtstospdif_plugin.so %{_libdir}/vlc/plugins/audio_filter/libdtstospdif_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libequalizer_plugin.so %{_libdir}/vlc/plugins/audio_filter/libequalizer_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libgain_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so %{_libdir}/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libkaraoke_plugin.so %{_libdir}/vlc/plugins/audio_filter/libkaraoke_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so %{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so %{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so %{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libremap_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so %{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libscaletempo_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/libsimple_channel_mixer_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so %{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so %{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libstereo_widen_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so %{_libdir}/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libugly_resampler_plugin.so %{_libdir}/vlc/plugins/audio_filter/libugly_resampler_plugin.so
%{_libdir}/vlc/plugins/audio_mixer/libfixed32_mixer_plugin.so %{_libdir}/vlc/plugins/audio_mixer/libfloat_mixer_plugin.so
%{_libdir}/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.so %{_libdir}/vlc/plugins/audio_mixer/libinteger_mixer_plugin.so
%{_libdir}/vlc/plugins/audio_output/libadummy_plugin.so %{_libdir}/vlc/plugins/audio_output/libadummy_plugin.so
%{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so %{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so
%{_libdir}/vlc/plugins/audio_output/libamem_plugin.so %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so
%{_libdir}/vlc/plugins/audio_output/libaout_file_plugin.so %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%{_libdir}/vlc/plugins/audio_output/liboss_plugin.so
%{_libdir}/vlc/plugins/codec/liba52_plugin.so %{_libdir}/vlc/plugins/codec/liba52_plugin.so
%{_libdir}/vlc/plugins/codec/libadpcm_plugin.so %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
%{_libdir}/vlc/plugins/codec/libaes3_plugin.so %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
@ -618,24 +609,27 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
%{_libdir}/vlc/plugins/codec/libedummy_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_plugin.so
%{_libdir}/vlc/plugins/codec/libflac_plugin.so %{_libdir}/vlc/plugins/codec/libflac_plugin.so
%{_libdir}/vlc/plugins/codec/libg711_plugin.so
%{_libdir}/vlc/plugins/codec/libkate_plugin.so %{_libdir}/vlc/plugins/codec/libkate_plugin.so
%{_libdir}/vlc/plugins/codec/liblpcm_plugin.so %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
%{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so
%{_libdir}/vlc/plugins/codec/libopus_plugin.so %{_libdir}/vlc/plugins/codec/libopus_plugin.so
%{_libdir}/vlc/plugins/codec/libpng_plugin.so %{_libdir}/vlc/plugins/codec/libpng_plugin.so
%{_libdir}/vlc/plugins/codec/librawvideo_plugin.so %{_libdir}/vlc/plugins/codec/librawvideo_plugin.so
%{_libdir}/vlc/plugins/codec/librealvideo_plugin.so
%{_libdir}/vlc/plugins/codec/libschroedinger_plugin.so %{_libdir}/vlc/plugins/codec/libschroedinger_plugin.so
%{_libdir}/vlc/plugins/codec/libspeex_plugin.so %{_libdir}/vlc/plugins/codec/libspeex_plugin.so
%{_libdir}/vlc/plugins/codec/libspudec_plugin.so %{_libdir}/vlc/plugins/codec/libspudec_plugin.so
%{_libdir}/vlc/plugins/codec/libstl_plugin.so %{_libdir}/vlc/plugins/codec/libstl_plugin.so
%{_libdir}/vlc/plugins/codec/libscte27_plugin.so
%{_libdir}/vlc/plugins/codec/libsubsdec_plugin.so %{_libdir}/vlc/plugins/codec/libsubsdec_plugin.so
%{_libdir}/vlc/plugins/codec/libsubsusf_plugin.so %{_libdir}/vlc/plugins/codec/libsubsusf_plugin.so
%{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
%{_libdir}/vlc/plugins/codec/libt140_plugin.so %{_libdir}/vlc/plugins/codec/libt140_plugin.so
%{_libdir}/vlc/plugins/codec/libtelx_plugin.so %{_libdir}/vlc/plugins/codec/libtelx_plugin.so
%{_libdir}/vlc/plugins/codec/libtheora_plugin.so %{_libdir}/vlc/plugins/codec/libtheora_plugin.so
%{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
%{_libdir}/vlc/plugins/codec/libvorbis_plugin.so %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
%{_libdir}/vlc/plugins/codec/libxwd_plugin.so
%{_libdir}/vlc/plugins/codec/libzvbi_plugin.so %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so
%{_libdir}/vlc/plugins/control/libdbus_plugin.so %{_libdir}/vlc/plugins/control/libdbus_plugin.so
%{_libdir}/vlc/plugins/control/libdummy_plugin.so %{_libdir}/vlc/plugins/control/libdummy_plugin.so
@ -661,7 +655,6 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/demux/libgme_plugin.so %{_libdir}/vlc/plugins/demux/libgme_plugin.so
%{_libdir}/vlc/plugins/demux/libh264_plugin.so %{_libdir}/vlc/plugins/demux/libh264_plugin.so
%{_libdir}/vlc/plugins/demux/libimage_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/libmjpeg_plugin.so
%{_libdir}/vlc/plugins/demux/libmkv_plugin.so %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
%{_libdir}/vlc/plugins/demux/libmod_plugin.so %{_libdir}/vlc/plugins/demux/libmod_plugin.so
@ -693,23 +686,20 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so
%{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so %{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so
%{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
%{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
%{_libdir}/vlc/plugins/misc/libexport_plugin.so %{_libdir}/vlc/plugins/misc/libexport_plugin.so
%{_libdir}/vlc/plugins/misc/libgnutls_plugin.so %{_libdir}/vlc/plugins/misc/libgnutls_plugin.so
%{_libdir}/vlc/plugins/misc/libinhibit_plugin.so
%{_libdir}/vlc/plugins/misc/liblogger_plugin.so %{_libdir}/vlc/plugins/misc/liblogger_plugin.so
%{_libdir}/vlc/plugins/misc/libmemcpy_plugin.so
%{_libdir}/vlc/plugins/misc/libosd_parser_plugin.so
%{_libdir}/vlc/plugins/misc/libstats_plugin.so %{_libdir}/vlc/plugins/misc/libstats_plugin.so
%{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so %{_libdir}/vlc/plugins/misc/libvod_rtsp_plugin.so
%{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so
%{_libdir}/vlc/plugins/misc/libxml_plugin.so %{_libdir}/vlc/plugins/misc/libxml_plugin.so
%{_libdir}/vlc/plugins/misc/libxscreensaver_plugin.so
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
%{_libdir}/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
%{_libdir}/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so %{_libdir}/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
%{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so #{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so
%{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so #{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
%endif %endif
%{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so
@ -720,7 +710,6 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
%{_libdir}/vlc/plugins/notify/libtelepathy_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
@ -745,9 +734,10 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so %{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so
%endif %endif
%{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libstream_filter_dash_plugin.so %{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libstream_filter_httplive_plugin.so %{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libstream_filter_record_plugin.so %{_libdir}/vlc/plugins/stream_filter/librecord_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
@ -762,7 +752,6 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_select_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_smem_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_smem_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so
@ -779,6 +768,7 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
%{_libdir}/vlc/plugins/video_filter/libadjust_plugin.so %{_libdir}/vlc/plugins/video_filter/libadjust_plugin.so
%{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so %{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so
%{_libdir}/vlc/plugins/video_filter/libanaglyph_plugin.so
%{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so %{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so
%{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so %{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so
%{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
@ -808,7 +798,6 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
%{_libdir}/vlc/plugins/video_filter/libosdmenu_plugin.so
%{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
@ -827,6 +816,8 @@ rm -rf "$RPM_BUILD_ROOT"
%{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{_libdir}/vlc/plugins/video_output/libfb_plugin.so %{_libdir}/vlc/plugins/video_output/libfb_plugin.so
%{_libdir}/vlc/plugins/video_output/libgl_plugin.so
%{_libdir}/vlc/plugins/video_output/libglx_plugin.so
%{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so
%{_libdir}/vlc/plugins/video_output/libvmem_plugin.so %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so
%{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so