alsa-lib-git: another try at upstream-compatible changes

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: alsa-lib-git: another try at upstream-compatible changes
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Thu, 03 Mar 2016 09:53:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Mar 3 10:53:21 2016 +0100
Changeset:	692e1ac0fd6a3ec0e486ffb6dc530bc8cee2b006

Modified Files:
	alsa-lib-git/distinfo
	alsa-lib-git/patches/patch-ae
	alsa-lib-git/patches/patch-include_sound_asound.h
Added Files:
	alsa-lib-git/patches/patch-include_type__compat.h

Log Message:
alsa-lib-git: another try at upstream-compatible changes

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

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

diffstat:
 alsa-lib-git/distinfo                             |  5 +-
 alsa-lib-git/patches/patch-ae                     | 52 +++--------------
 alsa-lib-git/patches/patch-include_sound_asound.h |  7 +--
 alsa-lib-git/patches/patch-include_type__compat.h | 71 +++++++++++++++++++++++
 4 files changed, 83 insertions(+), 52 deletions(-)

diffs:
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index 75006b5..ee28bec 100644
--- a/alsa-lib-git/distinfo
+++ b/alsa-lib-git/distinfo
@@ -5,7 +5,7 @@ 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) = 43b9a214626bac91cf5b9afb19b6785b100fd7de
-SHA1 (patch-ae) = 9929801e5ea1a76a1498d1810183f6871c564470
+SHA1 (patch-ae) = ac72304f17d402635da7be8c768872c5ecce404f
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
 SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
@@ -33,7 +33,8 @@ 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) = c8ab4307dd597a1919a7dc755050f4f517ac2228
+SHA1 (patch-include_sound_asound.h) = 07bf1748d064b4753aa621a03b7bd179e324b508
+SHA1 (patch-include_type__compat.h) = 2c2af104b06c0f7e08dd970a7420dfaa6bdbfbf1
 SHA1 (patch-src_conf.c) = 27795c60a05ced40c42dbfb474eed88f3b284cc6
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
diff --git a/alsa-lib-git/patches/patch-ae b/alsa-lib-git/patches/patch-ae
index 55a46fc..956091e 100644
--- a/alsa-lib-git/patches/patch-ae
+++ b/alsa-lib-git/patches/patch-ae
@@ -5,60 +5,22 @@ $NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
 
 --- include/local.h.orig	2016-02-29 14:44:47.000000000 +0000
 +++ include/local.h
-@@ -50,13 +50,52 @@
+@@ -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>
-+#endif
- 
- #ifndef EBADFD
- #define EBADFD EBADF
+-
+-#ifndef EBADFD
+-#define EBADFD EBADF
++#else
++#include "type_compat.h"
  #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
-+
  #ifdef SUPPORT_RESMGR
- #include <resmgr.h>
- #endif
-@@ -253,7 +292,9 @@ extern snd_lib_error_handler_t snd_err_m
+@@ -253,7 +253,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
   */
diff --git a/alsa-lib-git/patches/patch-include_sound_asound.h b/alsa-lib-git/patches/patch-include_sound_asound.h
index af4c03e..99b2ac6 100644
--- a/alsa-lib-git/patches/patch-include_sound_asound.h
+++ b/alsa-lib-git/patches/patch-include_sound_asound.h
@@ -2,19 +2,16 @@ $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,8 +23,14 @@
+@@ -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
-+typedef pid_t __kernel_pid_t;
-+typedef off_t __kernel_off_t;
 +#endif
+ 
  #ifndef __KERNEL__
  #include <stdlib.h>
- #endif
diff --git a/alsa-lib-git/patches/patch-include_type__compat.h b/alsa-lib-git/patches/patch-include_type__compat.h
new file mode 100644
index 0000000..a4073b5
--- /dev/null
+++ b/alsa-lib-git/patches/patch-include_type__compat.h
@@ -0,0 +1,71 @@
+$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
Prev by Date: alsa-lib-git: remove unnecessary chunk.
Next by Date: Makefile: Sync.
Previous by Thread: alsa-lib-git: remove unnecessary chunk.
Next by Thread: py-click: remove
Indexes:
Home | Main Index | Thread Index | Old Index