From 5eadca6422f4a8ac29f327259ad29b87c1e8a05a Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 23 Sep 2021 14:59:20 +0200 Subject: community/carla: another SSE/SSE2 patch missing --- community/carla/PKGBUILD | 8 ++++---- community/carla/carla-git-no-sse.patch | 14 +++++++++++++- community/carla/carla-git-no-sse2.patch | 12 ++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/community/carla/PKGBUILD b/community/carla/PKGBUILD index 577b95aa..48189396 100644 --- a/community/carla/PKGBUILD +++ b/community/carla/PKGBUILD @@ -2,8 +2,8 @@ if [ "${CARCH}" = "i686" ]; then source+=('carla-git-no-sse2.patch') - sha512sums+=('74fa0bf6afd032f68333680ae5bb7398c613bd74e9639e76ccd0bc5c3a9b67475d618ad9a1f178f924a0c5847228085971e9b7eb685ec6cfd36ee1329b7fff63') - b2sums+=('72e34c424289b84fe656a86c8ba29a7315350299114e2f1cf75892e219e79f9cf32b8c19d1aa0912a7668a2d9e741012e5c6372dcee9aaf45fb45833559fd376') + sha512sums+=('b481a9f9b1e404536a42706a36255216f64e49022c1c0f012e40be2941eb4a74b8d2b2f30998e16678a3d46e57dbeffa6f63259afff5a94a1bc4c7d8ba35a67c') + b2sums+=('cb314334ffb6552f11a6d5b3a2de707a846d316956a565ab350afee450c224ab693beace1a0e52b50d9150beca592d5ec79b3e8014bca2c4c8e44450dfbe6ee3') eval "$( declare -f build | \ sed ' @@ -15,8 +15,8 @@ fi if [ "${CARCH}" = "i486" ]; then source+=('carla-git-no-sse.patch') - sha512sums+=('ce8ac0a1e9346dcf0db5910234a2f7de7dfd2cee3df90624b09d9818689df5f8fec9b56d26b6c83f1e190763cc3f540208533d12fdf2841d7f871ebaaae94516') - b2sums+=('995fe6bdeb090bb14edd56d0dcdf57439462d20c5bf7de69409eaee58ae402bb87cfc2e02caa60a6488eed497063a2108add33e55878c960b86421354808b403') + sha512sums+=('bdce143bf9001c970d4001f9a65842f5f7130a26cb6c2804062146f80f672132181af0630d379fae5c51690761983df4cf1b37413d094d0157699dd509f828e4') + b2sums+=('294e7b6a3a902992b860867088e21e96f66316e41db8ecd510bf3ef6912ba0432ceb0abfe2ca6f78072858ed6e805e4f24f7aca598688eac45f7b41b8d5e72cd') eval "$( declare -f build | \ sed ' diff --git a/community/carla/carla-git-no-sse.patch b/community/carla/carla-git-no-sse.patch index 625dd213..ba302425 100644 --- a/community/carla/carla-git-no-sse.patch +++ b/community/carla/carla-git-no-sse.patch @@ -24,7 +24,7 @@ diff -rauN carla-git/data/linux/build-deps.sh carla-git-no-sse/data/linux/build- cd fftw-${FFTW3_VERSION} ./configure --enable-static --disable-shared --prefix=${PREFIX} \ - --enable-sse2 \ -+ --disable-sse --disable-sse2 \ ++ --disable=sse --disable-sse2 \ --disable-debug --disable-alloca --disable-fortran \ --with-our-malloc make @@ -48,6 +48,18 @@ diff -rauN carla-git/data/linux/build-pyqt.sh carla-git-no-sse/data/linux/build- export CXXFLAGS="${CFLAGS}" export LDFLAGS="-m${ARCH} -Wl,-O1" +diff -rauN carla-git/source/Makefile.mk carla-git-no-sse/source/Makefile.mk +--- carla-git/source/Makefile.mk 2021-09-23 08:50:25.088339419 +0200 ++++ carla-git-no-sse/source/Makefile.mk 2021-09-23 14:25:58.412917731 +0200 +@@ -162,7 +162,7 @@ + BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections + + ifeq ($(CPU_I386_OR_X86_64),true) +-BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse ++BASE_OPTS += -mtune=generic + endif + + ifeq ($(CPU_ARM),true) diff -rauN carla-git/source/tests.old/Makefile carla-git-no-sse/source/tests.old/Makefile --- carla-git/source/tests.old/Makefile 2021-09-23 08:50:25.275006380 +0200 +++ carla-git-no-sse/source/tests.old/Makefile 2021-09-23 09:03:18.023708117 +0200 diff --git a/community/carla/carla-git-no-sse2.patch b/community/carla/carla-git-no-sse2.patch index 7f13eeeb..99d324ca 100644 --- a/community/carla/carla-git-no-sse2.patch +++ b/community/carla/carla-git-no-sse2.patch @@ -48,6 +48,18 @@ diff -rauN carla-git/data/linux/build-pyqt.sh carla-git-no-sse2/data/linux/build export CXXFLAGS="${CFLAGS}" export LDFLAGS="-m${ARCH} -Wl,-O1" +diff -rauN carla-git/source/Makefile.mk carla-git-no-sse2/source/Makefile.mk +--- carla-git/source/Makefile.mk 2021-09-23 08:50:25.088339419 +0200 ++++ carla-git-no-sse2/source/Makefile.mk 2021-09-23 14:25:10.466157641 +0200 +@@ -162,7 +162,7 @@ + BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections + + ifeq ($(CPU_I386_OR_X86_64),true) +-BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse ++BASE_OPTS += -mtune=generic -msse -mfpmath=sse + endif + + ifeq ($(CPU_ARM),true) diff -rauN carla-git/source/tests.old/Makefile carla-git-no-sse2/source/tests.old/Makefile --- carla-git/source/tests.old/Makefile 2021-09-23 08:50:25.275006380 +0200 +++ carla-git-no-sse2/source/tests.old/Makefile 2021-09-23 08:51:13.868432167 +0200 -- cgit v1.2.3-70-g09d2