From 714f1aa6adbec14079610c5cc3fc7ac53f6cdfc4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 21 Oct 2009 21:10:53 +0000 Subject: [PATCH] - Update to snapshot 20091021 mplayer svn rev: 29776 ffmpeg : HEAD dvdnav : HEAD - Move from amrnb amrwb to opencore-amr - Conditionalize faac (moved to nonfree). --- .gitignore | 2 +- mplayer-cflags.patch | 12 ------------ mplayer-manlinks.patch | 21 --------------------- mplayer-ppc-compile.patch | 18 ------------------ mplayer-snapshot.sh | 13 ++++++++++--- mplayer.spec | 30 ++++++++++++++++-------------- sources | 2 +- 7 files changed, 28 insertions(+), 70 deletions(-) delete mode 100644 mplayer-cflags.patch delete mode 100644 mplayer-manlinks.patch delete mode 100644 mplayer-ppc-compile.patch diff --git a/.gitignore b/.gitignore index 2aaac33..e89ce23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2009-03-29.tar.bz2 +mplayer-export-20091021.tar.bz2 diff --git a/mplayer-cflags.patch b/mplayer-cflags.patch deleted file mode 100644 index ee208cf..0000000 --- a/mplayer-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mplayer-export-2009-03-29/configure.cflags mplayer-export-2009-03-29/configure ---- mplayer-export-2009-03-29/configure.cflags 2009-03-29 00:21:21.000000000 +0100 -+++ mplayer-export-2009-03-29/configure 2009-03-30 22:58:32.000000000 +0200 -@@ -795,7 +795,7 @@ for ac_option do - ;; - - --extra-cflags=*) -- extra_cflags=`echo $ac_option | cut -d '=' -f 2` -+ extra_cflags=`echo $ac_option | cut -d '=' -f 2-` - ;; - --extra-ldflags=*) - extra_ldflags=`echo $ac_option | cut -d '=' -f 2` diff --git a/mplayer-manlinks.patch b/mplayer-manlinks.patch deleted file mode 100644 index 0ca4038..0000000 --- a/mplayer-manlinks.patch +++ /dev/null @@ -1,21 +0,0 @@ -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)) - - 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 - - install-mplayer-man-en: - $(INSTALL) -d $(MANDIR)/man1 -@@ -838,7 +838,7 @@ install-mplayer-man-en: - - 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 - - define MPLAYER_MAN_RULE diff --git a/mplayer-ppc-compile.patch b/mplayer-ppc-compile.patch deleted file mode 100644 index 0d9d60e..0000000 --- a/mplayer-ppc-compile.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up mplayer-export-2009-02-04/libswscale/swscale.c.ppc-compile mplayer-export-2009-02-04/libswscale/swscale.c ---- mplayer-export-2009-02-04/libswscale/swscale.c.ppc-compile 2009-01-25 20:58:33.000000000 +0100 -+++ mplayer-export-2009-02-04/libswscale/swscale.c 2009-02-13 15:00:57.000000000 +0100 -@@ -955,13 +955,12 @@ static inline void yuv2rgbXinC_full(SwsC - - //Note: we have C, X86, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one - //Plain C versions --#if !HAVE_MMX || defined (RUNTIME_CPUDETECT) || !CONFIG_GPL -+#if !HAVE_MMX || !HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT) || !CONFIG_GPL - #define COMPILE_C - #endif - - #if ARCH_PPC - #if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL --#undef COMPILE_C - #define COMPILE_ALTIVEC - #endif - #endif //ARCH_PPC diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index fe29881..4ff6ee4 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -12,18 +12,25 @@ cleanup() { unset CDPATH pwd=$(pwd) -svn=$(date +%Y-%m-%d) +svn=20091021 dirname=mplayer-export-$svn +mplayer_rev=29776 +ffmpeg_rev=HEAD +dvdnav_rev=HEAD cd "$tmp" -svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname +svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname cd $dirname + rm -rf libdvdcss for dir in libav* libpostproc ; do cd $dir - svn update -r {$svn} + svn update -r ${ffmpeg_rev} cd .. done +svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src libdvdread4 +svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src libdvdnav + 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_revision/" version.sh find . -type d -name .svn -print0 | xargs -0r rm -rf diff --git a/mplayer.spec b/mplayer.spec index 1955a5c..5790aac 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20090329svn +%define pre 20091021svn %define svn 1 -%define svnbuild 2009-03-29 +%define svnbuild 20091021 %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,10 +20,7 @@ Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre %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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +32,7 @@ BuildRequires: cdparanoia-devel BuildRequires: desktop-file-utils BuildRequires: em8300-devel BuildRequires: enca-devel -BuildRequires: faac-devel +%{?_with_faac: BuildRequires: faac-devel} BuildRequires: faad2-devel >= %{faad2min} BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.0.9 @@ -58,6 +55,7 @@ BuildRequires: libdvdnav-devel >= 4.1.3-1 BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel BuildRequires: libtheora-devel +BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel BuildRequires: lirc-devel BuildRequires: live555-devel @@ -69,7 +67,7 @@ BuildRequires: x264-devel >= 0.0.0-0.14.20080613 BuildRequires: xvidcore-devel >= 0.9.2 BuildRequires: yasm %{?_with_arts:BuildRequires: arts-devel} -%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} +%{!?_without_amr:BuildRequires: opencore-amr-devel} %{?_with_directfb:BuildRequires: directfb-devel} %{?_with_esound:BuildRequires: esound-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} @@ -163,7 +161,7 @@ MPlayer documentation in various languages. --disable-mp3lame-lavc \\\ --disable-x264-lavc \\\ \\\ - %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \\\ + %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ --disable-faad-internal \\\ %{!?_with_libmad:--disable-mad} \\\ --disable-tremor-internal \\\ @@ -190,12 +188,8 @@ MPlayer documentation in various languages. %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 + doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -340,6 +334,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-0.110.20091021svn +- Update to snapshot 20091021 + mplayer svn rev: 29776 + ffmpeg : HEAD + dvdnav : HEAD +- Move from amrnb amrwb to opencore-amr +- Conditionalize faac (moved to nonfree). + * Sun Mar 29 2009 Dominik Mierzejewski - 1.0-0.109.20090329svn - 20090329 snapshot from 1.0rc3 branch - fix RPM_OPT_FLAGS usage diff --git a/sources b/sources index a6c625a..64cbc14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -96ec2dfd73bbd2e2f5d3476870a9fbcb mplayer-export-2009-03-29.tar.bz2 +416fa47da802f9aa256de0ce98371613 mplayer-export-20091021.tar.bz2