From f0d61c1c0cdd48cf30eb0c55887bbb3a330f762b Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sun, 4 May 2025 21:44:05 +0200 Subject: [PATCH] audio/freealut: Switch to fork Switching to this fork removes various patches and hacks we currently have and is used several distros such as Alpine and Arch Linux. Add a deprecation notice as its no longer maintained upstream PR: 285912 Approved by: maintainer timeout, 4+ weeks --- audio/freealut/Makefile | 34 ++++++++++--------- audio/freealut/distinfo | 5 +-- audio/freealut/files/patch-src_alutInit.c | 15 -------- audio/freealut/files/patch-src_alutInternal.h | 27 --------------- audio/freealut/files/patch-src_alutLoader.c | 11 ------ audio/freealut/files/patch-src_alutUtil.c | 10 ------ audio/freealut/pkg-plist | 1 - 7 files changed, 21 insertions(+), 82 deletions(-) delete mode 100644 audio/freealut/files/patch-src_alutInit.c delete mode 100644 audio/freealut/files/patch-src_alutInternal.h delete mode 100644 audio/freealut/files/patch-src_alutLoader.c delete mode 100644 audio/freealut/files/patch-src_alutUtil.c diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index c7d53f491345..08affe46e6f1 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -1,26 +1,28 @@ PORTNAME= freealut -PORTVERSION= 1.1.0 -PORTREVISION= 4 +DISTVERSION= 1.1.0.20240801 +PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= DEBIAN_POOL -DISTNAME= freealut_${PORTVERSION}.orig MAINTAINER= oliver@FreeBSD.org COMMENT= The OpenAL Utility Toolkit -WWW= http://connect.creativelabs.com/openal/default.aspx +WWW= https://github.com/vancegroup/freealut -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake libtool openal:al pathfix pkgconfig +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +DEPRECATED= No longer actively developed, consider migrating to another library + +USES= cmake localbase:ldflags openal pathfix USE_LDCONFIG= yes -LDFLAGS_i386= -Wl,-znotext -INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -post-patch: - @${REINPLACE_CMD} -e 's/@CFLAGS@/& -lopenal -lpthread/g' \ - ${WRKSRC}/examples/Makefile.in \ - ${WRKSRC}/test_suite/Makefile.in +USE_GITHUB= yes +GH_ACCOUNT= vancegroup +GH_TAGNAME= 8abb420 + +LDFLAGS_i386= -Wl,-znotext + +CMAKE_OFF= BUILD_EXAMPLES \ + BUILD_OPTIMIZATION \ + BUILD_TESTS .include diff --git a/audio/freealut/distinfo b/audio/freealut/distinfo index ccfb86d8ca90..94dd993d2ec7 100644 --- a/audio/freealut/distinfo +++ b/audio/freealut/distinfo @@ -1,2 +1,3 @@ -SHA256 (freealut_1.1.0.orig.tar.gz) = 60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f -SIZE (freealut_1.1.0.orig.tar.gz) = 461830 +TIMESTAMP = 1743902077 +SHA256 (vancegroup-freealut-1.1.0.20240801-8abb420_GH0.tar.gz) = 229f33367404c61fb6341398c5a7e74dbecea886b4acc3d59d42a09c669b83fe +SIZE (vancegroup-freealut-1.1.0.20240801-8abb420_GH0.tar.gz) = 147898 diff --git a/audio/freealut/files/patch-src_alutInit.c b/audio/freealut/files/patch-src_alutInit.c deleted file mode 100644 index d111d24abf29..000000000000 --- a/audio/freealut/files/patch-src_alutInit.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/alutInit.c.orig 2006-05-08 09:28:07 UTC -+++ src/alutInit.c -@@ -147,11 +147,7 @@ alutExit (void) - return AL_FALSE; - } - -- if (!alcCloseDevice (device)) -- { -- _alutSetError (ALUT_ERROR_CLOSE_DEVICE); -- return AL_FALSE; -- } -+ alcCloseDevice (device); - - initialisationState = Unintialized; - return AL_TRUE; diff --git a/audio/freealut/files/patch-src_alutInternal.h b/audio/freealut/files/patch-src_alutInternal.h deleted file mode 100644 index afa799efeb7b..000000000000 --- a/audio/freealut/files/patch-src_alutInternal.h +++ /dev/null @@ -1,27 +0,0 @@ ---- src/alutInternal.h.orig 2006-05-08 09:28:07 UTC -+++ src/alutInternal.h -@@ -13,23 +13,8 @@ - - #if HAVE_STDINT_H - #include --#elif _MSC_VER < 1300 --typedef char int8_t; --typedef unsigned char uint8_t; --typedef short int16_t; --typedef unsigned short uint16_t; --typedef int int32_t; --typedef unsigned int uint32_t; --#elif HAVE_BASETSD_H --#include --typedef INT8 int8_t; --typedef UINT8 uint8_t; --typedef INT16 int16_t; --typedef UINT16 uint16_t; --typedef INT32 int32_t; --typedef UINT32 uint32_t; - #else --#error Do not know sized types on this platform -+#include - #endif - - typedef int16_t Int16BigEndian; diff --git a/audio/freealut/files/patch-src_alutLoader.c b/audio/freealut/files/patch-src_alutLoader.c deleted file mode 100644 index 79aacab3d449..000000000000 --- a/audio/freealut/files/patch-src_alutLoader.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/alutLoader.c.orig 2006-05-08 09:28:07 UTC -+++ src/alutLoader.c -@@ -474,7 +474,7 @@ alutLoadWAVMemory (ALbyte *buffer, ALenu - - /* ToDo: Can we do something less insane than passing 0x7FFFFFFF? */ - stream = _alutInputStreamConstructFromMemory (buffer, 0x7FFFFFFF); -- _alutLoadMemoryFromInputStream (stream, format, size, &freq); -+ *data = _alutLoadMemoryFromInputStream (stream, format, size, &freq); - if (*data == NULL) - { - return; diff --git a/audio/freealut/files/patch-src_alutUtil.c b/audio/freealut/files/patch-src_alutUtil.c deleted file mode 100644 index 26b4edd94037..000000000000 --- a/audio/freealut/files/patch-src_alutUtil.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/alutUtil.c.orig 2006-05-08 09:28:07 UTC -+++ src/alutUtil.c -@@ -2,6 +2,7 @@ - - #if HAVE_NANOSLEEP && HAVE_TIME_H - #include -+#include - #include - #elif HAVE_USLEEP && HAVE_UNISTD_H - #include diff --git a/audio/freealut/pkg-plist b/audio/freealut/pkg-plist index f1ab0b8bc9ee..4323ec26d99e 100644 --- a/audio/freealut/pkg-plist +++ b/audio/freealut/pkg-plist @@ -1,7 +1,6 @@ bin/freealut-config include/AL/alut.h libdata/pkgconfig/freealut.pc -lib/libalut.a lib/libalut.so lib/libalut.so.0 lib/libalut.so.0.1.0