Page MenuHomeFreeBSD
Files F142521301

D34324.id103022.diff
No OneTemporary
Actions

D34324.id103022.diff
View Options

Index: audio/alsa-lib/Makefile
===================================================================
--- audio/alsa-lib/Makefile
+++ audio/alsa-lib/Makefile
@@ -1,17 +1,11 @@
# Created by: Aragon Gouveia <aragon@phat.za.net>
PORTNAME= alsa-lib
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-DISTVERSIONPREFIX= v
+PORTVERSION= 1.2.6.1
CATEGORIES= audio
-MASTER_SITES= GH
+MASTER_SITES= https://www.alsa-project.org/files/pub/lib/
-USE_GITHUB= yes
-GH_ACCOUNT= alsa-project
-GH_PROJECT= ${PORTNAME}
-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= rodrigo@FreeBSD.org
COMMENT= ALSA compatibility library
LICENSE= LGPL21+
Index: audio/alsa-lib/distinfo
===================================================================
--- audio/alsa-lib/distinfo
+++ audio/alsa-lib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634081449
-SHA256 (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = ad4fa29e3927c5bec0f71b24b6a88523f4e386905341fc9047abef5744805023
-SIZE (alsa-project-alsa-lib-v1.2.2_GH0.tar.gz) = 780688
+TIMESTAMP = 1645435186
+SHA256 (alsa-lib-1.2.6.1.tar.bz2) = ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
+SIZE (alsa-lib-1.2.6.1.tar.bz2) = 1079670
Index: audio/alsa-lib/files/patch-src_conf_alsa.conf
===================================================================
--- audio/alsa-lib/files/patch-src_conf_alsa.conf
+++ audio/alsa-lib/files/patch-src_conf_alsa.conf
@@ -1,13 +1,15 @@
---- src/conf/alsa.conf.orig 2020-02-19 09:35:39 UTC
+--- src/conf/alsa.conf.orig 2022-01-01 09:52:43 UTC
+++ src/conf/alsa.conf
-@@ -8,8 +8,8 @@
+@@ -8,10 +8,8 @@
{
func load
files [
+- "/var/lib/alsa/conf.d"
+- "/usr/etc/alsa/conf.d"
- "/etc/alsa/conf.d"
-- "/etc/asound.conf"
+- "/etc/asound.conf|||/usr/etc/asound.conf"
+ "%%PREFIX%%/etc/alsa/conf.d"
+ "%%PREFIX%%/etc/asound.conf"
"~/.asoundrc"
- ]
- errors false
+ {
+ @func concat
Index: audio/alsa-lib/files/patch-src_ucm_ucm_exec.c
===================================================================
--- /dev/null
+++ audio/alsa-lib/files/patch-src_ucm_ucm_exec.c
@@ -0,0 +1,12 @@
+--- ./src/ucm/ucm_exec.c.orig 2021-12-09 13:17:59 UTC
++++ ./src/ucm/ucm_exec.c
+@@ -32,7 +32,9 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <dirent.h>
++#include <signal.h>
+
++extern char **environ;
+ static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
+
+ /*
Index: audio/alsa-plugins/Makefile
===================================================================
--- audio/alsa-plugins/Makefile
+++ audio/alsa-plugins/Makefile
@@ -1,17 +1,11 @@
# Created by: Aragon Gouveia <aragon@phat.za.net>
PORTNAME= alsa-plugins
-PORTVERSION= 1.2.2
-PORTREVISION= 8
-DISTVERSIONPREFIX= v
+PORTVERSION= 1.2.6
CATEGORIES= audio
-MASTER_SITES= GH
+MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/
-USE_GITHUB= yes
-GH_ACCOUNT= alsa-project
-GH_PROJECT= ${PORTNAME}
-
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= rodrigo@FreeBSD.org
COMMENT= ALSA compatibility library plugins
LICENSE= LGPL21+
Index: audio/alsa-plugins/distinfo
===================================================================
--- audio/alsa-plugins/distinfo
+++ audio/alsa-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634083456
-SHA256 (alsa-project-alsa-plugins-v1.2.2_GH0.tar.gz) = 1872622227c474db9db57bf5b6ec91bbef391f9750e9d64d00d05af29f579e1a
-SIZE (alsa-project-alsa-plugins-v1.2.2_GH0.tar.gz) = 121998
+TIMESTAMP = 1645434820
+SHA256 (alsa-plugins-1.2.6.tar.bz2) = 068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0
+SIZE (alsa-plugins-1.2.6.tar.bz2) = 408596
Index: audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
===================================================================
--- audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
+++ audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
@@ -1,8 +1,6 @@
-based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c
-
---- usb_stream/pcm_usb_stream.c.orig 2016-03-31 13:11:29 UTC
+--- usb_stream/pcm_usb_stream.c.orig 2021-12-06 10:17:29 UTC
+++ usb_stream/pcm_usb_stream.c
-@@ -79,6 +79,69 @@ typedef struct {
+@@ -78,6 +78,69 @@
static struct user_usb_stream *uus;
static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -19,8 +17,8 @@
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Nick Black nor the names of other contributors may
-+ * be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
++ * be used to endorse or promote products derived from this software
++ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -41,41 +39,42 @@
+// mremap(2)), resulting in undefined behavior, despite realloc(3) semantics.
+// Similarly, oldlen and newlen must be non-zero (and page-aligned).
+void *mremap_compat(int fd,void *oldaddr,size_t oldlen,
-+ size_t newlen,int prot,int flags){
-+ void *ret;
++ size_t newlen,int prot,int flags){
++ void *ret;
+
-+ // From mmap(2) on freebsd 6.3: A successful FIXED mmap deletes any
-+ // previous mapping in the allocated address range. This means:
-+ // remapping over a current map will blow it away (unless FIXED isn't
-+ // provided, in which case it can't overlap an old mapping. See bug
-+ // 733 for extensive discussion of this issue for Linux and FreeBSD).
-+ if((ret = mmap((char *)oldaddr + oldlen,newlen - oldlen,prot,flags,fd,oldlen)) == MAP_FAILED){
-+ // We couldn't get the memory whatsoever (or we were a fresh
-+ // allocation that succeeded). Return the immediate result...
-+ return ret;
-+ } // ret != MAP_FAILED. Did we squash?
-+ if(ret != (char *)oldaddr + oldlen){
-+ // We got the memory, but not where we wanted it. Copy over the
-+ // old map, and then free it up...
-+ munmap(ret,newlen - oldlen);
-+ if((ret = mmap(NULL,newlen,prot,flags,fd,0)) == MAP_FAILED){
-+ return ret;
-+ }
-+ memcpy(ret,oldaddr,oldlen);
-+ munmap(oldaddr,oldlen); // Free the old mapping
-+ return ret;
-+ } // We successfully squashed. Return a pointer to the first buf.
-+ return oldaddr;
++ // From mmap(2) on freebsd 6.3: A successful FIXED mmap deletes any
++ // previous mapping in the allocated address range. This means:
++ // remapping over a current map will blow it away (unless FIXED isn't
++ // provided, in which case it can't overlap an old mapping. See bug
++ // 733 for extensive discussion of this issue for Linux and FreeBSD).
++ if((ret = mmap((char *)oldaddr + oldlen,newlen - oldlen,prot,flags,fd,oldlen)) == MAP_FAILED){
++ // We couldn't get the memory whatsoever (or we were a fresh
++ // allocation that succeeded). Return the immediate result...
++ return ret;
++ } // ret != MAP_FAILED. Did we squash?
++ if(ret != (char *)oldaddr + oldlen){
++ // We got the memory, but not where we wanted it. Copy over the
++ // old map, and then free it up...
++ munmap(ret,newlen - oldlen);
++ if((ret = mmap(NULL,newlen,prot,flags,fd,0)) == MAP_FAILED){
++ return ret;
++ }
++ memcpy(ret,oldaddr,oldlen);
++ munmap(oldaddr,oldlen); // Free the old mapping
++ return ret;
++ } // We successfully squashed. Return a pointer to the first buf.
++ return oldaddr;
+}
+#endif
+
- static struct user_usb_stream *get_uus(const char *card)
+ static struct user_usb_stream *get_uus(int card)
{
pthread_mutex_lock(&uus_mutex);
-@@ -219,7 +282,11 @@ static int snd_pcm_us_prepare(snd_pcm_io
+@@ -217,8 +280,11 @@
+ return -EIO;
}
-
+-
+#ifdef __linux__
uus->s = mremap(uus->s, sizeof(struct usb_stream), uus->s->read_size, MREMAP_MAYMOVE);
+#else
Index: audio/alsa-utils/Makefile
===================================================================
--- audio/alsa-utils/Makefile
+++ audio/alsa-utils/Makefile
@@ -1,13 +1,11 @@
# Created by: Aragon Gouveia <aragon@phat.za.net>
PORTNAME= alsa-utils
-PORTVERSION= 1.2.2
-DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTVERSION= 1.2.6
CATEGORIES= audio
-MASTER_SITES= GH
+MASTER_SITES= https://www.alsa-project.org/files/pub/utils/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= rodrigo@FreeBSD.org
COMMENT= ALSA compatibility utilities
LICENSE= GPLv2+
@@ -20,9 +18,6 @@
USES= autoreconf gettext-tools gmake libtool localbase ncurses shebangfix \
tar:bzip2 pkgconfig
-USE_GITHUB= yes
-GH_ACCOUNT= alsa-project
-GH_PROJECT= ${PORTNAME}
SHEBANG_FILES= alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh
GNU_CONFIGURE= yes
Index: audio/alsa-utils/distinfo
===================================================================
--- audio/alsa-utils/distinfo
+++ audio/alsa-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634081670
-SHA256 (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 9da1ce4f12a4dd56d55cd5a8f6ae7d56ac91397c3d37fdfcd737adeeb34fce1c
-SIZE (alsa-project-alsa-utils-v1.2.2_GH0.tar.gz) = 1252639
+TIMESTAMP = 1645435319
+SHA256 (alsa-utils-1.2.6.tar.bz2) = 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
+SIZE (alsa-utils-1.2.6.tar.bz2) = 1334063
Index: audio/alsa-utils/files/patch-amidi_amidi.c
===================================================================
--- /dev/null
+++ audio/alsa-utils/files/patch-amidi_amidi.c
@@ -0,0 +1,16 @@
+--- amidi/amidi.c.orig 2021-12-06 10:17:28 UTC
++++ amidi/amidi.c
+@@ -536,9 +536,10 @@
+ cid = CLOCK_REALTIME;
+ else if (strcasecmp(optarg, "monotonic") == 0)
+ cid = CLOCK_MONOTONIC;
+- else if (strcasecmp(optarg, "raw") == 0)
+- cid = CLOCK_MONOTONIC_RAW;
+- else
++ else if (strcasecmp(optarg, "raw") == 0) {
++ error("CLOCK_MONOTONIC_RAW is not supported by FreeBSD, use CLOCK_MONOTONIC instead");
++ cid = CLOCK_MONOTONIC;
++ } else
+ error("Clock type not known");
+ break;
+ case 't':
Index: audio/alsa-utils/pkg-plist
===================================================================
--- audio/alsa-utils/pkg-plist
+++ audio/alsa-utils/pkg-plist
@@ -15,7 +15,6 @@
bin/axfer
bin/iecset
bin/speaker-test
-lib/udev/89-alsa-ucm.rules
lib/udev/90-alsa-restore.rules
%%MANPAGES%%man/fr/man8/alsaconf.8.gz
%%MANPAGES%%man/man1/aconnect.1.gz
@@ -54,8 +53,10 @@
share/alsa/init/test
share/alsa/speaker-test/sample_map.csv
%%NLS%%share/locale/de/LC_MESSAGES/alsa-utils.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/alsa-utils.mo
%%NLS%%share/locale/fr/LC_MESSAGES/alsa-utils.mo
%%NLS%%share/locale/ja/LC_MESSAGES/alsa-utils.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/alsa-utils.mo
%%NLS%%share/locale/ja/LC_MESSAGES/alsaconf.mo
%%NLS%%share/locale/ru/LC_MESSAGES/alsaconf.mo
share/sounds/alsa/Front_Center.wav

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 2:43 PM (11 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27809336
Default Alt Text
D34324.id103022.diff (10 KB)

Event Timeline