diff options
Diffstat (limited to 'extra/webkit2gtk')
-rw-r--r-- | extra/webkit2gtk/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/webkit2gtk/webkitgtk-2.27.91-no-sse2.arch32.patch | 91 | ||||
-rw-r--r-- | extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch | 50 |
3 files changed, 60 insertions, 102 deletions
diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD index 8c57f8cb..6e0af735 100644 --- a/extra/webkit2gtk/PKGBUILD +++ b/extra/webkit2gtk/PKGBUILD @@ -1,14 +1,13 @@ # 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.36.3-no-sse2.arch32.patch') +source_i686+=('webkitgtk-2.36.3-no-sse2.arch32.patch') +sha256sums_i486+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac') +sha256sums_i686+=('58a724b7f1092a9049186a3b8c61689c31558b6c2b587c827cec04219397adac') if [ "${CARCH}" != "pentium4" ]; then eval "$( declare -f prepare | \ sed ' - /cd.*/a for _p in \"$srcdir\"\/*.arch32.patch; do patch -p1 -i \"$_p\"; done + /cd.*/a patch -Rp1 -i "$srcdir"/webkitgtk-2.36.3-no-sse2.arch32.patch ' )" fi @@ -29,12 +28,12 @@ eval "$( ' )" -# work around broken generated makefiles resulting in -# "make[2]: *** No rule to make target 'JavaScriptCore-4.0.gir', needed by 'WebKit2-4.0.gir'. Stop." -# https://bugs.webkit.org/show_bug.cgi?id=195251 +# linker runs out of memory on 32-bit eval "$( declare -f build | \ sed ' - s|cmake --build build|cmake --build build; cd build/Source/JavaScriptCore; make; cd ../../..; cmake --build build| + 3 i LDFLAGS+=" -Wl,--no-keep-memory" + 3 i CFLAGS+=" -g1" + 3 i CXXFLAGS+=" -g1" ' -)" +)" 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.36.3-no-sse2.arch32.patch b/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch new file mode 100644 index 00000000..63a098a7 --- /dev/null +++ b/extra/webkit2gtk/webkitgtk-2.36.3-no-sse2.arch32.patch @@ -0,0 +1,50 @@ +diff -rauN webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake +--- webkitgtk-2.36.3/Source/cmake/WebKitCompilerFlags.cmake 2022-06-02 08:44:07.302049344 +0200 ++++ webkitgtk-2.36.3-no-sse2-patch/Source/cmake/WebKitCompilerFlags.cmake 2022-06-02 08:32:46.169362098 +0200 +@@ -163,13 +163,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 () + + # Makes builds faster. The GCC manual warns about the possibility that the assembler being + # used may not support input from a pipe, but in practice the toolchains we support all do. +diff -rauN webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h +--- webkitgtk-2.36.3/Source/ThirdParty/ANGLE/src/common/platform.h 2022-06-02 08:45:17.042348743 +0200 ++++ webkitgtk-2.36.3-no-sse2-patch/Source/ThirdParty/ANGLE/src/common/platform.h 2022-06-02 08:32:46.189362180 +0200 +@@ -97,8 +97,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.36.3/Source/WTF/wtf/PlatformCPU.h webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h +--- webkitgtk-2.36.3/Source/WTF/wtf/PlatformCPU.h 2022-06-02 08:46:55.912771827 +0200 ++++ webkitgtk-2.36.3-no-sse2-patch/Source/WTF/wtf/PlatformCPU.h 2022-06-02 08:32:45.789360661 +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 |