SOURCES: mplayer-ffmpeg.patch, mplayer-on2flix.patch, mplayer-altivec.patch...

glen glen at pld-linux.org
Mon Nov 24 10:08:09 CET 2008 

Author: glen                         Date: Mon Nov 24 09:08:09 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for mplayer-1.0_rc2_p27725.tar.bz2

---- Files affected:
SOURCES:
   mplayer-ffmpeg.patch (1.2 -> 1.3) , mplayer-on2flix.patch (1.2 -> 1.3) , mplayer-altivec.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/mplayer-ffmpeg.patch
diff -u SOURCES/mplayer-ffmpeg.patch:1.2 SOURCES/mplayer-ffmpeg.patch:1.3
--- SOURCES/mplayer-ffmpeg.patch:1.2	Tue Feb 19 01:04:45 2008
+++ SOURCES/mplayer-ffmpeg.patch	Mon Nov 24 10:08:02 2008
@@ -1,33 +1,62 @@
---- mplayer-export-2007-06-26/Makefile~	2007-06-27 00:38:01.436453184 +0300
-+++ mplayer-export-2007-06-26/Makefile	2007-06-27 00:38:04.506522197 +0300
-@@ -59,6 +59,12 @@
- COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
- COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
- COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
-+
-+COMMON_LIBS-$(LIBAVFORMAT_SO)     += -lavformat
-+COMMON_LIBS-$(LIBAVCODEC_SO)      += -lavcodec
-+COMMON_LIBS-$(LIBAVUTIL_SO)       += -lavutil
-+COMMON_LIBS-$(LIBPOSTPROC_SO)     += -lpostproc
+--- mplayer-1.0_rc2_p27725/Makefile~	2008-11-23 21:44:23.000000000 +0200
++++ mplayer-1.0_rc2_p27725/Makefile	2008-11-23 21:46:59.771508333 +0200
+@@ -632,11 +632,11 @@
+ SRCS_MENCODER += $(SRCS_MENCODER-yes)
+ SRCS_MPLAYER  += $(SRCS_MPLAYER-yes)
+ 
+-COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
+-COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
+-COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
+-COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
+-COMMON_LIBS-$(LIBSWSCALE_A)       += libswscale/libswscale.a
++COMMON_LIBS   += -lavformat
++COMMON_LIBS   += -lavcodec
++COMMON_LIBS   += -lavutil
++COMMON_LIBS   += -lpostproc
++COMMON_LIBS   += -lswscale
+ COMMON_LIBS += $(COMMON_LIBS-yes)
+ 
+ OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)))
+@@ -677,8 +677,6 @@
+         libavcodec/ppc \
+         libavcodec/sh4 \
+         libavcodec/sparc \
+-        libavformat \
+-        libavutil \
+         libdvdcss \
+         libdvdread \
+         libfaad2 \
+@@ -687,8 +685,6 @@
+         libmpcodecs/native \
+         libmpdemux \
+         libmpeg2 \
+-        libpostproc \
+-        libswscale \
+         libvo \
+         loader \
+         loader/dshow \
+--- mplayer-1.0_rc2_p27725/configure~	2008-11-23 21:44:23.000000000 +0200
++++ mplayer-1.0_rc2_p27725/configure	2008-11-23 22:17:38.950927616 +0200
+@@ -468,6 +468,9 @@
+ exit 0
+ } #show_help()
+ 
++ffmpeg_config=false
++test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig
 +
- COMMON_LIBS-$(WIN32DLL)           += loader/libloader.a
- COMMON_LIBS-$(MP3LIB)             += mp3lib/libmp3.a
- COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
---- MPlayer-1.0rc2/configure~	2008-02-19 01:50:14.000000000 +0200
-+++ MPlayer-1.0rc2/configure	2008-02-19 01:50:17.223466682 +0200
-@@ -500,19 +500,22 @@
+ # GOTCHA: the variables below defines the default behavior for autodetection
+ # and have - unless stated otherwise - at least 2 states : yes no
+ # If autodetection is available then the third state is: auto
+@@ -501,19 +504,19 @@
  _libavcodec_a=auto
  _libamr_nb=auto
  _libamr_wb=auto
 -_libavdecoders_all=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-+# XXX this is in wrong place anyway
-+ffmpeg_config=false
-+test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig
 +_libavdecoders_all=`$ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
- _libavdecoders=` echo $_libavdecoders_all | sed -e s/LIBFAAD_DECODER// -e s/MPEG4AAC_DECODER//  -e s/LIBA52_DECODER// -e s/LIBGSM_DECODER// -e s/LIBGSM_MS_DECODER// -e s/LIBVORBIS_DECODER// `
+ _libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// `
 -_libavencoders_all=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
 +_libavencoders_all=`$ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
- _libavencoders=` echo $_libavencoders_all | sed -e s/LIBGSM_ENCODER// -e s/LIBGSM_MS_ENCODER// -e s/LIBTHEORA_ENCODER// `
+ _libavencoders=` echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g'`
 -_libavparsers_all=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
 +_libavparsers_all=`$ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
  _libavparsers=$_libavparsers_all
@@ -36,10 +65,10 @@
  _libavbsfs=$_libavbsfs_all
 -_libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
 +_libavdemuxers_all=`$ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
- _libavdemuxers=`echo $_libavdemuxers_all | sed -e s/AUDIO_BEOS_DEMUXER// -e s/OSS_DEMUXER// -e s/DC1394_DEMUXER// -e s/DV1394_DEMUXER// -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/V4L_DEMUXER// -e s/BKTR_DEMUXER// -e s/X11_GRAB_DEVICE_DEMUXER// -e s/V4L2_DEMUXER// -e s/LIBNUT_DEMUXER// -e s/AVISYNTH_DEMUXER// `
+ _libavdemuxers=`echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER// `
 -_libavmuxers_all=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-+_libavmuxers_all=`$ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
- _libavmuxers=`echo $_libavmuxers_all | sed -e s/AUDIO_BEOS_MUXER// -e s/OSS_MUXER// -e s/RTP_MUXER// `
++libavmuxers_all=`$ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
+ _libavmuxers=`echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// `
 -_libavprotocols_all=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
 +_libavprotocols_all=`$ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
  _libavcodec_so=auto

================================================================
Index: SOURCES/mplayer-on2flix.patch
diff -u SOURCES/mplayer-on2flix.patch:1.2 SOURCES/mplayer-on2flix.patch:1.3
--- SOURCES/mplayer-on2flix.patch:1.2	Wed Oct 31 17:45:43 2007
+++ SOURCES/mplayer-on2flix.patch	Mon Nov 24 10:08:03 2008
@@ -1,8 +1,35 @@
---- MPlayer-1.0rc2/version.sh~	2007-10-23 01:00:05.000000000 +0300
-+++ MPlayer-1.0rc2/version.sh	2007-10-23 01:01:55.117037453 +0300
-@@ -1,3 +1,3 @@
- #!/bin/sh
--echo "#define VERSION \"1.0rc2-$1\"" > version.h
--echo "#define MP_TITLE \"MPlayer 1.0rc2-$1 (C) 2000-2007 MPlayer Team\"" >> version.h
-+echo "#define VERSION \"1.0rc2-on2-$1\"" > version.h
-+echo "#define MP_TITLE \"MPlayer 1.0rc2-on2-$1 (C) 2000-2007 MPlayer Team\"" >> version.h
+--- mplayer-1.0_rc2_p27725/version.sh~	2008-11-23 20:34:23.000000000 +0200
++++ mplayer-1.0_rc2_p27725/version.sh	2008-11-23 20:34:25.547985245 +0200
+@@ -9,7 +9,7 @@
+ 
+ NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
+ OLD_REVISION=`cat version.h 2> /dev/null`
+-TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
++TITLE="#define MP_TITLE \"MPlayer dev-SVN-on2-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
+ 
+ # Update version.h only on revision changes to avoid spurious rebuilds
+ if test "$NEW_REVISION" != "$OLD_REVISION"; then
+--- mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff~	2008-09-30 17:48:23.000000000 +0300
++++ mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff	2008-11-23 20:42:01.869189287 +0200
+@@ -1,15 +1,12 @@
+-Index: libmpdemux/video.c
+-===================================================================
+---- libmpdemux/video.c	(revision 27474)
+-+++ libmpdemux/video.c	(working copy)
+-@@ -587,7 +587,9 @@
+-       }
++--- libmpdemux/video.c~	2008-11-23 20:35:08.000000000 +0200
+++++ libmpdemux/video.c	2008-11-23 20:39:05.232123918 +0200
++@@ -588,7 +588,8 @@
+        break;
+        case DEMUXER_TYPE_LAVF:
++       case DEMUXER_TYPE_LAVF_PREFERRED:
+ -        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
+-+      case DEMUXER_TYPE_LAVF_PREFERRED:
+-+        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1 
+-+            || sh_video->video.dwRate==1000) {          
+++        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1
+++            || sh_video->video.dwRate==1000) {
+            double next_pts = ds_get_next_pts(d_video);
+            double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;
+            if(d>=0){

================================================================
Index: SOURCES/mplayer-altivec.patch
diff -u SOURCES/mplayer-altivec.patch:1.4 SOURCES/mplayer-altivec.patch:1.5
--- SOURCES/mplayer-altivec.patch:1.4	Thu Oct 26 00:55:04 2006
+++ SOURCES/mplayer-altivec.patch	Mon Nov 24 10:08:03 2008
@@ -1,5 +1,5 @@
---- MPlayer-1.0pre2/configure.orig	2003-11-23 00:09:38.000000000 +0100
-+++ MPlayer-1.0pre2/configure	2003-11-23 00:20:52.337674440 +0100
+--- mplayer-1.0_rc2_p27725/configure~	2008-11-23 19:53:55.000000000 +0200
++++ mplayer-1.0_rc2_p27725/configure	2008-11-23 20:03:15.844840283 +0200
 @@ -1173,6 +1173,7 @@
  _vstream=auto
  _pthreads=yes
@@ -17,12 +17,12 @@
    --enable-armv5te) _armv5te=yes ;;
    --disable-armv5te) _armv5te=no ;;
    --enable-iwmmxt) _iwmmxt=yes ;;
-@@ -1623,7 +1624,7 @@
+@@ -2391,7 +2391,7 @@
  
-     _altivec_gcc_flags=''
  
--    if test "$_altivec" = yes -o "$_runtime_cpudetection" = yes ; then
-+    if test "$_altivec" = yes -o "$_runtime_cpudetection" = yes -a "$_disable_altivec" != "yes"; then
-         echocheck "GCC altivec support"
-         
-         p=''
+ #FIXME: This should happen before the check for CFLAGS..
+-if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ) ; then
++if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes) && test "$_disable_altivec" != "yes"; then
+ 
+     # check if AltiVec is supported by the compiler, and how to enable it
+     echocheck "GCC AltiVec flags"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mplayer-ffmpeg.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mplayer-on2flix.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mplayer-altivec.patch?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list