diff --git a/0001-no-return-in-non-void.patch b/0001-no-return-in-non-void.patch index 4a6a3df..21d0f03 100644 --- a/0001-no-return-in-non-void.patch +++ b/0001-no-return-in-non-void.patch @@ -1,32 +1,64 @@ -diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c -index 15586cc..c1a16b7 100644 ---- a/modules/access/mms/mmstu.c -+++ b/modules/access/mms/mmstu.c -@@ -1572,6 +1572,7 @@ static void *KeepAliveThread( void *p_data ) - msleep( 10 * CLOCK_FREQ ); +diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c +index 73af8ce..8ffad6f 100644 +--- a/modules/access/v4l2/demux.c ++++ b/modules/access/v4l2/demux.c +@@ -629,6 +629,7 @@ static void *MmapThread (void *data) + } + + assert (0); ++ return NULL; /* dead code, but the compiler can't know */ + } + + static void *ReadThread (void *data) +@@ -691,6 +692,7 @@ static void *ReadThread (void *data) + #endif + } + assert (0); ++ return NULL; /* dead code, but the compiler can't know */ + } + + static int DemuxControl( demux_t *demux, int query, va_list args ) +diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c +index 8d7dc6e..cc924aa 100644 +--- a/modules/control/dbus/dbus.c ++++ b/modules/control/dbus/dbus.c +@@ -880,6 +880,7 @@ static void *Run( void *data ) + vlc_restorecancel( canc ); } assert(0); + return NULL; /* dead code, but the compiler can't know */ } - static void KeepAliveStart( access_t *p_access ) -diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp -index a3357d6..1ede179 100644 ---- a/modules/demux/live555.cpp -+++ b/modules/demux/live555.cpp -@@ -1975,6 +1975,7 @@ static void* TimeoutPrevention( void *p_data ) - msleep (((int64_t)p_timeout->p_sys->i_timeout - 2) * CLOCK_FREQ); + static void wakeup_main_loop( void *p_data ) +diff --git a/modules/control/motion.c b/modules/control/motion.c +index 72d7ec6..49c5620 100644 +--- a/modules/control/motion.c ++++ b/modules/control/motion.c +@@ -190,6 +190,7 @@ static void *RunIntf( void *data ) + vlc_restorecancel( canc ); } - assert(0); /* dead code */ + assert(0); + return NULL; /* dead code, but the compiler can't know */ } + #undef LOW_THRESHOLD + #undef HIGH_THRESHOLD +diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c +index 9d24ced..b087410 100644 +--- a/modules/control/motionlib.c ++++ b/modules/control/motionlib.c +@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensors_t *motion ) + default: + assert( 0 ); + } ++ return 0; /* dead code, but the compiler can't know */ + } /***************************************************************************** diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c -index 613f6c0..32e346f 100644 +index 62c89b7..81f884a 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c -@@ -1507,6 +1507,7 @@ static void *rtp_listen_thread( void *data ) +@@ -1501,6 +1501,7 @@ static void *rtp_listen_thread( void *data ) } assert( 0 ); @@ -34,11 +66,23 @@ index 613f6c0..32e346f 100644 } +diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c +index 0baa2bc..6b788cb 100644 +--- a/modules/visualization/visual/visual.c ++++ b/modules/visualization/visual/visual.c +@@ -366,6 +366,7 @@ static void *Thread( void *data ) + vlc_restorecancel( canc ); + } + assert(0); ++ return NULL; + } + + static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf ) diff --git a/src/misc/events.c b/src/misc/events.c -index e3b1ee0..20480c2 100644 +index b430ee5..29c387f 100644 --- a/src/misc/events.c +++ b/src/misc/events.c -@@ -265,6 +265,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em, +@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_t * p_em, FOREACH_END() /* Unknown event = BUG */ assert( 0 ); @@ -46,15 +90,3 @@ index e3b1ee0..20480c2 100644 } /** -diff --git a/src/video_output/display.c b/src/video_output/display.c -index c743836..9b778ea 100644 ---- a/src/video_output/display.c -+++ b/src/video_output/display.c -@@ -555,6 +555,7 @@ static void *VoutDisplayEventKeyDispatch(void *data) - - vlc_restorecancel(cancel); - } -+ return NULL; - } - - static void VoutDisplayEventKey(vout_display_t *vd, int key) diff --git a/fix_font_path.patch b/fix_font_path.patch index 9984718..70dbd49 100644 --- a/fix_font_path.patch +++ b/fix_font_path.patch @@ -1,13 +1,16 @@ -diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c -index fcfe9a8..dfea2e7 100644 ---- a/modules/text_renderer/freetype.c -+++ b/modules/text_renderer/freetype.c -@@ -52,7 +52,7 @@ - # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" - # define DEFAULT_FAMILY "Nokia Sans Bold" +Index: vlc-2.1.0/modules/text_renderer/freetype.c +=================================================================== +--- vlc-2.1.0.orig/modules/text_renderer/freetype.c ++++ vlc-2.1.0/modules/text_renderer/freetype.c +@@ -67,9 +67,9 @@ + # define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf" + # define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Droid Sans Mono" #else --# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" -+# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf" - # define DEFAULT_FAMILY "Serif Bold" +-# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" ++# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf" + # 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 diff --git a/ppc64_altivec.patch b/ppc64_altivec.patch deleted file mode 100644 index 13fd054..0000000 --- a/ppc64_altivec.patch +++ /dev/null @@ -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" diff --git a/vlc-2.0.8a.tar.xz b/vlc-2.0.8a.tar.xz deleted file mode 100644 index c965488..0000000 --- a/vlc-2.0.8a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05215f34c487723c84ebb54ab43b836fc70fb466326f7c601847141a499034d2 -size 18859964 diff --git a/vlc-2.1.0.tar.xz b/vlc-2.1.0.tar.xz new file mode 100644 index 0000000..2fe249f --- /dev/null +++ b/vlc-2.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2177daa31786acf1e961b2f63429797a8c62c090e5359bcc7929a1ba5fe41f7 +size 19571224 diff --git a/vlc-avcodec-encoder-single-threaded.patch b/vlc-avcodec-encoder-single-threaded.patch deleted file mode 100644 index 2558fc6..0000000 --- a/vlc-avcodec-encoder-single-threaded.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5a43de506f31e1fa5460f8b62e25a1d640136597 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= -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; - diff --git a/vlc.changes b/vlc.changes index e052bca..66abdcf 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Mon Oct 21 18:04:36 UTC 2013 - hrvoje.senjan@gmail.com + +- Make vlc build on OBS for openSUSE 12.3 - BuildRequire + pkgconfig(libswscale) and live555-devel on >= 13.1, and on + BUILD_ORIG case + +------------------------------------------------------------------- +Sat Oct 12 09:42:57 UTC 2013 - scarabeus@opensuse.org + +- Drop support for < 12.2 as it does not build anyway + * Removal of pulseaudio subpackage and incorporating it to the + noX package. + * Cleanup of the dependencies and configure switches we don't + need to use anymore. +- Add lang subpackage as it was most of what was noX package + containing. This way we can reduce the size and use noarch there. +- Touch the ghosted file in %post to make rpmlint happy +- Fix __DATE__ and __TIME__ usage so we do not rebuild so often. +- Drop obsolete configure options which are no longer around +- Disable xcb switch as we no longer build for such old distros. + +------------------------------------------------------------------- +Wed Oct 2 9:11:58 UTC 2013 - wbauer@tmo.at + +- Re-add and adapt 0001-no-return-in-non-void.patch: fixes build on + openSUSE versions other than Factory + +------------------------------------------------------------------- +Wed Oct 2 08:20:45 UTC 2013 - guillaume@opensuse.org + +- Add support to openGL ES 2 (enabled by default for %arm): + + Introduce bcon_with(out) opengles. + + If enabled, pass --enable-gles2 --enable-egl to configure. + + Adjust the files section for that. + +------------------------------------------------------------------- +Wed Oct 2 08:16:18 UTC 2013 - guillaume@opensuse.org + +- Add vdpau support to -codecs package (BUILD_ORIG): + + BuildRequire libvdpua-devel + + Adapt files section. + +------------------------------------------------------------------- +Tue Oct 1 20:09:40 UTC 2013 - dimstar@opensuse.org + +- Only enable GME support on openSUSE >= 12.00 (disable on SLE11). + +------------------------------------------------------------------- +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. +- Drop 0001-no-return-in-non-void.patch: no longer needed. +- 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 diff --git a/vlc.spec b/vlc.spec index b87745b..c3b2cbf 100644 --- a/vlc.spec +++ b/vlc.spec @@ -17,29 +17,32 @@ # -%define pulseplugin 0%{suse_version} > 1130 -%define withxcb 0%{suse_version} > 1131 %define libvlc 5 -%define libvlccore 5 +%define libvlccore 7 %define conflicts vlc-beta # Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse) %define with_ncurses 0 -Summary: VLC - Video Lan Client +%ifarch %arm +%bcond_without opengles +%else +%bcond_with opengles +%endif + +Summary: Video Lan Client multimedia player License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Name: vlc -Version: 2.0.8a +Version: 2.1.0 Release: 0 -%define _version 2.0.8 -Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}a.tar.xz +%define _version 2.1.0 +Url: http://www.videolan.org/ +Source: http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz Patch1: fix_font_path.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 +BuildRequires: Mesa-devel BuildRequires: aalib-devel BuildRequires: alsa-devel BuildRequires: avahi-devel @@ -48,23 +51,19 @@ BuildRequires: flac-devel BuildRequires: freetype2-devel BuildRequires: fribidi-devel BuildRequires: gcc-c++ -%if 0%{?suse_version} >= 1140 BuildRequires: gdk-pixbuf-devel -%endif BuildRequires: gettext-devel BuildRequires: git BuildRequires: gnome-vfs2-devel BuildRequires: gnutls-devel BuildRequires: gtk2-devel +BuildRequires: libSDL-devel BuildRequires: libass-devel BuildRequires: libavc1394-devel BuildRequires: libbluray-devel BuildRequires: libcaca-devel BuildRequires: libcddb-devel BuildRequires: libcdio-devel -%if 0%suse_version < 1140 -BuildRequires: libdc1394_control12-devel -%endif BuildRequires: libdc1394-devel BuildRequires: libdvbpsi-devel < 1.0 BuildRequires: libdvdnav-devel @@ -78,11 +77,7 @@ BuildRequires: libmtp-devel BuildRequires: libnotify-devel BuildRequires: libogg-devel BuildRequires: libopus-devel -BuildRequires: pkgconfig(dirac) >= 0.10.0 -BuildRequires: pkgconfig(libgme) -%if 0%{suse_version} >= 1120 BuildRequires: libproxy-devel -%endif BuildRequires: libqt4-devel BuildRequires: libraw1394-devel BuildRequires: librsvg-devel @@ -91,51 +86,42 @@ BuildRequires: libshout-devel BuildRequires: libsmbclient-devel BuildRequires: libtheora-devel BuildRequires: libtool -%if 0%{suse_version} > 1100 BuildRequires: libudev-devel -%endif BuildRequires: libupnp-devel -%if 0%{?suse_version} > 1130 BuildRequires: libv4l-devel -%endif -%if 0%{?suse_version} > 1130 BuildRequires: libva-devel -%endif BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lirc-devel +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: live555-devel -%if 0%{?suse_version} >= 1220 +%endif BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif -BuildRequires: Mesa-devel -%if %{?with_ncurses} -BuildRequires: ncurses-devel -%endif BuildRequires: pcre-devel BuildRequires: pulseaudio-devel BuildRequires: schroedinger-devel -%if 0%{suse_version} < 1120 -BuildRequires: SDL-devel -%else -BuildRequires: libSDL-devel -%endif BuildRequires: slang-devel BuildRequires: speex-devel BuildRequires: taglib-devel BuildRequires: vcdimager-devel BuildRequires: xosd-devel BuildRequires: zvbi-devel +BuildRequires: pkgconfig(dirac) >= 0.10.0 +BuildRequires: pkgconfig(libgme) # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations # and can favor one over the other. +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libswscale) +%endif # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly BuildRequires: findutils BuildRequires: update-desktop-files BuildRequires: xz +# ncurses are not ready so far +%if %{?with_ncurses} +BuildRequires: ncurses-devel +%endif # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons. %if 0%{?BUILD_ORIG} BuildRequires: faad2-devel @@ -146,6 +132,7 @@ BuildRequires: libffmpeg-devel BuildRequires: libmad-devel BuildRequires: libmpeg2-devel BuildRequires: libtwolame-devel +BuildRequires: libvdpau-devel BuildRequires: libx264-devel BuildRequires: libxvidcore-devel %endif @@ -190,6 +177,12 @@ Requires: libvlc%{libvlc} = %{version}-%{release} Requires: libvlccore%{libvlccore} = %{version}-%{release} Conflicts: %{conflicts}-noX Recommends: libdvdcss +# pulseaudio subpackage merge +Supplements: packageand(%{name}-noX:pulseaudio) +Provides: vlc-aout-pulse = %{version} +Obsoletes: vlc-aout-pulse < %{version} +# lang subpackage +Recommends: vlc-noX-lang %description noX This Package of VLC contains the bare requirements you need to install. @@ -199,6 +192,8 @@ suitable for server installations (Streaming Server for example) Should you decide to install the GUI modules, %{name}-noX will stay installed as a dependency. +%lang_package -n vlc-noX + %if 0%{?BUILD_ORIG} %package codecs Summary: VLC: VideoLAN Client - Codec extension @@ -232,53 +227,36 @@ Conflicts: %{conflicts}-gnome In order to integrate flawless into GNOME, there are some access modules for gnome-vfs2. -%if 0%{pulseplugin} -%package aout-pulse -Summary: VLC Audio Out for Pulse Audio -Group: System/Libraries -Requires: %{name} = %{version}-%{release} -Supplements: packageand(%{name}-noX:pulseaudio) -Requires: %{name}-noX = %{version}-%{release} -Conflicts: %{conflicts}-aout-pulse - -%description aout-pulse -Extends VLC with Pulse Audio Support for Audio Out -%endif - %prep -echo '********* ENTERED PREP PHASE ********' -date %setup -q -n %{name}-%{_version} %patch1 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 rm -rf contrib -echo '********* ENDED PREP PHASE *********' -date + +# fix builddate info +# Remove build time references so build-compare can do its work +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c +sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c %build -echo '********* BOOTSTRAPPING *********' -date pkg-config --exists smbclient && smbclient=$(pkg-config --cflags smbclient) %ifarch %{ix86} x86_64 -export CFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" -export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" +export CFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" +export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse -Wno-return-type $smbclient" %else -export CFLAGS="%{optflags} -L%{_libdir}/live $smbclient" -export CXXFLAGS="%{optflags} -L%{_libdir}/live $smbclient" +export CFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" +export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" %endif -# Needed for patch5 -autoreconf -fi %configure \ + --disable-static \ --disable-dependency-tracking \ --enable-aa \ --enable-alsa \ -%if 0%{?suse_version} > 1120 --enable-dvbpsi \ -%endif --enable-dvdnav \ --enable-dvdread \ --enable-fast-install \ @@ -294,12 +272,14 @@ autoreconf -fi --enable-kate \ --enable-libass \ --enable-libcddb \ -%if 0%{suse_version} >= 1120 - --enable-libproxy \ -%endif --enable-lirc \ +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} --enable-swscale \ --enable-live555 \ +%else + --disable-swscale \ + --disable-live555 \ +%endif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ @@ -328,46 +308,34 @@ autoreconf -fi --enable-ogg \ --enable-optimizations \ --enable-opus \ - --enable-oss \ + --disable-oss \ --enable-png \ -%if 0%{pulseplugin} --enable-pulse \ -%endif - --enable-pvr \ - --enable-real \ --enable-realrtsp \ - --enable-smb \ + --enable-smbclient \ --enable-sout \ --enable-speex \ --enable-taglib \ --enable-theora \ -%if 0%{?suse_version} > 1130 --enable-v4l2 \ -%else - --disable-libv4l2 \ -%endif --enable-vcd \ --enable-vcdx \ - --enable-visual \ --enable-vorbis \ --enable-waveout \ -%if 0%{?withxcb} --enable-xcb \ -%else - --disable-xcb \ +%if %{with opengles} + --enable-gles2 \ + --enable-egl \ %endif --enable-xvideo -echo '********* FINISHED CONFIGURE *********' -date -%{__make} %{?jobs:-j %jobs} V=1 +make %{?_smp_mflags} V=1 %install -echo '********* ENTERED INSTALL PHASE *********' -date -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}/%{_datadir}/pixmaps ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png find %{buildroot} -name *.la -delete +rm %{buildroot}%{_libdir}/vlc/libcompat.a %suse_update_desktop_file vlc AudioPlayer VideoPlayer Player %fdupes %{buildroot}%{_datadir}/vlc @@ -377,34 +345,34 @@ for lang in ach cgg ff kmr; do done %find_lang vlc -%clean -rm -rf "$RPM_BUILD_ROOT" - %files %defattr(-,root,root) %{_bindir}/svlc -%{_datadir}/applications/vlc.desktop -%{_datadir}/pixmaps/vlc.png %{_datadir}/icons/hicolor/*/apps/vlc* %dir %{_datadir}/kde4 %dir %{_datadir}/kde4/apps %{_datadir}/kde4/apps/solid -%if 0%{?suse_version} > 1130 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so -%endif %{_libdir}/vlc/plugins//notify/libnotify_plugin.so %{_libdir}/vlc/plugins//video_filter/libremoteosd_plugin.so %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so -%if 0%{withxcb} %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so +%if %{with opengles} +%{_libdir}/vlc/plugins/video_output/libegl_plugin.so +%{_libdir}/vlc/plugins/video_output/libgles2_plugin.so %endif %{_libdir}/vlc/plugins/video_output/libaa_plugin.so -%files noX -f vlc.lang +%files noX-lang -f vlc.lang +%defattr(-,root,root) + +%files noX %defattr(-,root,root) %doc %{_datadir}/doc/vlc/ %doc NEWS AUTHORS COPYING THANKS README +%{_datadir}/applications/vlc.desktop +%{_datadir}/pixmaps/vlc.png %{_bindir}/cvlc %if %{?with_ncurses} %{_bindir}/nvlc @@ -413,19 +381,12 @@ rm -rf "$RPM_BUILD_ROOT" %{_bindir}/vlc %{_bindir}/vlc-wrapper %{_datadir}/vlc/ -%if 0%{?suse_version} <= 1130 -%dir %{_datadir}/locale/co -%dir %{_datadir}/locale/co/LC_MESSAGES -%endif -%if 0%{?suse_version} <= 1140 - %dir %{_datadir}/locale/tet - %dir %{_datadir}/locale/tet/LC_MESSAGES -%endif %{_mandir}/*/vlc* # Own the file.. but it's an auto-generated file, so ghost it. %ghost %{_libdir}/vlc/plugins/plugins.dat %dir %{_libdir}/vlc %dir %{_libdir}/vlc/lua +%dir %{_libdir}/vlc/lua/extensions %dir %{_libdir}/vlc/lua/intf %dir %{_libdir}/vlc/lua/intf/modules %dir %{_libdir}/vlc/lua/meta @@ -436,9 +397,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir %{_libdir}/vlc/lua/playlist %dir %{_libdir}/vlc/lua/sd %dir %{_libdir}/vlc/plugins -%ifarch %{ix86} x86_64 -%dir %{_libdir}/vlc/plugins/3dnow -%endif %ifarch ppc ppc64 %dir %{_libdir}/vlc/plugins/altivec %endif @@ -456,7 +414,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir %{_libdir}/vlc/plugins/misc %ifarch %{ix86} x86_64 %dir %{_libdir}/vlc/plugins/mmx -%dir %{_libdir}/vlc/plugins/mmxext %endif %dir %{_libdir}/vlc/plugins/mux %dir %{_libdir}/vlc/plugins/notify @@ -474,10 +431,10 @@ rm -rf "$RPM_BUILD_ROOT" %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. %{_libdir}/vlc/vlc-cache-gen +%{_libdir}/vlc/lua/extensions/VLSub.luac %{_libdir}/vlc/lua/intf/cli.luac %{_libdir}/vlc/lua/intf/dummy.luac %{_libdir}/vlc/lua/intf/dumpmeta.luac -%{_libdir}/vlc/lua/intf/hotkeys.luac %{_libdir}/vlc/lua/intf/http.luac %{_libdir}/vlc/lua/intf/luac.luac %{_libdir}/vlc/lua/intf/modules/common.luac @@ -509,6 +466,7 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/lua/playlist/katsomo.luac %{_libdir}/vlc/lua/playlist/koreus.luac %{_libdir}/vlc/lua/playlist/lelombrik.luac +%{_libdir}/vlc/lua/playlist/liveleak.luac %{_libdir}/vlc/lua/playlist/metacafe.luac %{_libdir}/vlc/lua/playlist/metachannels.luac %{_libdir}/vlc/lua/playlist/mpora.luac @@ -521,13 +479,9 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/lua/playlist/youtube_homepage.luac %{_libdir}/vlc/lua/playlist/zapiks.luac %{_libdir}/vlc/lua/sd/fmc.luac -%{_libdir}/vlc/lua/sd/freebox.luac %{_libdir}/vlc/lua/sd/icecast.luac %{_libdir}/vlc/lua/sd/jamendo.luac %{_libdir}/vlc/lua/sd/metachannels.luac -%ifarch %{ix86} x86_64 -%{_libdir}/vlc/plugins/3dnow/libmemcpy3dn_plugin.so -%endif %ifarch ppc ppc64 %{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so %{_libdir}/vlc/plugins/altivec/libmemcpyaltivec_plugin.so @@ -535,17 +489,14 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so %{_libdir}/vlc/plugins/access/libaccess_attachment_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_http_plugin.so %{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_mms_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_realrtsp_plugin.so -%{_libdir}/vlc/plugins/access/libaccess_shm_plugin.so %{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so %{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so @@ -553,18 +504,24 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/access/libcdda_plugin.so %{_libdir}/vlc/plugins/access/libdc1394_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/libdvdread_plugin.so %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} +%{_libdir}/vlc/plugins/access/liblive555_plugin.so +%endif %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_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/libsdp_plugin.so +%{_libdir}/vlc/plugins/access/libshm_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/libvcd_plugin.so %{_libdir}/vlc/plugins/access/libvcdx_plugin.so @@ -581,30 +538,32 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so %{_libdir}/vlc/plugins/audio_filter/libchorus_flanger_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/libdtstospdif_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/libkaraoke_plugin.so %{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so %{_libdir}/vlc/plugins/audio_filter/libnormvol_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/libscaletempo_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/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/libugly_resampler_plugin.so -%{_libdir}/vlc/plugins/audio_mixer/libfixed32_mixer_plugin.so -%{_libdir}/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.so +%{_libdir}/vlc/plugins/audio_mixer/libfloat_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/libalsa_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/liboss_plugin.so +%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so %{_libdir}/vlc/plugins/codec/liba52_plugin.so %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so %{_libdir}/vlc/plugins/codec/libaes3_plugin.so @@ -618,31 +577,31 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so %{_libdir}/vlc/plugins/codec/libedummy_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/liblpcm_plugin.so %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so %{_libdir}/vlc/plugins/codec/libopus_plugin.so %{_libdir}/vlc/plugins/codec/libpng_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/libspeex_plugin.so %{_libdir}/vlc/plugins/codec/libspudec_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/libsubsusf_plugin.so %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so %{_libdir}/vlc/plugins/codec/libt140_plugin.so %{_libdir}/vlc/plugins/codec/libtelx_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/libxwd_plugin.so %{_libdir}/vlc/plugins/codec/libzvbi_plugin.so %{_libdir}/vlc/plugins/control/libdbus_plugin.so %{_libdir}/vlc/plugins/control/libdummy_plugin.so %{_libdir}/vlc/plugins/control/libgestures_plugin.so -%if 0%{?suse_version} < 1220 -%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so -%endif %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so %{_libdir}/vlc/plugins/control/liblirc_plugin.so %{_libdir}/vlc/plugins/control/libmotion_plugin.so @@ -661,7 +620,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/demux/libgme_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 @@ -693,23 +651,20 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so %{_libdir}/vlc/plugins/meta_engine/libtaglib_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/libgnutls_plugin.so -%{_libdir}/vlc/plugins/misc/libinhibit_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/libvod_rtsp_plugin.so %{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libxml_plugin.so -%{_libdir}/vlc/plugins/misc/libxscreensaver_plugin.so %ifarch %{ix86} x86_64 %{_libdir}/vlc/plugins/mmx/libi420_rgb_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/libmemcpymmx_plugin.so -%{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so +#{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so +#{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so %endif %{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so %{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so @@ -720,7 +675,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ts_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_dirac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so @@ -745,9 +699,10 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so %endif %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libstream_filter_dash_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libstream_filter_httplive_plugin.so -%{_libdir}/vlc/plugins/stream_filter/libstream_filter_record_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so +%{_libdir}/vlc/plugins/stream_filter/libhttplive_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_bridge_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -762,7 +717,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_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_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_smem_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so @@ -779,6 +733,7 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so %{_libdir}/vlc/plugins/video_filter/libadjust_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/libatmo_plugin.so %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so @@ -808,7 +763,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_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/libpsychedelic_plugin.so %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so @@ -820,13 +774,17 @@ 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 +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so +%endif %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so %{_libdir}/vlc/plugins/video_filter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_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/libvmem_plugin.so %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so @@ -848,6 +806,8 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so %{_libdir}/vlc/plugins/codec/libx264_plugin.so +%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so +%{_libdir}/vlc/plugins/codec/libvdpau_plugin.so %{_libdir}/vlc/plugins/demux/libavformat_plugin.so %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so %endif @@ -876,16 +836,12 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/libvlc.so %{_libdir}/pkgconfig/libvlc.pc %{_libdir}/pkgconfig/vlc-plugin.pc -#%{_bindir}/vlc-config -%if 0%{pulseplugin} -%files aout-pulse -%defattr(-,root,root) -%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so -%endif +%post noX +/sbin/ldconfig +touch %{_libdir}/vlc/plugins/plugins.dat -%post -n %{name}-noX -p /sbin/ldconfig -%postun -n %{name}-noX -p /sbin/ldconfig +%postun noX -p /sbin/ldconfig %post -n libvlc%{libvlc} -p /sbin/ldconfig %postun -n libvlc%{libvlc} -p /sbin/ldconfig