Author: rathann Update of /cvs/free/rpms/mplayer/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29815 Modified Files: mplayer-nodvdcss.patch mplayer-snapshot.sh mplayer-x264.patch mplayer.spec Added Files: mplayer-lame.patch mplayer-libvorbis.patch Log Message: * Sun Dec 05 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.118.20101205svn - 20101205 snapshot - enabled BluRay, bzip2, libgsm, rtmp support - restored --disable-mp3lame-lavc to working condition - DGA support is now a build-time option mplayer-lame.patch: configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE mplayer-lame.patch --- diff -up mplayer-export-2010-12-04/configure.lame mplayer-export-2010-12-04/configure --- mplayer-export-2010-12-04/configure.lame 2010-12-05 00:51:46.000000000 +0100 +++ mplayer-export-2010-12-04/configure 2010-12-05 01:12:17.000000000 +0100 @@ -7275,7 +7275,7 @@ def_mp3lame_preset_medium='#undef CONFIG if test "$_mp3lame" = auto ; then _mp3lame=no statement_check lame/lame.h 'lame_set_VBR_quality(NULL, 0)' -lmp3lame $_ld_lm && - _mp3lame=yes && _mp3lame_lavc=yes + _mp3lame=yes fi if test "$_mp3lame" = yes ; then def_mp3lame="#define CONFIG_MP3LAME 1" @@ -7283,7 +7283,7 @@ if test "$_mp3lame" = yes ; then libs_mencoder="$libs_mencoder $_ld_mp3lame" statement_check lame/lame.h 'lame_set_preset(NULL, STANDARD_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset="#define CONFIG_MP3LAME_PRESET 1" statement_check lame/lame.h 'lame_set_preset(NULL, MEDIUM_FAST)' $_ld_mp3lame $_ld_lm && def_mp3lame_preset_medium="#define CONFIG_MP3LAME_PRESET_MEDIUM 1" - if test "$_mp3lame_lavc" = yes ; then + if test "$_mp3lame_lavc" != no ; then def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 1" libavencoders="$libavencoders LIBMP3LAME_ENCODER" libs_mplayer="$libs_mplayer $_ld_mp3lame" mplayer-libvorbis.patch: configure | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) --- NEW FILE mplayer-libvorbis.patch --- diff -up mplayer-export-2010-12-04/configure.libvorbis mplayer-export-2010-12-04/configure --- mplayer-export-2010-12-04/configure.libvorbis 2010-12-05 00:14:13.000000000 +0100 +++ mplayer-export-2010-12-04/configure 2010-12-05 00:16:53.000000000 +0100 @@ -659,6 +659,7 @@ _tremor=auto _tremor_internal=yes _tremor_low=no _libvorbis=auto +_libvorbisenc=auto _speex=auto _libgsm=auto _theora=auto @@ -6315,7 +6316,7 @@ if test "$_toolamedir" ; then fi echores "$_toolame" -echocheck "OggVorbis support" +echocheck "OggVorbis decoding support" if test "$_tremor_internal" = yes; then _libvorbis=no elif test "$_tremor" = auto; then @@ -6328,6 +6329,7 @@ if test "$_libvorbis" = auto; then fi if test "$_tremor_internal" = yes ; then _vorbis=yes + def_libvorbis='#define CONFIG_LIBVORBIS 0' def_vorbis='#define CONFIG_OGGVORBIS 1' def_tremor='#define CONFIG_TREMOR 1' codecmodules="tremor(internal) $codecmodules" @@ -6338,6 +6340,7 @@ if test "$_tremor_internal" = yes ; then fi elif test "$_tremor" = yes ; then _vorbis=yes + def_libvorbis='#define CONFIG_LIBVORBIS 0' def_vorbis='#define CONFIG_OGGVORBIS 1' def_tremor='#define CONFIG_TREMOR 1' codecmodules="tremor(external) $codecmodules" @@ -6345,17 +6348,32 @@ elif test "$_tremor" = yes ; then extra_ldflags="$extra_ldflags -logg -lvorbisidec" elif test "$_libvorbis" = yes ; then _vorbis=yes + def_libvorbis='#define CONFIG_LIBVORBIS 1' def_vorbis='#define CONFIG_OGGVORBIS 1' codecmodules="libvorbis $codecmodules" res_comment="libvorbis" extra_ldflags="$extra_ldflags -lvorbis -logg" - libavencoders="$libavencoders LIBVORBIS_ENCODER" else _vorbis=no nocodecmodules="libvorbis $nocodecmodules" fi echores "$_vorbis" +echocheck "OggVorbis encoding support" +if test "$_libvorbisenc" = auto; then + _libvorbisenc=no + statement_check vorbis/vorbisenc.h 'vorbis_encode_init(NULL, 0, 0, 0, 0, 0)' -lvorbisenc -lvorbis -logg $_ld_lm && _libvorbisenc=yes +fi +if test "$_libvorbisenc" = yes ; then + _vorbisenc=yes + res_comment="libvorbisenc" + extra_ldflags="$extra_ldflags -lvorbisenc -lvorbis -logg" + libavencoders="$libavencoders LIBVORBIS_ENCODER" +else + _vorbisenc=no +fi +echores "$_vorbisenc" + echocheck "libspeex (version >= 1.1 required)" if test "$_speex" = auto ; then _speex=no @@ -8725,7 +8743,7 @@ $def_yasm #define CONFIG_FFSERVER 0 #define CONFIG_GPL 1 #define CONFIG_GRAY 0 -#define CONFIG_LIBVORBIS 0 +$def_libvorbis #define CONFIG_POWERPC_PERF 0 #define CONFIG_SHARED 0 #define CONFIG_SMALL 0 mplayer-nodvdcss.patch: Makefile | 7 ------- configure | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-13/mplayer-nodvdcss.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mplayer-nodvdcss.patch 3 Jul 2010 23:37:27 -0000 1.8 +++ mplayer-nodvdcss.patch 11 Dec 2010 20:56:36 -0000 1.9 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure ---- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200 -+++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200 -@@ -677,7 +677,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2010-12-04/configure.nodvdcss mplayer-export-2010-12-04/configure +--- mplayer-export-2010-12-04/configure.nodvdcss 2010-11-03 09:12:22.000000000 +0100 ++++ mplayer-export-2010-12-04/configure 2010-12-05 00:01:29.000000000 +0100 +@@ -683,7 +683,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,10 +10,10 @@ _xanim=auto _real=auto _live=auto -diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile ---- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200 -+++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200 -@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2010-12-04/Makefile.nodvdcss mplayer-export-2010-12-04/Makefile +--- mplayer-export-2010-12-04/Makefile.nodvdcss 2010-12-05 00:01:29.000000000 +0100 ++++ mplayer-export-2010-12-04/Makefile 2010-12-05 00:02:07.000000000 +0100 +@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -25,19 +25,19 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c -@@ -764,7 +759,6 @@ DIRS = . \ - libavutil/sh4 \ - libavutil/tomi \ - libavutil/x86 \ +@@ -781,7 +776,6 @@ DIRS = . \ + libaf \ + libao2 \ + libass \ - libdvdcss \ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/ +@@ -898,7 +892,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma gui/%: CFLAGS += -Wno-strict-prototypes --libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) - libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) - libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) - libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) +-libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) + libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) + libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) + libfaad2/%: CFLAGS := -Ilibfaad2 -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) Index: mplayer-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/mplayer/F-13/mplayer-snapshot.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mplayer-snapshot.sh 30 Oct 2009 01:10:22 -0000 1.6 +++ mplayer-snapshot.sh 11 Dec 2010 20:56:36 -0000 1.7 @@ -21,7 +21,7 @@ cd $dirname rm -rf libdvdcss -for dir in libav* libdvd* libpostproc ; do +for dir in ffmpeg libdvd* ; do cd $dir svn update -r ${mplayer_rev} cd .. mplayer-x264.patch: DOCS/man/en/mplayer.1 | 2 configure | 2 libmpcodecs/ve_x264.c | 125 ++++++++++++++++++++++++-------------------------- 3 files changed, 62 insertions(+), 67 deletions(-) Index: mplayer-x264.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-13/mplayer-x264.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mplayer-x264.patch 3 Jul 2010 23:37:27 -0000 1.2 +++ mplayer-x264.patch 11 Dec 2010 20:56:36 -0000 1.3 @@ -1,27 +1,47 @@ -diff -up mplayer-export-2010-07-03/configure.x264 mplayer-export-2010-07-03/configure ---- mplayer-export-2010-07-03/configure.x264 2010-07-03 23:24:14.000000000 +0200 -+++ mplayer-export-2010-07-03/configure 2010-07-03 23:24:36.000000000 +0200 -@@ -7485,7 +7485,7 @@ if test "$_x264" = auto ; then +diff -up mplayer-export-2010-12-04/configure.x264 mplayer-export-2010-12-04/configure +--- mplayer-export-2010-12-04/configure.x264 2010-12-05 00:42:20.000000000 +0100 ++++ mplayer-export-2010-12-04/configure 2010-12-05 00:42:22.000000000 +0100 +@@ -7065,7 +7083,7 @@ if test "$_x264" = auto ; then cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> --#if X264_BUILD < 98 -+#if X264_BUILD < 83 +-#if !(X264_BUILD >= 99) ++#if !(X264_BUILD >= 78) #error We do not support old versions of x264. Get the latest from git. #endif int main(void) { x264_encoder_open((void*)0); return 0; } -diff -up mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-07-03/libmpcodecs/ve_x264.c ---- mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 2010-06-10 23:58:03.000000000 +0200 -+++ mplayer-export-2010-07-03/libmpcodecs/ve_x264.c 2010-07-03 23:24:43.000000000 +0200 -@@ -56,6 +56,7 @@ typedef struct h264_module_t { +diff -up mplayer-export-2010-12-04/DOCS/man/en/mplayer.1.x264 mplayer-export-2010-12-04/DOCS/man/en/mplayer.1 +--- mplayer-export-2010-12-04/DOCS/man/en/mplayer.1.x264 2010-11-27 20:15:54.000000000 +0100 ++++ mplayer-export-2010-12-04/DOCS/man/en/mplayer.1 2010-12-05 00:42:21.000000000 +0100 +@@ -8015,7 +8015,7 @@ need to use the fixpts filter for this o + .sp 1 + Not all codecs support forced key frames. + Currently, support is only implemented for the following encoders: +-lavc, x264, xvid. ++lavc, xvid. + . + . + . +diff -up mplayer-export-2010-12-04/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-12-04/libmpcodecs/ve_x264.c +--- mplayer-export-2010-12-04/libmpcodecs/ve_x264.c.x264 2010-11-10 09:32:54.000000000 +0100 ++++ mplayer-export-2010-12-04/libmpcodecs/ve_x264.c 2010-12-05 00:50:51.000000000 +0100 +@@ -45,7 +45,6 @@ + #include "img_format.h" + #include "mp_image.h" + #include "vf.h" +-#include "ve.h" + #include "ve_x264.h" + + #include <x264.h> +@@ -56,6 +55,7 @@ typedef struct h264_module_t { + x264_picture_t pic; } h264_module_t; - extern char* passtmpfile; +static int turbo = 0; static x264_param_t param; static int parse_error = 0; -@@ -64,79 +65,74 @@ static int encode_frame(struct vf_instan +@@ -64,79 +64,74 @@ static int encode_frame(struct vf_instan void x264enc_set_param(const m_option_t* opt, char* arg) { @@ -114,9 +134,9 @@ + + ret = x264_param_parse(&param, name, value); + if(ret == X264_PARAM_BAD_NAME) -+ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name); ++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name); + if(ret == X264_PARAM_BAD_VALUE) -+ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", name, value ? value : "(null)"); ++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", name, value ? value : "(null)"); + /* mark this option as done, so it's not reparsed if there's another -x264encopts */ *name = 0; @@ -155,3 +175,41 @@ } static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { +@@ -156,7 +151,6 @@ static int config(struct vf_instance *vf + param.i_height = height; + param.i_fps_num = mod->mux->h.dwRate; + param.i_fps_den = mod->mux->h.dwScale; +- param.b_vfr_input = 0; + param.vui.i_sar_width = d_width*height; + param.vui.i_sar_height = d_height*width; + +@@ -236,7 +230,7 @@ static int put_image(struct vf_instance + h264_module_t *mod=(h264_module_t*)vf->priv; + int i; + +- x264_picture_init(&mod->pic); ++ memset(&mod->pic, 0, sizeof(x264_picture_t)); + mod->pic.img.i_csp=param.i_csp; + mod->pic.img.i_plane=3; + for(i=0; i<4; i++) { +@@ -245,8 +239,6 @@ static int put_image(struct vf_instance + } + + mod->pic.i_type = X264_TYPE_AUTO; +- if (is_forced_key_frame(pts)) +- mod->pic.i_type = X264_TYPE_KEYFRAME; + + return encode_frame(vf, &mod->pic) >= 0; + } +@@ -266,7 +258,10 @@ static int encode_frame(struct vf_instan + return -1; + } + if(i_size>0) { +- int keyframe = pic_out.b_keyframe; ++ int keyframe = (pic_out.i_type == X264_TYPE_IDR) || ++ (pic_out.i_type == X264_TYPE_I ++ && param.i_frame_reference == 1 ++ && !param.i_bframe); + memcpy(mod->mux->buffer, nal->p_payload, i_size); + muxer_write_chunk(mod->mux, i_size, keyframe?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + } Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/F-13/mplayer.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mplayer.spec 3 Jul 2010 23:37:27 -0000 1.31 +++ mplayer.spec 11 Dec 2010 20:56:36 -0000 1.32 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100703svn +%define pre 20101205svn %define svn 1 -%define svnbuild 2010-07-03 +%define svnbuild 2010-12-05 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.117.%{pre}%{?dist} +Release: 0.118.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -28,11 +28,14 @@ Patch8: %{name}-manlinks.patch Patch14: %{name}-nodvdcss.patch Patch16: %{name}-x264.patch +Patch17: %{name}-libvorbis.patch +Patch18: %{name}-lame.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: a52dec-devel BuildRequires: aalib-devel +BuildRequires: bzip2-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel BuildRequires: desktop-file-utils @@ -43,6 +46,7 @@ BuildRequires: freetype-devel >= 2.0.9 BuildRequires: fribidi-devel BuildRequires: giflib-devel +BuildRequires: gsm-devel BuildRequires: gtk2-devel BuildRequires: ladspa-devel BuildRequires: lame-devel @@ -51,8 +55,9 @@ BuildRequires: libXScrnSaver-devel BuildRequires: libXv-devel BuildRequires: libXvMC-devel -BuildRequires: libXxf86dga-devel BuildRequires: libXxf86vm-devel +BuildRequires: libass-devel >= 0.9.10 +BuildRequires: libbluray-devel BuildRequires: libcaca-devel BuildRequires: libdca-devel BuildRequires: libdv-devel @@ -60,6 +65,7 @@ BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel BuildRequires: libmpeg2-devel +BuildRequires: librtmp-devel BuildRequires: libtheora-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel @@ -76,6 +82,7 @@ BuildRequires: yasm %{?_with_arts:BuildRequires: arts-devel} %{!?_without_amr:BuildRequires: opencore-amr-devel} +%{?_with_dga:BuildRequires: libXxf86dga-devel} %{?_with_directfb:BuildRequires: directfb-devel} %{?_with_esound:BuildRequires: esound-devel} %{?_with_faac:BuildRequires: faac-devel} @@ -115,6 +122,7 @@ --with jack: Enable JACK support --with arts: Enable aRts support --with esound: Enable EsounD support +--with dga: Enable DGA support --with directfb:Enable DirectFB support --with svgalib: Enable SVGAlib support --with nemesi: Enable libnemesi RTSP support @@ -200,6 +208,7 @@ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\ \\\ --disable-bitmap-font \\\ + %{!?_with_dga:--disable-dga1 --disable-dga2} \\\ --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\ %{!?_with_svgalib:--disable-svga} \\\ --disable-termcap \\\ @@ -222,6 +231,8 @@ %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss %patch16 -p1 -b .x264 +%patch17 -p1 -b .libvorbis +%patch18 -p1 -b .lame doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -238,12 +249,12 @@ pushd GUI %{mp_configure}--enable-gui --disable-mencoder -%{__make} %{?_smp_mflags} +%{__make} V=1 %{?_smp_mflags} popd %{mp_configure} -%{__make} %{?_smp_mflags} +%{__make} V=1 %{?_smp_mflags} %if %{svn} # build HTML documentation from XML files @@ -394,6 +405,12 @@ %{_datadir}/mplayer/*.fp %changelog +* Sun Dec 05 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.118.20101205svn +- 20101205 snapshot +- enabled BluRay, bzip2, libgsm, rtmp support +- restored --disable-mp3lame-lavc to working condition +- DGA support is now a build-time option + * Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.117.20100703svn - 20100703 snapshot - rebased patches