git: 3e5e92b77663 - main - audio/linux-rl9-sdl2_mixer: 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:39 UTC
The branch main has been updated by arrowd:

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

commit 3e5e92b776633a0fcf9f732a15e972e108275131
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-05-22 18:17:44 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-05-22 19:09:16 +0000

    audio/linux-rl9-sdl2_mixer: Merge into misc/linux-rl9-sdl20-extralibs
---
 MOVED                                        |  1 +
 Mk/Uses/linux.mk                             |  1 -
 audio/linux-rl9-sdl2_mixer/Makefile          | 25 -------------------------
 audio/linux-rl9-sdl2_mixer/distinfo          |  7 -------
 audio/linux-rl9-sdl2_mixer/pkg-plist.aarch64 |  9 ---------
 audio/linux-rl9-sdl2_mixer/pkg-plist.amd64   |  9 ---------
 6 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/MOVED b/MOVED
index 3911f9834b74..069598a5f4c8 100644
--- a/MOVED
+++ b/MOVED
@@ -4411,3 +4411,4 @@ databases/py-redis3|databases/py-redis|2025-05-18|Remove obsoleted port. Use dat
 net/rubygem-devfile-gitlab|net/rubygem-devfile|2025-05-18|Remove obsoleted port. Use net/rubygem-devfile instead
 devel/rubygem-view_component-rails70|devel/rubygem-view_component-rails-gitlab|2025-05-17|Expired, please use devel/rubygem-view_component-rails-gitlab instead
 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
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 9717b2db1cdf..cb3a7b485fd3 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -192,7 +192,6 @@ _linux_${linux_ARGS}_sdl20=		linux-${linux_ARGS}-sdl20>0:devel/linux-${linux_ARG
 _linux_${linux_ARGS}_sdl20-extralibs=	linux-${linux_ARGS}-sdl20-extralibs>0:misc/linux-${linux_ARGS}-sdl20-extralibs
 _linux_${linux_ARGS}_sdl2gfx=		linux-${linux_ARGS}-sdl2_gfx>0:graphics/linux-${linux_ARGS}-sdl2_gfx
 _linux_${linux_ARGS}_sdl2image=		linux-${linux_ARGS}-sdl2_image>0:graphics/linux-${linux_ARGS}-sdl2_image
-_linux_${linux_ARGS}_sdl2mixer=		linux-${linux_ARGS}-sdl2_mixer>0:audio/linux-${linux_ARGS}-sdl2_mixer
 _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/audio/linux-rl9-sdl2_mixer/Makefile b/audio/linux-rl9-sdl2_mixer/Makefile
deleted file mode 100644
index 7b41bf2cc4ba..000000000000
--- a/audio/linux-rl9-sdl2_mixer/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME=	sdl2_mixer
-PORTVERSION=	2.8.1
-DISTVERSIONSUFFIX=	-1.el9
-CATEGORIES=	audio linux
-MASTER_SITES=	EPEL9
-DISTNAME=	SDL2_mixer-${DISTVERSIONFULL}
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Sample multi-channel audio mixer library (Rocky Linux ${LINUX_DIST_VER})
-WWW=		https://github.com/libsdl-org/SDL_mixer/
-
-LICENSE=	ZLIB
-
-USES=		linux:rl9
-USE_LDCONFIG=	yes
-USE_LINUX=	sdl20
-USE_LINUX_RPM=	yes
-
-CONFLICTS=	linux-c7-${PORTNAME}
-DESCR=		${PORTSDIR}/${PKGCATEGORY}/${PORTNAME}/pkg-descr
-DOCSDIR=	${PREFIX}/usr/share/doc/SDL2_mixer
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/audio/linux-rl9-sdl2_mixer/distinfo b/audio/linux-rl9-sdl2_mixer/distinfo
deleted file mode 100644
index ce96a7dd6727..000000000000
--- a/audio/linux-rl9-sdl2_mixer/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1743426582
-SHA256 (rocky/s/SDL2_mixer-2.8.1-1.el9.aarch64.rpm) = d85f2590a7daf03ad73bc18f35e0868b3226b2624fd9940286131073de0dfa9e
-SIZE (rocky/s/SDL2_mixer-2.8.1-1.el9.aarch64.rpm) = 168550
-SHA256 (rocky/s/SDL2_mixer-2.8.1-1.el9.x86_64.rpm) = 736d9eeb48f24cedde2d704c5b237537eacf609b9bbfa996a9219c7efe8c7cf1
-SIZE (rocky/s/SDL2_mixer-2.8.1-1.el9.x86_64.rpm) = 171511
-SHA256 (rocky/s/SDL2_mixer-2.8.1-1.el9.src.rpm) = 7a750d39a5a1d45e02a8354b46fe97c7d6cb4c6f097283d1b5a7b2ac42429d0d
-SIZE (rocky/s/SDL2_mixer-2.8.1-1.el9.src.rpm) = 5992154
diff --git a/audio/linux-rl9-sdl2_mixer/pkg-plist.aarch64 b/audio/linux-rl9-sdl2_mixer/pkg-plist.aarch64
deleted file mode 100644
index f31c72865306..000000000000
--- a/audio/linux-rl9-sdl2_mixer/pkg-plist.aarch64
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin/playmus2
-usr/bin/playwave2
-usr/lib/.build-id/fe/50ad464c14c081ffc0682020772f0768bd789a
-usr/lib/.build-id/bb/f246f1d524b08e4d2df375bbb35976ccc78b02
-usr/lib/.build-id/da/f007650a0e92f9461de46089740f215231d258
-usr/lib64/libSDL2_mixer-2.0.so.0
-usr/lib64/libSDL2_mixer-2.0.so.0.800.1
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-usr/share/licenses/SDL2_mixer/LICENSE.txt
diff --git a/audio/linux-rl9-sdl2_mixer/pkg-plist.amd64 b/audio/linux-rl9-sdl2_mixer/pkg-plist.amd64
deleted file mode 100644
index 1f34eda15dbc..000000000000
--- a/audio/linux-rl9-sdl2_mixer/pkg-plist.amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin/playmus2
-usr/bin/playwave2
-usr/lib/.build-id/3f/37bd142d69499524b1ca23c44f6ddfa0bb6c67
-usr/lib/.build-id/6a/3d27a743249161be4625e0bc7e42a3b99b737b
-usr/lib/.build-id/76/2d5d8bcf311c81e265f69ce673fa8f5639e5a8
-usr/lib64/libSDL2_mixer-2.0.so.0
-usr/lib64/libSDL2_mixer-2.0.so.0.800.1
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-usr/share/licenses/SDL2_mixer/LICENSE.txt