From c79dcc664708f5bc3dac5de852c8f83f7eb376b4 Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Thu, 1 May 2025 22:19:52 +0300 Subject: [PATCH] graphics/linux-rl9-sdl_image: Merge into misc/linux-rl9-sdl12-extralibs --- MOVED | 1 + Mk/Uses/linux.mk | 1 - graphics/Makefile | 1 - graphics/linux-rl9-sdl_image/Makefile | 27 ------------------- graphics/linux-rl9-sdl_image/distinfo | 7 ----- .../linux-rl9-sdl_image/pkg-plist.aarch64 | 8 ------ graphics/linux-rl9-sdl_image/pkg-plist.amd64 | 8 ------ 7 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 graphics/linux-rl9-sdl_image/Makefile delete mode 100644 graphics/linux-rl9-sdl_image/distinfo delete mode 100644 graphics/linux-rl9-sdl_image/pkg-plist.aarch64 delete mode 100644 graphics/linux-rl9-sdl_image/pkg-plist.amd64 diff --git a/MOVED b/MOVED index e31888b0e857..d8db53ca7979 100644 --- a/MOVED +++ b/MOVED @@ -4333,3 +4333,4 @@ databases/py-carbon||2025-04-28|Has expired: In bandaid mode as the concentratio x11-toolkits/SoXt||2025-04-28|Has expired: Broken for more than 6 months graphics/agg26|graphics/agg|2025-05-01|Merged into agg graphics/linux-c7-sdl_ttf|misc/linux-c7-sdl12-extralibs|2025-05-03|Merged into misc/linux-c7-sdl12-extralibs +graphics/linux-rl9-sdl_image|misc/linux-rl9-sdl12-extralibs|2025-05-03|Merged into misc/linux-rl9-sdl12-extralibs diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index c9ec08bae578..1a37dda12a0f 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -196,7 +196,6 @@ _linux_${linux_ARGS}_sdl2mixer= linux-${linux_ARGS}-sdl2_mixer>0:audio/linux-${ _linux_${linux_ARGS}_sdl2ttf= linux-${linux_ARGS}-sdl2_ttf>0:graphics/linux-${linux_ARGS}-sdl2_ttf _linux_${linux_ARGS}_sdl2sound= linux-${linux_ARGS}-sdl2_sound>0:audio/linux-${linux_ARGS}-sdl2_sound _linux_${linux_ARGS}_sdlgfx= linux-${linux_ARGS}-sdl_gfx>0:graphics/linux-${linux_ARGS}-sdl_gfx -_linux_${linux_ARGS}_sdlimage= linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image _linux_${linux_ARGS}_sdlmixer= linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer _linux_${linux_ARGS}_sdlttf= linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf _linux_${linux_ARGS}_sdlsound= linux-${linux_ARGS}-sdl_sound>0:audio/linux-${linux_ARGS}-sdl_sound diff --git a/graphics/Makefile b/graphics/Makefile index af35515e1b27..3c659a056eac 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -558,7 +558,6 @@ SUBDIR += linux-rl9-sdl2_image SUBDIR += linux-rl9-sdl2_ttf SUBDIR += linux-rl9-sdl_gfx - SUBDIR += linux-rl9-sdl_image SUBDIR += linux-rl9-sdl_ttf SUBDIR += linux-rl9-shaderc SUBDIR += linux-rl9-spirv-tools diff --git a/graphics/linux-rl9-sdl_image/Makefile b/graphics/linux-rl9-sdl_image/Makefile deleted file mode 100644 index ae77dea3b3bb..000000000000 --- a/graphics/linux-rl9-sdl_image/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -PORTNAME= sdl_image -PORTVERSION= 1.2.12 -DISTVERSIONSUFFIX= -31.el9 -PORTREVISION= 1 -CATEGORIES= graphics linux -MASTER_SITES= EPEL9 -DISTNAME= SDL_image-${DISTVERSIONFULL} - -MAINTAINER= emulation@FreeBSD.org -COMMENT= Simple library to load images as SDL interfaces (Rocky Linux ${LINUX_DIST_VER}) -WWW= https://github.com/libsdl-org/SDL_image/ - -LICENSE= ZLIB - -USES= cpe linux:rl9 -CPE_VENDOR= libsdl -USE_LDCONFIG= yes -USE_LINUX= imageformats-libs sdl12 -USE_LINUX_RPM= yes - -CONFLICTS= linux-c7-${PORTNAME} -DESCR= ${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr -DOCSDIR= ${PREFIX}/usr/share/doc/SDL_image - -OPTIONS_DEFINE= DOCS - -.include diff --git a/graphics/linux-rl9-sdl_image/distinfo b/graphics/linux-rl9-sdl_image/distinfo deleted file mode 100644 index 14eb4fd2008d..000000000000 --- a/graphics/linux-rl9-sdl_image/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1739908140 -SHA256 (rocky/s/SDL_image-1.2.12-31.el9.aarch64.rpm) = 1e0e8914576843466a246c6e96e7b4a2a0b8368a994d4f6d06eda69363166d2a -SIZE (rocky/s/SDL_image-1.2.12-31.el9.aarch64.rpm) = 44744 -SHA256 (rocky/s/SDL_image-1.2.12-31.el9.x86_64.rpm) = 995492d9e25effed5b9d538feaceb8fc26314a91862ec3b7a044edeaae4471ac -SIZE (rocky/s/SDL_image-1.2.12-31.el9.x86_64.rpm) = 44952 -SHA256 (rocky/s/SDL_image-1.2.12-31.el9.src.rpm) = 5091193fc3c11aaff920040c51e9dc5ffe8e538a16cc0e62b7fec668fc5716d3 -SIZE (rocky/s/SDL_image-1.2.12-31.el9.src.rpm) = 2242755 diff --git a/graphics/linux-rl9-sdl_image/pkg-plist.aarch64 b/graphics/linux-rl9-sdl_image/pkg-plist.aarch64 deleted file mode 100644 index 36bf712b1719..000000000000 --- a/graphics/linux-rl9-sdl_image/pkg-plist.aarch64 +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin/showimage -usr/lib/.build-id/4a/c02f7e1b1036eb1ea1a1d1b791e17f8c9facf9 -usr/lib/.build-id/70/635f02a8666a53c1cba5c5cd4fdf150563342a -usr/lib64/libSDL_image-1.2.so.0 -usr/lib64/libSDL_image-1.2.so.0.8.4 -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -usr/share/licenses/SDL_image/COPYING diff --git a/graphics/linux-rl9-sdl_image/pkg-plist.amd64 b/graphics/linux-rl9-sdl_image/pkg-plist.amd64 deleted file mode 100644 index 194824c330e3..000000000000 --- a/graphics/linux-rl9-sdl_image/pkg-plist.amd64 +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin/showimage -usr/lib/.build-id/13/649529c80269e0eeb1927c6ab9d84a985a0355 -usr/lib/.build-id/6d/d9233a6ba62cfa403d9f23017e2c2050833051 -usr/lib64/libSDL_image-1.2.so.0 -usr/lib64/libSDL_image-1.2.so.0.8.4 -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -usr/share/licenses/SDL_image/COPYING