From 9bf905a867d125996014b1772e24305fc8cd75ce Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 2 Jul 2003 09:30:18 +0000 Subject: [PATCH] Updated vlc.spec file for Linux Mandrake. --- vlc.spec => vlc.spec.mdk | 576 ++++++++++++++++++++++++++++----------- 1 file changed, 415 insertions(+), 161 deletions(-) rename vlc.spec => vlc.spec.mdk (68%) diff --git a/vlc.spec b/vlc.spec.mdk similarity index 68% rename from vlc.spec rename to vlc.spec.mdk index 0fa15e8fe7..319efd0fc3 100644 --- a/vlc.spec +++ b/vlc.spec.mdk @@ -1,13 +1,15 @@ %define name vlc -%define version 0.5.2 -%define rel 1 +%define version 0.6.0 +%define rel 5 +%define ffcvs 20030622 +%define mpegcvs 20030612 -%define libmajor 0 +%define libmajor 0 %define cvs 0 %if %{cvs} -%define cvsrel 1 -%define cvsdate 20030127 +%define cvsrel 1 +%define cvsdate 20030203 %define release 0.%{cvsdate}.%{cvsrel}mdk %define cvs_name %{name}-snapshot-%cvsdate %else @@ -20,10 +22,10 @@ %define with_gtk 1 %define with_gnome 1 %define with_qt 0 -%define with_kde 0 +%define with_kde 1 %define with_ncurses 1 %define with_lirc 1 -%define with_wx 0 +%define with_wx 1 %define with_aa 1 %define with_sdl 1 @@ -33,23 +35,26 @@ %define with_mad 1 %define with_ogg 1 +%define with_flac 1 +%define with_mkv 1 %define with_a52 1 %define with_dv 1 %define with_dvb 1 -%define with_ffmpeg 1 +%define with_ffmpeg 1 +%define with_mpeg2dec 1 %define with_esd 1 %define with_arts 1 %define with_alsa 1 %define with_slp 1 +%define with_tar 1 -## but we try to figure out on wich system we are building -%define buildfor_mdk82 %([[ -e /etc/mandrake-release ]] && awk '{print ($4 == "8.2")}' %{_sysconfdir}/mandrake-release || echo 0) -%define buildfor_mdk90 %([[ -e /etc/mandrake-release ]] && awk '{print ($4 == "9.0")}' %{_sysconfdir}/mandrake-release || echo 0) -%define buildfor_mdk91 %([[ -e /etc/mandrake-release ]] && awk '{print ($4 == "9.1")}' %{_sysconfdir}/mandrake-release || echo 0) -# not a mandrake one. -%define buildfor_rh80 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1) +%define buildfor_rh80 0 +%define buildfor_mdk82 0 +%define buildfor_mdk90 0 +%define buildfor_mdk91 %(awk '{print ($4 == "9.1")}' %{_sysconfdir}/mandrake-release) +%define buildfor_mdk92 %(awk '{print ($4 == "9.2")}' %{_sysconfdir}/mandrake-release) # new macros %if %buildfor_mdk82 || %buildfor_mdk90 || %buildfor_rh80 @@ -61,87 +66,88 @@ %if %buildfor_rh80 %define release %rel # some mdk macros that do not exist in rh -%define configure2_5x CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr -%define make %__make +%define configure2_5x CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --libdir=%_libdir +%define make %__make %_smp_mflags %define makeinstall_std %__make DESTDIR="$RPM_BUILD_ROOT" install -%define _menudir /usr/lib/menu -%define _iconsdir /usr/share/icons -%define _liconsdir /usr/share/icons/large -%define _miconsdir /usr/share/icons/mini # adjust define for Redhat. -%define with_ggi 0 -%define with_dvb 0 -%define with_slp 0 -%define with_mozilla 0 %endif # without -%{?_without_mozilla: %{expand: %%define with_mozilla 0}} -%{?_without_gtk: %{expand: %%define with_gtk 0}} -%{?_without_gnome: %{expand: %%define with_gnome 0}} -%{?_without_qt: %{expand: %%define with_qt 0}} -%{?_without_kde: %{expand: %%define with_kde 0}} -%{?_without_ncurses: %{expand: %%define with_ncurses 0}} -%{?_without_lirc: %{expand: %%define with_lirc 0}} -%{?_without_wx: %{expand: %%define with_wx 0}} - -%{?_without_aa: %{expand: %%define with_aa 0}} -%{?_without_sdl: %{expand: %%define with_sdl 0}} -%{?_without_ggi: %{expand: %%define with_ggi 0}} -%{?_without_svgalib: %{expand: %%define with_svgalib 0}} -%{?_without_xosd: %{expand: %%define with_xosd 0}} - -%{?_without_mad: %{expand: %%define with_mad 0}} -%{?_without_ogg: %{expand: %%define with_ogg 0}} -%{?_without_a52: %{expand: %%define with_a52 0}} -%{?_without_dv: %{expand: %%define with_dv 0}} -%{?_without_dvb: %{expand: %%define with_dvb 0}} - -%{?_without_esd: %{expand: %%define with_esd 0}} -%{?_without_arts: %{expand: %%define with_arts 0}} -%{?_without_alsa: %{expand: %%define with_alsa 0}} - -%{?_without_slp: %{expand: %%define with_slp 0}} +%{?_without_mozilla: %{expand: %%global with_mozilla 0}} +%{?_without_gtk: %{expand: %%global with_gtk 0}} +%{?_without_gnome: %{expand: %%global with_gnome 0}} +%{?_without_qt: %{expand: %%global with_qt 0}} +%{?_without_kde: %{expand: %%global with_kde 0}} +%{?_without_ncurses: %{expand: %%global with_ncurses 0}} +%{?_without_lirc: %{expand: %%global with_lirc 0}} +%{?_without_wx: %{expand: %%global with_wx 0}} + +%{?_without_aa: %{expand: %%global with_aa 0}} +%{?_without_sdl: %{expand: %%global with_sdl 0}} +%{?_without_ggi: %{expand: %%global with_ggi 0}} +%{?_without_svgalib: %{expand: %%global with_svgalib 0}} +%{?_without_xosd: %{expand: %%global with_xosd 0}} + +%{?_without_mad: %{expand: %%global with_mad 0}} +%{?_without_ogg: %{expand: %%global with_ogg 0}} +%{?_without_flac: %{expand: %%global with_flac 0}} +%{?_without_mkv: %{expand: %%global with_mkv 0}} +%{?_without_a52: %{expand: %%global with_a52 0}} +%{?_without_dv: %{expand: %%global with_dv 0}} +%{?_without_dvb: %{expand: %%global with_dvb 0}} + +%{?_without_esd: %{expand: %%global with_esd 0}} +%{?_without_arts: %{expand: %%global with_arts 0}} +%{?_without_alsa: %{expand: %%global with_alsa 0}} + +%{?_without_slp: %{expand: %%global with_slp 0}} +%{?_without_tar: %{expand: %%global with_tar 0}} # with -%{?_with_mozilla: %{expand: %%define with_mozilla 1}} -%{?_with_gtk: %{expand: %%define with_gtk 1}} -%{?_with_gnome: %{expand: %%define with_gnome 1}} -%{?_with_qt: %{expand: %%define with_qt 1}} -%{?_with_kde: %{expand: %%define with_kde 1}} -%{?_with_ncurses: %{expand: %%define with_ncurses 1}} -%{?_with_lirc: %{expand: %%define with_lirc 1}} -%{?_with_wx: %{expand: %%define with_wx 0}} - -%{?_with_aa: %{expand: %%define with_aa 1}} -%{?_with_sdl: %{expand: %%define with_sdl 1}} -%{?_with_ggi: %{expand: %%define with_ggi 1}} -%{?_with_svgalib: %{expand: %%define with_svgalib 1}} -%{?_with_xosd: %{expand: %%define with_xosd 1}} - -%{?_with_mad: %{expand: %%define with_mad 1}} -%{?_with_ogg: %{expand: %%define with_ogg 1}} -%{?_with_a52: %{expand: %%define with_a52 1}} -%{?_with_dv: %{expand: %%define with_dv 1}} -%{?_with_dvb: %{expand: %%define with_dvb 1}} - -%{?_with_esd: %{expand: %%define with_esd 1}} -%{?_with_arts: %{expand: %%define with_arts 1}} -%{?_with_alsa: %{expand: %%define with_alsa 1}} - -%{?_with_slp: %{expand: %%define with_slp 1}} +%{?_with_mozilla: %{expand: %%global with_mozilla 1}} +%{?_with_gtk: %{expand: %%global with_gtk 1}} +%{?_with_gnome: %{expand: %%global with_gnome 1}} +%{?_with_qt: %{expand: %%global with_qt 1}} +%{?_with_kde: %{expand: %%global with_kde 1}} +%{?_with_ncurses: %{expand: %%global with_ncurses 1}} +%{?_with_lirc: %{expand: %%global with_lirc 1}} +%{?_with_wx: %{expand: %%global with_wx 1}} + +%{?_with_aa: %{expand: %%global with_aa 1}} +%{?_with_sdl: %{expand: %%global with_sdl 1}} +%{?_with_ggi: %{expand: %%global with_ggi 1}} +%{?_with_svgalib: %{expand: %%global with_svgalib 1}} +%{?_with_xosd: %{expand: %%global with_xosd 1}} + +%{?_with_mad: %{expand: %%global with_mad 1}} +%{?_with_ogg: %{expand: %%global with_ogg 1}} +%{?_with_flac: %{expand: %%global with_flac 1}} +%{?_with_mkv: %{expand: %%global with_mkv 1}} +%{?_with_a52: %{expand: %%global with_a52 1}} +%{?_with_dv: %{expand: %%global with_dv 1}} +%{?_with_dvb: %{expand: %%global with_dvb 1}} + +%{?_with_esd: %{expand: %%global with_esd 1}} +%{?_with_arts: %{expand: %%global with_arts 1}} +%{?_with_alsa: %{expand: %%global with_alsa 1}} + +%{?_with_slp: %{expand: %%global with_slp 1}} +%{?_with_tar: %{expand: %%global with_tar 1}} Summary: VLC is a free MPEG, MPEG2, DVD and DivX player. Name: %{name} Version: %{version} Release: %{release} -Packager: Yves Duret -%if %{cvs} +%if %{cvs} Source0: http://www.videolan.org/pub/videolan/vlc/snapshots/%{cvs_name}.tar.bz2 %else Source0: http://www.videolan.org/packages/%{version}/%{name}-%{version}.tar.bz2 %endif +Source1: http://www.videolan.org/pub/videolan/vlc/0.6.0/contrib/ffmpeg-%ffcvs.tar.bz2 +Source2: http://www.videolan.org/pub/videolan/vlc/0.6.0/contrib/mpeg2dec-%mpegcvs.tar.bz2 +#gw remove NP_GetValue, as it was already defined in the mozilla headers +Patch: vlc-0.6.0-mozilla-conflict.patch.bz2 License: GPL Group: Video URL: http://www.videolan.org/ @@ -152,11 +158,12 @@ Requires: vlc-plugin-mad Requires: vlc-plugin-a52 BuildRoot: %_tmppath/%name-%version-%release-root - -# for redhat system, NO buildrequires. rh sux -%if !%buildfor_rh80 +%if %with_tar +BuildRequires: libtar-devel +%endif +BuildRequires: freetype2-devel %if %with_mozilla -Buildrequires: mozilla-devel +Buildrequires: mozilla-devel >= 1.3 %endif %if %with_gtk Buildrequires: libgtk+1.2-devel @@ -165,7 +172,7 @@ Buildrequires: libgtk+1.2-devel Buildrequires: gnome-libs-devel %endif %if %with_qt -Buildrequires: libqt2-devel +Buildrequires: libqt3-devel %endif %if %with_kde Buildrequires: kdelibs-devel @@ -173,7 +180,8 @@ Buildrequires: kdelibs-devel %if %with_ncurses Buildrequires: libncurses5-devel %if %with_wx -Buildrequires: wxGTK-devel +Buildrequires: wxGTK-devel >= 2.4 +%endif %endif %if %with_lirc Buildrequires: liblirc-devel @@ -191,15 +199,24 @@ Buildrequires: libggi-devel Buildrequires: svgalib-devel %endif %if %with_xosd -Buildrequires: libxosd2-devel +Buildrequires: libxosd-devel %endif %if %with_mad +%if %buildfor_mdk92 +BuildRequires: libid3tag-devel +%endif Buildrequires: libmad-devel %endif %if %with_ogg Buildrequires: libvorbis-devel Buildrequires: libogg-devel %endif +%if %with_flac +Buildrequires: libflac-devel +%endif +%if %with_mkv +Buildrequires: libmatroska-devel >= 0.4.4-3mdk +%endif %if %with_dv Buildrequires: libdv2-devel %endif @@ -209,13 +226,13 @@ Buildrequires: liba52dec-devel %endif %if %with_ffmpeg -Buildrequires: libffmpeg-devel -%endif -%if %with_dvdplay -BuildRequires: libdvdplay-devel +#gw we use included cvs version +#Buildrequires: libffmpeg-devel %endif -%if %with_dvb -BuildRequires: libdvbpsi-devel + +%if %with_mpeg2dec +#gw we use the included cvs version +#Buildrequires: libmpeg2dec-devel >= 0.3.2 %endif %if %with_alsa @@ -232,7 +249,21 @@ Buildrequires: libarts-devel Buildrequires: libopenslp-devel %endif -%endif #no buildrequires for rh systems. +%if %with_dvdplay +BuildRequires: libdvdplay-devel +%endif + + +%if %with_dvb +BuildRequires: libdvbpsi-devel +%if %buildfor_mdk92 +# gw the cooker kernel has the new incompatible DVB api +BuildRequires: kernel-multimedia-source +%else +BuildRequires: kernel-source +%endif +%endif + %description VideoLAN is an OpenSource streaming solution for every OS developed by @@ -244,7 +275,7 @@ a stream sent by VLS (VideoLAN Server), from another VLC, or from a Web server. You may install vlc-gnome or vlc-gtk to have a nice graphical interface. This package contains no CSS unscrambling functionality for DVDs ; -you need the libdvdcss library available from +you need the libdvdcss library available from http://www.videolan.org/libdvdcss/ or http://plf.zarb.org/ #general packages @@ -263,6 +294,12 @@ for the VLC media player, or standalone applications using features from VLC. Summary: A multimedia plugin for Mozilla, based on vlc group: Video Requires: %name = %version-%release +%if %buildfor_mdk91 +%define moz_ver 1.3.1 +%else +%define moz_ver 1.4b +%endif +##%{e###xpand: %%define mozve %(rpm -q --queryformat "%{version}\n" mozilla)} %{expand: %%define mozve %(rpm -q mozilla| sed 's/mozilla-\([0-9].*\)-.*$/\1/')} Requires: mozilla = %mozve %description -n mozilla-plugin-vlc @@ -293,7 +330,7 @@ This plugin adds a Gnome interface to the VLC media player. To activate it, use the `--intf gnome' flag or run the `gnome-vlc' program. %package -n qvlc -Summary: Qt2 plugin for the VLC media player +Summary: QT plugin for the VLC media player Group: Video Requires: %{name} = %{version} Provides: vlc-gui, vlc-qt @@ -335,6 +372,7 @@ Group: Video Requires: %{name} = %{version} Obsoletes: vlc-lirc Provides: vlc-lirc +Provides: vlc-gui %description -n wxvlc This plugin adds a wxWindow interface to the VLC media player. To activate it, use the `--intf wxwin' flag or run the `wxvlc' program. @@ -420,6 +458,14 @@ Requires: %{name} = %{version} These plugins add support for the Ogg bitstream format and the Ogg Vorbis compressed audio format to the VLC media player. They are autodetected. +%package plugin-flac +Summary: Flac codec plugin for the VLC media player +Group: Video +Requires: %{name} = %{version} +%description plugin-flac +These plugins add support for the FLAC compressed audio format to the +VLC media player. + %package plugin-a52 Summary: A-52 (AC-3) codec plugin for the VLC media player Group: Video @@ -460,7 +506,7 @@ media player. To activate it, use the `--aout esd' flag or select the `esd' audio output plugin from the preferences menu. %package plugin-arts -Summary: aRts audio plugin for the VLC media player +Summary: Arts audio plugin for the VLC media player Group: Video Requires: %{name} = %{version} Obsoletes: vlc-arts @@ -493,23 +539,34 @@ the VLC media player. %prep %if %{cvs} -%setup -q -n %{cvs_name} +%setup -q -n %{cvs_name} -a 1 -a 2 %else -%setup -q +%setup -q -a 1 -a 2 %endif +%patch -p1 +rm -rf doc/skins/curve_maker/CVS %build +cd mpeg2dec-%mpegcvs +%configure2_5x --disable-sdl --without-x +%make +cd .. # yves 0.4.0-1mdk # ffmpeg: static linking cause no official ffmpeg release with a stable ABI # ffmpeg:no plugin posible on ia64 due to the static linking (can not put .a in a .so) -%if %with_mozilla -%define moz_ver 1.3a +cd ffmpeg-%ffcvs +./configure --libdir=%_libdir +%make +cd .. export XPIDL=/usr/lib/mozilla-%moz_ver/xpidl -perl -pi -e 's#-I/usr/share/idl/mozilla#-I/usr/share/idl/mozilla-1.3a#' Makefile.in -%endif +perl -pi -e 's#-I/usr/share/idl/mozilla#-I/usr/share/idl/mozilla-%{moz_ver}#' Makefile.in export QTDIR=%{_libdir}/qt3 # mandrake kernel specific export CPPFLAGS="${CPPFLAGS:--I/usr/src/linux/3rdparty/mod_dvb/include}" +# gw flags for the mozilla build +export CPPFLAGS="$CPPFLAGS -DOJI -DMOZ_X11" +# add missing ebml include dir +export CPPFLAGS="$CPPFLAGS -I/usr/include/ebml" # NO empty line or comments for the configure --switch or it won't work. %configure2_5x --enable-release \ --enable-dvd --without-dvdcss \ @@ -573,7 +630,7 @@ export CPPFLAGS="${CPPFLAGS:--I/usr/src/linux/3rdparty/mod_dvb/include}" --enable-mad \ %endif %if %with_ffmpeg - --enable-ffmpeg --with-ffmpeg=/usr --with-ffmpeg-tree=/usr/lib \ + --enable-ffmpeg --with-ffmpeg-tree=ffmpeg-%ffcvs \ %else --disable-ffmpeg \ %endif @@ -584,6 +641,16 @@ export CPPFLAGS="${CPPFLAGS:--I/usr/src/linux/3rdparty/mod_dvb/include}" --disable-vorbis \ --disable-ogg \ %endif +%if %with_flac + --enable-flac \ +%else + --disable-flac \ +%endif +%if %with_mkv + --enable-mkv \ +%else + --disable-mkv \ +%endif %if %with_dv --enable-dv \ %else @@ -603,11 +670,16 @@ export CPPFLAGS="${CPPFLAGS:--I/usr/src/linux/3rdparty/mod_dvb/include}" %if %with_arts --enable-arts \ %endif +%if %with_mpeg2dec + --enable-libmpeg2 --with-libmpeg2-tree=mpeg2dec-%mpegcvs \ +%else +~ --disable-libmpeg2 \ +%endif %make %install -rm -fr %buildroot +rm -rf %buildroot %makeinstall_std %find_lang %name install -d %buildroot/%_mandir/man1 @@ -617,30 +689,50 @@ install doc/vlc-config.1 %buildroot/%_mandir/man1 # menu mkdir -p %buildroot/%_menudir cat > %buildroot/%_menudir/vlc << EOF -?package(vlc): command="%_bindir/vlc" hotkey="V" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC media player" icon="vlc.png" hints="Video" +?package(vlc): command="%_bindir/vlc" hotkey="V" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC media player" icon="vlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" EOF %if %with_gtk cat > %buildroot/%_menudir/gvlc << EOF -?package(gvlc): command="%_bindir/gvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gtk media player" icon="gvlc.png" hints="Video" +?package(gvlc): command="%_bindir/gvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gtk media player" icon="gvlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" EOF %endif %if %with_gnome cat > %buildroot/%_menudir/gnome-vlc << EOF -?package(gnome-vlc): command="%_bindir/gnome-vlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gnome media player" icon="gnome-vlc.png" hints="Video" +?package(gnome-vlc): command="%_bindir/gnome-vlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Gnome media player" icon="gnome-vlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" EOF %endif %if %with_qt cat > %buildroot/%_menudir/qvlc << EOF -?package(qvlc): command="%_bindir/qvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Qt media player" icon="qvlc.png" hints="Video" +?package(qvlc): command="%_bindir/qvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC Qt media player" icon="qvlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" EOF %endif %if %with_kde cat > %buildroot/%_menudir/kvlc << EOF -?package(kvlc): command="%_bindir/kvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC KDE media player" icon="kvlc.png" hints="Video" +?package(kvlc): command="%_bindir/kvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC KDE media player" icon="kvlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" EOF %endif %if %with_wx -?package(wxvlc): command="%_bindir/wxvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC wxWindow media player" icon="vlc.png" hints="Video" +cat > %buildroot/%_menudir/wxvlc << EOF +?package(wxvlc): command="%_bindir/wxvlc" needs="X11" longtitle="VLC is a free MPEG, MPEG2, DVD and DivX player" section="Multimedia/Video" title="VLC wxWindow media player" icon="vlc.png" hints="Video" \ +mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,application/ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav"\ +accept_url="true"\ +multiple_files="true" +EOF %endif # icons @@ -670,19 +762,14 @@ install -m 644 %pngdir/qvlc32x32.png %buildroot/%_iconsdir/qvlc.png install -m 644 %pngdir/qvlc48x48.png %buildroot/%_liconsdir/qvlc.png %endif -#rpm (>= 4.0.4-20mdk) now checks for installed (but unpackaged) files -rm -f %pngdir/* -%if %buildfor_rh80 -rm -fr %buildroot/%_menudir -rm -fr %buildroot/%_iconsdir +%if ! %with_wx +rm -rf %buildroot%_datadir/vlc/skins %endif -%if !%buildfor_rh80 %post %update_menus %postun %clean_menus -%endif %clean rm -fr %buildroot @@ -690,11 +777,16 @@ rm -fr %buildroot %files -f %name.lang %defattr(-,root,root) %doc NEWS README COPYING AUTHORS MAINTAINERS THANKS +%doc doc/web-streaming.html doc/vlc-howto.sgml doc/lirc/ +%doc doc/fortunes.txt doc/bugreport-howto.txt %_bindir/vlc - +%dir %_datadir/vlc/ +%_datadir/vlc/*.* %dir %_libdir/vlc %dir %_libdir/vlc/access +%_libdir/vlc/access/libcdda_plugin.so +%_libdir/vlc/access/libaccess_directory_plugin.so %_libdir/vlc/access/libaccess_file_plugin.so %_libdir/vlc/access/libaccess_ftp_plugin.so %_libdir/vlc/access/libaccess_http_plugin.so @@ -710,9 +802,12 @@ rm -fr %buildroot %dir %_libdir/vlc/access_output/ %_libdir/vlc/access_output/libaccess_output_dummy_plugin.so %_libdir/vlc/access_output/libaccess_output_file_plugin.so +%_libdir/vlc/access_output/libaccess_output_http_plugin.so %_libdir/vlc/access_output/libaccess_output_udp_plugin.so %dir %_libdir/vlc/audio_filter +%_libdir/vlc/audio_filter/libbandlimited_resampler_plugin.so +%_libdir/vlc/audio_filter/libdtstospdif_plugin.so %_libdir/vlc/audio_filter/libfixed32tofloat32_plugin.so %_libdir/vlc/audio_filter/libfixed32tos16_plugin.so %_libdir/vlc/audio_filter/libfloat32tos16_plugin.so @@ -721,6 +816,7 @@ rm -fr %buildroot %_libdir/vlc/audio_filter/libfloat32tou8_plugin.so %_libdir/vlc/audio_filter/libheadphone_channel_mixer_plugin.so %_libdir/vlc/audio_filter/liblinear_resampler_plugin.so +%_libdir/vlc/audio_filter/libs16tofixed32_plugin.so %_libdir/vlc/audio_filter/libs16tofloat32_plugin.so %_libdir/vlc/audio_filter/libs16tofloat32swab_plugin.so %_libdir/vlc/audio_filter/libs8tofloat32_plugin.so @@ -743,36 +839,42 @@ rm -fr %buildroot %_libdir/vlc/codec/liba52_plugin.so %_libdir/vlc/codec/libadpcm_plugin.so %_libdir/vlc/codec/libaraw_plugin.so +%_libdir/vlc/codec/librawvideo_plugin.so %_libdir/vlc/codec/libcinepak_plugin.so -%_libdir/vlc/codec/libidctclassic_plugin.so -%ifarch %ix86 -%_libdir/vlc/codec/libidctmmxext_plugin.so -%_libdir/vlc/codec/libidctmmx_plugin.so -%endif -%_libdir/vlc/codec/libidct_plugin.so +%_libdir/vlc/codec/libdts_plugin.so +#%_libdir/vlc/codec/libidctclassic_plugin.so +#%ifarch %ix86 +#%_libdir/vlc/codec/libidctmmxext_plugin.so +#%_libdir/vlc/codec/libidctmmx_plugin.so +#%endif +#%_libdir/vlc/codec/libidct_plugin.so %_libdir/vlc/codec/liblpcm_plugin.so -%ifarch %ix86 -%_libdir/vlc/codec/libmotionmmxext_plugin.so -%_libdir/vlc/codec/libmotionmmx_plugin.so -%endif -%_libdir/vlc/codec/libmotion_plugin.so +#%ifarch %ix86 +#%_libdir/vlc/codec/libmotionmmxext_plugin.so +#%_libdir/vlc/codec/libmotionmmx_plugin.so +#%endif +#%_libdir/vlc/codec/libmotion_plugin.so +%_libdir/vlc/codec/liblibmpeg2_plugin.so %_libdir/vlc/codec/libmpeg_audio_plugin.so -%_libdir/vlc/codec/libmpeg_video_plugin.so +#%_libdir/vlc/codec/libmpeg_video_plugin.so %if %with_ffmpeg -%_libdir/vlc/codec/libpostprocessing_c_plugin.so +#%_libdir/vlc/codec/libpostprocessing_c_plugin.so %ifarch %ix86 - %_libdir/vlc/codec/libpostprocessing_mmx_plugin.so - %_libdir/vlc/codec/libpostprocessing_mmxext_plugin.so +# %_libdir/vlc/codec/libpostprocessing_mmx_plugin.so +# %_libdir/vlc/codec/libpostprocessing_mmxext_plugin.so %endif %endif %_libdir/vlc/codec/libspudec_plugin.so %dir %_libdir/vlc/control +%_libdir/vlc/control/libhttp_plugin.so %_libdir/vlc/control/librc_plugin.so +%_libdir/vlc/control/libgestures_plugin.so %dir %_libdir/vlc/demux %_libdir/vlc/demux/libaac_plugin.so %_libdir/vlc/demux/libasf_plugin.so +%_libdir/vlc/demux/libau_plugin.so %_libdir/vlc/demux/libaudio_plugin.so %_libdir/vlc/demux/libavi_plugin.so %_libdir/vlc/demux/liba52sys_plugin.so @@ -782,6 +884,9 @@ rm -fr %buildroot %_libdir/vlc/demux/libid3_plugin.so %_libdir/vlc/demux/libm3u_plugin.so %_libdir/vlc/demux/libm4v_plugin.so +%if %with_mkv +%_libdir/vlc/demux/libmkv_plugin.so +%endif %_libdir/vlc/demux/libmp4_plugin.so %_libdir/vlc/demux/libmpeg_system_plugin.so %_libdir/vlc/demux/libps_plugin.so @@ -791,20 +896,23 @@ rm -fr %buildroot %dir %_libdir/vlc/misc %_libdir/vlc/misc/libdummy_plugin.so +%_libdir/vlc/misc/libhttpd_plugin.so %_libdir/vlc/misc/libipv4_plugin.so %_libdir/vlc/misc/libipv6_plugin.so %_libdir/vlc/misc/liblogger_plugin.so -%ifarch %ix86 -%_libdir/vlc/misc/libmemcpy3dn_plugin.so -%_libdir/vlc/misc/libmemcpymmxext_plugin.so -%_libdir/vlc/misc/libmemcpymmx_plugin.so -%endif +#%ifarch %ix86 +#%_libdir/vlc/misc/libmemcpy3dn_plugin.so +#%_libdir/vlc/misc/libmemcpymmxext_plugin.so +#%_libdir/vlc/misc/libmemcpymmx_plugin.so +#%endif %_libdir/vlc/misc/libmemcpy_plugin.so %_libdir/vlc/misc/libsap_plugin.so +%_libdir/vlc/misc/libscreensaver_plugin.so %dir %_libdir/vlc/mux %_libdir/vlc/mux/libmux_avi_plugin.so %_libdir/vlc/mux/libmux_dummy_plugin.so +%_libdir/vlc/mux/libmux_ogg_plugin.so %_libdir/vlc/mux/libmux_ps_plugin.so %_libdir/vlc/mux/libmux_ts_plugin.so @@ -816,17 +924,24 @@ rm -fr %buildroot %_libdir/vlc/packetizer/libpacketizer_mpegaudio_plugin.so %_libdir/vlc/packetizer/libpacketizer_mpegvideo_plugin.so +%dir %_libdir/vlc/stream_out +%_libdir/vlc/stream_out/libstream_out_display_plugin.so +%_libdir/vlc/stream_out/libstream_out_dummy_plugin.so +%_libdir/vlc/stream_out/libstream_out_duplicate_plugin.so +%_libdir/vlc/stream_out/libstream_out_es_plugin.so +%_libdir/vlc/stream_out/libstream_out_standard_plugin.so + %dir %_libdir/vlc/video_chroma %_libdir/vlc/video_chroma/libi420_rgb_plugin.so %_libdir/vlc/video_chroma/libi420_ymga_plugin.so %_libdir/vlc/video_chroma/libi420_yuy2_plugin.so %_libdir/vlc/video_chroma/libi422_yuy2_plugin.so -%ifarch %ix86 -%_libdir/vlc/video_chroma/libi420_rgb_mmx_plugin.so -%_libdir/vlc/video_chroma/libi420_ymga_mmx_plugin.so -%_libdir/vlc/video_chroma/libi420_yuy2_mmx_plugin.so -%_libdir/vlc/video_chroma/libi422_yuy2_mmx_plugin.so -%endif +#%ifarch %ix86 +#%_libdir/vlc/video_chroma/libi420_rgb_mmx_plugin.so +#%_libdir/vlc/video_chroma/libi420_ymga_mmx_plugin.so +#%_libdir/vlc/video_chroma/libi420_yuy2_mmx_plugin.so +#%_libdir/vlc/video_chroma/libi422_yuy2_mmx_plugin.so +#%endif %dir %_libdir/vlc/video_filter %_libdir/vlc/video_filter/libadjust_plugin.so @@ -836,28 +951,28 @@ rm -fr %buildroot %_libdir/vlc/video_filter/libdistort_plugin.so %_libdir/vlc/video_filter/libinvert_plugin.so %_libdir/vlc/video_filter/libmotionblur_plugin.so +%_libdir/vlc/video_filter/libosdtext_plugin.so %_libdir/vlc/video_filter/libtransform_plugin.so %_libdir/vlc/video_filter/libwall_plugin.so %dir %_libdir/vlc/video_output %_libdir/vlc/video_output/libfb_plugin.so -%_libdir/vlc/video_output/libvout_encoder_plugin.so +#%_libdir/vlc/video_output/libvout_encoder_plugin.so %_libdir/vlc/video_output/libx11_plugin.so %_libdir/vlc/video_output/libxvideo_plugin.so %dir %_libdir/vlc/visualization %_mandir/man1/vlc.* -%if !%buildfor_rh80 %_menudir/vlc %_miconsdir/vlc.png %_iconsdir/vlc.png %_liconsdir/vlc.png -%endif %files -n %libname-devel %defattr(-,root,root) -%doc README +%doc README doc/release-howto.txt doc/skins doc/subtitles doc/Configure.help +%doc doc/arm-crosscompile-howto.sgml %dir %_includedir/vlc %_includedir/vlc/* %_libdir/*a @@ -880,7 +995,6 @@ rm -fr %buildroot %_libdir/vlc/misc/libgtk_main_plugin.so %_libdir/vlc/gui/libgtk_plugin.so %_bindir/gvlc -%if !%buildfor_rh80 %_menudir/gvlc %_miconsdir/gvlc.png %_iconsdir/gvlc.png @@ -890,7 +1004,6 @@ rm -fr %buildroot %postun -n gvlc %clean_menus %endif -%endif %if %with_gnome %files -n gnome-vlc @@ -899,7 +1012,6 @@ rm -fr %buildroot %_libdir/vlc/misc/libgnome_main_plugin.so %_libdir/vlc/gui/libgnome_plugin.so %_bindir/gnome-vlc -%if !%buildfor_rh80 %_menudir/gnome-vlc %_miconsdir/gnome-vlc.png %_iconsdir/gnome-vlc.png @@ -909,15 +1021,28 @@ rm -fr %buildroot %postun -n gnome-vlc %clean_menus %endif + +%if %with_wx +%files -n wxvlc +%defattr(-,root,root) +%doc README +%_bindir/wxvlc +%_libdir/vlc/gui/libwxwindows_plugin.so +%_menudir/wxvlc +%_datadir/vlc/skins +%post -n wxvlc +%update_menus +%postun -n wxvlc +%clean_menus %endif + %if %with_qt %files -n qvlc %defattr(-,root,root) %doc README %_libdir/vlc/gui/libqt_plugin.so %_bindir/qvlc -%if !%buildfor_rh80 %_menudir/qvlc %_miconsdir/qvlc.png %_iconsdir/qvlc.png @@ -927,14 +1052,13 @@ rm -fr %buildroot %postun -n qvlc %clean_menus %endif -%endif %if %with_kde %files -n kvlc +%defattr(-,root,root) %doc README %_libdir/vlc/gui/libkde_plugin.so %_bindir/kvlc -%if !%buildfor_rh80 %_menudir/kvlc %_miconsdir/kvlc.png %_iconsdir/kvlc.png @@ -944,7 +1068,6 @@ rm -fr %buildroot %postun -n kvlc %clean_menus %endif -%endif %if %with_ncurses %files plugin-ncurses @@ -1015,6 +1138,15 @@ rm -fr %buildroot %_libdir/vlc/codec/libvorbis_plugin.so %endif +%if %with_ogg +%files plugin-flac +%defattr(-,root,root) +%doc README +%_libdir/vlc/demux/libflac_plugin.so +%_libdir/vlc/codec/libflacdec_plugin.so +%endif + + %if %with_dv %files plugin-dv %defattr(-,root,root) @@ -1070,8 +1202,130 @@ rm -fr %buildroot %endif %changelog -* Sat Feb 01 2003 Yves Duret 0.5.0-1mdk -- new upstream release. +* Mon Jun 30 2003 Götz Waschk 0.6.0-5mdk +- reenable wxvlc, but use 2.4 instead of 2.5 +- remove the packager tag +- fix build on mdk 9.1 + +* Mon Jun 30 2003 Götz Waschk 0.6.0-4mdk +- add some more docs +- enable libtar +- fix comment about the DVB headers +- small spec fix + +* Mon Jun 30 2003 Götz Waschk 0.6.0-3mdk +- some spec fixes +- add mime types to the menu entries +- enable the kde plugin +- the wx package provides wx-gui +- move the skins to the wx package +- fix all --with options +- enable matroska +- disable wx, didn't work + +* Fri Jun 27 2003 Götz Waschk 0.6.0-2mdk +- add matroska to the spec file, but don't enable it yet +- enable the flac plugin +- enable DVB, use headers from kernel-multimedia-source + +* Fri Jun 27 2003 Götz Waschk 0.6.0-1mdk +- add lots of new plugins +- disable libvout_encoder_plugin.so +- disable postprocessing plugins +- add the data dir to the main package +- disable dvb (were have all the headers gone?) +- include static ffmpeg +- include static mpeg2dec +- enable wxGTK +- fix mozilla build +- fix buildrequires +- new version + +* Tue Apr 8 2003 Götz Waschk 0.5.2-2mdk +- new dvdread + +* Sun Apr 06 2003 Yves Duret 0.5.2-1mdk +- 0.5.2 + +* Tue Feb 18 2003 Götz Waschk 0.5.0-4mdk +- new xosd + +* Thu Feb 06 2003 Olivier Thauvin 0.5.0-3mdk +- BuildRequires libdvbpsi-devel libdvdplay-devel + +* Tue Feb 4 2003 Götz Waschk 0.5.0-2mdk +- rebuild for new xosd + +* Mon Feb 03 2003 Yves Duret 0.5.0-1mdk +- Natalya release. +- enables DVD menus. + +* Mon Feb 03 2003 Yves Duret 0.5.0-0.20030203.1mdk +- latest (!) cvs snapshot before release, oh yeah. +- added dv and dvb sub rpm (satellite). +- added mozilla-plugin. +- more docs. +- fixes here and here. +- sync with CVS one. + +* Fri Jan 31 2003 Yves Duret 0.5.0-0.20030131.1mdk +- new cvs snapshot. + +* Tue Jan 28 2003 Yves Duret 0.5.0-0.20030128.1mdk +- new cvs snapshot. +- sync specfile with HEAD CVS one. + +* Mon Jan 27 2003 Yves Duret 0.5.0-0.20030127.1mdk +- new cvs snapshot. + +* Fri Jan 24 2003 Yves Duret 0.5.0-0.20030124.1mdk +- new cvs snapshot adding transcoding feature! +- new video_output/vout_encoder plugin. +- new demux/a52sys plugin. + +* Mon Jan 20 2003 Yves Duret 0.5.0-0.20030120.1mdk +- new cvs snapshot. +- new access/slp plugin. +- more buildfor_{rh80,mdk{82,90}} stuff. +- use %%mklibname macro. +- use %%clean_menus in postun instead of %%update_menus everywhere. + +* Thu Jan 16 2003 Yves Duret 0.5.0-0.20030116.1mdk +- new cvs snapshot. +- codec/mad plugin is replaced by audio_filter/mpgatofixed32. + +* Tue Jan 14 2003 Yves Duret 0.5.0-0.20030114.1mdk +- new cvs snapshot. +- new demux/m4v and mux/avi plugins. + +* Fri Jan 10 2003 Yves Duret 0.5.0-0.20030110.1mdk +- new cvs snapshot. +- new packetizer/mpeg4audio plugin. + +* Tue Jan 07 2003 Yves Duret 0.5.0-0.20030107.1mdk +- cvs 2003/01/07. +- mmx/3dn plugins are only for x86 arch (use %ifarch %ix86 to list them) + ie. fix rpm building on ppc thx Olivier Thauvin + +* Mon Jan 06 2003 Yves Duret 0.5.0-0.20030106.1mdk +- cvs 2003/01/06. +- removed access/rtp plugin (merged in access/udp). +- removed codec/imdct and codec/downmix plugins (deprecated). +- libvlc0-devel provides libvlc-devel. + +* Sun Jan 05 2003 Yves Duret 0.5.0-0.20021220.2mdk +- rebuild against new glibc. +- rpm configure macro is now fixed. + +* Fri Dec 20 2002 Yves Duret 0.5.0-0.20021220.1mdk +- cvs 20021220 (aka fix segfaulting with broken trancoded avi) +- added rawdv plugin. +- few spec enhacement and sync with upstream CVS. + +* Wed Dec 18 2002 Olivier Thauvin 0.5.0-0.20021218.1mdk +- don't harcore arch in name +- cvs 20021218 + * Mon Jun 20 2002 Yves Duret 0.4.2-1mdk - new upstream release @@ -1199,7 +1453,7 @@ rm -fr %buildroot * Fri Apr 13 2001 Yves Duret 0.2.71-1mdk - version 0.2.71 : * Fixed segfaults when compiled with gcc 3.0pre and versions of gcc - shipped with the latest RedHat distributions. + shipped with the latest RedHat distributions. * Fixed the BeOS CSS decryption. * Fixed a few issues in IFO parsing. * Fixed XVideo video output. @@ -1209,13 +1463,13 @@ rm -fr %buildroot - version 0.2.70 * Thu Mar 22 2001 Yves Duret 0.2.63-1mdk -- version 0.2.63 : Bugfixes, bugfixes, and bugfixes again, a Gtk+ +- version 0.2.63 : Bugfixes, bugfixes, and bugfixes again, a Gtk+ interface for the Gnome-impaired, an even better DVD support * Fri Feb 16 2001 Yves Duret 0.2.61-1mdk -- new version for all the DVD fans (add MPEG1 support, direct DVD support, - DVD decryption, arbitrary, seeking in the stream, pause, fast forward - and slow motion, hardware YUV acceleration enhanced CSS support and a few +- new version for all the DVD fans (add MPEG1 support, direct DVD support, + DVD decryption, arbitrary, seeking in the stream, pause, fast forward + and slow motion, hardware YUV acceleration enhanced CSS support and a few new interface features including drag'n'drop. - first *real* public release (now under the GPL) -- 2.39.2