[arch-commits] Commit in mplayer/repos/extra-x86_64 (8 files)

Jan Steffens heftig at archlinux.org
Fri Apr 19 20:33:30 UTC 2019


    Date: Friday, April 19, 2019 @ 20:33:29
  Author: heftig
Revision: 350915

archrelease: copy trunk to extra-x86_64

Added:
  mplayer/repos/extra-x86_64/PKGBUILD
    (from rev 350913, mplayer/trunk/PKGBUILD)
  mplayer/repos/extra-x86_64/include-samba-4.0.patch
    (from rev 350913, mplayer/trunk/include-samba-4.0.patch)
  mplayer/repos/extra-x86_64/mplayer.desktop
    (from rev 350913, mplayer/trunk/mplayer.desktop)
  mplayer/repos/extra-x86_64/revert-icl-fixes.patch
    (from rev 350913, mplayer/trunk/revert-icl-fixes.patch)
Deleted:
  mplayer/repos/extra-x86_64/PKGBUILD
  mplayer/repos/extra-x86_64/include-samba-4.0.patch
  mplayer/repos/extra-x86_64/mplayer.desktop
  mplayer/repos/extra-x86_64/revert-icl-fixes.patch

-------------------------+
 PKGBUILD                |  228 +++++++++++++++++++++++-----------------------
 include-samba-4.0.patch |   24 ++--
 mplayer.desktop         |   44 ++++----
 revert-icl-fixes.patch  |  132 +++++++++++++-------------
 4 files changed, 214 insertions(+), 214 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 20:33:27 UTC (rev 350914)
+++ PKGBUILD	2019-04-19 20:33:29 UTC (rev 350915)
@@ -1,114 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=38125
-pkgrel=4
-pkgdesc='Media player for Linux'
-url='http://www.mplayerhq.hu/'
-arch=('x86_64')
-license=('GPL')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss'
-             'smbclient' 'aalib' 'jack' 'libcaca' 'faac' 'faad2' 'lirc' 'libxv'
-             'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa'
-             'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio' 'zlib'
-             'libcdio-paranoia' 'subversion' 'x264' 'libx264.so' 'rtmpdump'
-             'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' 'giflib' 'libgif.so'
-             'libbs2b' 'fribidi' 'opus' 'libvorbis' 'libvorbis.so' 'gsm'
-             'libpulse' 'alsa-lib' 'glibc' 'libass' 'libass.so' 'libjpeg'
-             'libpng' 'libogg' 'libtheora' 'libbluray' 'libbluray.so'
-             'xvidcore' 'libxvidcore.so' 'ncurses' 'libncursesw.so'
-             'fontconfig' 'freetype2' 'libx11' 'libxext' 'libvdpau' 'libgl'
-             'lame' 'desktop-file-utils' 'ttf-font' 'openal' 'speex'
-             'libmpeg2')
-options=('!emptydirs')
-source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
-        mplayer.desktop
-        include-samba-4.0.patch
-        revert-icl-fixes.patch)
-sha512sums=('SKIP'
-            'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc'
-            '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
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-  export CFLAGS="${CFLAGS/-march=x86-64/}"
-  export CFLAGS="${CFLAGS/-mtune=generic/}"
-  export LDFLAGS="${LDFLAGS/,O1/}"
-  export LDFLAGS="${LDFLAGS/,--sort-common/}"
-  ./configure --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-liblzo \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --disable-cdparanoia \
-    --disable-ffmpeg_a \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --enable-smb \
-    --language=all \
-    --confdir=/etc/mplayer \
-    --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
-    --extra-ldflags="${LDFLAGS}"
-  [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
-  make
-}
-
-package_mplayer() {
-  pkgdesc='Media player for Linux'
-  backup=('etc/mplayer/codecs.conf'
-          'etc/mplayer/input.conf')
-  depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-           'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
-           'jack' 'libmad' 'libcaca' 'libxxf86dga' 'libxxf86vm' 'faac' 'faad2'
-           'libxv' 'libxvmc' 'mpg123' 'libx11' 'libcdio' 'libcdio-paranoia'
-           'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' 'libbs2b' 'alsa-lib'
-           'giflib' 'libgif.so' 'glibc' 'libass' 'libass.so' 'zlib' 'libjpeg'
-           'libpng' 'libpulse' 'libogg' 'fribidi' 'libtheora' 'libvorbis'
-           'libvorbis.so' 'libbluray' 'libbluray.so' 'xvidcore'
-           'libxvidcore.so' 'ncurses' 'libncursesw.so' 'fontconfig' 'freetype2'
-           'libxext' 'libvdpau' 'libgl' 'openal' 'speex' 'libmpeg2')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
-
-  install -Dm 644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer"
-  install -Dm 644 "${srcdir}/mplayer.desktop" -t "${pkgdir}/usr/share/applications"
-  install -Dm 644 etc/mplayer256x256.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
-  pkgdesc='Free command line video decoding, encoding and filtering tool'
-  depends=('glibc' 'enca' 'a52dec' 'libvpx' 'x264' 'libx264.so' 'libmng' 'libdca'
-           'smbclient' 'libmad' 'faac' 'faad2' 'mpg123' 'libcdio'
-           'libcdio-paranoia' 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg'
-           'libbs2b' 'ncurses' 'libncursesw.so' 'zlib' 'alsa-lib' 'fontconfig'
-           'freetype2' 'fribidi' 'giflib' 'libgif.so' 'libvorbis'
-           'libvorbis.so' 'libpng' 'libjpeg' 'libass' 'libass.so' 'lame'
-           'libbluray' 'libbluray.so' 'libtheora' 'xvidcore' 'libxvidcore.so'
-           'openal' 'speex' 'libmpeg2')
-
-  make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
-  find "${pkgdir}/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
-}
-
-# vim: ts=2 sw=2 et:

Copied: mplayer/repos/extra-x86_64/PKGBUILD (from rev 350913, mplayer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-19 20:33:29 UTC (rev 350915)
@@ -0,0 +1,114 @@
+# Maintainer: Levente Polyak <anthraxx at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=38125
+pkgrel=5
+pkgdesc='Media player for Linux'
+url='http://www.mplayerhq.hu/'
+arch=('x86_64')
+license=('GPL')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss'
+             'smbclient' 'aalib' 'jack' 'libcaca' 'faac' 'faad2' 'lirc' 'libxv'
+             'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa'
+             'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio' 'zlib'
+             'libcdio-paranoia' 'subversion' 'x264' 'libx264.so' 'rtmpdump'
+             'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' 'giflib' 'libgif.so'
+             'libbs2b' 'fribidi' 'opus' 'libvorbis' 'libvorbis.so' 'gsm'
+             'libpulse' 'alsa-lib' 'glibc' 'libass' 'libass.so' 'libjpeg'
+             'libpng' 'libogg' 'libtheora' 'libbluray' 'libbluray.so'
+             'xvidcore' 'libxvidcore.so' 'ncurses' 'libncursesw.so'
+             'fontconfig' 'freetype2' 'libx11' 'libxext' 'libvdpau' 'libgl'
+             'lame' 'desktop-file-utils' 'ttf-font' 'openal' 'speex'
+             'libmpeg2')
+options=('!emptydirs')
+source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
+        mplayer.desktop
+        include-samba-4.0.patch
+        revert-icl-fixes.patch)
+sha512sums=('SKIP'
+            'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc'
+            '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
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+  export CFLAGS="${CFLAGS/-march=x86-64/}"
+  export CFLAGS="${CFLAGS/-mtune=generic/}"
+  export LDFLAGS="${LDFLAGS/,O1/}"
+  export LDFLAGS="${LDFLAGS/,--sort-common/}"
+  ./configure --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --disable-cdparanoia \
+    --disable-ffmpeg_a \
+    --enable-xvmc \
+    --enable-radio \
+    --enable-radio-capture \
+    --enable-smb \
+    --language=all \
+    --confdir=/etc/mplayer \
+    --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+    --extra-ldflags="${LDFLAGS}"
+  [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
+  make
+}
+
+package_mplayer() {
+  pkgdesc='Media player for Linux'
+  backup=('etc/mplayer/codecs.conf'
+          'etc/mplayer/input.conf')
+  depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
+           'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
+           'jack' 'libmad' 'libcaca' 'libxxf86dga' 'libxxf86vm' 'faac' 'faad2'
+           'libxv' 'libxvmc' 'mpg123' 'libx11' 'libcdio' 'libcdio-paranoia'
+           'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' 'libbs2b' 'alsa-lib'
+           'giflib' 'libgif.so' 'glibc' 'libass' 'libass.so' 'zlib' 'libjpeg'
+           'libpng' 'libpulse' 'libogg' 'fribidi' 'libtheora' 'libvorbis'
+           'libvorbis.so' 'libbluray' 'libbluray.so' 'xvidcore'
+           'libxvidcore.so' 'ncurses' 'libncursesw.so' 'fontconfig' 'freetype2'
+           'libxext' 'libvdpau' 'libgl' 'openal' 'speex' 'libmpeg2')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
+
+  install -Dm 644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer"
+  install -Dm 644 "${srcdir}/mplayer.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dm 644 etc/mplayer256x256.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
+}
+
+package_mencoder() {
+  pkgdesc='Free command line video decoding, encoding and filtering tool'
+  depends=('glibc' 'enca' 'a52dec' 'libvpx' 'x264' 'libx264.so' 'libmng' 'libdca'
+           'smbclient' 'libmad' 'faac' 'faad2' 'mpg123' 'libcdio'
+           'libcdio-paranoia' 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg'
+           'libbs2b' 'ncurses' 'libncursesw.so' 'zlib' 'alsa-lib' 'fontconfig'
+           'freetype2' 'fribidi' 'giflib' 'libgif.so' 'libvorbis'
+           'libvorbis.so' 'libpng' 'libjpeg' 'libass' 'libass.so' 'lame'
+           'libbluray' 'libbluray.so' 'libtheora' 'xvidcore' 'libxvidcore.so'
+           'openal' 'speex' 'libmpeg2')
+
+  make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+  find "${pkgdir}/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+}
+
+# vim: ts=2 sw=2 et:

Deleted: include-samba-4.0.patch
===================================================================
--- include-samba-4.0.patch	2019-04-19 20:33:27 UTC (rev 350914)
+++ include-samba-4.0.patch	2019-04-19 20:33:29 UTC (rev 350915)
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
- 
- #include "config.h"
- 
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
- 
- #include "mp_msg.h"

Copied: mplayer/repos/extra-x86_64/include-samba-4.0.patch (from rev 350913, mplayer/trunk/include-samba-4.0.patch)
===================================================================
--- include-samba-4.0.patch	                        (rev 0)
+++ include-samba-4.0.patch	2019-04-19 20:33:29 UTC (rev 350915)
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ 
+ #include "mp_msg.h"

Deleted: mplayer.desktop
===================================================================
--- mplayer.desktop	2019-04-19 20:33:27 UTC (rev 350914)
+++ mplayer.desktop	2019-04-19 20:33:29 UTC (rev 350915)
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny 
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
-X-KDE-Protocols=http,ftp,smb

Copied: mplayer/repos/extra-x86_64/mplayer.desktop (from rev 350913, mplayer/trunk/mplayer.desktop)
===================================================================
--- mplayer.desktop	                        (rev 0)
+++ mplayer.desktop	2019-04-19 20:33:29 UTC (rev 350915)
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny 
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb

Deleted: revert-icl-fixes.patch
===================================================================
--- revert-icl-fixes.patch	2019-04-19 20:33:27 UTC (rev 350914)
+++ revert-icl-fixes.patch	2019-04-19 20:33:29 UTC (rev 350915)
@@ -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);
- }
- 

Copied: mplayer/repos/extra-x86_64/revert-icl-fixes.patch (from rev 350913, mplayer/trunk/revert-icl-fixes.patch)
===================================================================
--- revert-icl-fixes.patch	                        (rev 0)
+++ revert-icl-fixes.patch	2019-04-19 20:33:29 UTC (rev 350915)
@@ -0,0 +1,66 @@
+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);
+ }
+ 


More information about the arch-commits mailing list