pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

alsa-lib-git: remove patches that were applied upstream.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Mar 7 11:21:09 2016 +0100
Changeset:	8336fa00b882ad6526dc48b61d46bc5dc3abd3b4

Modified Files:
	alsa-lib-git/distinfo
	alsa-lib-git/patches/patch-ae
	alsa-lib-git/patches/patch-bg
	alsa-lib-git/patches/patch-src_conf.c
	alsa-lib-git/patches/patch-src_ucm_parser.c
Removed Files:
	alsa-lib-git/patches/patch-ai
	alsa-lib-git/patches/patch-aj
	alsa-lib-git/patches/patch-ak
	alsa-lib-git/patches/patch-am
	alsa-lib-git/patches/patch-ap
	alsa-lib-git/patches/patch-ar
	alsa-lib-git/patches/patch-at
	alsa-lib-git/patches/patch-au
	alsa-lib-git/patches/patch-aw
	alsa-lib-git/patches/patch-ax
	alsa-lib-git/patches/patch-ay
	alsa-lib-git/patches/patch-az
	alsa-lib-git/patches/patch-ba
	alsa-lib-git/patches/patch-bb
	alsa-lib-git/patches/patch-bf
	alsa-lib-git/patches/patch-bh
	alsa-lib-git/patches/patch-include_sound_asound.h
	alsa-lib-git/patches/patch-include_type__compat.h
	alsa-lib-git/patches/patch-src_topology_tplg__local.h

Log Message:
alsa-lib-git: remove patches that were applied upstream.

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

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

diffstat:
 alsa-lib-git/distinfo                              | 27 ++------
 alsa-lib-git/patches/patch-ae                      | 16 -----
 alsa-lib-git/patches/patch-ai                      | 14 -----
 alsa-lib-git/patches/patch-aj                      | 14 -----
 alsa-lib-git/patches/patch-ak                      | 14 -----
 alsa-lib-git/patches/patch-am                      | 14 -----
 alsa-lib-git/patches/patch-ap                      | 14 -----
 alsa-lib-git/patches/patch-ar                      | 14 -----
 alsa-lib-git/patches/patch-at                      | 14 -----
 alsa-lib-git/patches/patch-au                      | 14 -----
 alsa-lib-git/patches/patch-aw                      | 20 ------
 alsa-lib-git/patches/patch-ax                      | 14 -----
 alsa-lib-git/patches/patch-ay                      | 14 -----
 alsa-lib-git/patches/patch-az                      | 14 -----
 alsa-lib-git/patches/patch-ba                      | 14 -----
 alsa-lib-git/patches/patch-bb                      | 14 -----
 alsa-lib-git/patches/patch-bf                      | 14 -----
 alsa-lib-git/patches/patch-bg                      | 22 +++----
 alsa-lib-git/patches/patch-bh                      | 14 -----
 alsa-lib-git/patches/patch-include_sound_asound.h  | 17 ------
 alsa-lib-git/patches/patch-include_type__compat.h  | 71 ----------------------
 alsa-lib-git/patches/patch-src_conf.c              | 12 +---
 .../patches/patch-src_topology_tplg__local.h       | 15 -----
 alsa-lib-git/patches/patch-src_ucm_parser.c        | 13 +---
 24 files changed, 17 insertions(+), 406 deletions(-)

diffs:
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index 6cf706b..c95e393 100644
--- a/alsa-lib-git/distinfo
+++ b/alsa-lib-git/distinfo
@@ -5,40 +5,21 @@ 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-ad) = 79a0f048751899247ec12990cd02332b977af248
-SHA1 (patch-ae) = ac72304f17d402635da7be8c768872c5ecce404f
+SHA1 (patch-ae) = 65e20f89ba847625b7632e62a787147c5138a300
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
-SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
-SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
-SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
-SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
-SHA1 (patch-ap) = 3a3c8316b56997052d27f084ed178acbc49d1b17
 SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
-SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
-SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
-SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
 SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
-SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
-SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
-SHA1 (patch-ay) = 9a4d25acf7e15a8b9a592583305500c7f4465b56
-SHA1 (patch-az) = 6cc7e6b94dd7c0a638e5c714718b970d2972669d
-SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
-SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
-SHA1 (patch-bf) = 10588dd9f8faac208b8f314676558c2c7da12063
-SHA1 (patch-bg) = 29c0fb6c1fb6a11e7f42778bdd965b9d25ddfd0c
-SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
+SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
 SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
 SHA1 (patch-configure.ac) = 1c245e2ccd1a71f93847f0f2efab5e0b0c5c46b9
 SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
 SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
-SHA1 (patch-include_sound_asound.h) = 07bf1748d064b4753aa621a03b7bd179e324b508
-SHA1 (patch-include_type__compat.h) = 2c2af104b06c0f7e08dd970a7420dfaa6bdbfbf1
-SHA1 (patch-src_conf.c) = 27795c60a05ced40c42dbfb474eed88f3b284cc6
+SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
 SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
 SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
-SHA1 (patch-src_topology_tplg__local.h) = 121d138c68b9c1832c4b3cf2f0f24c72623dbce0
-SHA1 (patch-src_ucm_parser.c) = 3c376ae30f11d749ea5e41da89a72269710a3b10
+SHA1 (patch-src_ucm_parser.c) = 13dc6b85281d996450c1010cec1bc6e9e87e6b3c
diff --git a/alsa-lib-git/patches/patch-ae b/alsa-lib-git/patches/patch-ae
index 956091e..0dd7ed0 100644
--- a/alsa-lib-git/patches/patch-ae
+++ b/alsa-lib-git/patches/patch-ae
@@ -1,25 +1,9 @@
 $NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
 
- - Fix up linuxism.
  - Don't assert GNU ld on Solaris, where it might not be true.
 
 --- include/local.h.orig	2016-02-29 14:44:47.000000000 +0000
 +++ include/local.h
-@@ -50,11 +50,11 @@
- #include <sys/poll.h>
- #include <sys/types.h>
- #include <errno.h>
-+#if defined(__linux__)
- #include <linux/types.h>
- #include <linux/ioctl.h>
--
--#ifndef EBADFD
--#define EBADFD EBADF
-+#else
-+#include "type_compat.h"
- #endif
- 
- #ifdef SUPPORT_RESMGR
 @@ -253,7 +253,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
diff --git a/alsa-lib-git/patches/patch-ai b/alsa-lib-git/patches/patch-ai
deleted file mode 100644
index 7a21172..0000000
--- a/alsa-lib-git/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_adpcm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_adpcm.c
-@@ -56,7 +56,9 @@ IMA compatibility project proceedings, V
-   come across a good description of XA yet.
-  */
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-aj b/alsa-lib-git/patches/patch-aj
deleted file mode 100644
index 33ed0de..0000000
--- a/alsa-lib-git/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_alaw.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_alaw.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-ak b/alsa-lib-git/patches/patch-ak
deleted file mode 100644
index 8b3905e..0000000
--- a/alsa-lib-git/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_copy.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_copy.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-am b/alsa-lib-git/patches/patch-am
deleted file mode 100644
index 16e2fa8..0000000
--- a/alsa-lib-git/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.5 2014/06/09 12:21:07 ryoon Exp $
-
---- src/pcm/pcm_dmix_generic.c.orig	2013-07-08 12:31:36.000000000 +0000
-+++ src/pcm/pcm_dmix_generic.c
-@@ -125,7 +125,9 @@ static void mix_select_callbacks(snd_pcm
- 	 (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \
- 	 (1ULL << SND_PCM_FORMAT_U8))
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- 
- static void generic_mix_areas_16_native(unsigned int size,
- 					volatile signed short *dst,
diff --git a/alsa-lib-git/patches/patch-ap b/alsa-lib-git/patches/patch-ap
deleted file mode 100644
index c288315..0000000
--- a/alsa-lib-git/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.6 2016/02/18 15:15:57 wiz Exp $
-
---- src/pcm/pcm_file.c.orig	2015-11-09 07:39:18.000000000 +0000
-+++ src/pcm/pcm_file.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <ctype.h>
- #include <string.h>
- #include "pcm_local.h"
diff --git a/alsa-lib-git/patches/patch-ar b/alsa-lib-git/patches/patch-ar
deleted file mode 100644
index ec63247..0000000
--- a/alsa-lib-git/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_iec958.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_iec958.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-at b/alsa-lib-git/patches/patch-at
deleted file mode 100644
index 2b258c4..0000000
--- a/alsa-lib-git/patches/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-at,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_lfloat.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_lfloat.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-au b/alsa-lib-git/patches/patch-au
deleted file mode 100644
index 3d37746..0000000
--- a/alsa-lib-git/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_linear.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-aw b/alsa-lib-git/patches/patch-aw
deleted file mode 100644
index 3317476..0000000
--- a/alsa-lib-git/patches/patch-aw
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aw,v 1.5 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_misc.c.orig	2008-10-29 14:42:10 +0200
-+++ src/pcm/pcm_misc.c	2008-12-21 17:08:14 +0200
-@@ -23,7 +23,15 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#ifdef __NetBSD__
-+#include <sys/bswap.h>
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#elif defined (__sun)
-+#include <sys/byteorder.h>
-+#else
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- 
- 
diff --git a/alsa-lib-git/patches/patch-ax b/alsa-lib-git/patches/patch-ax
deleted file mode 100644
index c773860..0000000
--- a/alsa-lib-git/patches/patch-ax
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_mulaw.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_mulaw.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/alsa-lib-git/patches/patch-ay b/alsa-lib-git/patches/patch-ay
deleted file mode 100644
index 2465a91..0000000
--- a/alsa-lib-git/patches/patch-ay
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ay,v 1.5 2016/02/18 15:15:57 wiz Exp $
-
---- src/pcm/pcm_null.c.orig	2016-02-24 08:33:29.000000000 +0000
-+++ src/pcm/pcm_null.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <limits.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/alsa-lib-git/patches/patch-az b/alsa-lib-git/patches/patch-az
deleted file mode 100644
index 7ca6cfa..0000000
--- a/alsa-lib-git/patches/patch-az
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-az,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_rate.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_rate.c
-@@ -28,7 +28,9 @@
-  *
-  */
- #include <inttypes.h>
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- #include "pcm_rate.h"
diff --git a/alsa-lib-git/patches/patch-ba b/alsa-lib-git/patches/patch-ba
deleted file mode 100644
index f6d330f..0000000
--- a/alsa-lib-git/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_rate_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_rate_linear.c
-@@ -21,7 +21,9 @@
-  */
- 
- #include <inttypes.h>
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- #include "pcm_rate.h"
diff --git a/alsa-lib-git/patches/patch-bb b/alsa-lib-git/patches/patch-bb
deleted file mode 100644
index e7659db..0000000
--- a/alsa-lib-git/patches/patch-bb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_route.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_route.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <math.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/alsa-lib-git/patches/patch-bf b/alsa-lib-git/patches/patch-bf
deleted file mode 100644
index f9a27ac..0000000
--- a/alsa-lib-git/patches/patch-bf
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bf,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_softvol.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_softvol.c
-@@ -26,7 +26,9 @@
-  *
-  */
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <math.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/alsa-lib-git/patches/patch-bg b/alsa-lib-git/patches/patch-bg
index 242ed37..259bbd4 100644
--- a/alsa-lib-git/patches/patch-bg
+++ b/alsa-lib-git/patches/patch-bg
@@ -1,8 +1,8 @@
 $NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
 
---- src/timer/timer_hw.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/timer/timer_hw.c.orig	2016-03-07 10:09:24.000000000 +0000
 +++ src/timer/timer_hw.c
-@@ -72,11 +72,14 @@ static int snd_timer_hw_nonblock(snd_tim
+@@ -66,11 +66,14 @@ static int snd_timer_hw_nonblock(snd_tim
  
  static int snd_timer_hw_async(snd_timer_t *timer, int sig, pid_t pid)
  {
@@ -17,7 +17,7 @@ $NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
  	if ((flags = fcntl(fd, F_GETFL)) < 0) {
  		SYSERR("F_GETFL failed");
  		return -errno;
-@@ -89,12 +92,22 @@ static int snd_timer_hw_async(snd_timer_
+@@ -83,13 +86,21 @@ static int snd_timer_hw_async(snd_timer_
  		SYSERR("F_SETFL for O_ASYNC failed");
  		return -errno;
  	}
@@ -25,18 +25,18 @@ $NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
  	if (sig < 0)
  		return 0;
 +#ifndef __sun
-+#ifdef F_SETSIG
+ #ifdef F_SETSIG
  	if (fcntl(fd, F_SETSIG, (long)sig) < 0) {
  		SYSERR("F_SETSIG failed");
  		return -errno;
- 	}
+-	}
++       }
 +#else
-+	if (fcntl(fd, F_SETFL, O_ASYNC) < 0) {
-+		SYSERR("F_SETFL failed");
-+		return -errno;
-+	}
-+#endif
++       if (fcntl(fd, F_SETFL, O_ASYNC) < 0) {
++               SYSERR("F_SETFL failed");
++               return -errno;
++       }
 +#endif
+ #endif
  	if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
  		SYSERR("F_SETOWN failed");
- 		return -errno;
diff --git a/alsa-lib-git/patches/patch-bh b/alsa-lib-git/patches/patch-bh
deleted file mode 100644
index 02bcc58..0000000
--- a/alsa-lib-git/patches/patch-bh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bh,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_meter.c.orig	2008-12-19 00:05:13.000000000 -0500
-+++ src/pcm/pcm_meter.c	2008-12-19 00:05:34.000000000 -0500
-@@ -27,7 +27,9 @@
-  */
-   
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <time.h>
- #include <pthread.h>
- #include <dlfcn.h>
diff --git a/alsa-lib-git/patches/patch-include_sound_asound.h b/alsa-lib-git/patches/patch-include_sound_asound.h
deleted file mode 100644
index 99b2ac6..0000000
--- a/alsa-lib-git/patches/patch-include_sound_asound.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-include_sound_asound.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
-
---- include/sound/asound.h.orig	2016-02-24 08:33:29.000000000 +0000
-+++ include/sound/asound.h
-@@ -23,7 +23,12 @@
- #ifndef _UAPI__SOUND_ASOUND_H
- #define _UAPI__SOUND_ASOUND_H
- 
-+#if defined(__linux__)
- #include <linux/types.h>
-+#else
-+#include <sys/ioctl.h>
-+#define __bitwise
-+#endif
- 
- #ifndef __KERNEL__
- #include <stdlib.h>
diff --git a/alsa-lib-git/patches/patch-include_type__compat.h b/alsa-lib-git/patches/patch-include_type__compat.h
deleted file mode 100644
index a4073b5..0000000
--- a/alsa-lib-git/patches/patch-include_type__compat.h
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
---- include/type_compat.h.orig	2016-03-03 09:47:40.792972771 +0000
-+++ include/type_compat.h
-@@ -0,0 +1,66 @@
-+/*
-+ *  ALSA lib - compatibility header to be included by local.h
-+ *  Copyright (c) 2016 by  Thomas Klausner <wiz%NetBSD.org@localhost>
-+ *
-+ *
-+ *   This 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.
-+ *
-+ *   This program 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 this library; if not, write to the Free Software
-+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-+ *
-+ */
-+
-+#ifndef __TYPE_COMPAT_H
-+#define __TYPE_COMPAT_H
-+
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
-+#ifndef __u16
-+#define __u16	uint16_t
-+#endif
-+#ifndef __u32
-+#define __u32	uint32_t
-+#endif
-+#ifndef __u64
-+#define __u64	uint64_t
-+#endif
-+#ifndef __le16
-+#define __le16	uint16_t
-+#endif
-+#ifndef __le32
-+#define __le32	uint32_t
-+#endif
-+#ifndef __le64
-+#define __le64	uint64_t
-+#endif
-+#ifndef u_int8_t
-+#define u_int8_t	uint8_t
-+#endif
-+#ifndef u_int16_t
-+#define u_int16_t	uint16_t
-+#endif
-+#ifndef u_int32_t
-+#define u_int32_t	uint32_t
-+#endif
-+#ifndef u_int32_t
-+#define u_int32_t	uint64_t
-+#endif
-+#ifndef __kernel_pid_t
-+#define __kernel_pid_t	pid_t
-+#endif
-+#ifndef __kernel_off_t
-+#define __kernel_off_t	off_t
-+#endif
-+
-+#endif
diff --git a/alsa-lib-git/patches/patch-src_conf.c b/alsa-lib-git/patches/patch-src_conf.c
index d423719..ec13f1d 100644
--- a/alsa-lib-git/patches/patch-src_conf.c
+++ b/alsa-lib-git/patches/patch-src_conf.c
@@ -1,7 +1,6 @@
 $NetBSD: patch-src_conf.c,v 1.4 2016/02/18 15:15:57 wiz Exp $
 
-* NetBSD has no PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-* SunOS has no versionsort or dirent d_type
+* SunOS has no dirent d_type
 
 --- src/conf.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/conf.c
@@ -25,12 +24,3 @@ $NetBSD: patch-src_conf.c,v 1.4 2016/02/18 15:15:57 wiz Exp $
  		return 0;
  
  	flen = strlen(dirent->d_name);
-@@ -3549,7 +3557,7 @@ int snd_config_hook_load(snd_config_t *r
- 			int n;
- 
- #ifndef DOC_HIDDEN
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
- #define SORTFUNC	versionsort
- #else
- #define SORTFUNC	alphasort
diff --git a/alsa-lib-git/patches/patch-src_topology_tplg__local.h b/alsa-lib-git/patches/patch-src_topology_tplg__local.h
deleted file mode 100644
index 8ecf473..0000000
--- a/alsa-lib-git/patches/patch-src_topology_tplg__local.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_topology_tplg__local.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
-
---- src/topology/tplg_local.h.orig	2016-02-24 08:33:29.000000000 +0000
-+++ src/topology/tplg_local.h
-@@ -13,8 +13,10 @@
- #include <limits.h>
- #include <stdint.h>
- #include <stdbool.h>
-+#ifdef __linux__
- #include <endian.h>
- #include <linux/types.h>
-+#endif
- 
- #include "local.h"
- #include "list.h"
diff --git a/alsa-lib-git/patches/patch-src_ucm_parser.c b/alsa-lib-git/patches/patch-src_ucm_parser.c
index e5d2cde..a1b5ea0 100644
--- a/alsa-lib-git/patches/patch-src_ucm_parser.c
+++ b/alsa-lib-git/patches/patch-src_ucm_parser.c
@@ -1,8 +1,6 @@
 $NetBSD: patch-src_ucm_parser.c,v 1.3 2014/06/26 20:23:14 asau Exp $
 
-* NetBSD has no versionsort
-* FreeBSD doesn't have it either
-* SunOS has no versionsort or dirent d_type
+* SunOS has no dirent d_type
 
 --- src/ucm/parser.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/ucm/parser.c
@@ -24,12 +22,3 @@ $NetBSD: patch-src_ucm_parser.c,v 1.3 2014/06/26 20:23:14 asau Exp $
  		if (dirent->d_name[0] == '.') {
  			if (dirent->d_name[1] == '\0')
  				return 0;
-@@ -1254,7 +1262,7 @@ int uc_mgr_scan_master_configs(const cha
- 		"%s", env ? env : ALSA_USE_CASE_DIR);
- 	filename[MAX_FILE-1] = '\0';
- 
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
- #define SORTFUNC	versionsort
- #else
- #define SORTFUNC	alphasort
Home | Main Index | Thread Index | Old Index