diff --git a/.gitignore b/.gitignore index 0295d73..4064202 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2010-04-24.tar.bz2 +mplayer-export-2010-04-29.tar.bz2 diff --git a/mplayer-llrintf.patch b/mplayer-llrintf.patch deleted file mode 100644 index cea6d2b..0000000 --- a/mplayer-llrintf.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- mplayer.orig/configure -+++ mplayer/configure -@@ -3041,7 +3041,7 @@ - fi - echores "$_posix4" - --for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do -+for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do - echocheck $func - cat > $TMPC << EOF - #include -@@ -9167,6 +9167,7 @@ - $def_hardcoded_tables - $def_libavcodec_mpegaudio_hp - $def_llrint -+$def_llrintf - $def_local_aligned_8 - $def_local_aligned_16 - $def_log2 diff --git a/mplayer-x264.patch b/mplayer-x264.patch deleted file mode 100644 index 21c5008..0000000 --- a/mplayer-x264.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mplayer-export-2010-04-24/configure.x264 mplayer-export-2010-04-24/configure ---- mplayer-export-2010-04-24/configure.x264 2010-04-24 19:00:26.000000000 +0200 -+++ mplayer-export-2010-04-24/configure 2010-04-24 19:00:26.000000000 +0200 -@@ -7482,7 +7482,7 @@ if test "$_x264" = auto ; then - cat > $TMPC << EOF - #include - #include --#if X264_BUILD < 89 -+#if X264_BUILD < 83 - #error We do not support old versions of x264. Get the latest from git. - #endif - int main(void) { x264_encoder_open((void*)0); return 0; } diff --git a/mplayer.spec b/mplayer.spec index 6ddfc21..37cec75 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100424svn +%define pre 20100429svn %define svn 1 -%define svnbuild 2010-04-24 +%define svnbuild 2010-04-29 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.115.%{pre}%{?dist} +Release: 0.116.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -28,8 +28,6 @@ Patch2: %{name}-config.patch Patch8: %{name}-manlinks.patch Patch14: %{name}-nodvdcss.patch Patch15: %{name}-libgif.patch -Patch16: %{name}-x264.patch -Patch17: %{name}-llrintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -223,8 +221,6 @@ This package contains various scripts from MPlayer TOOLS directory. %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss %patch15 -p1 -b .libgif -%patch16 -p1 -b .x264 -%patch17 -p1 -b .llrintf doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -397,6 +393,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mplayer/*.fp %changelog +* Thu Apr 29 2010 Dominik Mierzejewski - 1.0-0.116.20100429svn +- 20100429 snapshot +- drop unnecessary patches + * Sat Apr 24 2010 Dominik Mierzejewski - 1.0-0.115.20100424svn - 20100424 snapshot - patch to build against older x264 diff --git a/sources b/sources index 934a72a..7f45331 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2 +b393c9cabe1d10f412a9e56624957ef5 mplayer-export-2010-04-29.tar.bz2