sox_ng: remove, imported to pkgsrc/audio/sox_ng

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: sox_ng: remove, imported to pkgsrc/audio/sox_ng
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 3 Jul 2025 15:47:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jul 3 17:47:06 2025 +0200
Changeset:	5faf0c6ddc5d098279a7f91d989df195f33bdc33

Modified Files:
	Makefile
Removed Files:
	sox_ng/DESCR
	sox_ng/Makefile
	sox_ng/PLIST
	sox_ng/TODO
	sox_ng/buildlink3.mk
	sox_ng/distinfo
	sox_ng/options.mk
	sox_ng/patches/patch-src_oss.c
	sox_ng/patches/patch-src_sox__ng.c
	sox_ng/patches/patch-src_sunaudio.c

Log Message:
sox_ng: remove, imported to pkgsrc/audio/sox_ng

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5faf0c6ddc5d098279a7f91d989df195f33bdc33

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                            |  2 +-
 sox_ng/DESCR                        | 15 ---------------
 sox_ng/Makefile                     | 36 ------------------------------------
 sox_ng/PLIST                        | 15 ---------------
 sox_ng/TODO                         |  1 -
 sox_ng/buildlink3.mk                | 13 -------------
 sox_ng/distinfo                     |  8 --------
 sox_ng/options.mk                   | 13 -------------
 sox_ng/patches/patch-src_oss.c      | 15 ---------------
 sox_ng/patches/patch-src_sox__ng.c  | 34 ----------------------------------
 sox_ng/patches/patch-src_sunaudio.c | 37 -------------------------------------
 11 files changed, 1 insertion(+), 188 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index acb70b92d9..98e22bb218 100644
--- a/Makefile
+++ b/Makefile
@@ -2160,6 +2160,7 @@ SUBDIR+=	libretro-prboom
 SUBDIR+=	libretro-px68k
 SUBDIR+=	libretro-tyrquake
 SUBDIR+=	libretro-yabause
+SUBDIR+=	librewolf
 SUBDIR+=	librocket
 SUBDIR+=	libs-gui
 SUBDIR+=	libscscp
@@ -5420,7 +5421,6 @@ SUBDIR+=	sonic-visualiser
 SUBDIR+=	sophia
 SUBDIR+=	soplex
 SUBDIR+=	soqt
-SUBDIR+=	sox_ng
 SUBDIR+=	spacefm
 SUBDIR+=	spai
 SUBDIR+=	spamassassin-cvs
diff --git a/sox_ng/DESCR b/sox_ng/DESCR
deleted file mode 100644
index fcd1b2e890..0000000000
--- a/sox_ng/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-sox translates sound samples between different file formats,
-and performs various sound effects.
-
-This release understands "raw" files in various binary formats,
-raw textual data,
-Sound Blaster .VOC files, IRCAM SoundFile files, SUN Sparcstation
-.au files, mutant DEC .au files, Apple/SGI AIFF files,
-CD-R (music CD format), Macintosh HCOM files, Sounder files,
-NeXT .snd files, SUN ADPCM (compressed) .au files,
-and Soundtool (DOS) files.
-
-The sound effects include changing the sample rate, adding echo
-delay lines, applying low-, high, and band-pass filtering,
-reversing a sample in order to search for backmasked messages,
-and the infamous Fender Vibro effect.
diff --git a/sox_ng/Makefile b/sox_ng/Makefile
deleted file mode 100644
index e7f05cb1f3..0000000000
--- a/sox_ng/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.73 2025/02/12 06:44:29 ryoon Exp $
-
-DISTNAME=	sox_ng-14.6.0.2
-CATEGORIES=	audio
-MASTER_SITES=	https://codeberg.org/sox_ng/sox_ng/releases/download/${DISTNAME}/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://codeberg.org/sox_ng/sox_ng
-COMMENT=	SOund eXchange - universal sound sample translator
-LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-
-PKGCONFIG_OVERRIDE+=	sox_ng.pc.in
-
-SUBST_CLASSES+=		gsm
-SUBST_FILES.gsm=	configure src/gsm.c src/wav.c CMakeLists.txt
-SUBST_SED.gsm=		-e "s!gsm/gsm.h!gsm.h!"
-SUBST_STAGE.gsm=	pre-configure
-
-.include "options.mk"
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../sysutils/file/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sox_ng/PLIST b/sox_ng/PLIST
deleted file mode 100644
index ab5b49d704..0000000000
--- a/sox_ng/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD$
-bin/play_ng
-bin/rec_ng
-bin/sox_ng
-bin/soxi_ng
-include/sox_ng.h
-lib/libsox_ng.la
-lib/pkgconfig/sox_ng.pc
-man/man1/play_ng.1
-man/man1/rec_ng.1
-man/man1/sox_ng.1
-man/man1/soxi_ng.1
-man/man3/libsox_ng.3
-man/man7/soxeffect_ng.7
-man/man7/soxformat_ng.7
diff --git a/sox_ng/TODO b/sox_ng/TODO
deleted file mode 100644
index 77002d1f49..0000000000
--- a/sox_ng/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Doesn't finish cmake's configure step yet.
diff --git a/sox_ng/buildlink3.mk b/sox_ng/buildlink3.mk
deleted file mode 100644
index ae4dd233f4..0000000000
--- a/sox_ng/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	sox_ng
-
-.if !defined(SOX_NG_BUILDLINK3_MK)
-SOX_NG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.sox_ng+=	sox_ng>=14.6.0.1
-BUILDLINK_PKGSRCDIR.sox_ng?=	../../wip/sox_ng
-
-.endif	# SOX_NG_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-sox_ng
diff --git a/sox_ng/distinfo b/sox_ng/distinfo
deleted file mode 100644
index 7c7a96bdff..0000000000
--- a/sox_ng/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.31 2022/04/24 09:39:46 nia Exp $
-
-BLAKE2s (sox_ng-14.6.0.2.tar.gz) = da368431a0b584483d2a8393b40db83796757e177b54209cb690a18f5731f1e1
-SHA512 (sox_ng-14.6.0.2.tar.gz) = 9468cd15b83b2500210d54355ed5d7ae2a97171148b8a54c47007d1a7d9c57e378211c0429ee4d8065f0ba5ab97b31c9abb8795b659585c523942c044fe49b1d
-Size (sox_ng-14.6.0.2.tar.gz) = 1746640 bytes
-SHA1 (patch-src_oss.c) = f4665b500a5e6a996768e415145e751d9ff9886c
-SHA1 (patch-src_sox__ng.c) = 1dc7ddacbb1a7de683b3af981cc0d08e31888bae
-SHA1 (patch-src_sunaudio.c) = dd624099df32f67948becd647eded4d69c7c1c34
diff --git a/sox_ng/options.mk b/sox_ng/options.mk
deleted file mode 100644
index 0d9b5845f1..0000000000
--- a/sox_ng/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2017/01/07 21:30:26 maya Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.sox_ng
-PKG_SUPPORTED_OPTIONS=	oss
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Moss)
-LDFLAGS+=		-lossaudio
-.include "../../mk/oss.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-oss
-.endif
diff --git a/sox_ng/patches/patch-src_oss.c b/sox_ng/patches/patch-src_oss.c
deleted file mode 100644
index 0e284b1960..0000000000
--- a/sox_ng/patches/patch-src_oss.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix segfault when playing (PR pkg/49929).
-
---- src/oss.c.orig	2025-05-26 15:24:07.000000000 +0000
-+++ src/oss.c
-@@ -367,7 +367,7 @@ static size_t osswrite(
-         size_t cbStride;
-         int cbWritten;
- 
--        cStride = cInput;
-+        cStride = cInputRemaining;
-         if (cStride > pPriv->cOutput) {
-             cStride = pPriv->cOutput;
-         }
diff --git a/sox_ng/patches/patch-src_sox__ng.c b/sox_ng/patches/patch-src_sox__ng.c
deleted file mode 100644
index 50685a3f64..0000000000
--- a/sox_ng/patches/patch-src_sox__ng.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-PR pkg/56800 hitting v or V during sox's play command causes a
-segfault
-
-https://sourceforge.net/p/sox/code/ci/4b17639fb7591153dbd3e234eea21b1a2a29fcfa/
-from more than 10 years ago changed the sun audio driver for the 14.4 release
-to not use stdio (among others) while adjust_volume() in sox.c still used
-fileno under the assumption that stdio was being used in the audio driver.
-
-output_muted is not defined on NetBSD.
-
---- src/sox_ng.c.orig	2025-06-10 06:22:30.000000000 +0000
-+++ src/sox_ng.c
-@@ -1325,7 +1325,8 @@ static void adjust_volume(int delta)
- #elif defined(HAVE_AUDIOIO_H)
- static void adjust_volume(int delta)
- {
--  int vol1 = 0, vol2 = 0, fd = fileno((FILE*)ofile->ft->fp);
-+  int vol1 = 0, vol2 = 0, fd;
-+  fd = ofile->ft->fp != NULL ? *((int *)ofile->ft->fp) : -1;
-   fprintf(stderr, "Audioio volume\n");
-   if (lsx_adjust_softvol(delta) == SOX_SUCCESS) return;
-   if (fd >= 0) {
-@@ -1335,7 +1336,9 @@ static void adjust_volume(int delta)
-       vol2 = range_limit(vol1 + delta, 0, 100);
-       AUDIO_INITINFO(&audio_info);
-       audio_info.play.gain = (vol2 * AUDIO_MAX_GAIN + 50) / 100;
-+#if defined(__sun)
-       audio_info.output_muted = 0;
-+#endif
-       lsx_debug("%04x %04x", vol1, vol2);
-       if (vol1 != vol2 && ioctl(fd, AUDIO_SETINFO, &audio_info) < 0)
-         vol2 = vol1;
diff --git a/sox_ng/patches/patch-src_sunaudio.c b/sox_ng/patches/patch-src_sunaudio.c
deleted file mode 100644
index 47324d3556..0000000000
--- a/sox_ng/patches/patch-src_sunaudio.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-- Make the now unused (in the audio driver's case) void *fp member of the
-  sox_format_t structure a pointer to the filedescriptor of the audio
-  device in the driver and reference it in adjust_volume() with an
-  additional check for NULL. (PR pkg/56800)
-
-- Fix segfault when playing (PR pkg/49929).
-
---- src/sunaudio.c.orig	2025-05-26 15:24:07.000000000 +0000
-+++ src/sunaudio.c
-@@ -334,6 +334,8 @@ static int sunstartwrite(sox_format_t * 
-     pPriv->cOutput = sox_globals.bufsiz >> pPriv->sample_shift;
-     pPriv->pOutput = lsx_malloc((size_t)pPriv->cOutput << pPriv->sample_shift);
- 
-+    ft->fp = &pPriv->device;
-+
-     return (SOX_SUCCESS);
- }
- 
-@@ -346,6 +348,7 @@ static int sunstop(sox_format_t* ft)
-     if (pPriv->pOutput) {
-         free(pPriv->pOutput);
-     }
-+    ft->fp = NULL;
-     return SOX_SUCCESS;
- }
- 
-@@ -441,7 +444,7 @@ static size_t sunwrite(
-         size_t cbStride;
-         int cbWritten;
- 
--        cStride = cInput;
-+        cStride = cInputRemaining;
-         if (cStride > pPriv->cOutput) {
-             cStride = pPriv->cOutput;
-         }
Prev by Date: sox_ng: update to 14.6.0.2.
Next by Date: fbida: don't depend directly on jpeg
Previous by Thread: sox_ng: update to 14.6.0.2.
Next by Thread: fbida: don't depend directly on jpeg
Indexes:
Home | Main Index | Thread Index | Old Index