pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sndio: update to version 1.8.1



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Thu Dec 30 21:42:48 2021 +0100
Changeset:	60743373497f7234bd44ff623f654d52983dedd8

Modified Files:
	sndio/Makefile
	sndio/PLIST
	sndio/distinfo
Removed Files:
	sndio/patches/patch-configure
	sndio/patches/patch-sndiod_sndiod.c

Log Message:
sndio: update to version 1.8.1

update to version 1.8.1.
why? it is more modern and includes the wip patches.

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

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

diffstat:
 sndio/Makefile                      |  5 ++++-
 sndio/PLIST                         | 16 ++++++++++++++--
 sndio/distinfo                      |  8 +++-----
 sndio/patches/patch-configure       | 35 -----------------------------------
 sndio/patches/patch-sndiod_sndiod.c | 29 -----------------------------
 5 files changed, 21 insertions(+), 72 deletions(-)

diffs:
diff --git a/sndio/Makefile b/sndio/Makefile
index 8bdb751786..37955ce45c 100644
--- a/sndio/Makefile
+++ b/sndio/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	sndio-1.0.1
+DISTNAME=	sndio-1.8.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.sndio.org/
 
@@ -16,4 +16,7 @@ USE_TOOLS+=	gmake
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
+PKGCONFIG_OVERRIDE=		libsndio/sndio.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-configure
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sndio/PLIST b/sndio/PLIST
index 64520899fc..821678b73f 100644
--- a/sndio/PLIST
+++ b/sndio/PLIST
@@ -1,13 +1,15 @@
 @comment $NetBSD$
 bin/aucat
 bin/midicat
+bin/sndioctl
 bin/sndiod
 include/sndio.h
 lib/libsndio.so
-lib/libsndio.so.6.0
+lib/libsndio.so.7.1
+lib/pkgconfig/sndio.pc
 man/man1/aucat.1
 man/man1/midicat.1
-man/man1/sndiod.1
+man/man1/sndioctl.1
 man/man3/mio_close.3
 man/man3/mio_eof.3
 man/man3/mio_nfds.3
@@ -33,4 +35,14 @@ man/man3/sio_setvol.3
 man/man3/sio_start.3
 man/man3/sio_stop.3
 man/man3/sio_write.3
+man/man3/sioctl_close.3
+man/man3/sioctl_eof.3
+man/man3/sioctl_nfds.3
+man/man3/sioctl_ondesc.3
+man/man3/sioctl_onval.3
+man/man3/sioctl_open.3
+man/man3/sioctl_pollfd.3
+man/man3/sioctl_revents.3
+man/man3/sioctl_setval.3
 man/man7/sndio.7
+man/man8/sndiod.8
diff --git a/sndio/distinfo b/sndio/distinfo
index e987a2634d..d670b94a7a 100644
--- a/sndio/distinfo
+++ b/sndio/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-RMD160 (sndio-1.0.1.tar.gz) = da5f0a674124d7cab00854132fc1ec8913768368
-SHA512 (sndio-1.0.1.tar.gz) = 7cccb2bd7cff72bffc146f83b6603bb77a07adef0a2381c93ea9294353956a57d0dfc9117ef27ef3397ec6a7017ae7a1d218b57c3a00276d6724774a62c56348
-Size (sndio-1.0.1.tar.gz) = 119832 bytes
-SHA1 (patch-configure) = 98552eeeddb75cb30c84c05838d6ffc3311aec1b
-SHA1 (patch-sndiod_sndiod.c) = c81f9c6c56ef24c4bb6876c169c8a588b4fbe9cf
+BLAKE2s (sndio-1.8.1.tar.gz) = 906ef717710f5d7b20b367a49f69a11ef231ebb2c0f8d0146ef608a0056cf087
+SHA512 (sndio-1.8.1.tar.gz) = 4affeac5758768f9ebf7d823b8d2287695ff02bb4a990474412ab96cb8eef3784c19436a130efb4f7a204193ad479c0086f9bff7b3ac69e6077692dffaa62658
+Size (sndio-1.8.1.tar.gz) = 155821 bytes
diff --git a/sndio/patches/patch-configure b/sndio/patches/patch-configure
deleted file mode 100644
index c19a14ef85..0000000000
--- a/sndio/patches/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
-Patch merged upstream.
-
---- configure.orig	2015-08-30 09:51:50.000000000 +0000
-+++ configure
-@@ -51,14 +51,24 @@ case `uname` in
- 		ldadd="-lrt"
- 		user=sndiod
- 		so="$so libsndio.so"
--		defs='-D_GNU_SOURCE -DDEV_RANDOM=\\"/dev/urandom\\"'
-+		defs='-D_GNU_SOURCE -DDEV_RANDOM=\\"/dev/urandom\\" \\\
-+		-DHAVE_SETRESGID -DHAVE_SETRESUID'
-+		;;
-+	NetBSD)
-+		sun=no
-+		rmidi=yes
-+		user=_sndio
-+		so="$so libsndio.so"
-+		defs='-DHAVE_ARC4RANDOM -DHAVE_ISSETUGID \\\
-+		-DHAVE_STRLCAT -DHAVE_STRLCPY'
- 		;;
- 	OpenBSD)
- 		sun=yes
- 		rmidi=yes
- 		user=_sndio
- 		defs='-DHAVE_ARC4RANDOM -DHAVE_ISSETUGID \\\
--		-DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRTONUM'
-+		-DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRTONUM \\\
-+		-DHAVE_SETRESGID -DHAVE_SETRESUID'
- 		;;
- esac
- 
diff --git a/sndio/patches/patch-sndiod_sndiod.c b/sndio/patches/patch-sndiod_sndiod.c
deleted file mode 100644
index 95ac4406dc..0000000000
--- a/sndio/patches/patch-sndiod_sndiod.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
-Issue fixed upstream differently.
-
---- sndiod/sndiod.c.orig	2015-04-24 17:44:06.000000000 +0000
-+++ sndiod/sndiod.c
-@@ -286,8 +286,18 @@ privdrop(void)
- 	if (setpriority(PRIO_PROCESS, 0, SNDIO_PRIO) < 0)
- 		err(1, "setpriority");
- 	if (setgroups(1, &pw->pw_gid) ||
--	    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||
--	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
-+#if HAVE_SETRESGID
-+	    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid)
-+#else
-+	    setegid(pw->pw_gid)
-+#endif
-+	    ||
-+#if HAVE_SETRESUID
-+	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid)
-+#else
-+	    seteuid(pw->pw_gid)
-+#endif
-+	    )
- 		err(1, "cannot drop privileges");
- }
- 


Home | Main Index | Thread Index | Old Index