]> git.sesse.net Git - vlc/blobdiff - vlc.spec
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Updates due to the new playlist core
[vlc] / vlc.spec
diff --git a/vlc.spec b/vlc.spec
index dbb9d5cb4b0f699670bb4aebc0e0fe365827e1f8..fe8bb843a3cc7f937acd06a8bfe559f647d8f4a4 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,38 +1,41 @@
-%define mozver 1.4.1
+%define mozver 1.7.3
+%define ffmpeg_date 20040520
 
 
-Summary: VLC media player, a multimedia player and streaming application.
+Summary: The VideoLAN client, also a very good standalone video player.
 Name: vlc
 Name: vlc
-Version: 0.7.0
-Release: 1
+Version: 0.8.0
+Release: test2
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.videolan.org/
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.videolan.org/
-Source: http://download.videolan.org/pub/videolan/vlc/vlc-%{version}-%{release}.tar.bz2
+Source0: http://www.videolan.org/pub/videolan/vlc/vlc-%{version}-%{release}.tar.bz2
+Source1: http://download.videolan.org/pub/videolan/vlc/%{version}/contrib/ffmpeg-%{ffmpeg_date}.tar.bz2
+
 Buildroot: %{_tmppath}/%{name}-root
 Packager: Jason Luka <jason@geshp.com>
 Buildroot: %{_tmppath}/%{name}-root
 Packager: Jason Luka <jason@geshp.com>
-Buildrequires: XFree86-devel, desktop-file-utils, libpostproc >= 1.0
+Buildrequires: desktop-file-utils, libpostproc >= 1.0
 %{!?_without_dvd:Buildrequires: libdvdcss-devel >= 1.2.8}
 %{!?_without_dvdread:Buildrequires: libdvdread-devel >= 0.9.4}
 %{!?_without_dvd:Buildrequires: libdvdcss-devel >= 1.2.8}
 %{!?_without_dvdread:Buildrequires: libdvdread-devel >= 0.9.4}
-%{!?_without_dvdplay:Buildrequires: libdvdplay-devel >= 1.0.1}
+%{?_with_dvdplay:Buildrequires: libdvdplay-devel >= 1.0.1}
+%{!?_without_dvdnav:Buildrequires: libdvdnav >= 0.1.10}
 %{!?_without_dvbpsi:Buildrequires: libdvbpsi-devel >= 0.1.3}
 %{!?_without_ogg:Buildrequires: libogg-devel}
 %{!?_without_mad:Buildrequires: libmad-devel >= 0.15.0b}
 %{!?_without_dvbpsi:Buildrequires: libdvbpsi-devel >= 0.1.3}
 %{!?_without_ogg:Buildrequires: libogg-devel}
 %{!?_without_mad:Buildrequires: libmad-devel >= 0.15.0b}
-%{!?_without_ffmpeg:Buildrequires: ffmpeg-devel}
-%{!?_without_xvid:Buildrequires: xvidcore-devel >= 0.9.2}
+%{?_with_xvid:Buildrequires: xvidcore-devel >= 0.9.2}
 %{!?_without_a52:Buildrequires: a52dec-devel}
 %{!?_without_a52:Buildrequires: a52dec-devel}
-%{!?_without_dv:Buildrequires: libdv-devel >= 0.99}
+%{?_with_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_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_gtk:Buildrequires: gtk+-devel}
-%{!?_without_gnome:Buildrequires: gnome-libs-devel}
+%{!?_without_alsa:Buildrequires: alsa-lib-devel}
+%{?_with_gtk:Buildrequires: gtk+-devel}
+%{?_with_gnome:Buildrequires: gnome-libs-devel}
 %{!?_without_lirc:Buildrequires: lirc}
 %{!?_without_lirc:Buildrequires: lirc}
-%{!?_without_qt:Buildrequires: qt-devel}
-%{!?_without_kde:Buildrequires: kdelibs-devel}
+%{?_with_qt:Buildrequires: qt-devel}
+%{?_with_kde:Buildrequires: kdelibs-devel}
 %{!?_without_ncurses:Buildrequires: ncurses-devel >= 5}
 %{!?_without_xosd:Buildrequires: xosd-devel >= 2.2.5}
 %{!?_without_id3tag:BuildRequires: libid3tag-devel}
 %{!?_without_ncurses:Buildrequires: ncurses-devel >= 5}
 %{!?_without_xosd:Buildrequires: xosd-devel >= 2.2.5}
 %{!?_without_id3tag:BuildRequires: libid3tag-devel}
@@ -42,74 +45,89 @@ Buildrequires: XFree86-devel, desktop-file-utils, libpostproc >= 1.0
 %{!?_without_mozilla:BuildRequires: mozplugger >= 1.3.2}
 %{!?_without_speex:BuildRequires: speex-devel >= 1.0.3}
 %{!?_without_aa:BuildRequires: aalib >= 1.4}
 %{!?_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_mkv:BuildRequires: libmatroska-devel}
 %{!?_without_fribidi:BuildRequires: fribidi-devel}
 %{!?_without_fribidi:BuildRequires: fribidi-devel}
+%{!?_without_caca:BuildRequires: libcaca-devel}
 
 
-Obsoletes: videolan-client
+Obsoletes: videolan-client, matroska, libebml, libmatroska
 
 
-Requires: XFree86, desktop-file-utils
+Requires: desktop-file-utils
 %{!?_without_dvd:Requires: libdvdcss >= 1.2.8}
 %{!?_without_dvdread:Requires: libdvdread >= 0.9.4}
 %{!?_without_dvd:Requires: libdvdcss >= 1.2.8}
 %{!?_without_dvdread:Requires: libdvdread >= 0.9.4}
-%{!?_without_dvdplay:Requires: libdvdplay >= 1.0.1}
+%{?_with_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_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 >= 0.9.2}
 %{!?_without_a52:Requires: a52dec}
 %{!?_without_xvid:Requires: xvidcore >= 0.9.2}
 %{!?_without_a52:Requires: a52dec}
-%{!?_without_dv:Requires: libdv >= 0.99}
+%{?_with_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_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}
+%{!?_without_alsa:Requires: alsa-lib}
+%{?_with_gtk:Requires: gtk+}
+%{?_with_gnome:Requires: gnome-libs}
 %{?_with_qt:Requires: qt}
 %{?_with_kde:Requires: kdelibs}
 %{?_with_ncurses:Requires: ncurses}
 %{?_with_qt:Requires: qt}
 %{?_with_kde:Requires: kdelibs}
 %{?_with_ncurses:Requires: ncurses}
-%{!?_without_xosd:Requires: xosd >= 2.2.5}
+%{?_with_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_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
 %{!?_without_fribidi:Requires: fribidi}
 
 %description
-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.
+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.
 
 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 alsa gtk gnome xosd lsp lirc
 
 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 alsa gtk gnome xosd lsp lirc
-          pth id3tag dv qt kde ncurses faad wxwindows mkv fribidi
+          pth id3tag dv qt kde ncurses faad wxwindows mkv fribidi theora
 
 Options that would need not yet existing add-on packages :
 
 Options that would need not yet existing add-on packages :
---with tremor tarkin theora ggi glide svgalib mga
+--with tremor tarkin ggi glide svgalib mga
 
 
 %package devel
 
 
 %package devel
-Summary: Header files and static library from VLC media player.
+Summary: Header files and static library from the Videolan Client.
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
-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.
+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.
 
 Install this package if you need to build Videolan Client plugins or intend
 to link statically to it.
 
 
 %prep
 
 Install this package if you need to build Videolan Client plugins or intend
 to link statically to it.
 
 
 %prep
-%setup -q -n vlc-%{version}-%{release}
+%setup -q -n vlc-%{version} -a 1
+
+# Build bundeled ffmpeg first
+pushd ffmpeg-%{ffmpeg_date}
+    %configure \
+        --disable-shared \
+        --enable-gpl \
+        --enable-pp \
+        %{!?_without_lame: --enable-mp3lame} \
+        %{!?_without_vorbis: --enable-vorbis} \
+        %{!?_without_faad: --enable-faad} \
+        %{!?_without_faac: --enable-faac} \
+        %{!?_without_a52dec: --enable-a52}
+    %{__make} %{?_smp_mflags}
+popd
+
+export XPIDL=%{_libdir}/mozilla-%mozver/xpidl
+export XPIDL_INCL=-I%{_includedir}/mozilla-%mozver
+./bootstrap
 
 %build
 cp %{_libdir}/mozilla/plugins/mozplugger.so %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak -f
 
 %build
 cp %{_libdir}/mozilla/plugins/mozplugger.so %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so.bak -f
@@ -121,71 +139,77 @@ ln /usr/share/idl/mozilla-%{mozver} /usr/share/idl/mozilla -sf
 
 %configure \
        --enable-release \
 
 %configure \
        --enable-release \
-       %{?_without_dvd:--disable-dvd} \
+       --enable-vcd \
+       --enable-x11 \
+       --enable-xvideo \
+       --disable-qte \
+       --disable-directx \
+       --enable-fb \
        %{!?_without_dvdread:--enable-dvdread} \
        %{!?_without_dvdread:--enable-dvdread} \
-       %{!?_without_dvdplay:--enable-dvdplay} \
+       %{!?_without_dvdnav:--enable-dvdnav} \
        %{!?_without_dvbpsi:--enable-dvbpsi} \
        %{!?_without_v4l:--enable-v4l} \
        %{!?_without_dvbpsi:--enable-dvbpsi} \
        %{!?_without_v4l:--enable-v4l} \
-       --enable-vcd \
-       %{?_without_avi:--disable-avi} \
-       %{?_without_asf:--disable-asf} \
-       %{?_without_aac:--disable-aac} \
-       %{?_without_ogg:--disable-ogg} \
-       %{?_without_rawdv:--disable-rawdv} \
+        %{!?_without_ffmpeg:--enable-ffmpeg} \
+        %{!?_without_ffmpeg:--with-ffmpeg-tree=ffmpeg-%{ffmpeg_date}} \
+       %{!?_without_flac:--enable-flac} \
+       %{!?_without_theora:--enable-theora} \
        %{!?_without_mad:--enable-mad} \
        %{!?_without_mad:--enable-mad} \
-       %{!?_without_ffmpeg:--enable-pp --enable-ffmpeg --with-ffmpeg=%{_prefix}} \
        %{!?_without_faad:--enable-faad} \
        %{!?_without_faad:--enable-faad} \
-       %{!?_without_xvid:--enable-xvid} \
+       %{!?_without_aa:--enable-aa} \
+       %{!?_without_caca:--enable-caca} \
+       %{!?_without_dvb:--enable-dvb} \
+       %{!?_without_pvr:--enable-pvr} \
+       %{!?_without_livedotcom:--enable-livedotcom --with-livedotcom-tree=%{_libdir}/live} \
+       %{!?_without_alsa:--enable-alsa} \
+       %{!?_without_esd:--enable-esd} \
+       %{!?_without_arts:--enable-arts} \
+       %{!?_without_fribidi:--enable-fribidi} \
+       %{!?_without_freetype:--enable-freetype} \
+       %{!?_without_wxwindows:--enable-wxwindows} \
+       %{!?_without_ncurses:--enable-ncurses} \
+       %{!?_without_lirc:--enable-lirc} \
+       %{!?_without_mozilla:--enable-mozilla} \
+       %{?_with_xvid:--enable-xvid} \
+       %{?_with_dv:--enable-dv} \
+       %{!?_without_sdl:--enable-sdl} \
+       %{?_with_xosd:--enable-xosd} \
+       %{?_with_slp:--enable-slp} \
+        %{?_without_mkv:--disable-mkv} \
+       %{?_with_tremor:--enable-tremor} \
+       %{?_with_tarkin:--enable-tarkin} \
        %{?_without_mp4:--disable-mp4} \
        %{?_without_a52:--disable-a52} \
        %{?_without_cinepak:--disable-cinepak} \
        %{?_without_mp4:--disable-mp4} \
        %{?_without_a52:--disable-a52} \
        %{?_without_cinepak:--disable-cinepak} \
-       %{!?_without_dv:--enable-dv} \
-       %{!?_without_flac:--enable-flac} \
        %{?_without_mpeg2dec:--disable-libmpeg2} \
        %{?_without_vorbis:--disable-vorbis} \
        %{?_without_mpeg2dec:--disable-libmpeg2} \
        %{?_without_vorbis:--disable-vorbis} \
-       %{?_with_tremor:--enable-tremor} \
-       %{?_with_tarkin:--enable-tarkin} \
-       %{!?_without_theora:--enable-theora} \
-       --enable-x11 \
-       --enable-xvideo \
-       %{?_without_sdl:--disable-sdl} \
-       --disable-qte \
-       --disable-directx \
-       --enable-fb \
        %{?_with_mga:--enable-mga} \
        %{?_with_svgalib:--enable-svgalib} \
        %{?_with_ggi:--enable-ggi} \
        %{?_with_glide:--enable-glide} \
        %{?_with_mga:--enable-mga} \
        %{?_with_svgalib:--enable-svgalib} \
        %{?_with_ggi:--enable-ggi} \
        %{?_with_glide:--enable-glide} \
-       %{!?_without_aa:--enable-aa} \
        --without-wingdi \
        --enable-oss \
        --without-wingdi \
        --enable-oss \
-       %{!?_without_esd:--enable-esd} \
-       %{!?_without_arts:--enable-arts} \
-       %{?_with_alsa:--enable-alsa} \
-       %{!?_without_fribidi:--enable-fribidi} \
         --disable-waveout \
         --disable-waveout \
-       %{!?_without_gtk:--enable-gtk} \
+       %{?_with_gtk:--enable-gtk} \
        --disable-familiar \
        --disable-familiar \
-       %{!?_without_gnome:--enable-gnome} \
-       %{?_without_wxwindows:--disable-wxwindows} \
-       %{!?_without_qt:--enable-qt} \
-       %{!?_without_kde:--enable-kde} \
+       %{?_with_gnome:--enable-gnome} \
+       %{?_with_qt:--enable-qt} \
+       %{?_with_kde:--enable-kde} \
        --disable-opie \
        --disable-macosx \
        --disable-qnx \
        --disable-intfwin \
        --disable-opie \
        --disable-macosx \
        --disable-qnx \
        --disable-intfwin \
-       %{!?_without_ncurses:--enable-ncurses} \
-       %{!?_without_xosd:--enable-xosd} \
-       %{?_without_slp:--disable-slp} \
-       %{!?_without_lirc:--enable-lirc} \
-       %{!?_without_pth:--enable-pth} \
+       %{?_with_pth:--enable-pth} \
        --disable-st \
        --disable-st \
-       %{!?_without_mozilla:--enable-mozilla} \
         %{?_without_speex:--disable-speex} \
        --disable-testsuite \
         %{?_without_speex:--disable-speex} \
        --disable-testsuite \
-       --enable-plugins \
-        %{?_without_mkv:--disable-mkv} \
-        %{!?_without_fribidi:--enable-fribidi}
+       %{?_with_dvdplay:--enable-dvdplay} \
+       %{?_without_dvd:--disable-dvd} \
+       %{?_without_avi:--disable-avi} \
+       %{?_without_asf:--disable-asf} \
+       %{?_without_aac:--disable-aac} \
+       %{?_without_ogg:--disable-ogg} \
+       %{?_without_rawdv:--disable-rawdv}
+
 make %{?_smp_mflags}
 
 %install
 make %{?_smp_mflags}
 
 %install
@@ -196,7 +220,7 @@ find  %{buildroot}%{_libdir}/vlc -name "*.so" | xargs strip
 
 cat > %{name}.desktop << EOF
 [Desktop Entry]
 
 cat > %{name}.desktop << EOF
 [Desktop Entry]
-Name=VLC Media Player
+Name=VideoLAN Media Player
 Comment=%{summary}
 Icon=%{_datadir}/vlc/vlc48x48.png
 Exec=vlc
 Comment=%{summary}
 Icon=%{_datadir}/vlc/vlc48x48.png
 Exec=vlc
@@ -231,7 +255,7 @@ mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so %{_libdir}/mozilla/plugins
 %files -f vlc.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS
 %files -f vlc.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog MAINTAINERS README THANKS
-%doc doc/fortunes.txt doc/web-streaming.html doc/intf-vcd.txt doc/vlc-howto.sgml
+%doc doc/fortunes.txt doc/intf-vcd.txt
 %doc doc/bugreport-howto.txt
 %exclude %{_datadir}/doc/vlc/*
 %{_bindir}/*vlc
 %doc doc/bugreport-howto.txt
 %exclude %{_datadir}/doc/vlc/*
 %{_bindir}/*vlc
@@ -250,6 +274,26 @@ mv %{_libdir}/mozilla-%{mozver}/plugins/mozplugger.so %{_libdir}/mozilla/plugins
 %{_libdir}/libvlc.a
 
 %changelog
 %{_libdir}/libvlc.a
 
 %changelog
+* Sun Oct 10 2004 Jason Luka
+- Update to 0.8.0-test2
+- Inserted static ffmpeg routine
+- Removed outdated kde, qt, gnome, and gtk+ interfaces
+- Added livedotcom dependancy
+- Openslp is broken, temporarily removed
+- Added EXPORTs and bootstrap
+- Removed ffmpeg dependancy as the static lib works better for now
+
+* Sun Sep 19 2004 Jason Luka
+- Update to 0.8.0-test1
+- Added --enable-gpl
+- Updated Mozilla version for FC2
+
+* Fri Mar 19 2004 Jason Luka
+- Removed dependancy on XFree86 as FC2 now calls the same package xorg
+
+* Mon Mar 15 2004 Jason Luka
+- Update to 0.7.1
+
 * Tue Dec 2 2003 Jason Luka
 - Added fribidi support
 - Added fribidi and mkv options to configure
 * Tue Dec 2 2003 Jason Luka
 - Added fribidi support
 - Added fribidi and mkv options to configure
Unnamed repository; edit this file 'description' to name the repository.