diff options
| author | ryoon <ryoon@pkgsrc.org> | 2020-02-12 15:33:37 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2020-02-12 15:33:37 +0000 |
| commit | a932c2b34ffb9741525e1005231dce5c1b4aed54 (patch) | |
| tree | 027c56fb41c310fc70fdd97445f1a01c99a59329 /multimedia | |
| parent | bebcc26061b43b3622faa1ba2b68caf3078d12c8 (diff) | |
| download | pkgsrc-a932c2b34ffb9741525e1005231dce5c1b4aed54.tar.gz | |
libbluray: Fix potential segfault on recent NetBSD-current
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libbluray/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libbluray/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/libbluray/patches/patch-src_util_mutex.c | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile index 1b4cc59826f..4e689e6b07c 100644 --- a/multimedia/libbluray/Makefile +++ b/multimedia/libbluray/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2020/01/26 17:31:46 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2020/02/12 15:33:37 ryoon Exp $ DISTNAME= libbluray-1.1.2 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/libbluray/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo index 0c4837fa001..f05394da879 100644 --- a/multimedia/libbluray/distinfo +++ b/multimedia/libbluray/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.14 2019/06/10 14:40:52 adam Exp $ +$NetBSD: distinfo,v 1.15 2020/02/12 15:33:37 ryoon Exp $ SHA1 (libbluray-1.1.2.tar.bz2) = 3885c0d0bd0f04a3a372ceec3a01a44a7624f272 RMD160 (libbluray-1.1.2.tar.bz2) = bbfea1093f9fc5ea089cf5860e55e020b916a4b0 SHA512 (libbluray-1.1.2.tar.bz2) = 5a82af6c1840a1dcb31d06d90203c68e2c4f0bbadc9212eb0bb2776d42b0ab3793a769ebe07b3051be151e8b15876874d5a0658292f72b7126dd915a1ada3fe7 Size (libbluray-1.1.2.tar.bz2) = 745779 bytes +SHA1 (patch-src_util_mutex.c) = 0c14aa467b0025f23c1cfda824e10cdd3fcdbd7b diff --git a/multimedia/libbluray/patches/patch-src_util_mutex.c b/multimedia/libbluray/patches/patch-src_util_mutex.c new file mode 100644 index 00000000000..79b56a3b57e --- /dev/null +++ b/multimedia/libbluray/patches/patch-src_util_mutex.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_util_mutex.c,v 1.1 2020/02/12 15:33:37 ryoon Exp $ + +* Fix segfault on NetBSD/amd64 9.99.46 + +--- src/util/mutex.c.orig 2019-06-07 18:00:28.000000000 +0000 ++++ src/util/mutex.c +@@ -89,7 +89,7 @@ static int _mutex_init(MUTEX_IMPL *p) + + static int _mutex_lock(MUTEX_IMPL *p) + { +- if (pthread_equal(p->owner, pthread_self())) { ++ if (p->owner == pthread_self()) { + /* recursive lock */ + p->lock_count++; + return 0; +@@ -108,7 +108,7 @@ static int _mutex_lock(MUTEX_IMPL *p) + + static int _mutex_unlock(MUTEX_IMPL *p) + { +- if (!pthread_equal(p->owner, pthread_self())) { ++ if (!(p->owner == pthread_self())) { + BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_mutex_unlock(): not owner !\n"); + return -1; + } |