Attachment 127739 Details for Bug 171601 – alsa-1.0.26.diff

[patch] alsa-1.0.26.diff

alsa-1.0.26.diff (text/x-patch; charset=utf-8), 13.44 KB, created by Jan Beich on 2012-10-02 08:18:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2012-10-02 08:18:24 UTC

Size: 13.44 KB

patch

obsolete

>Index: Mk/bsd.sites.mk
>===================================================================
>--- Mk/bsd.sites.mk	(revision 305029)
>+++ Mk/bsd.sites.mk	(working copy)
>@@ -51,6 +51,17 @@ MASTER_SITE_AFTERSTEP+= \
> 	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/
> .endif
> 
>+.if !defined(IGNORE_MASTER_SITE_ALSA)
>+MASTER_SITE_ALSA+= \
>+	ftp://ftp.silug.org/pub/alsa/%SUBDIR%/ \
>+	ftp://ftp.task.gda.pl/pub/linux/misc/alsa/%SUBDIR%/ \
>+	ftp://gd.tuwien.ac.at/opsys/linux/alsa/%SUBDIR%/ \
>+	http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/%SUBDIR%/ \
>+	http://mirrors.zerg.biz/alsa/%SUBDIR%/ \
>+	http://alsa.cybermirror.org/%SUBDIR%/ \
>+	ftp://ftp.alsa-project.org/pub/%SUBDIR%/
>+.endif
>+
> .if !defined(IGNORE_MASTER_SITE_APACHE)
> MASTER_SITE_APACHE+= \
> 	http://www.apache.org/dist/%SUBDIR%/ \
>Index: audio/alsa-lib/files/patch-alsa-lib
>===================================================================
>--- audio/alsa-lib/files/patch-alsa-lib	(revision 304985)
>+++ audio/alsa-lib/files/patch-alsa-lib	(working copy)
>@@ -154,13 +154,23 @@
>  #if __BYTE_ORDER == __LITTLE_ENDIAN
>  #define __cpu_to_le32(x) (x)
>  #define __cpu_to_be32(x) bswap_32(x)
>---- src/async.c.orig	2009-09-09 20:34:54.000000000 +0800
>-+++ src/async.c	2009-09-15 00:49:34.000000000 +0800
>-@@ -51,6 +51,7 @@
>+$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
>+
>+--- src/async.c.orig	2008-12-25 08:18:22 +0200
>++++ src/async.c	2008-12-25 08:20:39 +0200
>+@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
>  
>  static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
>  {
>-+#ifndef __FreeBSD__
>++#if defined(__DragonFly__) || defined(__FreeBSD__)
>++	/* XXX XXX XXX */
>++	struct list_head *i;
>++	list_for_each(i, &snd_async_handlers) {
>++		snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
>++		if (h->callback)
>++			h->callback(h);
>++	}
>++#else
>  	int fd;
>  	struct list_head *i;
>  	//assert(siginfo->si_code == SI_SIGIO);
>@@ -174,12 +184,14 @@
>  /**
> --- src/compat/hsearch_r.c.orig	2009-09-09 20:34:54.000000000 +0800
> +++ src/compat/hsearch_r.c	2009-09-15 00:22:11.000000000 +0800
>-@@ -18,7 +18,9 @@
>+@@ -18,7 +18,11 @@
>     Boston, MA 02111-1307, USA.  */
>  
>  #include <errno.h>
>-+#ifndef __FreeBSD__
>++#ifdef __GLIBC__
>  #include <malloc.h>
>++#else
>++#include <stdlib.h>
> +#endif
>  #include <string.h>
>  
>@@ -448,12 +460,14 @@
>  #ifndef DOC_HIDDEN
> --- src/shmarea.c.orig	2009-09-09 20:34:54.000000000 +0800
> +++ src/shmarea.c	2009-09-15 00:22:00.000000000 +0800
>-@@ -19,7 +19,9 @@
>+@@ -19,7 +19,11 @@
>   */
>    
>  #include <stdio.h>
>-+#ifndef __FreeBSD__
>++#ifdef __GLIBC__
>  #include <malloc.h>
>++#else
>++#include <stdlib.h>
> +#endif
>  #include <string.h>
>  #include <errno.h>
>Index: audio/alsa-lib/files/patch-versionsort
>===================================================================
>--- audio/alsa-lib/files/patch-versionsort	(revision 304985)
>+++ audio/alsa-lib/files/patch-versionsort	(working copy)
>@@ -1,157 +0,0 @@
>-based on https://bugs.busybox.net/show_bug.cgi?id=3529
>-
>---- include/local.h.orig
>-+++ include/local.h
>-@@ -285,4 +285,125 @@ int snd_config_search_alias_hooks(snd_co
>-                                   const char *base, const char *key,
>- 				  snd_config_t **result);
>- 
>-+#ifdef NEED_VERSIONSORT
>-+
>-+/* Compare strings while treating digits characters numerically.
>-+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
>-+   This file is part of the GNU C Library.
>-+   Contributed by Jean-FranÃ§ois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
>-+
>-+   The GNU C Library is free software; you can redistribute it and/or
>-+   modify it under the terms of the GNU Lesser General Public
>-+   License as published by the Free Software Foundation; either
>-+   version 2.1 of the License, or (at your option) any later version.
>-+
>-+   The GNU C Library is distributed in the hope that it will be useful,
>-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-+   Lesser General Public License for more details.
>-+
>-+   You should have received a copy of the GNU Lesser General Public
>-+   License along with the GNU C Library; if not, write to the Free
>-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
>-+   02111-1307 USA.  */
>-+
>-+#include <string.h>
>-+#include <ctype.h>
>-+
>-+
>-+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
>-+           fractionnal parts, S_Z: idem but with leading Zeroes only */
>-+#define  S_N    0x0
>-+#define  S_I    0x4
>-+#define  S_F    0x8
>-+#define  S_Z    0xC
>-+
>-+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
>-+#define  CMP    2
>-+#define  LEN    3
>-+
>-+/* Compare S1 and S2 as strings holding indices/version numbers,
>-+   returning less than, equal to or greater than zero if S1 is less than,
>-+   equal to or greater than S2 (for more info, see the texinfo doc).
>-+*/
>-+static inline
>-+int strverscmp (s1, s2)
>-+     const char *s1;
>-+     const char *s2;
>-+{
>-+  const unsigned char *p1 = (const unsigned char *) s1;
>-+  const unsigned char *p2 = (const unsigned char *) s2;
>-+  unsigned char c1, c2;
>-+  int state;
>-+  int diff;
>-+
>-+  /* Symbol(s)    0       [1-9]   others  (padding)
>-+     Transition   (10) 0  (01) d  (00) x  (11) -   */
>-+  static const unsigned int next_state[] =
>-+  {
>-+      /* state    x    d    0    - */
>-+      /* S_N */  S_N, S_I, S_Z, S_N,
>-+      /* S_I */  S_N, S_I, S_I, S_I,
>-+      /* S_F */  S_N, S_F, S_F, S_F,
>-+      /* S_Z */  S_N, S_F, S_Z, S_Z
>-+  };
>-+
>-+  static const int result_type[] =
>-+  {
>-+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
>-+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
>-+
>-+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
>-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
>-+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
>-+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
>-+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
>-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
>-+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
>-+                 -1,  CMP, CMP, CMP
>-+  };
>-+
>-+  if (p1 == p2)
>-+    return 0;
>-+
>-+  c1 = *p1++;
>-+  c2 = *p2++;
>-+  /* Hint: '0' is a digit too.  */
>-+  state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
>-+
>-+  while ((diff = c1 - c2) == 0 && c1 != '\0')
>-+    {
>-+      state = next_state[state];
>-+      c1 = *p1++;
>-+      c2 = *p2++;
>-+      state |= (c1 == '0') + (isdigit (c1) != 0);
>-+    }
>-+
>-+  state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
>-+
>-+  switch (state)
>-+  {
>-+    case CMP:
>-+      return diff;
>-+
>-+    case LEN:
>-+      while (isdigit (*p1++))
>-+	if (!isdigit (*p2++))
>-+	  return 1;
>-+
>-+      return isdigit (*p2) ? -1 : diff;
>-+
>-+    default:
>-+      return state;
>-+  }
>-+}
>-+
>-+static inline
>-+int versionsort(const void * a, const void * b)
>-+{
>-+    return strverscmp ((*(const struct dirent **) a)->d_name,
>-+	    (*(const struct dirent **) b)->d_name);
>-+}
>-+
>-+#endif
>- #endif
>---- src/conf.c.orig
>-+++ src/conf.c
>-@@ -419,6 +419,9 @@ beginning:</P>
>- #include <sys/stat.h>
>- #include <dirent.h>
>- #include <locale.h>
>-+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30
>-+#define NEED_VERSIONSORT
>-+#endif
>- #include "local.h"
>- #ifdef HAVE_LIBPTHREAD
>- #include <pthread.h>
>---- src/ucm/parser.c.orig
>-+++ src/ucm/parser.c
>-@@ -30,8 +30,11 @@
>-  *               Jaroslav Kysela <perex@perex.cz>
>-  */
>- 
>--#include "ucm_local.h"
>- #include <dirent.h>
>-+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30
>-+#define NEED_VERSIONSORT
>-+#endif
>-+#include "ucm_local.h"
>- 
>- /** The name of the environment variable containing the UCM directory */
>- #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
>Index: audio/alsa-lib/pkg-plist
>===================================================================
>--- audio/alsa-lib/pkg-plist	(revision 304985)
>+++ audio/alsa-lib/pkg-plist	(working copy)
>@@ -72,6 +72,7 @@ share/alsa/cards/EMU10K1X.conf
> share/alsa/cards/ENS1370.conf
> share/alsa/cards/ENS1371.conf
> share/alsa/cards/ES1968.conf
>+share/alsa/cards/Echo_Echo3G.conf
> share/alsa/cards/FM801.conf
> share/alsa/cards/FWSpeakers.conf
> share/alsa/cards/FireWave.conf
>Index: audio/alsa-lib/Makefile
>===================================================================
>--- audio/alsa-lib/Makefile	(revision 304985)
>+++ audio/alsa-lib/Makefile	(working copy)
>@@ -6,12 +6,10 @@
> #
> 
> PORTNAME=	alsa-lib
>-PORTVERSION=	1.0.25
>+PORTVERSION=	1.0.26
> CATEGORIES=	audio
>-MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/lib/ \
>-		ftp://gd.tuwien.ac.at/opsys/linux/alsa/lib/ \
>-		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/ \
>-		ftp://ftp.alsa-project.org/pub/lib/
>+MASTER_SITES=	ALSA/lib \
>+		GENTOO/distfiles
> 
> MAINTAINER=	aragon@phat.za.net
> COMMENT=	ALSA compatibility library
>@@ -24,6 +22,7 @@ CONFIGURE_ARGS+=--disable-aload --disable-python \
> 
> post-patch:	.SILENT
> 	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
>+		-e '/-D_GNU_SOURCE/d' \
> 		-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
> 	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
> 		${WRKSRC}/modules/mixer/simple/Makefile.in
>Index: audio/alsa-lib/distinfo
>===================================================================
>--- audio/alsa-lib/distinfo	(revision 304985)
>+++ audio/alsa-lib/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (alsa-lib-1.0.25.tar.bz2) = 5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6
>-SIZE (alsa-lib-1.0.25.tar.bz2) = 838403
>+SHA256 (alsa-lib-1.0.26.tar.bz2) = 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d
>+SIZE (alsa-lib-1.0.26.tar.bz2) = 883076
>Index: audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
>===================================================================
>--- audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c	(revision 304985)
>+++ audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c	(working copy)
>@@ -2,16 +2,16 @@ based on https://github.com/dankamongmen/libdank/b
> 
> --- usb_stream/pcm_usb_stream.c.orig
> +++ usb_stream/pcm_usb_stream.c
>-@@ -18,7 +18,9 @@
>-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
>+@@ -19,7 +19,9 @@
>   */
>  
>+ #define _GNU_SOURCE
> +#ifndef __FreeBSD__
>  #include <byteswap.h>
> +#endif
>- #define _GNU_SOURCE
>  #include <sys/mman.h>
>  #include <sys/shm.h>
>+ #include <sys/ioctl.h>
> @@ -79,6 +81,69 @@ typedef struct {
>  static struct user_usb_stream *uus;
>  static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
>Index: audio/alsa-plugins/Makefile
>===================================================================
>--- audio/alsa-plugins/Makefile	(revision 304985)
>+++ audio/alsa-plugins/Makefile	(working copy)
>@@ -6,12 +6,10 @@
> #
> 
> PORTNAME=	alsa-plugins
>-PORTVERSION=	1.0.25
>+PORTVERSION=	1.0.26
> CATEGORIES=	audio
>-MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/plugins/ \
>-		ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \
>-		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/plugins/ \
>-		ftp://ftp.alsa-project.org/pub/plugins/
>+MASTER_SITES=	ALSA/plugins \
>+		GENTOO/distfiles
> 
> MAINTAINER=	aragon@phat.za.net
> COMMENT=	ALSA compatibility library plugins
>@@ -25,12 +23,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> USE_LDCONFIG=	${PREFIX}/lib/alsa-lib
> 
> OPTIONS_DEFINE=	ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
>-OPTIONS_DEFAULT=ARIFF_OSS
> ARIFF_OSS_DESC=	FreeBSD-specific OSS plugin
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MARIFF_OSS}
>+.if ${PORT_OPTIONS:MARIFF_OSS} || ${OSVERSION} < 800097
> EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
> .endif
> 
>Index: audio/alsa-plugins/distinfo
>===================================================================
>--- audio/alsa-plugins/distinfo	(revision 304985)
>+++ audio/alsa-plugins/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (alsa-plugins-1.0.25.tar.bz2) = a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
>-SIZE (alsa-plugins-1.0.25.tar.bz2) = 331568
>+SHA256 (alsa-plugins-1.0.26.tar.bz2) = 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f
>+SIZE (alsa-plugins-1.0.26.tar.bz2) = 361017
>Index: audio/alsa-utils/Makefile
>===================================================================
>--- audio/alsa-utils/Makefile	(revision 304985)
>+++ audio/alsa-utils/Makefile	(working copy)
>@@ -6,12 +6,10 @@
> #
> 
> PORTNAME=	alsa-utils
>-PORTVERSION=	1.0.25
>+PORTVERSION=	1.0.26
> CATEGORIES=	audio
>-MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/utils/ \
>-		ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/ \
>-		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/ \
>-		ftp://ftp.alsa-project.org/pub/utils/
>+MASTER_SITES=	ALSA/utils \
>+		GENTOO/distfiles
> 
> MAINTAINER=	aragon@phat.za.net
> COMMENT=	ALSA compatibility utils
>Index: audio/alsa-utils/distinfo
>===================================================================
>--- audio/alsa-utils/distinfo	(revision 304985)
>+++ audio/alsa-utils/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (alsa-utils-1.0.25.tar.bz2) = 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c
>-SIZE (alsa-utils-1.0.25.tar.bz2) = 1132780
>+SHA256 (alsa-utils-1.0.26.tar.bz2) = f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7
>+SIZE (alsa-utils-1.0.26.tar.bz2) = 1134474

Actions: View | Diff

Attachments on bug 171601: 127737 | 127738 | 127739