[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: contrib: SDL_image: remove tiff support
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Sat Jun 27 12:05:32 UTC 2026
Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC
Commits:
2799c389 by Steve Lhomme at 2026-06-27T12:49:21+02:00
contrib: SDL_image: remove tiff support
libtiff can decode jpeg and zlib, but ffmpeg 8 can do it too.
- - - - -
cc57e22c by Steve Lhomme at 2026-06-27T12:49:21+02:00
contrib: tiff: remove contrib not build
It used to be pulled as a SDL dependency.
But SDL was removed in c218cfbcac14200599b9a04b53c340464d6235fa.
(cherry picked from commit 0f1727b25f164bc4441b66c7b3c2c17132214b8f)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
(cherry picked from commit 5d63b4bc1f362d72c27b2ff2d4700173d86d4bde)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
- - - - -
3d014748 by Steve Lhomme at 2026-06-27T12:49:21+02:00
contrib: sdl: update to 3.4.10
- - - - -
ea007ef7 by Steve Lhomme at 2026-06-27T12:49:21+02:00
contrib: SDL_image: update to 3.4.4
- - - - -
9 changed files:
- − contrib/src/SDL_image/SDL_image.patch
- contrib/src/SDL_image/SHA512SUMS
- − contrib/src/SDL_image/pkg-config.patch
- contrib/src/SDL_image/rules.mak
- contrib/src/sdl/SHA512SUMS
- − contrib/src/sdl/direct_palette_ref.diff
- contrib/src/sdl/rules.mak
- − contrib/src/tiff/SHA512SUMS
- − contrib/src/tiff/rules.mak
Changes:
=====================================
contrib/src/SDL_image/SDL_image.patch deleted
=====================================
@@ -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)
=====================================
contrib/src/SDL_image/SHA512SUMS
=====================================
@@ -1 +1 @@
-0e71b280abc2a7f15755e4480a3c1b52d41f9f8b0c9216a6f5bd9fc0e939456fb5d6c10419e1d1904785783f9a1891ead278c03e88b0466fecc6871c3ca40136 SDL_image-1.2.12.tar.gz
+1d0482e4ddc813111bfe539c0916866517225a76a462d46e764123947b5d0e2653dc64a03843ccd12eb8ce7fa122a257f077a3cac8983bf6ab4042863f4cb8c5 SDL3_image-3.4.4.tar.gz
=====================================
contrib/src/SDL_image/pkg-config.patch deleted
=====================================
@@ -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
-
=====================================
contrib/src/SDL_image/rules.mak
=====================================
@@ -1,7 +1,7 @@
# 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
+SDL_IMAGE_VERSION := 3.4.4
+SDL_IMAGE_URL := https://github.com/libsdl-org/SDL_image/releases/download/release-$(SDL_IMAGE_VERSION)/SDL3_image-$(SDL_IMAGE_VERSION).tar.gz
# sdl_image module is disabled on macOS, and it's dependency sdl failed to build
ifndef HAVE_DARWIN_OS
@@ -11,22 +11,27 @@ ifeq ($(call need_pkg,"SDL_image"),)
PKGS_FOUND += SDL_image
endif
-$(TARBALLS)/SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
+$(TARBALLS)/SDL3_image-$(SDL_IMAGE_VERSION).tar.gz:
$(call download_pkg,$(SDL_IMAGE_URL),SDL_image)
-.sum-SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+.sum-SDL_image: SDL3_image-$(SDL_IMAGE_VERSION).tar.gz
-SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
+SDL_image: SDL3_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)
+ $(call pkg_static,"cmake/sdl3-image.pc.in")
$(MOVE)
-DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
+DEPS_SDL_image = jpeg $(DEPS_jpeg) \
sdl $(DEPS_sdl)
-.SDL_image: SDL_image
- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest --disable-png
- $(MAKE) -C $< install
+SDL_IMAGE_CONF := -DSDLIMAGE_TIF=OFF \
+ -DSDLIMAGE_PNG=OFF \
+ -DSDLIMAGE_TESTS=OFF \
+ -DSDLIMAGE_SAMPLES=OFF
+
+.SDL_image: SDL_image toolchain.cmake
+ $(CMAKECLEAN)
+ $(HOSTVARS_CMAKE) $(CMAKE) $(SDL_IMAGE_CONF)
+ +$(CMAKEBUILD)
+ $(CMAKEINSTALL)
touch $@
=====================================
contrib/src/sdl/SHA512SUMS
=====================================
@@ -1 +1 @@
-ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc SDL-1.2.15.tar.gz
+a66366071aa5dcc5949c3f48b2041dff8850cd05917c1ba5f6ae251e9eef3277d31884fe020251388051887c8c1587cd80457a02bdb96c11eb41065ac9f69958 SDL3-3.4.10.tar.gz
=====================================
contrib/src/sdl/direct_palette_ref.diff deleted
=====================================
@@ -1,12 +0,0 @@
---- sdl/src/video/quartz/SDL_QuartzVideo.h.orig 2014-03-05 14:09:28.000000000 +0100
-+++ sdl/src/video/quartz/SDL_QuartzVideo.h 2014-03-05 14:09:45.000000000 +0100
-@@ -91,7 +91,9 @@
- CGDirectDisplayID display; /* 0 == main display (only support single display) */
- const void *mode; /* current mode of the display */
- const void *save_mode; /* original mode of the display */
-+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
- CGDirectPaletteRef palette; /* palette of an 8-bit display */
-+#endif
- NSOpenGLContext *gl_context; /* OpenGL rendering context */
- NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */
- Uint32 width, height, bpp; /* frequently used data about the display */
=====================================
contrib/src/sdl/rules.mak
=====================================
@@ -1,46 +1,51 @@
# SDL
-SDL_VERSION := 1.2.15
-SDL_URL := http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
+SDL_VERSION := 3.4.10
+SDL_URL := https://github.com/libsdl-org/SDL/releases/download/release-$(SDL_VERSION)/SDL3-$(SDL_VERSION).tar.gz
#PKGS += sdl
ifeq ($(call need_pkg,"sdl"),)
PKGS_FOUND += sdl
endif
-$(TARBALLS)/SDL-$(SDL_VERSION).tar.gz:
+$(TARBALLS)/SDL3-$(SDL_VERSION).tar.gz:
$(call download_pkg,$(SDL_URL),sdl)
-.sum-sdl: SDL-$(SDL_VERSION).tar.gz
+.sum-sdl: SDL3-$(SDL_VERSION).tar.gz
-sdl: SDL-$(SDL_VERSION).tar.gz .sum-sdl
+sdl: SDL3-$(SDL_VERSION).tar.gz .sum-sdl
$(UNPACK)
- $(APPLY) $(SRC)/sdl/direct_palette_ref.diff
- $(UPDATE_AUTOCONFIG)
+ $(call pkg_static,"cmake/sdl3.pc.in")
$(MOVE)
- mv sdl/config.sub sdl/config.guess sdl/build-scripts
-
-SDLCONF := $(HOSTCONF) \
- --disable-audio \
- --enable-video \
- --enable-events \
- --disable-joystick \
- --disable-cdrom \
- --disable-threads \
- --disable-timers \
- --disable-file \
- --disable-assembly \
- --disable-video-x11 \
- --disable-video-aalib \
- --disable-video-dga \
- --disable-video-fbcon \
- --disable-video-directfb \
- --disable-video-ggi \
- --disable-video-svga \
- --disable-directx \
- --disable-sdl-dlopen
-
-.sdl: sdl
- cd $< && $(HOSTVARS) ./configure $(SDLCONF)
- $(MAKE) -C $< install
+
+SDL_CONF := \
+ -DSDL_AUDIO=OFF \
+ -DSDL_VIDEO=ON \
+ -DSDL_HAPTIC=OFF \
+ -DSDL_JOYSTICK=OFF \
+ -DSDL_THREADS=OFF \
+ -DSDL_ASSEMBLY=OFF \
+ -DSDL_X11=OFF \
+ -DSDL_DIRECTX=OFF \
+ -DSDL_TESTS=OFF \
+ -DSDL_EXAMPLES=OFF
+
+
+ # -Dsdl-dlopen=ON
+ # -DSDL_events=ON \
+ # -DSDL_cdrom=OFF \
+ # -DSDL_timers=OFF \
+ # -DSDL_file=OFF \
+ # -DSDL_video-aalib=OFF \
+ # -DSDL_video-dga=OFF \
+ # -DSDL_video-fbcon=OFF \
+ # -DSDL_video-directfb=OFF \
+ # -DSDL_video-ggi=OFF \
+ # -DSDL_video-svga=OFF \
+
+.sdl: sdl toolchain.cmake
+ $(CMAKECLEAN)
+ $(HOSTVARS_CMAKE) $(CMAKE) $(SDL_CONF)
+ +$(CMAKEBUILD)
+ $(CMAKEINSTALL)
touch $@
=====================================
contrib/src/tiff/SHA512SUMS deleted
=====================================
@@ -1 +0,0 @@
-04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz
=====================================
contrib/src/tiff/rules.mak deleted
=====================================
@@ -1,27 +0,0 @@
-# tiff
-
-TIFF_VERSION := 4.0.9
-TIFF_URL := http://download.osgeo.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
-
-$(TARBALLS)/tiff-$(TIFF_VERSION).tar.gz:
- $(call download_pkg,$(TIFF_URL),tiff)
-
-.sum-tiff: tiff-$(TIFF_VERSION).tar.gz
-
-tiff: tiff-$(TIFF_VERSION).tar.gz .sum-tiff
- $(UNPACK)
- $(UPDATE_AUTOCONFIG)
- $(MOVE)
- mv tiff/config.sub tiff/config.guess tiff/config
-
-.tiff: tiff
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) \
- --disable-jpeg \
- --disable-zlib \
- --disable-cxx \
- --without-x
- +$(MAKEBUILD) -C port
- +$(MAKEBUILD) -C libtiff
- +$(MAKEBUILD) -C libtiff install
- touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09086a6bb9da0e89d8bf5e921edcb52eb702f5dd...ea007ef7582fc56a3527b3910530418c679fcb2b
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09086a6bb9da0e89d8bf5e921edcb52eb702f5dd...ea007ef7582fc56a3527b3910530418c679fcb2b
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
More information about the vlc-commits
mailing list