diff --git a/.gitignore b/.gitignore index 9e5898d..dba4b85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2010-07-03.tar.bz2 +mplayer-export-2011-01-10.tar.bz2 diff --git a/mplayer-config.patch b/mplayer-config.patch index fe352ba..5c00d6b 100644 --- a/mplayer-config.patch +++ b/mplayer-config.patch @@ -1,16 +1,16 @@ -diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-10-29/etc/example.conf ---- mplayer-export-2009-10-29/etc/example.conf.config 2008-02-08 19:33:39.000000000 +0100 -+++ mplayer-export-2009-10-29/etc/example.conf 2009-10-29 23:54:30.000000000 +0100 +diff -up mplayer-export-2011-01-10/etc/example.conf.config mplayer-export-2011-01-10/etc/example.conf +--- mplayer-export-2011-01-10/etc/example.conf.config 2011-01-05 15:55:45.000000000 +0100 ++++ mplayer-export-2011-01-10/etc/example.conf 2011-01-10 19:46:06.000000000 +0100 @@ -1,7 +1,7 @@ # # MPlayer configuration file # -# 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 + # and per-user from ~/.mplayer/config, where per-user settings override # system-wide settings, all of which are overrriden by the command line. # -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ ################## # Specify default audio driver (see -ao help for a list). @@ -19,7 +19,7 @@ diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-1 # Use SDL audio driver with the esd subdriver by default. #ao = sdl:esd -@@ -95,7 +95,7 @@ +@@ -114,7 +114,7 @@ #framedrop = yes # Specify your preferred skin here (skins are searched for in @@ -28,7 +28,7 @@ diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-1 #skin = Abyss # Resample the font alphamap. -@@ -105,6 +105,15 @@ +@@ -124,6 +124,15 @@ # 10 bold black outline #ffactor = 0.75 @@ -44,7 +44,7 @@ diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-1 # cache settings # # Use 8MB input cache by default. -@@ -122,6 +131,12 @@ +@@ -141,6 +150,11 @@ # DVD: Play English audio tracks if available. #alang = en @@ -53,7 +53,6 @@ diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-1 + +# Inhibit (a XScrnSaver compatible) screensaver while playing a movie +stop-xscreensaver = yes -+ - ################### - # DVDNAV Settings # - ################### + + ############ + # Profiles # diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch new file mode 100644 index 0000000..001b6af --- /dev/null +++ b/mplayer-ffmpeg.patch @@ -0,0 +1,307 @@ +diff -up mplayer-export-2011-01-10/configure.ffmpeg mplayer-export-2011-01-10/configure +--- mplayer-export-2011-01-10/configure.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/configure 2011-01-10 19:05:23.000000000 +0100 +@@ -6866,7 +6866,8 @@ elif test "$ffmpeg_so" = auto ; then + inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil libavcore) + _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil libavcore) + header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp && +- extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes ++ extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && ++ extra_cflags="$extra_cflags $inc_ffmpeg" + elif header_check libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore $_ld_lm ; then + extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore" + ffmpeg_so=yes +@@ -7553,7 +7554,7 @@ if test "$_gui" = yes ; then + + # Required libraries + if test "$ffmpeg" != yes || +- ! echo $libavdecoders | grep -q PNG_DECODER ; then ++ ! objdump -T $_libdir/libavcodec.so | grep -q png_decoder ; then + die "The GUI requires libavcodec with PNG support (needs zlib)." + fi + test "$_freetype" = no && test "$_bitmap_font" = no && +diff -up mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h +--- mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/ffmpeg/libavformat/riff.h 2011-01-10 19:05:57.000000000 +0100 +@@ -0,0 +1,41 @@ ++/* ++ * RIFF codec tags ++ * copyright (c) 2000 Fabrice Bellard ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++/** ++ * @file ++ * internal header for RIFF based (de)muxers ++ * do NOT include this in end user applications ++ */ ++ ++#ifndef AVFORMAT_RIFF_H ++#define AVFORMAT_RIFF_H ++ ++#include "libavcodec/avcodec.h" ++ ++typedef struct AVCodecTag { ++ enum CodecID id; ++ unsigned int tag; ++} AVCodecTag; ++ ++extern const AVCodecTag ff_codec_bmp_tags[]; ++extern const AVCodecTag ff_codec_wav_tags[]; ++ ++#endif /* AVFORMAT_RIFF_H */ +diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h +--- mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/ffmpeg/libavutil/aes.h 2011-01-10 19:04:02.000000000 +0100 +@@ -0,0 +1,47 @@ ++/* ++ * copyright (c) 2007 Michael Niedermayer ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef AVUTIL_AES_H ++#define AVUTIL_AES_H ++ ++#include ++ ++extern const int av_aes_size; ++ ++struct AVAES; ++ ++/** ++ * Initialize an AVAES context. ++ * @param key_bits 128, 192 or 256 ++ * @param decrypt 0 for encryption, 1 for decryption ++ */ ++int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); ++ ++/** ++ * Encrypt or decrypt a buffer using a previously initialized context. ++ * @param count number of 16 byte blocks ++ * @param dst destination array, can be equal to src ++ * @param src source array, can be equal to dst ++ * @param iv initialization vector for CBC mode, if NULL then ECB will be used ++ * @param decrypt 0 for encryption, 1 for decryption ++ */ ++void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt); ++ ++#endif /* AVUTIL_AES_H */ +diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h +--- mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/ffmpeg/libavutil/sha.h 2011-01-10 19:04:02.000000000 +0100 +@@ -0,0 +1,56 @@ ++/* ++ * Copyright (C) 2007 Michael Niedermayer ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef AVUTIL_SHA_H ++#define AVUTIL_SHA_H ++ ++#include ++ ++extern const int av_sha_size; ++ ++struct AVSHA; ++ ++/** ++ * Initialize SHA-1 or SHA-2 hashing. ++ * ++ * @param context pointer to the function context (of size av_sha_size) ++ * @param bits number of bits in digest (SHA-1 - 160 bits, SHA-2 224 or 256 bits) ++ * @return zero if initialization succeeded, -1 otherwise ++ */ ++int av_sha_init(struct AVSHA* context, int bits); ++ ++/** ++ * Update hash value. ++ * ++ * @param context hash function context ++ * @param data input data to update hash with ++ * @param len input data length ++ */ ++void av_sha_update(struct AVSHA* context, const uint8_t* data, unsigned int len); ++ ++/** ++ * Finish hashing and output digest value. ++ * ++ * @param context hash function context ++ * @param digest buffer where output digest value is stored ++ */ ++void av_sha_final(struct AVSHA* context, uint8_t *digest); ++ ++#endif /* AVUTIL_SHA_H */ +diff -up mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h +--- mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/ffmpeg/libavutil/x86_cpu.h 2011-01-10 19:04:02.000000000 +0100 +@@ -0,0 +1,98 @@ ++/* ++ * copyright (c) 2006 Michael Niedermayer ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef AVUTIL_X86_CPU_H ++#define AVUTIL_X86_CPU_H ++ ++#include ++#include "config.h" ++ ++#if ARCH_X86_64 ++# define OPSIZE "q" ++# define REG_a "rax" ++# define REG_b "rbx" ++# define REG_c "rcx" ++# define REG_d "rdx" ++# define REG_D "rdi" ++# define REG_S "rsi" ++# define PTR_SIZE "8" ++typedef int64_t x86_reg; ++ ++# define REG_SP "rsp" ++# define REG_BP "rbp" ++# define REGBP rbp ++# define REGa rax ++# define REGb rbx ++# define REGc rcx ++# define REGd rdx ++# define REGSP rsp ++ ++#elif ARCH_X86_32 ++ ++# define OPSIZE "l" ++# define REG_a "eax" ++# define REG_b "ebx" ++# define REG_c "ecx" ++# define REG_d "edx" ++# define REG_D "edi" ++# define REG_S "esi" ++# define PTR_SIZE "4" ++typedef int32_t x86_reg; ++ ++# define REG_SP "esp" ++# define REG_BP "ebp" ++# define REGBP ebp ++# define REGa eax ++# define REGb ebx ++# define REGc ecx ++# define REGd edx ++# define REGSP esp ++#else ++typedef int x86_reg; ++#endif ++ ++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) ++#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) ++ ++#if ARCH_X86_64 && defined(PIC) ++# define BROKEN_RELOCATIONS 1 ++#endif ++ ++/* ++ * If gcc is not set to support sse (-msse) it will not accept xmm registers ++ * in the clobber list for inline asm. XMM_CLOBBERS takes a list of xmm ++ * registers to be marked as clobbered and evaluates to nothing if they are ++ * not supported, or to the list itself if they are supported. Since a clobber ++ * list may not be empty, XMM_CLOBBERS_ONLY should be used if the xmm ++ * registers are the only in the clobber list. ++ * For example a list with "eax" and "xmm0" as clobbers should become: ++ * : XMM_CLOBBERS("xmm0",) "eax" ++ * and a list with only "xmm0" should become: ++ * XMM_CLOBBERS_ONLY("xmm0") ++ */ ++#if HAVE_XMM_CLOBBERS ++# define XMM_CLOBBERS(...) __VA_ARGS__ ++# define XMM_CLOBBERS_ONLY(...) : __VA_ARGS__ ++#else ++# define XMM_CLOBBERS(...) ++# define XMM_CLOBBERS_ONLY(...) ++#endif ++ ++#endif /* AVUTIL_X86_CPU_H */ +diff -up mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-2011-01-10/libmpcodecs/vf_pp.c +--- mplayer-export-2011-01-10/libmpcodecs/vf_pp.c.ffmpeg 2010-09-13 20:19:25.000000000 +0200 ++++ mplayer-export-2011-01-10/libmpcodecs/vf_pp.c 2011-01-10 19:04:02.000000000 +0100 +@@ -34,10 +34,10 @@ + #include "img_format.h" + #include "mp_image.h" + #include "vf.h" +-#include "libavutil/internal.h" + #include "libpostproc/postprocess.h" + + #ifdef CONFIG_FFMPEG_A ++#include "libavutil/internal.h" + #define EMU_OLD + #include "libpostproc/postprocess_internal.h" + #endif +diff -up mplayer-export-2011-01-10/Makefile.ffmpeg mplayer-export-2011-01-10/Makefile +--- mplayer-export-2011-01-10/Makefile.ffmpeg 2011-01-10 19:04:02.000000000 +0100 ++++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:04:02.000000000 +0100 +@@ -810,7 +810,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): + $(CC) -o $@ $^ $(EXTRALIBS) + + codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h +- $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< ++ $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg $(CFLAGS) -o $@ $< + + codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf + ./$^ > $@ diff --git a/mplayer-libvorbis.patch b/mplayer-libvorbis.patch new file mode 100644 index 0000000..6f44946 --- /dev/null +++ b/mplayer-libvorbis.patch @@ -0,0 +1,79 @@ +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 diff --git a/mplayer-nodvdcss.patch b/mplayer-nodvdcss.patch index c41fd5f..1f67fcf 100644 --- a/mplayer-nodvdcss.patch +++ b/mplayer-nodvdcss.patch @@ -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-2011-01-10/configure.nodvdcss mplayer-export-2011-01-10/configure +--- mplayer-export-2011-01-10/configure.nodvdcss 2011-01-06 13:42:59.000000000 +0100 ++++ mplayer-export-2011-01-10/configure 2011-01-10 19:02:59.000000000 +0100 +@@ -689,7 +689,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,10 +10,10 @@ diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/ _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-2011-01-10/Makefile.nodvdcss mplayer-export-2011-01-10/Makefile +--- mplayer-export-2011-01-10/Makefile.nodvdcss 2011-01-10 19:02:59.000000000 +0100 ++++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:03:25.000000000 +0100 +@@ -111,11 +111,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -25,19 +25,19 @@ diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/M SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c -@@ -764,7 +759,6 @@ DIRS = . \ - libavutil/sh4 \ - libavutil/tomi \ - libavutil/x86 \ +@@ -742,7 +737,6 @@ DIRS = . \ + libaf \ + libao2 \ + libass \ - libdvdcss \ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/ +@@ -858,7 +852,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) + diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 1a17cf9..6e33c93 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,19 +13,16 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) +#svn=2010-12-05 dirname=mplayer-export-$svn mplayer_rev={$svn} +#mplayer_rev=HEAD cd "$tmp" -svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname +svn checkout --ignore-externals -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname cd $dirname -rm -rf libdvdcss -for dir in libav* libdvd* libpostproc ; do - cd $dir - svn update -r ${mplayer_rev} - cd .. -done +rm -rf libdvdcss libswscale svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` sed -i -e 's/\(SVN-r[0-9]* \)/\1rpmfusion /' -e "s/UNKNOWN/SVN-r$svn_revision/" version.sh diff --git a/mplayer.spec b/mplayer.spec index 7ab1f76..18d2766 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100703svn +%define pre 20110110svn %define svn 1 -%define svnbuild 2010-07-03 +%define svnbuild 2011-01-10 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.119.%{pre}%{?dist} +Release: 0.120.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -27,21 +27,26 @@ Source10: mplayer-snapshot.sh Patch2: %{name}-config.patch Patch8: %{name}-manlinks.patch Patch14: %{name}-nodvdcss.patch +Patch17: %{name}-libvorbis.patch +Patch18: %{name}-ffmpeg.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 BuildRequires: em8300-devel BuildRequires: enca-devel BuildRequires: faad2-devel >= %{faad2min} +BuildRequires: ffmpeg-devel BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.0.9 BuildRequires: fribidi-devel BuildRequires: giflib-devel +BuildRequires: gsm-devel BuildRequires: gtk2-devel BuildRequires: ladspa-devel BuildRequires: lame-devel @@ -50,8 +55,9 @@ BuildRequires: libXinerama-devel 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 @@ -59,6 +65,7 @@ BuildRequires: libdvdnav-devel >= 4.1.3-1 BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel BuildRequires: libmpeg2-devel +BuildRequires: librtmp-devel BuildRequires: libtheora-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel @@ -67,14 +74,13 @@ BuildRequires: lirc-devel BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 BuildRequires: pulseaudio-lib-devel -BuildRequires: schroedinger-devel BuildRequires: speex-devel >= 1.1 BuildRequires: twolame-devel BuildRequires: x264-devel >= 0.0.0-0.28 BuildRequires: xvidcore-devel >= 0.9.2 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} @@ -114,6 +120,7 @@ Non-default rpmbuild options: --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 @@ -185,13 +192,10 @@ This package contains various scripts from MPlayer TOOLS directory. %{!?_with_nemesi:--disable-nemesi} \\\ %{!?_with_samba:--disable-smb} \\\ \\\ - --disable-faac-lavc \\\ - --disable-mp3lame-lavc \\\ - --disable-x264-lavc \\\ + --disable-ffmpeg_a \\\ \\\ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ %{!?_with_faac:--disable-faac} \\\ - --disable-faad-internal \\\ %{!?_with_libmad:--disable-mad} \\\ --disable-libmpeg2-internal \\\ --disable-tremor-internal \\\ @@ -199,6 +203,7 @@ This package contains various scripts from MPlayer TOOLS directory. %{?_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 \\\ @@ -220,6 +225,8 @@ This package contains various scripts from MPlayer TOOLS directory. %patch2 -p1 -b .config %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss +%patch17 -p1 -b .libvorbis +%patch18 -p1 -b .ffmpeg doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -236,12 +243,12 @@ cp -a `ls -1|grep -v GUI` GUI/ 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 @@ -392,6 +399,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mplayer/*.fp %changelog +* Mon Jan 10 2011 Dominik Mierzejewski - 1.0-0.120.20110110svn +- 20110110 snapshot +- enabled BluRay, bzip2, libgsm, rtmp support +- DGA support is now a build-time option +- build against system FFmpeg (experimental!) + (drop direct opencore-amr and schroedinger linking) + * Sat Jul 03 2010 Dominik Mierzejewski - 1.0-0.119.20100703svn - rebuild against latest x264 diff --git a/sources b/sources index bf4c08a..357fa2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2 +d1c8316979ec850a8b345a08775739e7 mplayer-export-2011-01-10.tar.bz2