rpms/vlc/F-13 vlc-1.1.0-vlc-cache-gen_noerror.patch, NONE,
1.1 .cvsignore, 1.25, 1.26 sources, 1.31, 1.32 vlc.spec, 1.78,
1.79 0001-Default-libv4l2-to-true.patch, 1.1,
NONE 300_all_pic.patch, 1.1, NONE 310_all_mmx_pic.patch, 1.1,
NONE vlc-1.0.4-xulrunner-192.patch, 1.1,
NONE vlc-trunk-default_font.patch, 1.1, NONE
Nicolas Chauvet
kwizart at rpmfusion.org
Thu Aug 5 18:10:13 CEST 2010
Author: kwizart
Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24026/F-13
Modified Files:
.cvsignore sources vlc.spec
Added Files:
vlc-1.1.0-vlc-cache-gen_noerror.patch
Removed Files:
0001-Default-libv4l2-to-true.patch 300_all_pic.patch
310_all_mmx_pic.patch vlc-1.0.4-xulrunner-192.patch
vlc-trunk-default_font.patch
Log Message:
Update to 1.1.X branch
vlc-1.1.0-vlc-cache-gen_noerror.patch:
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vlc-1.1.0-vlc-cache-gen_noerror.patch ---
diff -up vlc-1.1.0/modules/Makefile.am.mock vlc-1.1.0/modules/Makefile.am
--- vlc-1.1.0/modules/Makefile.am.mock 2010-04-05 19:46:04.000000000 -0500
+++ vlc-1.1.0/modules/Makefile.am 2010-04-16 12:24:52.745993752 -0500
@@ -63,7 +63,7 @@ MOSTLYCLEANFILES = stamp-cache plugins-*
stamp-cache:
$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
- ../bin/vlc-cache-gen$(EXEEXT) . ; \
+ ../bin/vlc-cache-gen$(EXEEXT) . ||: ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
fi
@@ -71,7 +71,7 @@ stamp-cache:
install-exec-hook:
if test -z "$(DESTDIR)"; then \
- ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
+ ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ||: ; \
else \
echo "Staged installation: cache generation skipped!" ; \
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 1 May 2010 20:13:31 -0000 1.25
+++ .cvsignore 5 Aug 2010 16:10:11 -0000 1.26
@@ -1 +1 @@
-vlc-1.0.6.tar.bz2
+vlc-1.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 1 May 2010 20:13:31 -0000 1.31
+++ sources 5 Aug 2010 16:10:12 -0000 1.32
@@ -1 +1 @@
-246a3865ec037f8f5757ef6b973a80fc vlc-1.0.6.tar.bz2
+dec11ed850e044c518aee6fef7e7f893 vlc-1.1.2.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- vlc.spec 1 May 2010 20:13:31 -0000 1.78
+++ vlc.spec 5 Aug 2010 16:10:12 -0000 1.79
@@ -1,13 +1,26 @@
-# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-
-#global live555_date 2009.07.28
-#global vlc_rc -rc
-%global vlc_bootstrap 1
+#global live555_date 2009.07.28
+#global vlc_rc -rc3
+%global vlc_bootstrap 1
+%global _with_freeworld 1
+%if 0%{?_with_freeworld:1}
+%global _with_a52dec --with-a52dec
+%global _with_faad2 --with-faad2
+%global _with_ffmpeg --with-ffmpeg
+%global _with_libdca --with-libdca
+%global _with_libdvbpsi --with-libdvbpsi
+%global _with_libmad --with-libmad
+%global _with_libmpeg2 --with-libmpeg2
+%global _with_twolame --with-twolame
+%global _with_vcdimager --with-vcdimager
+%global _with_x264 --with-x264
+%global _with_xvidcore --with-xvidcore
+%global _with_live555 --with-live55
+%endif
-Summary: Multi-platform MPEG, DVD, and DivX player
+Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.0.6
+Version: 1.1.2
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
@@ -16,123 +29,115 @@
%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
-Source10: vlc-handlers.schemas
-Patch0: vlc-trunk-default_font.patch
-Patch1: 0001-Default-libv4l2-to-true.patch
-Patch3: 300_all_pic.patch
-Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0.4-xulrunner-192.patch
+Source10: vlc-handlers.schemas
+Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: prelink
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: prelink
%if 0%{?vlc_bootstrap:1}
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
-BuildRequires: a52dec-devel
+%{?_with_a52dec:BuildRequires: a52dec-devel}
BuildRequires: aalib-devel
BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel
-BuildRequires: cdparanoia-devel
-BuildRequires: dbus-devel
-BuildRequires: dirac-devel >= 1.0.0
-%{!?_without_directfb:BuildRequires: directfb-devel}
-BuildRequires: faad2-devel
-BuildRequires: ffmpeg-devel >= 0.4.9-0
+BuildRequires: cdparanoia-devel
+BuildRequires: dbus-devel
+BuildRequires: dirac-devel >= 1.0.0
+%{!?_without_directfb:BuildRequires: directfb-devel}
+%{?_with_faad2:BuildRequires: faad2-devel}
+%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
-BuildRequires: fluidsynth-devel
+BuildRequires: fluidsynth-devel
BuildRequires: fribidi-devel
-BuildRequires: gnome-vfs2-devel
+BuildRequires: gnome-vfs2-devel
BuildRequires: gnutls-devel >= 1.0.17
BuildRequires: gsm-devel
-BuildRequires: hal-devel
BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libavc1394-devel
+BuildRequires: kde-filesystem
+BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
-BuildRequires: libdca-devel
+BuildRequires: libdc1394-devel >= 2.1.0
+%{?_with_libdca:BuildRequires: libdca-devel}
BuildRequires: libdv-devel
-BuildRequires: libdvbpsi-devel
+%{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel}
BuildRequires: libdvdnav-devel
-BuildRequires: libebml-devel
+BuildRequires: libebml-devel
BuildRequires: libid3tag-devel
-BuildRequires: libkate-devel
-BuildRequires: libmad-devel
+BuildRequires: libkate-devel
+%{?_with_libmad:BuildRequires: libmad-devel}
BuildRequires: libmatroska-devel >= 0.7.6
BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
-BuildRequires: libmtp-devel
-BuildRequires: libnotify-devel
-BuildRequires: libproxy-devel
+BuildRequires: libmtp-devel >= 1.0.0
+BuildRequires: libnotify-devel
+BuildRequires: libprojectM-qt-devel
+BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
+BuildRequires: libssh2-devel
BuildRequires: libsysfs-devel
-BuildRequires: libshout-devel
-BuildRequires: libsmbclient-devel
+BuildRequires: libshout-devel
+BuildRequires: libsmbclient-devel
BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
-BuildRequires: libtiff-devel
-BuildRequires: libupnp-devel
-%if 0%{?fedora} > 8
+BuildRequires: libtiff-devel
+BuildRequires: libudev-devel >= 142
+BuildRequires: libupnp-devel
BuildRequires: libv4l-devel
-%endif
+%{?_with_vaapi:BuildRequires: libva-devel}
BuildRequires: libvorbis-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%if 0%{?live555_date:1}
-BuildConflicts: live555-devel
-%else
-BuildRequires: live555-devel >= 0-0.19.2008.04.03
-%endif
+%{?_with_live555:BuildRequires: live555-devel >= 0-0.19.2008.04.03}
BuildRequires: kernel-headers
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-BuildRequires: libmusicbrainz-devel
-BuildRequires: libshout-devel
-BuildRequires: lua-devel
-BuildRequires: minizip-devel
-BuildRequires: mpeg2dec-devel >= 0.3.2
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libshout-devel
+BuildRequires: lua-devel
+BuildRequires: minizip-devel
+%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
-BuildRequires: opencv-devel
-BuildRequires: openslp-devel
-BuildRequires: pcre-devel
-BuildRequires: pulseaudio-libs-devel >= 0.9.8
-BuildRequires: portaudio-devel
-BuildRequires: qt4-devel >= 4.5.2
-BuildRequires: schroedinger-devel
+BuildRequires: opencv-devel
+BuildRequires: openslp-devel
+BuildRequires: pcre-devel
+BuildRequires: pulseaudio-libs-devel >= 0.9.8
+BuildRequires: portaudio-devel
+BuildRequires: qt4-devel >= 4.5.2
+BuildRequires: schroedinger-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
%ifarch %{ix86} x86_64
-BuildRequires: svgalib-devel
+BuildRequires: svgalib-devel
%endif
-BuildRequires: taglib-devel
-BuildRequires: twolame-devel
-BuildRequires: vcdimager-devel >= 0.7.21
-BuildRequires: x264-devel >= 0-0.8.20061028
+BuildRequires: taglib-devel
+%{?_with_twolame:BuildRequires: twolame-devel}
+%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
+%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
BuildRequires: xosd-devel
-BuildRequires: xvidcore-devel
+%{?_with_xvidcore:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
-BuildRequires: zvbi-devel
+BuildRequires: zvbi-devel
# X-libs
BuildRequires: libXt-devel
BuildRequires: libXv-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXpm-devel
-%ifarch %{ix86} x86_64
-BuildRequires: libXvMC-devel
-%endif
-BuildRequires: xcb-util-devel
-BuildRequires: xorg-x11-proto-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libXpm-devel
+BuildRequires: xcb-util-devel
+BuildRequires: xorg-x11-proto-devel
%{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel}
@@ -141,6 +146,7 @@
Provides: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: vlc-core%{_isa} = %{version}-%{release}
+Requires: kde-filesystem
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
@@ -151,67 +157,58 @@
Requires: qt4%{?_isa} >= %{_qt4_version}
-%package devel
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name}-core%{_isa} = %{version}-%{release}
%description
-VLC (initially VideoLAN Client) is a highly portable multimedia player
-for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
-mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
-It can also be used as a server to stream in unicast or multicast in
-IPv4 or IPv6 on a high-bandwidth network.
+VLC media player is a highly portable multimedia player and multimedia framework
+capable of reading most audio and video formats as well as DVDs, Audio CDs VCDs,
+and various streaming protocols.
+It can also be used as a media converter or a server to stream in uni-cast or
+multi-cast in IPv4 or IPv6 on networks.
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-core%{_isa} = %{version}-%{release}
%description devel
-This package contains development files for VLC Media Player.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
-VLC (initially VideoLAN Client) is a highly portable multimedia player
-for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
-mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
-It can also be used as a server to stream in unicast or multicast in
-IPv4 or IPv6 on a high-bandwidth network.
%{!?_without_mozilla:
%package -n mozilla-vlc
-Summary: VLC Media Player plugin for Mozilla compatible web browsers
+Summary: VLC media player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
Requires: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: %{_libdir}/mozilla/plugins
%description -n mozilla-vlc
-This package contains a VLC Media Player plugin for Mozilla compatible
+This package contains a VLC media player plugging for Mozilla compatible
web browsers.
-VLC (initially VideoLAN Client) is a highly portable multimedia player
-for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX,
-mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
-It can also be used as a server to stream in unicast or multicast in
-IPv4 or IPv6 on a high-bandwidth network.
}
%package core
-Summary: VLC Media Player core
+Summary: VLC media player core
Group: Applications/Multimedia
%description core
-VLC Media Player core components
+VLC media player core components
%package nox
-Summary: VLC Media Player without Xorg
+Summary: VLC media player without Xorg
Group: Applications/Multimedia
-Requires: vlc-core%{_isa} = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description nox
-VLC Media Player with framebuffer support for X-less server.
+VLC media player with frame-buffer support for X-less server.
%package plugin-jack
Summary: JACK audio plugin for VLC
Group: Applications/Multimedia
-Requires: vlc-core%{_isa} = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description plugin-jack
JACK audio plugin for the VLC media player.
@@ -222,13 +219,7 @@
%if 0%{?live555_date:1}
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
-%patch0 -p1 -b .default_font
-%patch1 -p1 -b .istrue
-#http://trac.videolan.org/vlc/ticket/1383
-%patch3 -p1 -b .dmo_pic
-sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
-%patch4 -p1 -b .mmx_pic
-%patch5 -p1 -b .xul192
+%patch0 -p1 -b .noerror
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -254,30 +245,36 @@
%configure \
--disable-dependency-tracking \
--disable-rpath \
- --enable-release \
- --with-binary-version=%{version}-%{release} \
+ --with-binary-version=%{version} \
--with-tuning=no \
- --enable-switcher \
- --enable-lua \
+ --with-kde-solid=%{_kde4_appsdir}/solid/actions \
+%{?_with_ffmpeg:--enable-switcher} \
+ --enable-lua \
--enable-live555 \
%if 0%{?live555_date:1}
--with-live555-tree=live \
%endif
--enable-dv \
--enable-opencv \
+ --enable-sftp \
--enable-pvr \
--enable-gnomevfs \
- --enable-cddax \
- --enable-wma-fixed \
- --enable-shine \
- --enable-faad \
- --enable-twolame \
- --enable-real \
- --enable-realrtsp \
+%{?_with_vcdimager--enable-vcdx} \
+%if 0
+%{?_with_freeworld:--enable-wma-fixed} \
+%{?_with_freeworld:--enable-shine} \
+%endif
+ --enable-omxil \
+%{!?_with_a52dec:--disable-a52} \
+%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
+ --disable-swscale --disable-postproc} \
+%{?_with_faad2:--enable-faad} \
+%{!?_with_libmad:--disable-mad} \
+%{?_with_twolame:--enable-twolame} \
+%{?_with_freeworld:--enable-real --enable-realrtsp} \
--enable-flac \
--enable-tremor \
--enable-speex \
- --enable-tarkin \
--enable-theora \
--enable-dirac \
--enable-libass \
@@ -287,20 +284,16 @@
--enable-snapshot \
%ifarch %{ix86} x86_64
--enable-svgalib \
- --enable-xvmc \
%endif
%{!?_without_directfb:--enable-directfb} \
--enable-aa \
--enable-caca \
--enable-jack \
-%if 0%{?fedora} > 7
- --enable-portaudio \
+ --enable-portaudio \
--enable-pulse \
-%endif
--enable-ncurses \
--enable-xosd \
--enable-fbosd \
- --enable-galaktos \
--enable-lirc \
%ifarch %{ix86}
--enable-loader \
@@ -310,10 +303,11 @@
%{!?_without_mozilla:--enable-mozilla} \
-
+%if 1
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%endif
%if 0
# clean unused-direct-shlib-dependencies
@@ -332,16 +326,7 @@
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -pm 644 doc/vlc*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-for i in 16x16 32x32 48x48 128x128 ; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps
- install -pm 0644 share/vlc${i}.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/vlc.png
-done
-
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \
--mode 644 \
@@ -364,6 +349,7 @@
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
+
%find_lang %{name}
@@ -416,37 +402,33 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README THANKS
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/vlc.png
+%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
+%{_datadir}/icons/hicolor/*/apps/vlc*.png
+%{_datadir}/icons/hicolor/*/apps/vlc*.xpm
%{_datadir}/vlc/skins2/
%{_bindir}/qvlc
%{_bindir}/svlc
-%{_libdir}/vlc/gui/libqt4_plugin.so
-%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
-%{_libdir}/vlc/access/libx11_screen_plugin.so
-%{_libdir}/vlc/misc/libsvg_plugin.so
-%{_libdir}/vlc/misc/libnotify_plugin.so
-%{_libdir}/vlc/video_output/libaa_plugin.so
-%{_libdir}/vlc/video_output/libcaca_plugin.so
-%{_libdir}/vlc/video_output/libglx_plugin.so
-%{_libdir}/vlc/video_output/libopengl_plugin.so
-%{_libdir}/vlc/video_output/libx11_plugin.so
-%{_libdir}/vlc/video_output/libxcb_plugin.so
-%{_libdir}/vlc/video_output/libxcb_window_plugin.so
-%{_libdir}/vlc/video_output/libxcb_xv_plugin.so
-%{_libdir}/vlc/video_output/libxvideo_plugin.so
-%{_libdir}/vlc/visualization/libgalaktos_plugin.so
-%{_libdir}/vlc/misc/libxosd_plugin.so
-%ifarch %{ix86} x86_64
-%{_libdir}/vlc/codec/libxvmc_plugin.so
-%{_libdir}/vlc/video_output/libxvmc_plugin.so
+%{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
+%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
+%{_libdir}/vlc/plugins/misc/libsvg_plugin.so
+%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
+%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
+%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
+%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
+%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
+%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
+%{_libdir}/vlc/plugins/misc/libxosd_plugin.so
+%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
+%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+%if 0%{fedora} > 11
+%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
%endif
-%{_libdir}/vlc/gui/libskins2_plugin.so
-%{_libdir}/vlc/video_filter/libopencv_example_plugin.so
-%{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so
-%{_libdir}/vlc/video_filter/libpanoramix_plugin.so
-%{_libdir}/vlc/audio_output/libpulse_plugin.so
+%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang
%defattr(-,root,root,-)
@@ -458,56 +440,52 @@
%exclude %{_datadir}/vlc/skins2
%{_datadir}/vlc/
%{_libdir}/*.so.*
-%exclude %{_libdir}/vlc/gui/libqt4_plugin.so
-%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
-%exclude %{_libdir}/vlc/access/libaccess_jack_plugin.so
-%exclude %{_libdir}/vlc/access/libx11_screen_plugin.so
-%exclude %{_libdir}/vlc/codec/libfluidsynth_plugin.so
-%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
-%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
-%exclude %{_libdir}/vlc/video_output/libaa_plugin.so
-%exclude %{_libdir}/vlc/video_output/libcaca_plugin.so
-%exclude %{_libdir}/vlc/video_output/libglx_plugin.so
-%exclude %{_libdir}/vlc/video_output/libopengl_plugin.so
-%exclude %{_libdir}/vlc/video_output/libx11_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxcb_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxcb_window_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxcb_xv_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so
-%exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so
-%exclude %{_libdir}/vlc/misc/libxosd_plugin.so
+%exclude %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
+%exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
+%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
+%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
+%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+%exclude %{_libdir}/vlc/plugins/misc/libsvg_plugin.so
+%exclude %{_libdir}/vlc/plugins/misc/libnotify_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
+%exclude %{_libdir}/vlc/plugins/misc/libxosd_plugin.so
%ifarch %{ix86} x86_64
-%exclude %{_libdir}/vlc/codec/libxvmc_plugin.so
-%exclude %{_libdir}/vlc/video_output/libxvmc_plugin.so
-%exclude %{_libdir}/vlc/video_output/libsvgalib_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
%endif
%{!?_without_directfb:
-%exclude %{_libdir}/vlc/video_output/libdirectfb_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
-%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
-%exclude %{_libdir}/vlc/video_filter/libopencv_example_plugin.so
-%exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so
-%exclude %{_libdir}/vlc/video_filter/libpanoramix_plugin.so
-%exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
-%exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
-%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
+%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+%if 0%{fedora} > 11
+%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+%endif
+%exclude %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%exclude %{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
+%exclude %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%{_libdir}/vlc/
%{_mandir}/man1/vlc*.1*
%files plugin-jack
%defattr(-,root,root,-)
-%{_libdir}/vlc/access/libaccess_jack_plugin.so
-%{_libdir}/vlc/audio_output/libportaudio_plugin.so
-%{_libdir}/vlc/audio_output/libjack_plugin.so
-%{_libdir}/vlc/codec/libfluidsynth_plugin.so
+%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
+%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
+%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
%files nox
%defattr(-,root,root,-)
%{!?_without_directfb:
-%{_libdir}/vlc/video_output/libdirectfb_plugin.so
+%{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
%ifarch %{ix86} x86_64
-%{_libdir}/vlc/video_output/libsvgalib_plugin.so
+%{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
%endif
%files devel
@@ -529,11 +507,32 @@
%changelog
-* Sat May 01 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0.6-1
-- Update to 1.0.6 security - http://www.videolan.org/security/sa1003.html
+* Thu Aug 05 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
+* Thu Jul 01 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.0-1
+- Update to 1.1.0
+
+* Sat Jun 12 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.0-0.12.rc3
+- Update to -rc3
+
+* Tue Jun 08 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.0-0.11.rc2
+- Fix segfault on dlopen
+
+* Mon Jun 07 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.0-0.10.rc2
+- Fix --with a52dec conditional
+
+* Fri Jun 04 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.0-0.9.rc2
+- Update to 1.1.0-rc2
+
+* Sun May 2 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.1.0-0.6.pre3
+- Update to 1.1.0-pre3
+- Add patch from rdieter
-* Fri Mar 26 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0.5-3
-- rebuilt for opencv
+* Fri Apr 16 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.1.0-0.3.pre1
+- Update to 1.1.0-pre1
+- Built for Fedora
+- Changed summary and descriptions
* Sat Feb 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0.5-2
- Add BR libtiger-devel
--- 0001-Default-libv4l2-to-true.patch DELETED ---
--- 300_all_pic.patch DELETED ---
--- 310_all_mmx_pic.patch DELETED ---
--- vlc-1.0.4-xulrunner-192.patch DELETED ---
--- vlc-trunk-default_font.patch DELETED ---
More information about the rpmfusion-commits
mailing list