X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.spec;h=dbb9d5cb4b0f699670bb4aebc0e0fe365827e1f8;hb=6350b08982cf30a3b63a4780382c88c3a3d148ce;hp=9b3e8ed5f0ba6ca671f6ec42929fda9f6d637089;hpb=becae536672fa03efe74214797d0c35c090b15d6;p=vlc diff --git a/vlc.spec b/vlc.spec index 9b3e8ed5f0..dbb9d5cb4b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,115 +1,123 @@ -%define mozver 1.2.1 +%define mozver 1.4.1 -Summary: The VideoLAN client, also a very good standalone video player. +Summary: VLC media player, a multimedia player and streaming application. Name: vlc -Version: 0.6.3 +Version: 0.7.0 Release: 1 Group: Applications/Multimedia License: GPL URL: http://www.videolan.org/ -Source: http://www.videolan.org/pub/videolan/vlc/vlc-%{version}.tar.bz2 +Source: http://download.videolan.org/pub/videolan/vlc/vlc-%{version}-%{release}.tar.bz2 Buildroot: %{_tmppath}/%{name}-root Packager: Jason Luka -Buildrequires: XFree86-devel, desktop-file-utils, libpostproc -%{!?_without_dvd:Buildrequires: libdvdcss-devel} -%{!?_without_dvdread:Buildrequires: libdvdread-devel} -%{!?_without_dvdplay:Buildrequires: libdvdplay-devel} -%{!?_without_dvbpsi:Buildrequires: libdvbpsi-devel} +Buildrequires: XFree86-devel, desktop-file-utils, libpostproc >= 1.0 +%{!?_without_dvd:Buildrequires: libdvdcss-devel >= 1.2.8} +%{!?_without_dvdread:Buildrequires: libdvdread-devel >= 0.9.4} +%{!?_without_dvdplay:Buildrequires: libdvdplay-devel >= 1.0.1} +%{!?_without_dvbpsi:Buildrequires: libdvbpsi-devel >= 0.1.3} %{!?_without_ogg:Buildrequires: libogg-devel} -%{!?_without_mad:Buildrequires: libmad} +%{!?_without_mad:Buildrequires: libmad-devel >= 0.15.0b} %{!?_without_ffmpeg:Buildrequires: ffmpeg-devel} -%{!?_without_xvid:Buildrequires: xvidcore-devel} +%{!?_without_xvid:Buildrequires: xvidcore-devel >= 0.9.2} %{!?_without_a52:Buildrequires: a52dec-devel} -%{!?_without_dv:Buildrequires: libdv-devel} -%{!?_without_flac:Buildrequires: flac-devel} +%{!?_without_dv:Buildrequires: libdv-devel >= 0.99} +%{!?_without_flac:Buildrequires: flac-devel >= 1.1.0} %{!?_without_vorbis:Buildrequires: libvorbis-devel} %{!?_without_sdl:Buildrequires: SDL-devel} %{!?_without_aa:Buildrequires: aalib-devel} %{!?_without_esd:Buildrequires: esound-devel} %{!?_without_arts:Buildrequires: arts-devel} -%{!?_without_alsa:Buildrequires: alsa-lib-devel} +#%%{!?_without_alsa:Buildrequires: alsa-lib-devel} %{!?_without_gtk:Buildrequires: gtk+-devel} %{!?_without_gnome:Buildrequires: gnome-libs-devel} %{!?_without_lirc:Buildrequires: lirc} %{!?_without_qt:Buildrequires: qt-devel} %{!?_without_kde:Buildrequires: kdelibs-devel} %{!?_without_ncurses:Buildrequires: ncurses-devel >= 5} -%{!?_without_xosd:Buildrequires: xosd-devel} -%{!?_without_mozilla:BuildRequires: mozilla-devel} +%{!?_without_xosd:Buildrequires: xosd-devel >= 2.2.5} %{!?_without_id3tag:BuildRequires: libid3tag-devel} %{!?_without_mpeg2dec:BuildRequires: mpeg2dec-devel >= 0.3.2} -%{?_with_wxwindows:BuildRequires: wxGTK-devel >= 2.4.1} -%{!?_without_mozilla:BuildRequires: mozilla-devel = %{mozver}} +%{!?_without_wxwindows:BuildRequires: wxGTK-devel >= 2.4.2} +%{!?_without_mozilla:BuildRequires: mozilla-devel >= %{mozver}} +%{!?_without_mozilla:BuildRequires: mozplugger >= 1.3.2} +%{!?_without_speex:BuildRequires: speex-devel >= 1.0.3} +%{!?_without_aa:BuildRequires: aalib >= 1.4} +%{!?_without_mkv:BuildRequires: matroska} +%{!?_without_fribidi:BuildRequires: fribidi-devel} + Obsoletes: videolan-client Requires: XFree86, desktop-file-utils -%{!?_without_dvd:Requires: libdvdcss} -%{!?_without_dvdread:Requires: libdvdread} -%{!?_without_dvdplay:Requires: libdvdplay} -%{!?_without_dvbpsi:Requires: libdvbpsi} -#%%{!?_without_ogg:Requires: libogg} -%{!?_without_mad:Requires: libmad} +%{!?_without_dvd:Requires: libdvdcss >= 1.2.8} +%{!?_without_dvdread:Requires: libdvdread >= 0.9.4} +%{!?_without_dvdplay:Requires: libdvdplay >= 1.0.1} +%{!?_without_dvbpsi:Requires: libdvbpsi >= 0.1.3} +%{!?_without_ogg:Requires: libogg} +%{!?_without_mad:Requires: libmad >= 0.15.0b} %{!?_without_ffmpeg:Requires: ffmpeg} -#%%{!?_without_xvid:Requires: xvidcore} +%{!?_without_xvid:Requires: xvidcore >= 0.9.2} %{!?_without_a52:Requires: a52dec} -#%%{!?_without_dv:Requires: libdv} -#%%{!?_without_flac:Requires: flac} -#%%{!?_without_vorbis:Requires: libvorbis} -#%%{!?_without_sdl:Requires: SDL} -#%%{!?_without_aa:Requires: aalib} -#%%{!?_without_esd:Requires: esound} -#%%{!?_without_arts:Requires: arts} +%{!?_without_dv:Requires: libdv >= 0.99} +%{!?_without_flac:Requires: flac >= 1.1.0} +%{!?_without_vorbis:Requires: libvorbis} +%{!?_without_sdl:Requires: SDL} +%{!?_without_aa:Requires: aalib >= 1.4} +%{!?_without_esd:Requires: esound} +%{!?_without_arts:Requires: arts} #%%{!?_without_alsa:Requires: alsa-lib} -#%%{!?_without_gtk:Requires: gtk+} -#%%{!?_without_gnome:Requires: gnome-libs} -#%%{?_with_qt:Requires: qt} -#%%{?_with_kde:Requires: kdelibs} -#%%{?_with_ncurses:Requires: ncurses} -#%%{!?_without_xosd:Requires: xosd} -#%%{!?_without_lirc:Requires: lirc} -%{?_with_mozilla:Requires: mozilla = %{mozver}} +%{!?_without_gtk:Requires: gtk+} +%{!?_without_gnome:Requires: gnome-libs} +%{?_with_qt:Requires: qt} +%{?_with_kde:Requires: kdelibs} +%{?_with_ncurses:Requires: ncurses} +%{!?_without_xosd:Requires: xosd >= 2.2.5} +%{!?_without_lirc:Requires: lirc} +%{!?_without_mozilla:Requires: mozilla >= %{mozver}} +%{!?_without_speex:Requires: speex >= 1.0.3} +%{!?_without_wxwindows:Requires: wxGTK >= 2.4.2} +%{!?_without_mkv:Requires: matroska} +%{!?_without_fribidi:Requires: fribidi} %description -VideoLAN Client (VLC) 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. +VLC media player is a highly portable multimedia player for various audio and +video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVD's, +VCD's, 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. Available rpmbuild rebuild options : --without dvd dvdread dvdplay dvbpsi dv v4l avi asf aac ogg rawdv mad ffmpeg xvid - mp4 a52 vorbis mpeg2dec flac aa esd arts gtk gnome xosd lsp lirc - pth id3tag dv qt kde ncurses faad + mp4 a52 vorbis mpeg2dec flac aa esd arts alsa gtk gnome xosd lsp lirc + pth id3tag dv qt kde ncurses faad wxwindows mkv fribidi Options that would need not yet existing add-on packages : --with tremor tarkin theora ggi glide svgalib mga -Options removed for better Red Hat compatibility ---with alsa wxwindows - %package devel -Summary: Header files and static library from the Videolan Client. +Summary: Header files and static library from VLC media player. Group: Development/Libraries Requires: %{name} = %{version} %description devel -VideoLAN Client (VLC) 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. +VLC media player is a highly portable multimedia player for various audio and +video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVD's, +VCD's, 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. Install this package if you need to build Videolan Client plugins or intend to link statically to it. %prep -%setup -q -n vlc-%{version} +%setup -q -n vlc-%{version}-%{release} %build -cp %{_libdir}/mozilla/plugins/plugger.so %{_libdir}/mozilla-%{mozver}/plugins/plugger.so.bak -f -mv %{_libdir}/mozilla-%{mozver}/plugins/plugger.so.bak %{_libdir}/mozilla-%{mozver}/plugins/plugger.so -f +cp %{_libdir}/mozilla/plugins/mozplugger.so %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak -f +mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so -f rm %{_libdir}/mozilla -fr ln %{_libdir}/mozilla-%{mozver} %{_libdir}/mozilla -sf ln /usr/share/idl/mozilla-%{mozver} /usr/share/idl/mozilla -sf -ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf +#ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf %configure \ --enable-release \ @@ -125,7 +133,7 @@ ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf %{?_without_ogg:--disable-ogg} \ %{?_without_rawdv:--disable-rawdv} \ %{!?_without_mad:--enable-mad} \ - %{!?_without_ffmpeg:--enable-ffmpeg --with-ffmpeg=%{_prefix}} \ + %{!?_without_ffmpeg:--enable-pp --enable-ffmpeg --with-ffmpeg=%{_prefix}} \ %{!?_without_faad:--enable-faad} \ %{!?_without_xvid:--enable-xvid} \ %{?_without_mp4:--disable-mp4} \ @@ -154,11 +162,12 @@ ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf %{!?_without_esd:--enable-esd} \ %{!?_without_arts:--enable-arts} \ %{?_with_alsa:--enable-alsa} \ - --disable-waveout \ + %{!?_without_fribidi:--enable-fribidi} \ + --disable-waveout \ %{!?_without_gtk:--enable-gtk} \ --disable-familiar \ %{!?_without_gnome:--enable-gnome} \ - %{!?_with_wxwindows:--disable-wxwindows} \ + %{?_without_wxwindows:--disable-wxwindows} \ %{!?_without_qt:--enable-qt} \ %{!?_without_kde:--enable-kde} \ --disable-opie \ @@ -172,8 +181,11 @@ ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf %{!?_without_pth:--enable-pth} \ --disable-st \ %{!?_without_mozilla:--enable-mozilla} \ + %{?_without_speex:--disable-speex} \ --disable-testsuite \ - --enable-plugins + --enable-plugins \ + %{?_without_mkv:--disable-mkv} \ + %{!?_without_fribidi:--enable-fribidi} make %{?_smp_mflags} %install @@ -184,7 +196,7 @@ find %{buildroot}%{_libdir}/vlc -name "*.so" | xargs strip cat > %{name}.desktop << EOF [Desktop Entry] -Name=VideoLAN Media Player +Name=VLC Media Player Comment=%{summary} Icon=%{_datadir}/vlc/vlc48x48.png Exec=vlc @@ -204,25 +216,24 @@ desktop-file-install --vendor gnome --delete-original \ %post ln /dev/cdrom /dev/dvd -sf -ln %{_libdir}/libxvidcore.so.2 %{_libdir}/libxvidcore.so -sf %postun rm -f /dev/dvd rm /usr/share/idl/mozilla -fr -rm %{_libdir}/libxvidcore.so -f %clean rm -rf %{buildroot} rm /usr/share/idl/mozilla -fr rm /usr/lib/mozilla -fr mkdir /usr/lib/mozilla/plugins -p --mode=755 -mv %{_libdir}/mozilla-%{mozver}/plugins/plugger.so %{_libdir}/mozilla/plugins -f -rm %{_libdir}/libxvidcore.so -f +mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so %{_libdir}/mozilla/plugins -f %files -f vlc.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS -%doc doc/fortunes.txt doc/web-streaming.html +%doc doc/fortunes.txt doc/web-streaming.html doc/intf-vcd.txt doc/vlc-howto.sgml +%doc doc/bugreport-howto.txt +%exclude %{_datadir}/doc/vlc/* %{_bindir}/*vlc %{_libdir}/vlc %{_libdir}/libvlc_pic.a @@ -239,9 +250,21 @@ rm %{_libdir}/libxvidcore.so -f %{_libdir}/libvlc.a %changelog -* Thu Sep 20 2003 Jason Luka -- Removed wxinterface because it's redundant -- Removed alsa support because it's not needed in Red Hat +* Tue Dec 2 2003 Jason Luka +- Added fribidi support +- Added fribidi and mkv options to configure + +* Sat Nov 29 2003 Jason Luka +- Fixed Matroska/EBML problem +- Updated script for mozilla plugin installation + +* Fri Nov 28 2003 Jason Luka +- Update to 0.7.0-test1 +- Updated version numbers on dependancies +- Removed ALSA support until RH/FC turns to kernel 2.6 +- Added --enable-speex and --enable-pp +- Mozilla plugin now built for 1.4.1 +- Currently broken (Matroska/EBML problems) * Mon Aug 25 2003 Jason Luka - Added matroska support