[vlc-devel] [PATCH 4/6] contrib: Update config.sub/guess for kate/caca/sdl/SDL_image

Martin Storsjö martin at martin.st
Thu Dec 28 21:58:31 CET 2017


This fixes building for non-x86 windows platforms.
---
 contrib/src/SDL_image/rules.mak | 1 +
 contrib/src/caca/rules.mak      | 2 ++
 contrib/src/kate/rules.mak      | 2 ++
 contrib/src/sdl/rules.mak       | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index ab67bc6..c66911a 100644
--- a/contrib/src/SDL_image/rules.mak
+++ b/contrib/src/SDL_image/rules.mak
@@ -17,6 +17,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
 	$(UNPACK)
 	$(APPLY) $(SRC)/SDL_image/SDL_image.patch
 	$(APPLY) $(SRC)/SDL_image/pkg-config.patch
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index 95e3325..f1f2a31 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -20,7 +20,9 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
 	$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
 	$(APPLY) $(SRC)/caca/caca-win32-static.patch
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv caca/config.sub caca/config.guess caca/.auto
 
 CACA_CONF := \
 	--disable-imlib2 \
diff --git a/contrib/src/kate/rules.mak b/contrib/src/kate/rules.mak
index 5236bed..150972d 100644
--- a/contrib/src/kate/rules.mak
+++ b/contrib/src/kate/rules.mak
@@ -15,7 +15,9 @@ $(TARBALLS)/libkate-$(KATE_VERSION).tar.gz:
 
 libkate: libkate-$(KATE_VERSION).tar.gz .sum-kate
 	$(UNPACK)
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv libkate/config.sub libkate/config.guess libkate/misc/autotools
 
 DEPS_kate = ogg $(DEPS_ogg)
 
diff --git a/contrib/src/sdl/rules.mak b/contrib/src/sdl/rules.mak
index 89948c9..4b16cc9 100644
--- a/contrib/src/sdl/rules.mak
+++ b/contrib/src/sdl/rules.mak
@@ -16,7 +16,9 @@ $(TARBALLS)/SDL-$(SDL_VERSION).tar.gz:
 sdl: SDL-$(SDL_VERSION).tar.gz .sum-sdl
 	$(UNPACK)
 	$(APPLY) $(SRC)/sdl/direct_palette_ref.diff
+	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
+	mv sdl/config.sub sdl/config.guess sdl/build-scripts
 
 SDLCONF := $(HOSTCONF) \
 	--disable-audio \
-- 
2.7.4



More information about the vlc-devel mailing list