Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef00ae58fe3aac0936aee6f51850c10a998c0a3a
commit ef00ae58fe3aac0936aee6f51850c10a998c0a3a
Author: Melko <me...@frugalware.org>
Date: Thu Oct 27 20:40:40 2011 +0200
mplayer-1.0rc4-12-i686
* add patch to fix a bug of libavcodec with gcc46
* drop 'force' option
diff --git a/source/xapps/mplayer/0001-Fix-ff_imdct_calc_sse-on-gcc-4.6.patch
b/source/xapps/mplayer/0001-Fix-ff_imdct_calc_sse-on-gcc-4.6.patch
new file mode 100644
index 0000000..bda7220
--- /dev/null
+++ b/source/xapps/mplayer/0001-Fix-ff_imdct_calc_sse-on-gcc-4.6.patch
@@ -0,0 +1,49 @@
+From a35d782d28ef0497f2b65eb300c2e6a6028fc165 Mon Sep 17 00:00:00 2001
+From: Alex Converse <alex.conve...@gmail.com>
+Date: Sun, 30 Jan 2011 01:04:41 -0800
+Subject: [PATCH] Fix ff_imdct_calc_sse() on gcc-4.6
+
+Gcc 4.6 only preserves the first value when using an array with an "m"
+constraint.
+
+Signed-off-by: Mans Rullgard <m...@mansr.com>
+(cherry picked from commit 770c410fbb8e1b87ce8ad7f3d7eddaa55e2b8295)
+---
+ libavcodec/x86/fft_sse.c | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/libavcodec/x86/fft_sse.c b/libavcodec/x86/fft_sse.c
+index 9f02816..0d151bc 100644
+--- a/libavcodec/x86/fft_sse.c
++++ b/libavcodec/x86/fft_sse.c
+@@ -23,7 +23,7 @@
+ #include "libavcodec/dsputil.h"
+ #include "fft.h"
+
+-DECLARE_ALIGNED(16, static const int, m1m1m1m1)[4] =
++DECLARE_ASM_CONST(16, int, ff_m1m1m1m1)[4] =
+ { 1 << 31, 1 << 31, 1 << 31, 1 << 31 };
+
+ void ff_fft_dispatch_sse(FFTComplex *z, int nbits);
+@@ -183,7 +183,7 @@ void ff_imdct_calc_sse(FFTContext *s, FFTSample *output,
const FFTSample *input)
+ j = -n;
+ k = n-16;
+ __asm__ volatile(
+- "movaps %4, %%xmm7 \n"
++ "movaps "MANGLE(ff_m1m1m1m1)", %%xmm7 \n"
+ "1: \n"
+ "movaps (%2,%1), %%xmm0 \n"
+ "movaps (%3,%0), %%xmm1 \n"
+@@ -196,8 +196,7 @@ void ff_imdct_calc_sse(FFTContext *s, FFTSample *output,
const FFTSample *input)
+ "add $16, %0 \n"
+ "jl 1b \n"
+ :"+r"(j), "+r"(k)
+- :"r"(output+n4), "r"(output+n4*3),
+- "m"(*m1m1m1m1)
++ :"r"(output+n4), "r"(output+n4*3)
+ );
+ }
+
+--
+1.7.7
+
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 029706b..8df5967 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -9,7 +9,7 @@ _F_archive_name=MPlayer
pkgver=1.0rc4
Fuse $USE_DEVEL && pkgver=1.0rc2.29962
pkgextraver=.29962
-pkgrel=11
+pkgrel=12
Fuse $USE_DEVEL && pkgrel=1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/";
@@ -25,7 +25,7 @@ groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
replaces=('emovix')
archs=('i686' 'x86_64' 'ppc')
-options=('scriptlet' 'force')
+options=('scriptlet')
up2date="lynx -dump http://www.mplayerhq.hu/MPlayer/releases | Flasttar"
source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.bz2
\
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 \
@@ -33,7 +33,7 @@
source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.bz
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
- mp3lib_gcc46.patch)
+ mp3lib_gcc46.patch 0001-Fix-ff_imdct_calc_sse-on-gcc-4.6.patch)
sha1sums=('36dfaeda726896b6831d66b0fe179623e0385fbe' \
'0250d0b468b36ee13f160a814297afcb77f97e1d' \
@@ -41,7 +41,8 @@ sha1sums=('36dfaeda726896b6831d66b0fe179623e0385fbe' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
'2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
- 'ca0df52d64f72f28f70af19432439c5e530daa87')
+ 'ca0df52d64f72f28f70af19432439c5e530daa87' \
+ '0bd0b40a4137cac72873cba1b7a01680859267ca')
if Fuse $USE_DEVEL; then
source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]})
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
