pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
alsa-lib-git: remove part of a patch that was applied upstream
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Mon Feb 29 15:47:32 2016 +0100
Changeset: 6b0c4d6734a6bf80e40e11b718d49f84c25f27f9
Modified Files:
alsa-lib-git/distinfo
alsa-lib-git/patches/patch-ae
Log Message:
alsa-lib-git: remove part of a patch that was applied upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6b0c4d6734a6bf80e40e11b718d49f84c25f27f9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
alsa-lib-git/distinfo | 2 +-
alsa-lib-git/patches/patch-ae | 15 +++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
diffs:
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index e04aca8..c9d5c4d 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) = 285328e2fe76d90f6b53daad964fe65332bd0396
+SHA1 (patch-ae) = d4555043215e1868172a2defd60d52801f4a633c
SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
diff --git a/alsa-lib-git/patches/patch-ae b/alsa-lib-git/patches/patch-ae
index 5095124..b7c0521 100644
--- a/alsa-lib-git/patches/patch-ae
+++ b/alsa-lib-git/patches/patch-ae
@@ -1,12 +1,11 @@
$NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
- 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 2016-02-24 08:33:29.000000000 +0000
+--- include/local.h.orig 2016-02-29 14:44:47.193778346 +0000
+++ include/local.h
-@@ -50,8 +50,14 @@
+@@ -50,8 +50,10 @@
#include <sys/poll.h>
#include <sys/types.h>
#include <errno.h>
@@ -14,14 +13,10 @@ $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 +255,9 @@ extern snd_lib_error_handler_t snd_err_m
+ #ifndef EBADFD
+ #define EBADFD EBADF
+@@ -253,7 +259,9 @@ extern snd_lib_error_handler_t snd_err_m
/*
*/
Home |
Main Index |
Thread Index |
Old Index