Experimental mplayer packages available: current code, VDPAU and VAAPI acceleration, multi-threading

Wed Sep 23 22:28:31 CEST 2009

On Wed, 2009-09-23 at 22:11 +0200, Dominik 'Rathann' Mierzejewski wrote:
> On Wednesday, 23 September 2009 at 20:52, Adam Williamson wrote:
> > On Wed, 2009-09-23 at 02:09 +0200, Dominik 'Rathann' Mierzejewski wrote:
> > 
> > > If you'd like to update MPlayer in the devel branch to current snapshot
> > > and enable vdpau support, then by all means, go ahead. Feel free to fix
> > > any trivial bugs from the bugzilla as well. I'm still quite short on time
> > > these days, so any help is welcome.
> > 
> > I've got a build of this now (today's mplayer snapshot, all appropriate
> > rediffing done, VDPAU support enabled). I don't think I have the rights
> > to commit directly, though. Do you want an SRPM? Patch against current
> > CVS checkout?
> 
> A patch is preferable, yes. Thanks!

Attached.

-- 
adamw
-------------- next part --------------
? mplayer-1.0-0.109.20090923svn.fc12.src.rpm
? mplayer-1.0-0.110.20090923svn.fc12.src.rpm
? mplayer-export-2009-09-23.tar.bz2
? mplayer_patch
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-manlinks.patch,v
retrieving revision 1.2
diff -u -r1.2 mplayer-manlinks.patch

--- mplayer-manlinks.patch	19 Aug 2008 12:32:35 -0000	1.2
+++ mplayer-manlinks.patch	23 Sep 2009 20:28:00 -0000
@@ -1,8 +1,7 @@
-diff -up mplayer-export-2008-08-18/Makefile.manlinks mplayer-export-2008-08-18/Makefile
---- mplayer-export-2008-08-18/Makefile.manlinks	2008-08-14 22:42:54.000000000 +0200
-+++ mplayer-export-2008-08-18/Makefile	2008-08-19 13:50:17.000000000 +0200
-@@ -830,7 +830,7 @@ install-mencoder-man: $(foreach lang,$(M
- install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
+--- mplayer-export-2009-09-23/Makefile	2009-09-23 10:56:23.000000000 -0700
++++ mplayer-export-2009-09-23/Makefile.new	2009-09-23 11:14:59.909104730 -0700
+@@ -933,7 +933,7 @@
+ 	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
  
  install-mencoder-man-en: install-mplayer-man-en
 -	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
@@ -10,7 +9,7 @@
  
  install-mplayer-man-en:
  	$(INSTALL) -d $(MANDIR)/man1
-@@ -838,7 +838,7 @@ install-mplayer-man-en:
+@@ -946,7 +946,7 @@
  
  define MENCODER_MAN_RULE
  install-mencoder-man-$(lang): install-mplayer-man-$(lang)
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.5
diff -u -r1.5 mplayer-nodvdcss.patch
--- mplayer-nodvdcss.patch	31 Mar 2009 17:37:39 -0000	1.5
+++ mplayer-nodvdcss.patch	23 Sep 2009 20:28:00 -0000
@@ -1,7 +1,6 @@
-diff -up mplayer-export-2009-03-29/configure.nodvdcss mplayer-export-2009-03-29/configure
---- mplayer-export-2009-03-29/configure.nodvdcss	2009-03-29 00:21:21.000000000 +0100
-+++ mplayer-export-2009-03-29/configure	2009-03-29 11:20:11.000000000 +0200
-@@ -622,7 +622,7 @@ _dvdnavconfig=dvdnav-config
+--- mplayer/configure	2009-08-12 15:25:31.031361437 -0700
++++ mplayer/configure.new	2009-08-12 17:24:23.753207824 -0700
+@@ -643,7 +643,7 @@
  _dvdreadconfig=dvdread-config
  _dvdread=auto
  _dvdread_internal=auto
@@ -10,10 +9,9 @@
  _xanim=auto
  _real=auto
  _live=auto
-diff -up mplayer-export-2009-03-29/Makefile.nodvdcss mplayer-export-2009-03-29/Makefile
---- mplayer-export-2009-03-29/Makefile.nodvdcss	2009-03-29 11:20:11.000000000 +0200
-+++ mplayer-export-2009-03-29/Makefile	2009-03-29 11:20:55.000000000 +0200
-@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA)                += 
+--- mplayer/Makefile	2009-08-12 15:25:31.025354558 -0700
++++ mplayer/Makefile.new	2009-08-12 17:25:18.815188579 -0700
+@@ -159,11 +159,6 @@
  SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
                                          libmpcodecs/vd_libdv.c \
                                          libmpdemux/demux_rawdv.c
@@ -24,20 +22,20 @@
 -                                        libdvdcss/libdvdcss.c \
  
  SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
- SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c \
-@@ -745,7 +740,6 @@ DIRS =  . \
-         libavcodec/x86 \
-         libavformat \
-         libavutil \
+ 
+@@ -762,7 +757,6 @@
+         libavutil/ppc \
+         libavutil/sh4 \
+         libavutil/x86 \
 -        libdvdcss \
          libdvdnav \
          libdvdnav/vm \
          libdvdread4 \
-@@ -852,7 +846,6 @@ version.h: version.sh
- # Make sure all generated header files are created.
- $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h
+@@ -880,7 +874,6 @@
+ $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
+ $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
  
--libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
- libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
- libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV)
- libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
+-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)
Index: mplayer-qcelp.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-qcelp.patch,v
retrieving revision 1.1
diff -u -r1.1 mplayer-qcelp.patch
--- mplayer-qcelp.patch	9 Aug 2008 09:32:32 -0000	1.1
+++ mplayer-qcelp.patch	23 Sep 2009 20:28:00 -0000
@@ -1,8 +1,7 @@
-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}, 
+--- mplayer-export-2009-09-23/libmpdemux/demux_nemesi.c	2009-09-23 10:56:22.000000000 -0700
++++ mplayer-export-2009-09-23/libmpdemux/demux_nemesi.c.new	2009-09-23 11:17:31.221226768 -0700
+@@ -42,6 +42,7 @@
+     {"MPA", 0x55},
      {"vorbis", mmioFOURCC('v','r','b','s')},
      {"mpeg4-generic", mmioFOURCC('M','P','4','A')},
 +    {"x-Purevoice", mmioFOURCC('Q','c','l','p')},
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.22
diff -u -r1.22 mplayer.spec
--- mplayer.spec	31 Mar 2009 18:14:20 -0000	1.22
+++ mplayer.spec	23 Sep 2009 20:28:00 -0000
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20090329svn
+%define         pre 20090923svn
 %define         svn 1
-%define         svnbuild 2009-03-29
+%define         svnbuild 2009-09-23
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.109.%{pre}%{?dist}
+Release:        0.110.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -20,9 +20,7 @@
 %endif
 Source1:        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10:       mplayer-snapshot.sh
-Patch1:         %{name}-ppc-compile.patch
 Patch2:         %{name}-config.patch
-Patch3:         %{name}-cflags.patch
 Patch8:         %{name}-manlinks.patch
 Patch10:        %{name}-qcelp.patch
 Patch14:        %{name}-nodvdcss.patch
@@ -58,6 +56,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libtheora-devel
+BuildRequires:	libvdpau-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  lirc-devel
 BuildRequires:  live555-devel
@@ -163,7 +162,7 @@
     --disable-mp3lame-lavc \\\
     --disable-x264-lavc \\\
     \\\
-    %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \\\
+    %{!?_with_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
     --disable-faad-internal \\\
     %{!?_with_libmad:--disable-mad} \\\
     --disable-tremor-internal \\\
@@ -190,9 +189,7 @@
 %else
 %setup -q -n MPlayer-%{version}%{pre}
 %endif
-%patch1 -p1 -b .ppc-compile
 %patch2 -p1 -b .config
-%patch3 -p1 -b .cflags
 %patch8 -p1 -b .manlinks
 %patch10 -p1 -b .qclp
 %patch14 -p1 -b .nodvdcss
@@ -340,6 +337,13 @@
 
 
 %changelog
+* Wed Sep 23 2009 Adam Williamson <adamwill at shaw.ca> - 1.0-0.110.20090923svn
+- 20090923 snapshot
+- drop patches merged upstream: ppc-compile.patch, cflags.patch
+- rediff manlinks.patch, qcelp.patch and nodvdcss.patch
+- enable VDPAU support (by buildrequiring libvdpua-devel)
+- update AMR config parameters (changed upstream)
+
 * Sun Mar 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.109.20090329svn
 - 20090329 snapshot from 1.0rc3 branch
 - fix RPM_OPT_FLAGS usage
