Skip to content

Commit 7ff9bbd

Browse files
committed
Fix pixman on wasm
Signed-off-by: falkTX <falktx@falktx.com>
1 parent e8ae96d commit 7ff9bbd

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

bootstrap-plugins.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ fi # !MACOS
9292
# ---------------------------------------------------------------------------------------------------------------------
9393
# pixman
9494

95+
PIXMAN_EXTRAFLAGS="--disable-gtk --enable-libpng"
96+
9597
download pixman "${PIXMAN_VERSION}" "${PIXMAN_URL}"
96-
build_autoconf pixman "${PIXMAN_VERSION}"
98+
build_autoconf pixman "${PIXMAN_VERSION}" "${PIXMAN_EXTRAFLAGS}"
9799

98100
if [ "${CROSS_COMPILING}" -eq 0 ]; then
99101
run_make pixman "${PIXMAN_VERSION}" check
@@ -114,7 +116,7 @@ FREETYPE_EXTRAFLAGS+=" -DFT_DISABLE_HARFBUZZ=TRUE"
114116
# FREETYPE_EXTRAFLAGS+=" -DBROTLIDEC_INCLUDE_DIRS:PATH=${PAWPAW_PREFIX}/include"
115117
# FREETYPE_EXTRAFLAGS+=" -DFREETYPE_INCLUDE_DIRS:PATH=${PAWPAW_PREFIX}/include"
116118
# FREETYPE_EXTRAFLAGS+=" -DHarfBuzz_INCLUDE_DIR:PATH=${PAWPAW_PREFIX}/include/harfbuzz"
117-
FREETYPE_EXTRAFLAGS+=" -DPNG_PNG_INCLUDE_DIR:PATH=${PAWPAW_PREFIX}/include"
119+
FREETYPE_EXTRAFLAGS+=" -DPNG_INCLUDE_DIR:PATH=${PAWPAW_PREFIX}/include"
118120

119121
if [ "${MACOS}" -eq 0 ]; then
120122
FREETYPE_EXTRAFLAGS+=" -DZLIB_INCLUDE_DIR:PATH=${PAWPAW_PREFIX}/include"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/test/utils-prng.c b/test/utils-prng.c
2+
index 0cf53dd..ecadbdc 100644
3+
--- a/test/utils-prng.c
4+
+++ b/test/utils-prng.c
5+
@@ -83,7 +83,7 @@ store_rand_128_data (void *addr, prng_rand_128_data_t *d, int aligned)
6+
}
7+
else
8+
{
9+
-#ifdef __SSE2__
10+
+#if defined(__SSE2__) && !defined(__EMSCRIPTEN__)
11+
/* workaround for http://gcc.gnu.org/PR55614 */
12+
_mm_storeu_si128 (addr, _mm_loadu_si128 ((__m128i *)d));
13+
return;

0 commit comments

Comments
 (0)