[vlc-devel] [PATCH 4/5] contrib: remove SDL_image

[Marvin Scholz]

---
 contrib/src/SDL_image/SDL_image.patch  | 43 --------------------------
 contrib/src/SDL_image/SHA512SUMS       |  1 -
 contrib/src/SDL_image/pkg-config.patch |  9 ------
 contrib/src/SDL_image/rules.mak        | 31 -------------------
 4 files changed, 84 deletions(-)
 delete mode 100644 contrib/src/SDL_image/SDL_image.patch
 delete mode 100644 contrib/src/SDL_image/SHA512SUMS
 delete mode 100644 contrib/src/SDL_image/pkg-config.patch
 delete mode 100644 contrib/src/SDL_image/rules.mak

diff --git a/contrib/src/SDL_image/SDL_image.patch b/contrib/src/SDL_image/SDL_image.patch
deleted file mode 100644
index 7e27041d8a7..00000000000
--- a/contrib/src/SDL_image/SDL_image.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- SDL_image/Makefile.am.orig	2009-11-08 05:55:32.000000000 -0500
-+++ SDL_image/Makefile.am	2011-11-22 22:17:14.234702385 -0500
-@@ -47,7 +47,6 @@
- else
- libSDL_image_la_LDFLAGS = 	\
- 	-no-undefined		\
--	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libSDL_image_la_LIBADD = $(IMG_LIBS)
- endif
-@@ -58,7 +57,7 @@
- %.o : %.rc
- 	$(WINDRES) $< $@
- 
--noinst_PROGRAMS = showimage
-+#noinst_PROGRAMS = showimage
- 
- showimage_LDADD = libSDL_image.la
- 
---- SDL_image/Makefile.in.orig	2009-11-12 01:42:10.000000000 -0500
-+++ SDL_image/Makefile.in	2011-11-22 22:17:10.714684927 -0500
-@@ -41,7 +41,7 @@
- host_triplet = @host@
- @USE_VERSION_RC_FALSE at libSDL_image_la_DEPENDENCIES =  \
- @USE_VERSION_RC_FALSE@	$(am__DEPENDENCIES_1)
--noinst_PROGRAMS = showimage$(EXEEXT)
-+#noinst_PROGRAMS = showimage$(EXEEXT)
- subdir = .
- DIST_COMMON = README $(am__configure_deps) \
- 	$(libSDL_imageinclude_HEADERS) $(srcdir)/Makefile.am \
-@@ -297,12 +297,10 @@
- 
- @USE_VERSION_RC_FALSE at libSDL_image_la_LDFLAGS = \
- @USE_VERSION_RC_FALSE@	-no-undefined		\
-- at USE_VERSION_RC_FALSE@	-release $(LT_RELEASE)	\
- @USE_VERSION_RC_FALSE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- @USE_VERSION_RC_TRUE at libSDL_image_la_LDFLAGS = \
- @USE_VERSION_RC_TRUE@	-no-undefined		\
-- at USE_VERSION_RC_TRUE@	-release $(LT_RELEASE)	\
- @USE_VERSION_RC_TRUE@	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o
- 
- @USE_VERSION_RC_FALSE at libSDL_image_la_LIBADD = $(IMG_LIBS)
diff --git a/contrib/src/SDL_image/SHA512SUMS b/contrib/src/SDL_image/SHA512SUMS
deleted file mode 100644
index 3866332b486..00000000000
--- a/contrib/src/SDL_image/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136  SDL_image-1.2.12.tar.gz
diff --git a/contrib/src/SDL_image/pkg-config.patch b/contrib/src/SDL_image/pkg-config.patch
deleted file mode 100644
index b5d1d23ee63..00000000000
--- a/contrib/src/SDL_image/pkg-config.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- SDL_image/SDL_image.pc.in.orig	2011-11-15 10:34:23.504770604 -0500
-+++ SDL_image/SDL_image.pc.in	2011-11-15 10:34:39.924852030 -0500
-@@ -8,5 +8,6 @@
- Version: @VERSION@
- Requires: sdl >= @SDL_VERSION@
- Libs: -L${libdir} -lSDL_image
-+Libs.private:  -ljpeg -ltiff
- Cflags: -I${includedir}/SDL
- 
diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
deleted file mode 100644
index 072463493a2..00000000000
--- a/contrib/src/SDL_image/rules.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-# SDL_image
-
-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
-
-$(TARBALLS)/SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
-	$(call download_pkg,$(SDL_IMAGE_URL),SDL_image)
-
-.sum-SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
-
-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) \
-	sdl $(DEPS_sdl)
-
-.SDL_image: SDL_image
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest --disable-png
-	cd $< && $(MAKE) install
-	touch $@
-- 
2.24.3 (Apple Git-128)