extra/mplayer to 38322-1

extra/mplayer/PKGBUILD

@@ -9,8 +9,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=38157
+pkgver=38322
-pkgrel=4
+pkgrel=1
 pkgdesc='Media player for Linux'
 url='http://www.mplayerhq.hu/'
 arch=('x86_64')
@@ -31,19 +31,14 @@ makedepends=('xorgproto' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss'
 options=('!emptydirs')
 source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
         mplayer.desktop
-        include-samba-4.0.patch
+        include-samba-4.0.patch)
-        revert-icl-fixes.patch)
 sha512sums=('SKIP'
             'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc'
-            '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99'
+            '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99')
-            '0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
   patch -p1 < "../include-samba-4.0.patch"
-  patch -p0 < "../revert-icl-fixes.patch"
-  # https://bugs.archlinux.org/task/62050
-  sed -E "s|(#include <samba-4.0/libsmbclient.h>)|#include <time.h>\n\1|g" -i stream/stream_smb.c
   ./version.sh
 }
 

extra/mplayer/revert-icl-fixes.patch

@@ -1,66 +0,0 @@
-Index: libmpcodecs/vf_fspp.c
-===================================================================
---- libmpcodecs/vf_fspp.c	(revision 37183)
-+++ libmpcodecs/vf_fspp.c	(revision 37181)
-@@ -1598,10 +1598,6 @@
- 
-         : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps)
-         : "d"(thr_adr)
--          NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433,
--          ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065)
--          NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065,
--          MM_FIX_1_082392200)
-         : "%"REG_a
-         );
- }
-@@ -1871,8 +1867,6 @@
- 
-         : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps)
-         : "a"(output_stride*sizeof(short))
--        NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200,
--        MM_FIX_1_414213562,MM_DESCALE_RND)
-         : "%"REG_d
-         );
- }
-@@ -1980,10 +1974,10 @@
-         "movd (%%"REG_S",%%"REG_a",2), %%mm3    \n\t" //5
-         "paddw %%mm4, %%mm1            \n\t"
- 
--        "movq %%mm5, %3                \n\t" //t7
-+        "movq %%mm5, 0*8+%3            \n\t" //t7
-         "punpcklbw %%mm7, %%mm3        \n\t"
- 
--        "movq %%mm6, %4                \n\t" //t6
-+        "movq %%mm6, 1*8+%3            \n\t" //t6
-         "movq %%mm2, %%mm4             \n\t"
- 
-         "movd (%%"REG_S"), %%mm5           \n\t" //3
-@@ -2029,7 +2023,7 @@
-         "psubw %%mm1, %%mm5            \n\t" //d1
-         "movq %%mm0, %%mm6             \n\t"
- 
--        "movq %4, %%mm1                \n\t"
-+        "movq 1*8+%3, %%mm1            \n\t"
-         "punpcklwd %%mm5, %%mm0        \n\t"
- 
-         "punpckhwd %%mm5, %%mm6        \n\t"
-@@ -2053,7 +2047,7 @@
-         "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
-         "psllw $2, %%mm3              \n\t" //t10
- 
--        "movq %3, %%mm2               \n\t"
-+        "movq 0*8+%3, %%mm2           \n\t"
-         "psllw $2, %%mm4              \n\t" //t11
- 
-         "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3
-@@ -2116,9 +2110,8 @@
-         "dec %%"REG_c"                   \n\t"
-         "jnz 6b                  \n\t"
- 
--        : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1])
-+        : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps)
-         : "a"(line_size)
--        NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965)
-         : "%"REG_d);
- }
-