CVS commit: pkgsrc/multimedia/libbluray

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Feb 12 15:33:37 UTC 2020

Modified Files:
        pkgsrc/multimedia/libbluray: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libbluray/patches: patch-src_util_mutex.c

Log Message:
libbluray: Fix potential segfault on recent NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/libbluray/Makefile \
    pkgsrc/multimedia/libbluray/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libbluray/patches/patch-src_util_mutex.c

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

Modified files:

Index: pkgsrc/multimedia/libbluray/Makefile
diff -u pkgsrc/multimedia/libbluray/Makefile:1.14 pkgsrc/multimedia/libbluray/Makefile:1.15
--- pkgsrc/multimedia/libbluray/Makefile:1.14   Sun Jan 26 17:31:46 2020
+++ pkgsrc/multimedia/libbluray/Makefile        Wed Feb 12 15:33:37 2020
@@ -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
Index: pkgsrc/multimedia/libbluray/distinfo
diff -u pkgsrc/multimedia/libbluray/distinfo:1.14 pkgsrc/multimedia/libbluray/distinfo:1.15
--- pkgsrc/multimedia/libbluray/distinfo:1.14   Mon Jun 10 14:40:52 2019
+++ pkgsrc/multimedia/libbluray/distinfo        Wed Feb 12 15:33:37 2020
@@ -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

Added files:

Index: pkgsrc/multimedia/libbluray/patches/patch-src_util_mutex.c
diff -u /dev/null pkgsrc/multimedia/libbluray/patches/patch-src_util_mutex.c:1.1
--- /dev/null   Wed Feb 12 15:33:37 2020
+++ pkgsrc/multimedia/libbluray/patches/patch-src_util_mutex.c  Wed Feb 12 15:33:37 2020
@@ -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;
+     }