Author: rathann Update of /cvs/free/rpms/mplayer/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27662 Modified Files: .cvsignore sources Added Files: mplayer-config.patch mplayer-dvdread.patch mplayer-man-zh_CN.patch mplayer-manlinks.patch mplayer-qcelp.patch mplayer-x86_32-compile.patch mplayer.spec Log Message: - initial import into F-9 branch (backport from devel + fixes) mplayer-config.patch: --- NEW FILE mplayer-config.patch --- --- etc/example.conf~ 2006-06-11 21:35:46.000000000 +0300 +++ etc/example.conf 2006-08-10 01:18:25.000000000 +0300 @@ -3,3 +3,3 @@ # -# Configuration files are read system-wide from /usr/local/etc/mplayer.conf +# Configuration files are read system-wide from /etc/mplayer/mplayer.conf # and per user from ~/.mplayer/config, where per-user settings override @@ -93,3 +93,3 @@ # Specify your preferred skin here (skins are searched for in -# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>). +# /usr/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>). #skin = Abyss @@ -120,4 +120,9 @@ +# A plugged in joystick can interfere with keyboard shortcuts +joystick = no + +# FriBidi can do "funny" things to some ISO-8859-* subtitles +flip-hebrew = no # You can also include other configuration files. -#include = /path/to/the/file/you/want/to/include +#include = /home/me/.mplayer/something mplayer-dvdread.patch: --- NEW FILE mplayer-dvdread.patch --- diff -up mplayer-export-2008-08-18/configure.dvdread mplayer-export-2008-08-18/configure --- mplayer-export-2008-08-18/configure.dvdread 2008-08-18 00:02:05.000000000 +0200 +++ mplayer-export-2008-08-18/configure 2008-08-18 22:47:42.000000000 +0200 @@ -5458,10 +5458,10 @@ elif test "$_dvdread" = auto ; then if test "$_dl" = yes; then cat > $TMPC << EOF #include <inttypes.h> -#include <libdvdread/dvd_reader.h> -#include <libdvdread/ifo_types.h> -#include <libdvdread/ifo_read.h> -#include <libdvdread/nav_read.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/ifo_types.h> +#include <dvdread/ifo_read.h> +#include <dvdread/nav_read.h> int main(void) { return 0; } EOF fi diff -up mplayer-export-2008-08-18/stream/stream_dvd_common.c.dvdread mplayer-export-2008-08-18/stream/stream_dvd_common.c --- mplayer-export-2008-08-18/stream/stream_dvd_common.c.dvdread 2008-07-30 14:01:30.000000000 +0200 +++ mplayer-export-2008-08-18/stream/stream_dvd_common.c 2008-08-18 22:49:46.000000000 +0200 @@ -1,10 +1,6 @@ #include "config.h" #include <inttypes.h> -#ifdef CONFIG_DVDREAD_INTERNAL #include <dvdread/ifo_types.h> -#else -#include <libdvdread/ifo_types.h> -#endif #include "stream_dvd_common.h" /** diff -up mplayer-export-2008-08-18/stream/stream_dvd_common.h.dvdread mplayer-export-2008-08-18/stream/stream_dvd_common.h --- mplayer-export-2008-08-18/stream/stream_dvd_common.h.dvdread 2008-07-30 14:01:30.000000000 +0200 +++ mplayer-export-2008-08-18/stream/stream_dvd_common.h 2008-08-18 22:50:11.000000000 +0200 @@ -3,11 +3,7 @@ #include "config.h" #include <inttypes.h> -#ifdef CONFIG_DVDREAD_INTERNAL #include <dvdread/ifo_types.h> -#else -#include <libdvdread/ifo_types.h> -#endif int mp_dvdtimetomsec(dvd_time_t *dt); diff -up mplayer-export-2008-08-18/stream/stream_dvd.h.dvdread mplayer-export-2008-08-18/stream/stream_dvd.h --- mplayer-export-2008-08-18/stream/stream_dvd.h.dvdread 2008-07-30 14:01:30.000000000 +0200 +++ mplayer-export-2008-08-18/stream/stream_dvd.h 2008-08-18 22:50:47.000000000 +0200 @@ -9,10 +9,10 @@ #include "dvdread/ifo_read.h" #include "dvdread/nav_read.h" #else -#include <libdvdread/dvd_reader.h> -#include <libdvdread/ifo_types.h> -#include <libdvdread/ifo_read.h> -#include <libdvdread/nav_read.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/ifo_types.h> +#include <dvdread/ifo_read.h> +#include <dvdread/nav_read.h> #endif #include "stream.h" mplayer-man-zh_CN.patch: --- NEW FILE mplayer-man-zh_CN.patch --- diff -up mplayer-export-2008-08-18/configure.man-zh_CN mplayer-export-2008-08-18/configure --- mplayer-export-2008-08-18/configure.man-zh_CN 2008-08-18 22:53:34.000000000 +0200 +++ mplayer-export-2008-08-18/configure 2008-08-18 23:33:58.000000000 +0200 @@ -185,7 +185,7 @@ case `echo -n` in esac msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` -man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` +man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"` doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` show_help(){ mplayer-manlinks.patch: --- NEW FILE mplayer-manlinks.patch --- diff -up mplayer-export-2008-06-04/Makefile.manlinks mplayer-export-2008-06-04/Makefile --- mplayer-export-2008-06-04/Makefile.manlinks 2008-05-30 22:10:36.000000000 +0200 +++ mplayer-export-2008-06-04/Makefile 2008-06-04 23:13:37.000000000 +0200 @@ -805,7 +805,7 @@ install-mplayer-man-en: $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ install-mencoder-man-en: install-mplayer-man-en - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 + echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1 define MPLAYER_MAN_RULE install-mplayer-man-$(lang): @@ -815,7 +815,7 @@ endef define MENCODER_MAN_RULE install-mencoder-man-$(lang): install-mplayer-man-$(lang) - cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 + echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1 endef $(foreach lang,$(MAN_LANG),$(eval $(MPLAYER_MAN_RULE))) mplayer-qcelp.patch: --- NEW FILE mplayer-qcelp.patch --- diff -up mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c --- mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp 2008-01-13 17:00:39.000000000 +0100 +++ mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c 2008-02-22 21:19:57.000000000 +0100 @@ -40,6 +40,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT {"MPA", 0x55}, {"vorbis", mmioFOURCC('v','r','b','s')}, {"mpeg4-generic", mmioFOURCC('M','P','4','A')}, + {"x-Purevoice", mmioFOURCC('Q','c','l','p')}, {NULL, 0}, }; mplayer-x86_32-compile.patch: --- NEW FILE mplayer-x86_32-compile.patch --- diff -up mplayer-export-2008-05-31/libavcodec/Makefile.compile mplayer-export-2008-05-31/libavcodec/Makefile --- mplayer-export-2008-05-31/libavcodec/Makefile.compile 2008-05-31 16:32:11.000000000 +0200 +++ mplayer-export-2008-05-31/libavcodec/Makefile 2008-06-11 07:47:18.000000000 +0200 @@ -91,6 +91,11 @@ OBJS-$(CONFIG_H263I_DECODER) + OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o golomb.o mpegvideo.o error_resilience.o +# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# on ix86 in cabac.h +ifeq ($(ARCH_X86_32),yes) +h264.o: CFLAGS += -fomit-frame-pointer +endif OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o @@ -395,6 +400,11 @@ OBJS-$(CONFIG_ENCODERS) + OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o +# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# on ix86 in snowdsp_mmx.o +ifeq ($(ARCH_X86_32),yes) +i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer +endif OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o --- NEW FILE mplayer.spec --- %define codecdir %{_libdir}/codecs %define pre 20080818svn %define svn 1 %define svnbuild 2008-08-18 %define svnrev 27470 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 Release: 0.96.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia License: GPLv2+ URL: http://www.mplayerhq.hu/ %if %{svn} Source0: http://rpm.greysector.net/livna/mplayer-export-%{svnbuild}.tar.bz2 %else Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2 %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Patch2: %{name}-config.patch Patch5: %{name}-x86_32-compile.patch Patch8: %{name}-manlinks.patch Patch10: %{name}-qcelp.patch Patch11: %{name}-dvdread.patch Patch12: %{name}-man-zh_CN.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: aalib-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel BuildRequires: desktop-file-utils BuildRequires: em8300-devel BuildRequires: enca-devel BuildRequires: faac-devel BuildRequires: faad2 >= %{faad2min} BuildRequires: faad2-devel >= %{faad2min} BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.0.9 BuildRequires: fribidi-devel BuildRequires: giflib-devel BuildRequires: gtk2-devel BuildRequires: ladspa-devel BuildRequires: lame-devel BuildRequires: libGL-devel BuildRequires: libXinerama-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXv-devel BuildRequires: libXvMC-devel BuildRequires: libXxf86dga-devel BuildRequires: libXxf86vm-devel BuildRequires: libcaca-devel BuildRequires: libdca-devel BuildRequires: libdv-devel BuildRequires: libdvdnav-devel >= 4.1.2 BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: lirc-devel BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 BuildRequires: pulseaudio-lib-devel BuildRequires: speex-devel >= 1.1 BuildRequires: twolame-devel BuildRequires: x264-devel BuildRequires: xvidcore-devel >= 0.9.2 %{?_with_arts:BuildRequires: arts-devel} %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} %{?_with_directfb:BuildRequires: directfb-devel} %{?_with_esound:BuildRequires: esound-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} %{?_with_libmad:BuildRequires: libmad-devel} %{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3} %{?_with_openal:BuildRequires: openal-devel} %{?_with_samba:BuildRequires: libsmbclient-devel} %{?_with_svgalib:BuildRequires: svgalib-devel} %{?_with_xmms:BuildRequires: xmms-devel} %if %{svn} # for XML docs, SVN only BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: libxml2 BuildRequires: libxslt %endif Obsoletes: mplayer-fonts Requires: faad2-libs >= %{faad2min} %description MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, and PVA files. You can also use it to watch VCDs, SVCDs, DVDs, 3ivx, RealMedia, and DivX movies. It supports a wide range of output drivers including X11, XVideo, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice antialiased shaded subtitles and OSD. Non-default rpmbuild options: --with samba: Enable Samba (smb://) support --with xmms: Enable XMMS input plugin support --with amr: Enable AMR support --with libmad: Enable libmad support --with openal: Enable OpenAL support --with jack: Enable JACK support --with arts: Enable aRts support --with esound: Enable EsounD support --with directfb:Enable DirectFB support --with svgalib: Enable SVGAlib support --with nemesi: Enable libnemesi RTSP support %package gui Summary: GUI for MPlayer Group: Applications/Multimedia Requires: mplayer = %{version}-%{release} %description gui This package contains a GUI for MPlayer and a default skin for it. %package -n mencoder Summary: MPlayer movie encoder Group: Applications/Multimedia Requires: mplayer = %{version}-%{release} Provides: mplayer-mencoder = %{version}-%{release} Obsoletes: mplayer-mencoder < 1.0-0.36 %description -n mencoder This package contains the MPlayer movie encoder. %package doc Summary: MPlayer documentation in various languages Group: Documentation %description doc MPlayer documentation in various languages. %prep %if %{svn} %setup -q -n mplayer-export-%{svnbuild} %else %setup -q -n MPlayer-%{version}%{pre} %endif %patch2 -p0 %patch5 -p1 -b .compile %patch8 -p1 -b .manlinks %patch10 -p1 -b .qclp %patch11 -p1 -b .dvdread %patch12 -p1 -b .man-zh_CN doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 } for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done for lang in ru ; do doconv koi8-r utf-8 $lang ; done mv DOCS/man/zh DOCS/man/zh_CN sed -i -e 's/\(SVN-r[0-9]* \)/\1rpm.livna.org /' -e 's/UNKNOWN/%{svnrev}/' version.sh # remove internal libdvdread copy to avoid clashes rm -r dvdread %build export CFLAGS="$RPM_OPT_FLAGS -ffast-math" %ifarch ppc export CFLAGS="$CFLAGS -maltivec -mabi=altivec" %endif ./configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --datadir=%{_datadir}/mplayer \ --mandir=%{_mandir} \ --confdir=%{_sysconfdir}/mplayer \ --libdir=%{_libdir} \ --codecsdir=%{codecdir} \ \ --disable-faac-lavc \ --disable-mp3lame-lavc \ --disable-x264-lavc \ \ --enable-gui \ --enable-largefiles \ --enable-unrarexec \ --disable-termcap \ --disable-bitmap-font \ --enable-lirc \ --enable-joystick \ %{!?_with_nemesi:--disable-nemesi} \ %{!?_with_samba:--disable-smb} \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --enable-menu \ \ --disable-faad-internal \ --disable-tremor-internal \ %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \ %{!?_with_libmad:--disable-mad} \ %{?_with_xmms:--enable-xmms} \ \ --enable-xvmc \ --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \ %{!?_with_svgalib:--disable-svga} \ \ %{!?_with_arts:--disable-arts} \ %{!?_with_esound:--disable-esd} \ %{!?_with_jack:--disable-jack} \ %{!?_with_openal:--disable-openal} \ \ --enable-runtime-cpudetection \ --target=%{_target_cpu}-%{_target_os} \ --language=all \ \ --with-fribidi-config="pkg-config fribidi" \ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \ --with-xvmclib=XvMCW # parallel make fails in vidix #%{__make} %{?_smp_mflags} %{__make} mv -f mplayer gmplayer %{__make} distclean ./configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --datadir=%{_datadir}/mplayer \ --mandir=%{_mandir} \ --confdir=%{_sysconfdir}/mplayer \ --libdir=%{_libdir} \ --codecsdir=%{codecdir} \ \ --disable-faac-lavc \ --disable-mp3lame-lavc \ --disable-x264-lavc \ \ --enable-largefiles \ --enable-unrarexec \ --disable-termcap \ --disable-bitmap-font \ --enable-lirc \ --enable-joystick \ %{!?_with_nemesi:--disable-nemesi} \ %{!?_with_samba:--disable-smb} \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ --enable-menu \ \ --disable-faad-internal \ --disable-tremor-internal \ %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \ %{!?_with_libmad:--disable-mad} \ %{?_with_xmms:--enable-xmms} \ \ --enable-xvmc \ --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \ %{!?_with_svgalib:--disable-svga} \ \ %{!?_with_arts:--disable-arts} \ %{!?_with_esound:--disable-esd} \ %{!?_with_jack:--disable-jack} \ %{!?_with_openal:--disable-openal} \ \ --enable-runtime-cpudetection \ --target=%{_target_cpu}-%{_target_os} \ --language=all \ \ --with-fribidi-config="pkg-config fribidi" \ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \ --with-xvmclib=XvMCW # parallel make fails in vidix #%{__make} %{?_smp_mflags} %{__make} %if %{svn} # build HTML documentation from XML files pushd DOCS/xml %{__make} html-chunked popd %endif %install rm -rf $RPM_BUILD_ROOT doc make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no for file in aconvert.sh midentify.sh ; do install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/ done # Clean up documentation mkdir doc cp -pR DOCS/* doc/ rm -r doc/man doc/xml doc/README mv doc/HTML/* doc/ rm -rf doc/HTML # Default config files install -Dpm 644 etc/example.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf # use Nimbus Sans L font for OSD (via fontconfig) echo "fontconfig=yes" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf echo "font=\"Sans\"" >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf echo "ao=pulse,alsa," >>$RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf install -pm 644 etc/{input,menu}.conf $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/ # GUI mplayer install -pm 755 g%{name} $RPM_BUILD_ROOT%{_bindir}/ # Default skin install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins tar xjC $RPM_BUILD_ROOT%{_datadir}/mplayer/skins --exclude=.svn -f %{SOURCE1} ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default # Icons install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -pm 644 etc/mplayer.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps # Desktop file desktop-file-install \ --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ etc/%{name}.desktop # Codec dir install -dm 755 $RPM_BUILD_ROOT%{codecdir} %post gui gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : update-desktop-database &>/dev/null || : %postun gui gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : update-desktop-database &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc AUTHORS Changelog Copyright LICENSE README %dir %{_sysconfdir}/mplayer %config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf %config(noreplace) %{_sysconfdir}/mplayer/input.conf %config(noreplace) %{_sysconfdir}/mplayer/menu.conf %{_bindir}/aconvert.sh %{_bindir}/midentify.sh %{_bindir}/mplayer %dir %{codecdir}/ %dir %{_datadir}/mplayer/ %{_mandir}/man1/mplayer.1* %lang(cs) %{_mandir}/cs/man1/mplayer.1* %lang(de) %{_mandir}/de/man1/mplayer.1* %lang(es) %{_mandir}/es/man1/mplayer.1* %lang(fr) %{_mandir}/fr/man1/mplayer.1* %lang(hu) %{_mandir}/hu/man1/mplayer.1* %lang(it) %{_mandir}/it/man1/mplayer.1* %lang(pl) %{_mandir}/pl/man1/mplayer.1* %lang(ru) %{_mandir}/ru/man1/mplayer.1* %lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1* %files gui %defattr(-, root, root, -) %{_bindir}/gmplayer %{_datadir}/applications/*mplayer.desktop %{_datadir}/icons/hicolor/32x32/apps/mplayer.xpm %{_datadir}/mplayer/skins/ %files -n mencoder %defattr(-, root, root, -) %{_bindir}/mencoder %{_mandir}/man1/mencoder.1* %lang(cs) %{_mandir}/cs/man1/mencoder.1* %lang(de) %{_mandir}/de/man1/mencoder.1* %lang(es) %{_mandir}/es/man1/mencoder.1* %lang(fr) %{_mandir}/fr/man1/mencoder.1* %lang(hu) %{_mandir}/hu/man1/mencoder.1* %lang(it) %{_mandir}/it/man1/mencoder.1* %lang(pl) %{_mandir}/pl/man1/mencoder.1* %lang(ru) %{_mandir}/ru/man1/mencoder.1* %lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1* %files doc %defattr(-, root, root, -) %doc doc/en/ doc/tech/ %lang(cs) %doc doc/cs/ %lang(de) %doc doc/de/ %lang(es) %doc doc/es/ %lang(fr) %doc doc/fr/ %lang(hu) %doc doc/hu/ %lang(pl) %doc doc/pl/ %lang(ru) %doc doc/ru/ %lang(zh_CN) %doc doc/zh_CN/ %changelog * Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080818svn - updated to latest SVN snapshot - dropped obsolete patches - fixed build with libdvdread 4.1.2 - installed aconvert.sh to bindir - fixed zh_CN manpage installation * Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.95.20080531svn - rebuild against shared live555 - add missing libXScrnSaver-devel BR - fixed audio in some rtsp streams (backport from SVN) * Wed Jun 04 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.94.20080531svn - updated to latest SVN snapshot (bugs #1812, #1910, #1895) - fixed building with svgalib support - use pulseaudio output by default - BR latest libdvdnav - bring back live (bug #1950), make libnemesi optional - drop obsolete patches - fix building against fribidi (bug #1887) * Sat Mar 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 1.0-0.93.20080211svn - rebuild for new x264 * Mon Feb 11 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.92.20080211svn - updated to latest SVN snapshot - fixed opening files with spaces in their names (bug #1674) - libnemesi doesn't conflict with live anymore - fixed samba BR (bug #1809) - enabled libnemesi by default - made live optional - security fixes: CVE-2008-0485, CVE-2008-0486, CVE-2008-0629, CVE-2008-0630 (bug #1852) * Mon Dec 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.91.20071201svn - use correct chanmap patch - obsolete mplayer-fonts - require our faad2 2.6.1 * Sat Dec 01 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.90.20071201svn - updated to latest SVN snapshot - reverted a change which requires newer libdvdnav snapshot - fixed license tag - use man-links instead of real filesystem symlinks for mencoder.1 - fixed desktop file * Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.89.rc2 - rebuild against faad2-2.6.1 - drop obsolete patch * Tue Nov 06 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.88.rc2 - fixed crash in vorbis decoder (bug #1516) - added pulseaudio support - better libnemesi support - fixed libdca support * Tue Nov 06 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.0-87 - rebuild * Sat Oct 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.86.rc2 - work around Fedora bug 330031 * Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.85.rc2 - 1.0rc2 - drop obsolete/useless patches - add experimental audio channel reordering patch - optional libnemesi support (mutually exclusive with LIVE555) - revert to internal faad2 (linking with 2.5 makes MPlayer non-distributable) but leave a build-time option - don't rebuild HTML docs for releases - include Copyright file * Thu Sep 27 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.84.20070923svn - really fix it this time * Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.83.20070923svn - fix build on x86_32 * Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.82.20070923svn - disable parallel make (fails on vidix) - re-enable external faad2 (fixed in 2.5-4) * Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.81.20070923svn - latest snapshot - update Blue skin - fix seeking with -demux lavf - dropped obsolete patches - Czech manpage is already utf8 (bug #1626) - fixes CVE-2007-4938 (bug #1645) - disable external faad, seems broken * Sat Jul 21 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.80.20070715svn - fix build on i386 - another libdca patch update - fix parallel builds * Fri Jul 20 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.79.20070715svn - fix a crash in subtitle selection code - updated libdca patch * Sun Jul 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.78.20070715svn - latest snapshot - use external libfaad again - restore libdca support - make ad_faad detect the correct sample rate on 64-bit systems (based on a patch by Rasmus Rohde) * Tue Jun 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.77.20070612svn - latest snapshot - dropped one obsolete patch - fixed CVE-2007-2948 (#1525) - backported compilation fix from r23546 - dropped redundant BR: libpng-devel (brought in by gtk2-devel) * Tue May 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.75.20070513svn - BuildRequire the new libdvdnav * Sun May 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.74.20070513svn - 20070513 snapshot - libdha is now static * Sun Mar 25 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.72.20070325svn - 20070325 snapshot - built with internal libav{codec,format,util} - dropped obsolete patches * Sun Mar 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.71.rc1 - fix buffer overflow in DS_VideoDecoder.c (bug #1443) * Sat Mar 10 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.70.rc1 - fix buffer overflow in DMO_VideoDecoder.c * Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.69.rc1 - fix buffer overflow in asmrp.c * Thu Dec 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.68.rc1 - don't depend on urw-fonts, use generic Sans font instead * Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.67.rc1 - disable bitmap fonts - add libdca support - add twolame support - prevent linking mplayer with GUI libs - make libmad support optional * Sun Nov 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.66.rc1 - Apply upstream mp3lib workaround instead of disabling 3DNow altogether in it, thanks to Dominik 'Rathann' Mierzejewski. * Tue Oct 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.65.rc1 - 1.0rc1, ffmpeg WMV3 patch applied upstream. - Include libdvdnav and x264 support. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0-64 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.63.pre8 - Rebuild. * Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.62.pre8 - Enable ffmpeg WMV3 decoder. - Work around hang when dumping to wav on ix86 (#1127). - Disable internal tremor due to above workaround making it crashy. - Disable FriBidi (#612) and joystick (#983) in default config file. - Specfile/build dependency cleanups. - Update default Blue skin to 1.6. * Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.61.pre8 - Move codecs dir to %%{_libdir}/codecs to follow upstream, old location in %%{_libdir}/win32 still appears to work as a fallback. - Ship codecs dir on all architectures again. * Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.60.pre8 - Make DirectFB support optional, disabled by default (#1102). - Adapt to lzo2, require it. - Include midentify (#1105). * Mon Jun 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.44.pre8 - System wide skins dir has changed to /usr/share/mplayer/skins (#1070). * Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.42.pre8 - Make arts and esound support optional, disabled by default (#1067). - Specfile and legacy dependency cleanups. * Fri Jun 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.pre8 - 1.0pre8. - Drop runtime CPU detection message removal patch. - Disable XMMS and OpenAL support by default. - Add support for building with JACK support, disabled by default. - Don't include the %%{_libdir}/win32 dir on non-x86. - Fix %%lang tags in -doc. * Sat May 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060513 - 2006-05-13 CVS snapshot. - Make audio output default to ALSA in default config (#970). - Trim pre-2005 %%changelog entries. * Sat May 06 2006 Noa Resare <noa(a)resare.com&gt; - Move doc to a separate package (#960). * Sun Apr 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060412 - Enable Musepack support. * Thu Apr 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060412 - 2006-04-12 CVS snapshot. - Fix 3dnow disabling patch, some parts were erroneously omitted in the previous revision (Thomas Jansen). * Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060407 - 2006-04-07 CVS snapshot using shared ffmpeg, GTK2, FAAC, OpenAL, and XvMC. - XMMS input plugin support can be disabled by rebuilding with "--without xmms" - GUI changes: use upstream desktop entry file, update GTK icon cache and desktop database at post(un)install time, install icon to %%{_datadir}/icons. - Drop lots of obsolete patches. * Fri Mar 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 1.0-0.37.pre7try2 - fix #836 - fix #835,#834 by disabling detection of 3dnowext for now (Thomas Jansen) this should work around the garbage sound output * Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.36.pre7try2 - Add RLO identifier to version string per upstream recommendation. - Use configure flags instead of patch for enabling v4l*. - Make DVB and DirectFB support unconditional. - Drop libXvMC-devel build dependency until xvmc is actually built (#731). - Backport get_time_pos slave mode command from CVS to fix progress bar with mplayerplug-in >= 3.15. - Drop vdr-mplayer slave mode patch. - Rename mplayer-mencoder to mencoder. * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 1.0-0.35.pre7try2 - fix x86_64 asm issues (maybe?!) - fix file section for ppc * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.34.pre7try2 - Apply upstream demuxer.h heap overflow fix (CVE-2006-0579). - Fix build time X11 detection on lib64 archs. - Update Blue skin to 1.5. * Mon Jan 16 2006 Adrian Reber <adrian(a)lisas.de&gt; - 1.0-0.lvn.0.32.pre7try2 - re-enabled the aalib-devel BR * Thu Dec 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.31.pre7try2 - Apply fix for CVE-2005-4048 from ffmpeg CVS. * Sun Dec 11 2005 Adrian Reber <adrian(a)lisas.de&gt; - 1.0-0.lvn.0.30.pre7try2 - changed BR for modular X - temporary removal of aalib-devel BR * Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.29.pre7try2 - More pre-FC3 cleanups. - Make "Blue" the default skin by symlinking, fixes fallback (#571). - Build against new DirectFB. * Thu Sep 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.28.pre7try2 - Clean up obsolete pre-FC3 stuff (LIRC, CACA, DXR3, and Enca support now unconditional). - Drop zero Epochs. * Thu Sep 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.27.pre7try2 - Enable Enca by default, build with it for FC3+. * Tue Sep 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.26.pre7try2 - 1.0pre7try2. - Enable v4l2 interface (#576). - Enable DVB support only with recent enough glibc-kernheaders. * Mon Jul 4 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.26.pre7 - Add a patch to allow compiling for x86_64-FC4; thx to Ryo Dairiki: https://www.redhat.com/archives/fedora-extras-list/2005-July/msg00997.html * Mon Jul 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.25.pre7 - Enable DirectFB by default, rebuild with "--without directfb" to disable. - Clean up obsolete pre-FC2 support. * Thu Jun 30 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.24.pre7 - Added patch to fix ppc/altivec builds (#494) * Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.23.pre7 - Completely disable parallel make for now. * Mon Jun 6 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.22.pre7 - add gcc4 patch from thias/gentoo/myself * Mon May 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.21.pre7 - Use em8300-devel for DXR3 support, and make it optional, default enabled. * Tue May 03 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.lvn.0.20.pre7 - fix build issues on x86_64: - move target= to a ix86 section -- on x86_64 it passes the option x86-64 and not x86_64 - use explicit --with-xmmslibdir - {_libdir}/libdha.so.* and {_libdir}/mplayer are missing on x86_64 * Tue Apr 19 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.19.pre7 - Updated installstrip patch - Updated ldconfig patch - Updated to 1.0pre7 * Sun Feb 27 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.18.pre6a - Fix PPC build (David Woodhouse, bug 376). - Add libcaca support (rebuild "--without caca" to disable). - Rebuild with LIRC support. * Thu Jan 6 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.17.pre6a - Update to 1.0pre6a (== 1.0pre6 + included HTML docs). Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:56 -0000 1.1 +++ .cvsignore 19 Aug 2008 00:08:33 -0000 1.2 @@ -0,0 +1,2 @@ +Blue-1.7.tar.bz2 +mplayer-export-2008-08-18.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:56 -0000 1.1 +++ sources 19 Aug 2008 00:08:33 -0000 1.2 @@ -0,0 +1,2 @@ +e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 +f09caa71435c9c8818c2f681722042a7 mplayer-export-2008-08-18.tar.bz2