diff --git a/src/curl.mk b/src/curl.mk
index abbc491a..aee1b698 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -22,10 +22,10 @@ define $(PKG)_BUILD
$(MXE_CONFIGURE_OPTS) \
--with-winssl \
--without-ssl \
- --with-libidn2 \
+ --without-libidn2 \
--enable-sspi \
--enable-ipv6 \
- --with-libssh2 \
+ --without-libssh2 \
LIBS=`'$(TARGET)-pkg-config' pthreads --libs`
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
diff --git a/src/freetype.mk b/src/freetype.mk
index ff8d3cdb..3196bcc6 100644
--- a/src/freetype.mk
+++ b/src/freetype.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75
$(PKG)_SUBDIR := freetype-$($(PKG)_VERSION)
$(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE)
-$(PKG)_DEPS := cc bzip2 harfbuzz libpng zlib
+$(PKG)_DEPS := cc bzip2 libpng zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://sourceforge.net/projects/freetype/files/freetype2/' | \
@@ -18,13 +18,13 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD_COMMON
- cd '$(1)' && GNUMAKE=$(MAKE) ./configure --with-harfbuzz=yes \
+ cd '$(1)' && GNUMAKE=$(MAKE) ./configure --with-harfbuzz=no \
$(MXE_CONFIGURE_OPTS) \
- --enable-freetype-config \
+ --enable-freetype-config --without-bzip2 \
LIBPNG_CFLAGS="`$(TARGET)-pkg-config libpng --cflags`" \
LIBPNG_LDFLAGS="`$(TARGET)-pkg-config libpng --libs`" \
FT2_EXTRA_LIBS="`$(TARGET)-pkg-config libpng --libs`" \
- $(if $(BUILD_STATIC),HARFBUZZ_LIBS="`$(TARGET)-pkg-config harfbuzz --libs` -lharfbuzz_too -lfreetype_too `$(TARGET)-pkg-config glib-2.0 --libs`",)
+ $(if $(BUILD_STATIC),HARFBUZZ_LIBS="`$(TARGET)-pkg-config --libs` -lfreetype_too `$(TARGET)-pkg-config glib-2.0 --libs`",)
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/bin/freetype-config' '$(PREFIX)/bin/$(TARGET)-freetype-config'
diff --git a/src/gettext.mk b/src/gettext.mk
index 3874190d..1069ca08 100644
--- a/src/gettext.mk
+++ b/src/gettext.mk
@@ -11,7 +11,7 @@ $(PKG)_URL := https://ftp.gnu.org/gnu/gettext/$($(PKG)_FILE)
$(PKG)_URL_2 := https://ftpmirror.gnu.org/gettext/$($(PKG)_FILE)
# native gettext isn't technically required, but downstream
# cross-packages may need binaries and/or *.m4 files etc.
-$(PKG)_DEPS := cc libiconv $(BUILD)~$(PKG)
+$(PKG)_DEPS := cc libiconv expat $(BUILD)~$(PKG)
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
$(PKG)_DEPS_$(BUILD) := libiconv
diff --git a/src/sdl_image.mk b/src/sdl_image.mk
index b9faead9..6c0305f1 100644
--- a/src/sdl_image.mk
+++ b/src/sdl_image.mk
@@ -20,11 +20,15 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- $(SED) -i 's,^\(Requires:.*\),\1 libtiff-4 libpng libwebp,' '$(SOURCE_DIR)/SDL_image.pc.in'
+ $(SED) -i 's,^\(Requires:.*\),\1 libpng,' '$(SOURCE_DIR)/SDL_image.pc.in'
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
+ --enable-tif-shared \
+ --disable-jpg-shared \
+ --disable-png-shared \
+ --enable-webp-shared \
$(if $(BUILD_STATIC), \
--disable-jpg-shared \
--disable-png-shared \
diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk
index 3542e13d..8d22635c 100644
--- a/src/sdl_mixer.mk
+++ b/src/sdl_mixer.mk
@@ -32,10 +32,15 @@ define $(PKG)_BUILD
--with-sdl-prefix='$(PREFIX)/$(TARGET)' \
--disable-sdltest \
--disable-music-mod \
- --enable-music-mod-modplug \
+ --disable-music-mod-modplug \
+ --disable-music-mod \
--enable-music-ogg \
+ --disable-music-ogg-shared \
--disable-music-flac \
+ --disable-music-fluidsynth-shared \
--enable-music-mp3 \
+ --disable-smpegtest \
+ --disable-smpeg \
$(if $(BUILD_STATIC), \
--disable-music-mod-shared \
--disable-music-ogg-shared \
diff --git a/src/gdb.mk b/src/gdb.mk
index f4818c9c..ed5976c2 100644
--- a/src/gdb.mk
+++ b/src/gdb.mk
@@ -23,6 +23,7 @@ define $(PKG)_BUILD
--with-system-readline \
--disable-gdbtk \
--disable-tui \
+ --disable-libctf \
host_configargs="LIBS=\"`$(TARGET)-pkg-config --libs dlfcn` -lmman\"" \
CONFIG_SHELL=$(SHELL) \
LDFLAGS='-Wl,--allow-multiple-definition'
