SPECS: vlc.spec - updated to 0.8.5 final - (partial) merged from D...
charles
charles at pld-linux.org
Mon May 8 18:06:50 CEST 2006
Author: charles Date: Mon May 8 16:06:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to 0.8.5 final - (partial) merged from DEVEL
- enabled real* codecs, added -real_codecs_path.patch
- updated BRs, updated %files
---- Files affected:
SPECS:
vlc.spec (1.85 -> 1.86)
---- Diffs:
================================================================
Index: SPECS/vlc.spec
diff -u SPECS/vlc.spec:1.85 SPECS/vlc.spec:1.86
--- SPECS/vlc.spec:1.85 Sun Jan 22 07:33:47 2006
+++ SPECS/vlc.spec Mon May 8 18:06:45 2006
@@ -3,8 +3,14 @@
# TODO:
# - check the altivec patch
# - add proper package descriptions/translations
-#
+# - bcondize this damn spec! (it should be automated too)
+# - go through the configure --help and add all options with proper
+# reqs and bconds
# Conditional build:
+%bcond_without aa
+%bcond_without caca
+%bcond_without dv
+%bcond_without lirc
%bcond_without alsa # don't build alsa plugin
%bcond_without arts # don't build arts plugin
%bcond_without ggi # don't build ggi plugin
@@ -18,12 +24,13 @@
Summary: VLC - a multimedia player and stream server
Summary(pl): VLC - odtwarzacz multimedialny oraz serwer strumieni
Name: vlc
-Version: 0.8.4a
-Release: 1
+Version: 0.8.5
+Release: 0.1
License: GPL
Group: X11/Applications/Multimedia
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fd4d98255dc1599a58779f77ade9ff65
+# use the bz2 src, its a 4mb difference
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 16bb5bf87ed94879a8eb7b0ff9b4f16f
Source1: %{name}.desktop
Patch0: %{name}-altivec.patch
Patch1: %{name}-buildflags.patch
@@ -31,11 +38,12 @@
Patch3: %{name}-live.patch
Patch4: %{name}-pic-mmx.patch
Patch5: %{name}-matroska-shared.patch
+Patch6: %{name}-real_codecs_path.patch
URL: http://www.videolan.org/vlc/
BuildRequires: OpenGL-devel
-BuildRequires: SDL-devel >= 1.2
+BuildRequires: SDL_image-devel >= 1.2
BuildRequires: a52dec-libs-devel
-BuildRequires: aalib-devel
+%{?with_aa:BuildRequires: aalib-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel >= 0.9}
%{?with_arts:BuildRequires: artsc-devel}
BuildRequires: autoconf
@@ -47,11 +55,11 @@
BuildRequires: fribidi-devel
BuildRequires: gettext-devel
%{?with_hal:BuildRequires: hal-devel >= 0.2.97}
-BuildRequires: libcaca-devel
+%{?with_caca:BuildRequires: libcaca-devel}
BuildRequires: libcdio-devel
BuildRequires: libcddb-devel
BuildRequires: libdts-devel
-BuildRequires: libdv-devel
+%{?with_dv:BuildRequires: libdv-devel}
BuildRequires: libdvbpsi-devel
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
@@ -68,9 +76,9 @@
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
-BuildRequires: lirc-devel
+%{?with_lirc:BuildRequires: lirc-devel}
%{?with_live:BuildRequires: live >= 2005.03.11}
-BuildRequires: mpeg2dec-devel
+BuildRequires: mpeg2dec-devel >= 0.3.2
%{?with_mozilla:BuildRequires: mozilla-devel}
BuildRequires: ncurses-devel
%{?with_slp:BuildRequires: openslp-devel}
@@ -205,6 +213,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
cp -f /usr/share/automake/config.* .
@@ -216,14 +225,14 @@
%ifarch ppc
--disable-altivec \
%endif
- --enable-aa \
+ --%{?with_aa:en}%{!?with_aa:dis}able-aa \
%{?with_alsa:--enable-alsa} \
%{?with_arts:--enable-arts} \
%{!?with_arts:--disable-arts} \
- --enable-caca \
+ --%{?with_caca:en}%{!?with_caca:dis}able-caca \
--enable-dsp \
--enable-dummy \
- --enable-dv \
+ --%{?with_dv:en}%{!?with_dv:dis}able-dv \
--enable-dvb \
--enable-dvbpsi \
--with-dvdcss \
@@ -236,12 +245,11 @@
--enable-fribidi \
--enable-ffmpeg \
--enable-flac \
- %{?with_ggi:--enable-ggi} \
+ --%{?with_ggi:en}%{!?with_ggi:dis}able-ggi \
%{?with_ggi:--with-ggi} \
- %{!?with_ggi:--disable-ggi} \
%{!?with_speex:--disable-speex} \
--disable-glide \
- --enable-lirc \
+ --%{?with_lirc:en}%{!?with_lirc:dis}able-lirc \
--enable-mad \
--enable-mga \
%{?with_mozilla:--enable-mozilla } \
@@ -250,6 +258,8 @@
--with-livedotcom-tree=%{_libdir}/liveMedia \
--enable-ncurses \
--enable-pvr \
+ --enable-real \
+ --enable-realrtsp \
--enable-sdl \
--with-sdl=/usr \
--enable-skins2 \
@@ -322,28 +332,17 @@
%attr(755,root,root) %{_libdir}/vlc/stream_out
%attr(755,root,root) %{_libdir}/vlc/audio_filter
%attr(755,root,root) %{_libdir}/vlc/packetizer
-%attr(755,root,root) %{_libdir}/vlc/audio_output
%attr(755,root,root) %{_libdir}/vlc/access_filter
%attr(755,root,root) %{_libdir}/vlc/services_discovery
+%dir %{_libdir}/vlc/audio_output
%exclude %{_libdir}/%{name}/audio_output/libaout_sdl_plugin.so
%{?with_alsa:%exclude %{_libdir}/%{name}/audio_output/libalsa_plugin.so}
%exclude %{_libdir}/%{name}/audio_output/libesd_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/audio_output/*.so
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/http
-%dir %{_datadir}/%{name}/http/vlm
-%dir %{_datadir}/%{name}/http/admin
-%dir %{_datadir}/%{name}/skins2
-%dir %{_datadir}/%{name}/skins2/fonts
-%{_datadir}/%{name}/http/vlm/*.html
-%{_datadir}/%{name}/http/admin/*.html
-%{_datadir}/%{name}/http/admin/.access
-%{_datadir}/%{name}/http/style.css
-%{_datadir}/%{name}/http/*.html
-%{_datadir}/%{name}/http/*.png
-%{_datadir}/%{name}/http/*.ico
+%{_datadir}/%{name}/http
+%{_datadir}/%{name}/osdmenu
%{_mandir}/man1/vlc.1*
-%dir %{_datadir}/%{name}/osdmenu/
-%{_datadir}/%{name}/osdmenu/*
%files devel
%defattr(644,root,root,755)
@@ -368,11 +367,9 @@
%exclude %{_libdir}/%{name}/video_output/libvout_sdl_plugin.so
%exclude %{_libdir}/%{name}/video_output/libfb_plugin.so
%attr(755,root,root) %{_libdir}/vlc/visualization/libxosd_plugin.so
-%{_datadir}/%{name}/skins2/default.vlt
-%{_datadir}/%{name}/skins2/fonts/FreeSans.ttf
-%{_datadir}/%{name}/skins2/skin.catalog
-%{_datadir}/%{name}/skins2/skin.dtd
+%{_datadir}/%{name}/skins2
%{_datadir}/%{name}/vlc*.xpm
+%{_datadir}/%{name}/pda*.xpm
%{_datadir}/%{name}/vlc*.png
%{_datadir}/%{name}/vlc*.ico
%{_desktopdir}/*
@@ -408,6 +405,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.86 2006/05/08 16:06:45 charles
+- updated to 0.8.5 final - (partial) merged from DEVEL
+- enabled real* codecs, added -real_codecs_path.patch
+- updated BRs, updated %files
+
Revision 1.85 2006/01/22 06:33:47 charles
- updated to 0.8.4a (bugfix release)
- STBR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/vlc.spec?r1=1.85&r2=1.86&f=u
More information about the pld-cvs-commit
mailing list