From 1e4c7b9249320e7b2e8310534734155ef47a3b7c Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 8 Jan 2009 21:45:06 +0000 Subject: [PATCH] * Wed Jan 07 2009 Dominik Mierzejewski - 1.0-0.105.20090107svn - 20090107 snapshot - dropped .sh extension from shell scripts in %{_bindir} - BR: yasm for more asm-optimized routines - rebased patches --- .gitignore | 2 +- mplayer-nodvdcss.patch | 20 ++++++++++---------- mplayer-x86_32-compile.patch | 10 +++++----- mplayer.spec | 12 ++++++++---- sources | 2 +- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 0ab6de4..cb097ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -mplayer-export-2008-12-18.tar.bz2 +mplayer-export-2009-01-07.tar.bz2 Blue-1.7.tar.bz2 diff --git a/mplayer-nodvdcss.patch b/mplayer-nodvdcss.patch index 38d873c..1b95b50 100644 --- a/mplayer-nodvdcss.patch +++ b/mplayer-nodvdcss.patch @@ -1,7 +1,7 @@ -diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/configure ---- mplayer-export-2008-09-03/configure.nodvdcss 2008-10-16 21:22:23.000000000 +0200 -+++ mplayer-export-2008-09-03/configure 2008-10-16 21:30:47.000000000 +0200 -@@ -589,7 +589,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2009-01-07/configure.nodvdcss mplayer-export-2009-01-07/configure +--- mplayer-export-2009-01-07/configure.nodvdcss 2009-01-07 00:27:10.000000000 +0100 ++++ mplayer-export-2009-01-07/configure 2009-01-07 00:27:10.000000000 +0100 +@@ -617,7 +617,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,9 +10,9 @@ diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/ _xanim=auto _real=auto _live=auto -diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/Makefile ---- mplayer-export-2008-09-03/Makefile.nodvdcss 2008-10-16 21:22:23.000000000 +0200 -+++ mplayer-export-2008-09-03/Makefile 2008-10-16 21:27:12.000000000 +0200 +diff -up mplayer-export-2009-01-07/Makefile.nodvdcss mplayer-export-2009-01-07/Makefile +--- mplayer-export-2009-01-07/Makefile.nodvdcss 2009-01-07 00:27:10.000000000 +0100 ++++ mplayer-export-2009-01-07/Makefile 2009-01-07 00:27:10.000000000 +0100 @@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ @@ -25,15 +25,15 @@ diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/M SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ -@@ -677,7 +672,6 @@ DIRS = . \ - libavcodec/sparc \ +@@ -732,7 +727,6 @@ DIRS = . \ + libavcodec/x86 \ libavformat \ libavutil \ - libdvdcss \ libdvdread \ libfaad2 \ libmenu \ -@@ -783,7 +777,6 @@ codec-cfg.d: codecs.conf.h +@@ -838,7 +832,6 @@ codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h $(DEPS): help_mp.h diff --git a/mplayer-x86_32-compile.patch b/mplayer-x86_32-compile.patch index 9f3c980..1aaafa3 100644 --- a/mplayer-x86_32-compile.patch +++ b/mplayer-x86_32-compile.patch @@ -1,11 +1,11 @@ -diff -up mplayer-export-2008-12-18/libavcodec/Makefile.compile mplayer-export-2008-12-18/libavcodec/Makefile ---- mplayer-export-2008-12-18/libavcodec/Makefile.compile 2008-12-17 01:54:54.000000000 +0100 -+++ mplayer-export-2008-12-18/libavcodec/Makefile 2008-12-18 19:44:49.000000000 +0100 -@@ -505,3 +505,7 @@ include $(SUBDIR)../subdir.mak +diff -up mplayer-export-2009-01-07/libavcodec/Makefile.compile mplayer-export-2009-01-07/libavcodec/Makefile +--- mplayer-export-2009-01-07/libavcodec/Makefile.compile 2009-01-06 23:01:57.000000000 +0100 ++++ mplayer-export-2009-01-07/libavcodec/Makefile 2009-01-08 21:32:58.000000000 +0100 +@@ -511,3 +511,7 @@ include $(SUBDIR)../subdir.mak $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o $(SUBDIR)aandcttab.o $(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fdctref.o +ifeq ($(ARCH_X86_32),yes) -+$(SUBDIR)i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer ++$(SUBDIR)x86/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer +$(SUBDIR)h264.o: CFLAGS += -fomit-frame-pointer +endif diff --git a/mplayer.spec b/mplayer.spec index 8a55dcb..da3ddd7 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20081218svn +%define pre 20090107svn %define svn 1 -%define svnbuild 2008-12-18 +%define svnbuild 2009-01-07 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.104.%{pre}%{?dist} +Release: 0.105.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -68,6 +68,7 @@ BuildRequires: speex-devel >= 1.1 BuildRequires: twolame-devel 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} %{?_with_directfb:BuildRequires: directfb-devel} @@ -346,8 +347,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -* ??? Jan ?? 2009 Dominik Mierzejewski - 1.0-0.105.??? +* Wed Jan 07 2009 Dominik Mierzejewski - 1.0-0.105.20090107svn +- 20090107 snapshot - dropped .sh extension from shell scripts in %%{_bindir} +- BR: yasm for more asm-optimized routines +- rebased patches * Thu Dec 18 2008 Dominik Mierzejewski - 1.0-0.104.20081218svn - 20081218 snapshot diff --git a/sources b/sources index 2279ad9..5241d31 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -a1034c489750f70af6e7696a0cd509c7 mplayer-export-2008-12-18.tar.bz2 +e4ad749b4ad4d824fef4a333a0ef0680 mplayer-export-2009-01-07.tar.bz2