From b52fc148c742eabb47444441cd2fd5d496c7f54e Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Wed, 25 Aug 2021 21:02:18 -0700 Subject: [PATCH] libgoom2: fix emms clobbers --- mingw-w64-libgoom2/003-fix-x87-clobbers.patch | 18 ++++++++++++++++++ mingw-w64-libgoom2/PKGBUILD | 9 ++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-libgoom2/003-fix-x87-clobbers.patch diff --git a/mingw-w64-libgoom2/003-fix-x87-clobbers.patch b/mingw-w64-libgoom2/003-fix-x87-clobbers.patch new file mode 100644 index 0000000000..1e6cac5446 --- /dev/null +++ b/mingw-w64-libgoom2/003-fix-x87-clobbers.patch @@ -0,0 +1,18 @@ +--- goom2k4-0/src/mmx.h.orig 2021-08-25 20:52:28.962510200 -0700 ++++ goom2k4-0/src/mmx.h 2021-08-25 20:54:36.790526200 -0700 +@@ -715,13 +715,13 @@ + { \ + printf("emms()\n"); \ + __asm__ __volatile__ ("emms" \ +- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \ ++ "st", "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \ + } + + #else + + #define emms() __asm__ __volatile__ ("emms"::: \ +- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)") ++ "st", "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)") + + #endif + diff --git a/mingw-w64-libgoom2/PKGBUILD b/mingw-w64-libgoom2/PKGBUILD index 001a23b926..c1222c3426 100644 --- a/mingw-w64-libgoom2/PKGBUILD +++ b/mingw-w64-libgoom2/PKGBUILD @@ -4,7 +4,7 @@ _realname=libgoom2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2k4 -pkgrel=3 +pkgrel=4 pkgdesc="Shared library part of the Goom visualization plugin (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -15,15 +15,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs' 'strip') source=("https://downloads.sourceforge.net/project/goom/goom2k4/0/goom-${pkgver}-0-src.tar.gz" 001-no-undefined.patch - 002-fix-random.patch) + 002-fix-random.patch + 003-fix-x87-clobbers.patch) sha256sums=('d993c904c05faba87fd7f159291fa1cb7aadcff2edd28454d8e967880a8a0c85' 'dc11dec75b93c479b8036871656a967748de71e26b40225d0e4d3b427c6afa7f' - 'f3ec1a7c295441c3e29f43ae92d9d4191c13c7a9d5a8668796a613d65e43ab1d') + 'f3ec1a7c295441c3e29f43ae92d9d4191c13c7a9d5a8668796a613d65e43ab1d' + '6bf406a9da62702fd6f70c9a8c7a4f2655936f00e4de8685093e2262ed1a7157') prepare() { cd "${srcdir}/goom2k4-0" patch -p1 -i ${srcdir}/001-no-undefined.patch patch -p1 -i ${srcdir}/002-fix-random.patch + patch -p1 -i ${srcdir}/003-fix-x87-clobbers.patch aclocal -I m4 libtoolize --copy --force