[vlc-commits] contrib: sdl_image: disable package not usable on Winstore builds

Steve Lhomme git at videolan.org
Wed Mar 20 10:50:24 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar  7 15:18:33 2019 +0100| [89aa45f030799ec1dbcce006cf440931424fbc31] | committer: Steve Lhomme

contrib: sdl_image: disable package not usable on Winstore builds

depends on sdl which is not usable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89aa45f030799ec1dbcce006cf440931424fbc31
---

 contrib/src/SDL_image/rules.mak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index eb050dba5f..072463493a 100644
--- a/contrib/src/SDL_image/rules.mak
+++ b/contrib/src/SDL_image/rules.mak
@@ -3,7 +3,9 @@
 SDL_IMAGE_VERSION := 1.2.12
 SDL_IMAGE_URL := http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 
+ifndef HAVE_WINSTORE
 PKGS += SDL_image
+endif
 ifeq ($(call need_pkg,"SDL_image"),)
 PKGS_FOUND += SDL_image
 endif
@@ -20,10 +22,8 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
-DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff)
-ifndef HAVE_WINSTORE
-DEPS_SDL_image += sdl $(DEPS_sdl)
-endif
+DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
+	sdl $(DEPS_sdl)
 
 .SDL_image: SDL_image
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest --disable-png



More information about the vlc-commits mailing list