git: cc3599ae1fd6 - main - graphics/linux-rl9-sdl2_image: Merge into misc/linux-rl9-sdl20-extralibs

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Thu, 22 May 2025 19:09:41 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc3599ae1fd6f024cb2479ef0b56bc767e179e9e

commit cc3599ae1fd6f024cb2479ef0b56bc767e179e9e
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-05-22 18:26:13 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-05-22 19:09:16 +0000

    graphics/linux-rl9-sdl2_image: Merge into misc/linux-rl9-sdl20-extralibs
---
 MOVED                                           |  1 +
 Mk/Uses/linux.mk                                |  1 -
 graphics/linux-rl9-sdl2_image/Makefile          | 27 -------------------------
 graphics/linux-rl9-sdl2_image/distinfo          |  7 -------
 graphics/linux-rl9-sdl2_image/pkg-plist.aarch64 |  7 -------
 graphics/linux-rl9-sdl2_image/pkg-plist.amd64   |  7 -------
 6 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/MOVED b/MOVED
index 7c1d82a54652..609560dcdf20 100644
--- a/MOVED
+++ b/MOVED
@@ -4413,3 +4413,4 @@ devel/rubygem-view_component-rails70|devel/rubygem-view_component-rails-gitlab|2
 security/rubygem-devise-two-factor41-rails70|security/rubygem-devise-two-factor-rails-gitlab|2025-05-17|Expired, please use security/rubygem-devise-two-factor-rails-gitlab instead
 audio/linux-rl9-sdl2_mixer|misc/linux-rl9-sdl20-extralibs|2025-05-22|Merged into misc/linux-rl9-sdl20-extralibs
 graphics/linux-rl9-sdl2_gfx|misc/linux-rl9-sdl20-extralibs|2025-05-22|Merged into misc/linux-rl9-sdl20-extralibs
+graphics/linux-rl9-sdl2_image|misc/linux-rl9-sdl20-extralibs|2025-05-22|Merged into misc/linux-rl9-sdl20-extralibs
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index a795329eeb6c..f8774405294a 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -190,7 +190,6 @@ _linux_${linux_ARGS}_sdl12=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}
 _linux_${linux_ARGS}_sdl12-extralibs=	linux-${linux_ARGS}-sdl12-extralibs>0:misc/linux-${linux_ARGS}-sdl12-extralibs
 _linux_${linux_ARGS}_sdl20=		linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARGS}-sdl20
 _linux_${linux_ARGS}_sdl20-extralibs=	linux-${linux_ARGS}-sdl20-extralibs>0:misc/linux-${linux_ARGS}-sdl20-extralibs
-_linux_${linux_ARGS}_sdl2image=		linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image
 _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_rl9_shaderc=			linux-rl9-shaderc>0:graphics/linux-rl9-shaderc
diff --git a/graphics/linux-rl9-sdl2_image/Makefile b/graphics/linux-rl9-sdl2_image/Makefile
deleted file mode 100644
index 383299e3e1e0..000000000000
--- a/graphics/linux-rl9-sdl2_image/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-PORTNAME=	sdl2_image
-PORTVERSION=	2.8.2
-DISTVERSIONSUFFIX=	-1.el9
-PORTREVISION=	1
-CATEGORIES=	graphics linux
-MASTER_SITES=	EPEL9
-DISTNAME=	SDL2_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 sdl20
-USE_LINUX_RPM=	yes
-
-CONFLICTS=	linux-c7-${PORTNAME}
-DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/SDL2_image
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/graphics/linux-rl9-sdl2_image/distinfo b/graphics/linux-rl9-sdl2_image/distinfo
deleted file mode 100644
index 0a560769b092..000000000000
--- a/graphics/linux-rl9-sdl2_image/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1739868652
-SHA256 (rocky/s/SDL2_image-2.8.2-1.el9.aarch64.rpm) = a1a78f8460a84ccf272659df540354331ccf128b63ab56d3e04b1e4602766dea
-SIZE (rocky/s/SDL2_image-2.8.2-1.el9.aarch64.rpm) = 107516
-SHA256 (rocky/s/SDL2_image-2.8.2-1.el9.x86_64.rpm) = 30e896d0666851a4c721ee45b242fd317fd58038b1bb95576a0af7ce0e0a084a
-SIZE (rocky/s/SDL2_image-2.8.2-1.el9.x86_64.rpm) = 107860
-SHA256 (rocky/s/SDL2_image-2.8.2-1.el9.src.rpm) = b29fa23de7cf4f7bd1e43921207a9a98a72a65e2aa415976173d2e7f95ded1f9
-SIZE (rocky/s/SDL2_image-2.8.2-1.el9.src.rpm) = 11361542
diff --git a/graphics/linux-rl9-sdl2_image/pkg-plist.aarch64 b/graphics/linux-rl9-sdl2_image/pkg-plist.aarch64
deleted file mode 100644
index dae5a9ea265d..000000000000
--- a/graphics/linux-rl9-sdl2_image/pkg-plist.aarch64
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/showimage2
-usr/lib/.build-id/77/e41c8b152a062d85b08a8f0c1571bc78294bfe
-usr/lib/.build-id/ae/5e4a28cd22e963e74b8a54c8d0d2f4bc2f19e5
-usr/lib64/libSDL2_image-2.0.so.0
-usr/lib64/libSDL2_image-2.0.so.0.800.2
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-usr/share/licenses/SDL2_image/LICENSE.txt
diff --git a/graphics/linux-rl9-sdl2_image/pkg-plist.amd64 b/graphics/linux-rl9-sdl2_image/pkg-plist.amd64
deleted file mode 100644
index 556df5363176..000000000000
--- a/graphics/linux-rl9-sdl2_image/pkg-plist.amd64
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/showimage2
-usr/lib/.build-id/a6/2990bf4f41d140ff7050e242b442578fed9ed0
-usr/lib/.build-id/c1/9aa514e517d8cbea69c7f37a59cfa6d0ab4d80
-usr/lib64/libSDL2_image-2.0.so.0
-usr/lib64/libSDL2_image-2.0.so.0.800.2
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-usr/share/licenses/SDL2_image/LICENSE.txt