diff options
| -rw-r--r-- | extra/webkit2gtk/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/webkit2gtk/webkitgtk-2.27.91-no-sse2.arch32.patch | 91 | ||||
| -rw-r--r-- | extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch | 83 |
3 files changed, 87 insertions, 95 deletions
diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD index 396ada76..4c4fb0aa 100644 --- a/extra/webkit2gtk/PKGBUILD +++ b/extra/webkit2gtk/PKGBUILD @@ -1,8 +1,8 @@ # disable SSE2 on 486 and 686 -source_i486+=('webkitgtk-2.27.91-no-sse2.arch32.patch') -source_i686+=('webkitgtk-2.27.91-no-sse2.arch32.patch') -sha256sums_i486+=('30f40db0ce4c90f62207925e0bd03766c64756725c463444279d2685daf4dfc3') -sha256sums_i686+=('30f40db0ce4c90f62207925e0bd03766c64756725c463444279d2685daf4dfc3') +source_i486+=('webkitgtk-2.32.0-no-sse2.arch32.patch') +source_i686+=('webkitgtk-2.32.0-no-sse2.arch32.patch') +sha256sums_i486+=('11f3d9cd6d36db290fd725f57530fb6ea398bb61fcf2575a77154d7009c1718a') +sha256sums_i686+=('11f3d9cd6d36db290fd725f57530fb6ea398bb61fcf2575a77154d7009c1718a') if [ "${CARCH}" != "pentium4" ]; then eval "$( diff --git a/extra/webkit2gtk/webkitgtk-2.27.91-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.27.91-no-sse2.arch32.patch deleted file mode 100644 index 0f70b6cf..00000000 --- a/extra/webkit2gtk/webkitgtk-2.27.91-no-sse2.arch32.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -rauN webkitgtk-2.27.91/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.27.91-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake ---- webkitgtk-2.27.91/Source/cmake/WebKitCompilerFlags.cmake 2020-02-25 14:02:33.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake 2020-03-08 10:52:59.256386510 +0100 -@@ -140,13 +140,13 @@ - endif () - - # Force SSE2 fp on x86 builds. -- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) -- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) -- include(DetectSSE2) -- if (NOT SSE2_SUPPORT_FOUND) -- message(FATAL_ERROR "SSE2 support is required to compile WebKit") -- endif () -- endif () -+# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) -+# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) -+# include(DetectSSE2) -+# if (NOT SSE2_SUPPORT_FOUND) -+# message(FATAL_ERROR "SSE2 support is required to compile WebKit") -+# endif () -+# endif () - endif () - - if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC) -diff -rauN webkitgtk-2.27.91/Source/ThirdParty/ANGLE/src/common/mathutil.h webkitgtk-2.27.91-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/mathutil.h ---- webkitgtk-2.27.91/Source/ThirdParty/ANGLE/src/common/mathutil.h 2020-02-05 11:02:04.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/mathutil.h 2020-03-08 14:02:05.582650747 +0100 -@@ -145,6 +145,7 @@ - - inline bool supportsSSE2() - { -+ return false; - #if defined(ANGLE_USE_SSE) - static bool checked = false; - static bool supports = false; -diff -rauN webkitgtk-2.27.91/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp webkitgtk-2.27.91-no-sse2-patch/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp ---- webkitgtk-2.27.91/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp 2020-02-05 11:02:04.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/ThirdParty/ANGLE/src/image_util/loadimage.cpp 2020-03-08 10:57:55.570049890 +0100 -@@ -26,6 +26,7 @@ - size_t outputDepthPitch) - { - #if defined(ANGLE_USE_SSE) -+#error No SSE2 - if (gl::supportsSSE2()) - { - __m128i zeroWide = _mm_setzero_si128(); -diff -rauN webkitgtk-2.27.91/Source/WebCore/platform/audio/SincResampler.cpp webkitgtk-2.27.91-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp ---- webkitgtk-2.27.91/Source/WebCore/platform/audio/SincResampler.cpp 2020-02-04 11:24:07.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp 2020-03-08 11:04:31.904959427 +0100 -@@ -36,6 +36,7 @@ - #include <wtf/MathExtras.h> - - #if CPU(X86_SSE2) -+#error No SSE2 - #include <emmintrin.h> - #endif - -diff -rauN webkitgtk-2.27.91/Source/WebCore/platform/audio/VectorMath.cpp webkitgtk-2.27.91-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp ---- webkitgtk-2.27.91/Source/WebCore/platform/audio/VectorMath.cpp 2020-02-04 11:24:07.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp 2020-03-08 11:05:13.875479720 +0100 -@@ -33,6 +33,7 @@ - #endif - - #if CPU(X86_SSE2) -+#error No SSE2 - #include <emmintrin.h> - #endif - -diff -rauN webkitgtk-2.27.91/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.27.91-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h ---- webkitgtk-2.27.91/Source/WTF/wtf/PlatformCPU.h 2020-02-04 11:24:07.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h 2020-03-08 11:06:26.063041396 +0100 -@@ -99,7 +99,7 @@ - #define WTF_CPU_KNOWN 1 - - #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) --#define WTF_CPU_X86_SSE2 1 -+/* #define WTF_CPU_X86_SSE2 1 */ - #endif - - #endif -diff -rauN webkitgtk-2.27.91/Source/WTF/wtf/text/ASCIIFastPath.h webkitgtk-2.27.91-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h ---- webkitgtk-2.27.91/Source/WTF/wtf/text/ASCIIFastPath.h 2020-02-04 11:24:07.000000000 +0100 -+++ webkitgtk-2.27.91-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h 2020-03-08 11:06:54.516727539 +0100 -@@ -27,6 +27,7 @@ - #include <wtf/text/LChar.h> - - #if CPU(X86_SSE2) -+#error No SSE2 - #include <emmintrin.h> - #endif - diff --git a/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch new file mode 100644 index 00000000..4d453aae --- /dev/null +++ b/extra/webkit2gtk/webkitgtk-2.32.0-no-sse2.arch32.patch @@ -0,0 +1,83 @@ +diff -rauN webkitgtk-2.32.0/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.32.0-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.32.0/Source/cmake/WebKitCompilerFlags.cmake 2021-03-25 14:27:32.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake 2021-05-08 17:00:53.952879632 +0200 +@@ -143,13 +143,13 @@ + endif () + + # Force SSE2 fp on x86 builds. +- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) +- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) +- include(DetectSSE2) +- if (NOT SSE2_SUPPORT_FOUND) +- message(FATAL_ERROR "SSE2 support is required to compile WebKit") +- endif () +- endif () ++# if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING) ++# WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse) ++# include(DetectSSE2) ++# if (NOT SSE2_SUPPORT_FOUND) ++# message(FATAL_ERROR "SSE2 support is required to compile WebKit") ++# endif () ++# endif () + endif () + + if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC) +diff -rauN webkitgtk-2.32.0/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.32.0-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.32.0/Source/ThirdParty/ANGLE/src/common/platform.h 2021-02-26 10:57:06.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h 2021-05-08 17:02:05.056394762 +0200 +@@ -90,8 +90,8 @@ + # include <intrin.h> + # define ANGLE_USE_SSE + #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) +-# include <x86intrin.h> +-# define ANGLE_USE_SSE ++//# include <x86intrin.h> ++//# define ANGLE_USE_SSE + #endif + + // Mips and arm devices need to include stddef for size_t. +diff -rauN webkitgtk-2.32.0/Source/WebCore/platform/audio/SincResampler.cpp webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp +--- webkitgtk-2.32.0/Source/WebCore/platform/audio/SincResampler.cpp 2021-02-26 10:57:13.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/SincResampler.cpp 2021-05-08 17:12:14.678638777 +0200 +@@ -39,6 +39,7 @@ + #if USE(ACCELERATE) + #include <Accelerate/Accelerate.h> + #elif CPU(X86_SSE2) ++#error No SSE2 + #include <xmmintrin.h> + #elif HAVE(ARM_NEON_INTRINSICS) + #include <arm_neon.h> +diff -rauN webkitgtk-2.32.0/Source/WebCore/platform/audio/VectorMath.cpp webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp +--- webkitgtk-2.32.0/Source/WebCore/platform/audio/VectorMath.cpp 2021-02-26 10:57:13.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/WebCore/platform/audio/VectorMath.cpp 2021-05-08 17:12:40.725409625 +0200 +@@ -35,6 +35,7 @@ + #endif + + #if CPU(X86_SSE2) ++#error No SSE2 + #include <emmintrin.h> + #endif + +diff -rauN webkitgtk-2.32.0/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h +--- webkitgtk-2.32.0/Source/WTF/wtf/PlatformCPU.h 2021-02-26 10:57:08.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h 2021-05-08 17:13:21.592239207 +0200 +@@ -99,7 +99,7 @@ + #define WTF_CPU_KNOWN 1 + + #if defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2) +-#define WTF_CPU_X86_SSE2 1 ++/* #define WTF_CPU_X86_SSE2 1 */ + #endif + + #endif +diff -rauN webkitgtk-2.32.0/Source/WTF/wtf/text/ASCIIFastPath.h webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h +--- webkitgtk-2.32.0/Source/WTF/wtf/text/ASCIIFastPath.h 2021-02-26 10:57:08.000000000 +0100 ++++ webkitgtk-2.32.0-no-sse2-patch/Source/WTF/wtf/text/ASCIIFastPath.h 2021-05-08 17:13:42.528989083 +0200 +@@ -27,6 +27,7 @@ + #include <wtf/text/LChar.h> + + #if CPU(X86_SSE2) ++#error No SSE2 + #include <emmintrin.h> + #endif + |