Author: arekm Date: Tue Jul 7 21:23:59 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.0.0
---- Files affected:
packages/vlc:
vlc-osdmenu_path.patch (1.1 -> 1.2) , vlc.spec (1.178 -> 1.179)
---- Diffs:
================================================================
Index: packages/vlc/vlc-osdmenu_path.patch
diff -u packages/vlc/vlc-osdmenu_path.patch:1.1
packages/vlc/vlc-osdmenu_path.patch:1.2
--- packages/vlc/vlc-osdmenu_path.patch:1.1 Tue May 9 04:16:50 2006
+++ packages/vlc/vlc-osdmenu_path.patch Tue Jul 7 23:23:54 2009
@@ -6,14 +6,6 @@
action key-play-pause (0,0)
unselect unselected.png
select selection/play_pause.png
---- vlc.orig/share/osdmenu/dvd.cfg
-+++ vlc/share/osdmenu/dvd.cfg
-@@ -1,4 +1,4 @@
--dir share/osdmenu/dvd
-+dir /usr/share/vlc/osdmenu/dvd
- action key-play (0,0)
- unselect unselect/barroff.png
- select selection/play.png
--- vlc.orig/modules/video_filter/osdmenu.c
+++ vlc/modules/video_filter/osdmenu.c
@@ -90,7 +90,7 @@
================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.178 packages/vlc/vlc.spec:1.179
--- packages/vlc/vlc.spec:1.178 Fri Apr 3 01:25:51 2009
+++ packages/vlc/vlc.spec Tue Jul 7 23:23:54 2009
@@ -14,7 +14,6 @@
# Conditional build:
%bcond_without aalib # build without aalib support
%bcond_without alsa # don't build alsa plugin
-%bcond_without arts # don't build arts plugin
%bcond_without bonjour # bonjour plugin
%bcond_without caca # build without caca support
%bcond_without daap # DAAP plugin
@@ -44,13 +43,13 @@
Summary: VLC - a multimedia player and stream server
Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
-Version: 0.9.9
+Version: 1.0.0
Release: 1
License: GPL
Group: X11/Applications/Multimedia
# use the bz2 src, its a 4mb difference
-Source0:
http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: b7c2a75194ad5c73979c3d880aebbe38
+Source0:
http://download.videolan.org/pub/videolan/vlc/latest/%{name}-%{version}.tar.bz2
+# Source0-md5: fc78904ab5fa73f518d8fe4e852e7f67
Source1: %{name}.desktop
Patch0: %{name}-buildflags.patch
Patch1: %{name}-defaultfont.patch
@@ -67,7 +66,6 @@
BuildRequires: a52dec-libs-devel
%{?with_aalib:BuildRequires: aalib-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel >= 0.9}
-%{?with_arts:BuildRequires: artsc-devel}
BuildRequires: autoconf
BuildRequires: automake
%{?with_bonjour:BuildRequires: avahi-devel >= 0.6}
@@ -93,7 +91,7 @@
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel
BuildRequires: libdts-devel
-BuildRequires: libdvbpsi-devel
+BuildRequires: libdvbpsi-devel >= 0.1.6
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
BuildRequires: libebml-devel >= 0.7.6
@@ -117,6 +115,7 @@
BuildRequires: libtool
%{?with_upnp:BuildRequires: libupnp-devel}
BuildRequires: libvorbis-devel
+BuildRequires: libv4l-devel
%{?with_x264:BuildRequires: libx264-devel}
BuildRequires: libxml2-devel
%{?with_lirc:BuildRequires: lirc-devel}
@@ -233,18 +232,6 @@
%description SDL -l pl.UTF-8
Wtyczka wyjścia SDL dla klienta VLC.
-%package esd
-Summary: VLC - EsounD audio output plugin
-Summary(pl.UTF-8): Klient VLC - wtyczka wyjścia dźwięku EsounD
-Group: X11/Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-
-%description esd
-EsounD audio output plugin for VLC.
-
-%description esd -l pl.UTF-8
-Wtyczka wyjścia dźwięku EsounD dla klienta VLC.
-
%package alsa
Summary: VLC - ALSA audio output plugin
Summary(pl.UTF-8): Klient VLC - wtyczka wyjścia dźwięku ALSA
@@ -275,7 +262,7 @@
%{__aclocal} -I m4
%{__autoconf}
%configure \
- CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
+ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses
-I/usr/include/xulrunner/plugin" \
%ifarch ppc
--disable-altivec \
%endif
@@ -285,8 +272,6 @@
--disable-testsuite \
--%{?with_aalib:en}%{!?with_aalib:dis}able-aa \
%{?with_alsa:--enable-alsa} \
- %{?with_arts:--enable-arts} \
- %{!?with_arts:--disable-arts} \
%{!?with_bonjour:--disable-bonjour} \
--%{?with_caca:en}%{!?with_caca:dis}able-caca \
--enable-cddax \
@@ -299,7 +284,6 @@
--enable-dvbpsi \
--enable-dvdnav \
--enable-dvdread \
- %{?with_esound:--enable-esd} \
--enable-faad \
--enable-fb \
--enable-freetype \
@@ -465,7 +449,6 @@
%attr(755,root,root) %{_libdir}/vlc/audio_mixer/libtrivial_mixer_plugin.so
%dir %{_libdir}/vlc/audio_output
%attr(755,root,root) %{_libdir}/vlc/audio_output/libaout_file_plugin.so
-%{?with_arts:%attr(755,root,root)
%{_libdir}/vlc/audio_output/libarts_plugin.so}
%{?with_jack:%attr(755,root,root)
%{_libdir}/vlc/audio_output/libjack_plugin.so}
%{?with_portaudio:%attr(755,root,root)
%{_libdir}/vlc/audio_output/libportaudio_plugin.so}
%attr(755,root,root) %{_libdir}/vlc/audio_output/libpulse_plugin.so
@@ -767,12 +750,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/video_output/libfb_plugin.so
-%if %{with esound}
-%files esd
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/audio_output/libesd_plugin.so
-%endif
-
%if %{with alsa}
%files alsa
%defattr(644,root,root,755)
@@ -785,6 +762,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.179 2009/07/07 21:23:54 arekm
+- up to 1.0.0
+
Revision 1.178 2009/04/02 23:25:51 charles
- updated to 0.9.9
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc-osdmenu_path.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.178&r2=1.179&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
