alsa-lib-git: define EBADFD in a central location.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: alsa-lib-git: define EBADFD in a central location.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Wed, 24 Feb 2016 13:11:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Feb 24 14:11:30 2016 +0100
Changeset:	8a758e49e6f6d6877764124ed5de5c36f050cc0b

Modified Files:
	alsa-lib-git/distinfo
	alsa-lib-git/patches/patch-ae
	alsa-lib-git/patches/patch-ah
	alsa-lib-git/patches/patch-aq
	alsa-lib-git/patches/patch-ay
	alsa-lib-git/patches/patch-az
Removed Files:
	alsa-lib-git/patches/patch-aa
	alsa-lib-git/patches/patch-ag
	alsa-lib-git/patches/patch-al
	alsa-lib-git/patches/patch-an
	alsa-lib-git/patches/patch-ao
	alsa-lib-git/patches/patch-as
	alsa-lib-git/patches/patch-bc
	alsa-lib-git/patches/patch-bd
	alsa-lib-git/patches/patch-be

Log Message:
alsa-lib-git: define EBADFD in a central location.

Suggested by Takashi Iwai.

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

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

diffstat:
 alsa-lib-git/distinfo         | 19 +++++--------------
 alsa-lib-git/patches/patch-aa | 15 ---------------
 alsa-lib-git/patches/patch-ae | 12 ++++++++----
 alsa-lib-git/patches/patch-ag | 15 ---------------
 alsa-lib-git/patches/patch-ah | 11 -----------
 alsa-lib-git/patches/patch-al | 15 ---------------
 alsa-lib-git/patches/patch-an | 15 ---------------
 alsa-lib-git/patches/patch-ao | 15 ---------------
 alsa-lib-git/patches/patch-aq | 11 -----------
 alsa-lib-git/patches/patch-as | 15 ---------------
 alsa-lib-git/patches/patch-ay | 12 ++----------
 alsa-lib-git/patches/patch-az | 11 -----------
 alsa-lib-git/patches/patch-bc | 15 ---------------
 alsa-lib-git/patches/patch-bd | 15 ---------------
 alsa-lib-git/patches/patch-be | 15 ---------------
 15 files changed, 15 insertions(+), 196 deletions(-)

diffs:
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index f4ceabc..e04aca8 100644
--- a/alsa-lib-git/distinfo
+++ b/alsa-lib-git/distinfo
@@ -4,35 +4,26 @@ SHA1 (alsa-lib-1.1.0.tar.bz2) = 94b9af685488221561a73ae285c4fddaa93663e4
 RMD160 (alsa-lib-1.1.0.tar.bz2) = 0a9ecf05c136ae025df7ab749db907ad81c4db8f
 SHA512 (alsa-lib-1.1.0.tar.bz2) = 2939d0b621c1c619b0a492b05f2e84f354d588c9cc982d93dbcf01c582319258dd5f803ff5c10be52343cd8827d690f671ab5b20ad586a0ee371f0949c9e98f4
 Size (alsa-lib-1.1.0.tar.bz2) = 929874 bytes
-SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
 SHA1 (patch-ad) = 43b9a214626bac91cf5b9afb19b6785b100fd7de
-SHA1 (patch-ae) = c2165e3b3d644eb42a6bc9260fb079adcb0da1ba
+SHA1 (patch-ae) = 285328e2fe76d90f6b53daad964fe65332bd0396
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
-SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
-SHA1 (patch-ah) = 3d2aa98ba2791c2beb152d7e3a454b8d6bb527d3
+SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
 SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
 SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
 SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
-SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
 SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
-SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
-SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
 SHA1 (patch-ap) = 3a3c8316b56997052d27f084ed178acbc49d1b17
-SHA1 (patch-aq) = 6a6cf97a17997a9ffc5d269ad2231fc0451bd532
+SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
 SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
-SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
 SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
 SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
 SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
 SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
 SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
-SHA1 (patch-ay) = 889656f4627c108fdb8f6db7003c8f823efbc1f8
-SHA1 (patch-az) = 6664cb045360c770c80e8d0a7e8e7192d8267487
+SHA1 (patch-ay) = 9a4d25acf7e15a8b9a592583305500c7f4465b56
+SHA1 (patch-az) = 6cc7e6b94dd7c0a638e5c714718b970d2972669d
 SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
 SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
-SHA1 (patch-bc) = 0b034b98d536c4ab7f785420d0d51c3d0763d960
-SHA1 (patch-bd) = 63a102186f4df59da93bedaac772530e166a9fde
-SHA1 (patch-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
 SHA1 (patch-bf) = 10588dd9f8faac208b8f314676558c2c7da12063
 SHA1 (patch-bg) = 29c0fb6c1fb6a11e7f42778bdd965b9d25ddfd0c
 SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
diff --git a/alsa-lib-git/patches/patch-aa b/alsa-lib-git/patches/patch-aa
deleted file mode 100644
index 8fe8b59..0000000
--- a/alsa-lib-git/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- aserver/aserver.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ aserver/aserver.c
-@@ -35,6 +35,10 @@
- 
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- char *command;
- 
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
diff --git a/alsa-lib-git/patches/patch-ae b/alsa-lib-git/patches/patch-ae
index a43a0a8..5095124 100644
--- a/alsa-lib-git/patches/patch-ae
+++ b/alsa-lib-git/patches/patch-ae
@@ -1,12 +1,12 @@
 $NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
 
- - Handle endian detection for assorted operating systems.
  - Fix up linuxism.
+ - Define EBADFD if it's not provided.
  - Don't assert GNU ld on Solaris, where it might not be true.
 
---- include/local.h.orig	2015-11-09 07:39:18.000000000 +0000
+--- include/local.h.orig	2016-02-24 08:33:29.000000000 +0000
 +++ include/local.h
-@@ -50,8 +50,10 @@
+@@ -50,8 +50,14 @@
  #include <sys/poll.h>
  #include <sys/types.h>
  #include <errno.h>
@@ -14,10 +14,14 @@ $NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
  #include <linux/types.h>
  #include <linux/ioctl.h>
 +#endif
++
++#ifndef EBADFD
++#define EBADFD EBADF
++#endif
  
  #ifdef SUPPORT_RESMGR
  #include <resmgr.h>
-@@ -249,7 +251,9 @@ extern snd_lib_error_handler_t snd_err_m
+@@ -249,7 +255,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
   */
diff --git a/alsa-lib-git/patches/patch-ag b/alsa-lib-git/patches/patch-ag
deleted file mode 100644
index 21d22d6..0000000
--- a/alsa-lib-git/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/control/control_shm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/control/control_shm.c
-@@ -35,6 +35,10 @@
- #include <netdb.h>
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_control_shm = "";
diff --git a/alsa-lib-git/patches/patch-ah b/alsa-lib-git/patches/patch-ah
index 44cbd8c..a4cecce 100644
--- a/alsa-lib-git/patches/patch-ah
+++ b/alsa-lib-git/patches/patch-ah
@@ -11,14 +11,3 @@ $NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
  #include <stdarg.h>
  #include <signal.h>
  #include <ctype.h>
-@@ -640,6 +640,10 @@ playback devices.
- #include <limits.h>
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- /**
-  * \brief get identifier of PCM handle
-  * \param pcm PCM handle
diff --git a/alsa-lib-git/patches/patch-al b/alsa-lib-git/patches/patch-al
deleted file mode 100644
index 209c067..0000000
--- a/alsa-lib-git/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dmix.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dmix.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dmix = "";
diff --git a/alsa-lib-git/patches/patch-an b/alsa-lib-git/patches/patch-an
deleted file mode 100644
index 8417f2d..0000000
--- a/alsa-lib-git/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dshare.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dshare.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dshare = "";
diff --git a/alsa-lib-git/patches/patch-ao b/alsa-lib-git/patches/patch-ao
deleted file mode 100644
index b39488f..0000000
--- a/alsa-lib-git/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dsnoop.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dsnoop.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dsnoop = "";
diff --git a/alsa-lib-git/patches/patch-aq b/alsa-lib-git/patches/patch-aq
index 64f75f2..2e53fac 100644
--- a/alsa-lib-git/patches/patch-aq
+++ b/alsa-lib-git/patches/patch-aq
@@ -2,17 +2,6 @@ $NetBSD: patch-aq,v 1.3 2014/06/09 12:21:07 ryoon Exp $
 
 --- src/pcm/pcm_hw.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm_hw.c
-@@ -41,6 +41,10 @@
- #include "../control/control_local.h"
- #include "../timer/timer_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- //#define DEBUG_RW		/* use to debug readi/writei/readn/writen */
- //#define DEBUG_MMAP		/* debug mmap_commit */
- 
 @@ -220,10 +224,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
  
  static int snd_pcm_hw_async(snd_pcm_t *pcm, int sig, pid_t pid)
diff --git a/alsa-lib-git/patches/patch-as b/alsa-lib-git/patches/patch-as
deleted file mode 100644
index b1e4547..0000000
--- a/alsa-lib-git/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_ioplug.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_ioplug.c
-@@ -31,6 +31,10 @@
- #include "pcm_ext_parm.h"
- #include "pcm_generic.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_ioplug = "";
diff --git a/alsa-lib-git/patches/patch-ay b/alsa-lib-git/patches/patch-ay
index 4034334..2465a91 100644
--- a/alsa-lib-git/patches/patch-ay
+++ b/alsa-lib-git/patches/patch-ay
@@ -1,8 +1,8 @@
 $NetBSD: patch-ay,v 1.5 2016/02/18 15:15:57 wiz Exp $
 
---- src/pcm/pcm_null.c.orig	2015-11-09 07:39:18.000000000 +0000
+--- src/pcm/pcm_null.c.orig	2016-02-24 08:33:29.000000000 +0000
 +++ src/pcm/pcm_null.c
-@@ -26,11 +26,17 @@
+@@ -26,7 +26,9 @@
   *
   */
    
@@ -12,11 +12,3 @@ $NetBSD: patch-ay,v 1.5 2016/02/18 15:15:57 wiz Exp $
  #include <limits.h>
  #include "pcm_local.h"
  #include "pcm_plugin.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_null = "";
diff --git a/alsa-lib-git/patches/patch-az b/alsa-lib-git/patches/patch-az
index 3e18c87..7ca6cfa 100644
--- a/alsa-lib-git/patches/patch-az
+++ b/alsa-lib-git/patches/patch-az
@@ -12,14 +12,3 @@ $NetBSD: patch-az,v 1.4 2014/03/25 23:06:07 asau Exp $
  #include "pcm_local.h"
  #include "pcm_plugin.h"
  #include "pcm_rate.h"
-@@ -36,6 +38,10 @@
- 
- #include "plugin_ops.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #if 0
- #define DEBUG_REFINE
- #endif
diff --git a/alsa-lib-git/patches/patch-bc b/alsa-lib-git/patches/patch-bc
deleted file mode 100644
index 0d7454e..0000000
--- a/alsa-lib-git/patches/patch-bc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_share.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_share.c
-@@ -39,6 +39,10 @@
- #include <pthread.h>
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_share = "";
diff --git a/alsa-lib-git/patches/patch-bd b/alsa-lib-git/patches/patch-bd
deleted file mode 100644
index 556186d..0000000
--- a/alsa-lib-git/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_shm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_shm.c
-@@ -45,6 +45,10 @@
- #include <netdb.h>
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_shm = "";
diff --git a/alsa-lib-git/patches/patch-be b/alsa-lib-git/patches/patch-be
deleted file mode 100644
index 15126a3..0000000
--- a/alsa-lib-git/patches/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_simple.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_simple.c
-@@ -25,6 +25,10 @@
- 
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- static int set_buffer_time(snd_spcm_latency_t latency,
- 			   unsigned int *buffer_time)
- {
Prev by Date: Add py-napalm, version 0.51.0.
Next by Date: Add patch for setup.py in order to correct utf8 issue
Previous by Thread: Add py-napalm, version 0.51.0.
Next by Thread: Add patch for setup.py in order to correct utf8 issue
Indexes:
Home | Main Index | Thread Index | Old Index