pkgsrc-WIP-changes archive

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

alsa-lib-git: remove more unnecessary patches



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

Modified Files:
	alsa-lib-git/distinfo
	alsa-lib-git/patches/patch-configure.ac
Removed Files:
	alsa-lib-git/patches/patch-av
	alsa-lib-git/patches/patch-include_pcm.h

Log Message:
alsa-lib-git: remove more unnecessary patches

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

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

diffstat:
 alsa-lib-git/distinfo                    |  4 +---
 alsa-lib-git/patches/patch-av            | 15 ---------------
 alsa-lib-git/patches/patch-configure.ac  | 13 -------------
 alsa-lib-git/patches/patch-include_pcm.h | 32 --------------------------------
 4 files changed, 1 insertion(+), 63 deletions(-)

diffs:
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index c95e393..6108ead 100644
--- a/alsa-lib-git/distinfo
+++ b/alsa-lib-git/distinfo
@@ -9,14 +9,12 @@ SHA1 (patch-ae) = 65e20f89ba847625b7632e62a787147c5138a300
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
 SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
-SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
 SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
 SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
-SHA1 (patch-configure.ac) = 1c245e2ccd1a71f93847f0f2efab5e0b0c5c46b9
+SHA1 (patch-configure.ac) = 1c407e8a9d9ea745ab1b79175f6fc0ec6d475acc
 SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
-SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
 SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
diff --git a/alsa-lib-git/patches/patch-av b/alsa-lib-git/patches/patch-av
deleted file mode 100644
index a14a7fc..0000000
--- a/alsa-lib-git/patches/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-av,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_local.h.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_local.h
-@@ -393,6 +393,10 @@ int _snd_pcm_poll_descriptor(snd_pcm_t *
- #define _snd_pcm_link_descriptor _snd_pcm_poll_descriptor /* FIXME */
- #define _snd_pcm_async_descriptor _snd_pcm_poll_descriptor /* FIXME */
- 
-+#ifndef ESTRPIPE
-+#define ESTRPIPE EPIPE
-+#endif
-+
- /* handle special error cases */
- static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err)
- {
diff --git a/alsa-lib-git/patches/patch-configure.ac b/alsa-lib-git/patches/patch-configure.ac
index f074f8a..4de9640 100644
--- a/alsa-lib-git/patches/patch-configure.ac
+++ b/alsa-lib-git/patches/patch-configure.ac
@@ -2,19 +2,6 @@ $NetBSD$
 
 --- configure.ac.orig	2016-02-24 08:33:29.000000000 +0000
 +++ configure.ac
-@@ -86,6 +86,12 @@ AC_SUBST(ALSA_CONFIG_DIR)
- dnl ALSA plugin directory
- test "x$exec_prefix" = xNONE && exec_prefix=$prefix
- 
-+case $host_os in
-+  netbsd*|freebsd*|dragonfly*)
-+    DEFS="$DEFS -Dbswap_32=bswap32 -Dbswap_16=bswap16 -Dbswap_64=bswap64"
-+    ;;
-+esac
-+
- AC_ARG_WITH(plugindir,
-     AS_HELP_STRING([--with-plugindir=dir],
- 	[path where ALSA plugin files are stored]),
 @@ -665,6 +671,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
  	  test/Makefile test/lsb/Makefile \
  	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
diff --git a/alsa-lib-git/patches/patch-include_pcm.h b/alsa-lib-git/patches/patch-include_pcm.h
deleted file mode 100644
index d6d44ba..0000000
--- a/alsa-lib-git/patches/patch-include_pcm.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-include_pcm.h,v 1.4 2014/06/09 12:21:07 ryoon Exp $
-
---- include/pcm.h.orig	2013-07-08 12:31:36.000000000 +0000
-+++ include/pcm.h
-@@ -579,7 +579,9 @@ int snd_pcm_chmap_print(const snd_pcm_ch
- unsigned int snd_pcm_chmap_from_string(const char *str);
- snd_pcm_chmap_t *snd_pcm_chmap_parse_string(const char *str);
- 
-+/*
- //int snd_pcm_mixer_element(snd_pcm_t *pcm, snd_mixer_t *mixer, snd_mixer_elem_t **elem);
-+ */
- 
- /*
-  * application helpers - these functions are implemented on top
-@@ -1048,10 +1050,17 @@ int snd_pcm_format_width(snd_pcm_format_
- int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
-+#ifdef __sun
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#else
- u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
- u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
- u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
- u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#endif
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
- 
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);


Home | Main Index | Thread Index | Old Index