libbluray: updated to 1.2.0

Version 1.2.0
- Add functions to list and read BD-ROM files.
- Add support for separate key pressed / typed / released user input events.
- Add support for AWT mouse events (BD-J).
- Fix build with OpenJDK 12 / 13.

3 files changed, 8 insertions, 102 deletions

diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index 8ef7af5523c..1c0e6efa6b6 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/02/13 16:54:58 kamil Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/24 16:18:06 adam Exp $
 
-DISTNAME=	libbluray-1.1.2
-PKGREVISION=	2
+DISTNAME=	libbluray-1.2.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/libbluray/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -20,7 +19,7 @@ PKGCONFIG_OVERRIDE+=	src/libbluray.pc.in
 
 # provide jni_md.h for other architectures
 post-extract:
-	ln -s ${WRKSRC}/jni/linux/jni_md.h ${WRKSRC}/jni/jni_md.h
+	${LN} -s ${WRKSRC}/jni/linux/jni_md.h ${WRKSRC}/jni/jni_md.h
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo
index 1d6d070c821..59f5fe7e546 100644
--- a/multimedia/libbluray/distinfo
+++ b/multimedia/libbluray/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.16 2020/02/13 16:54:58 kamil Exp $
+$NetBSD: distinfo,v 1.17 2020/03/24 16:18:06 adam 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) = 38b7e8de22206bb7801af9be8bd799e79d75026f
+SHA1 (libbluray-1.2.0.tar.bz2) = 4602d71fe6af0f677aa33034815c411d49408460
+RMD160 (libbluray-1.2.0.tar.bz2) = c25824276ea03a50e12bae7daaa9a95e5cb253fc
+SHA512 (libbluray-1.2.0.tar.bz2) = d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
+Size (libbluray-1.2.0.tar.bz2) = 747265 bytes
diff --git a/multimedia/libbluray/patches/patch-src_util_mutex.c b/multimedia/libbluray/patches/patch-src_util_mutex.c
deleted file mode 100644
index ce057355e08..00000000000
--- a/multimedia/libbluray/patches/patch-src_util_mutex.c
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-src_util_mutex.c,v 1.2 2020/02/13 16:54:58 kamil Exp $
-
-* mutex: Switch the POSIX backend to PTHREAD_MUTEX_RECURSIVE
-  https://code.videolan.org/videolan/libbluray/merge_requests/17
-
---- src/util/mutex.c.orig	2019-06-07 18:00:28.000000000 +0000
-+++ src/util/mutex.c
-@@ -68,18 +68,16 @@ static int _mutex_destroy(MUTEX_IMPL *p)
- 
- #elif defined(HAVE_PTHREAD_H)
- 
--typedef struct {
--    int             lock_count;
--    pthread_t       owner;
--    pthread_mutex_t mutex;
--} MUTEX_IMPL;
-+typedef pthread_mutex_t MUTEX_IMPL;
- 
- static int _mutex_init(MUTEX_IMPL *p)
- {
--    p->owner      = (pthread_t)-1;
--    p->lock_count = 0;
-+    pthread_mutexattr_t attr;
- 
--    if (pthread_mutex_init(&p->mutex, NULL)) {
-+    pthread_mutexattr_init(&attr);
-+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+
-+    if (pthread_mutex_init(p, &attr)) {
-         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "pthread_mutex_init() failed !\n");
-         return -1;
-     }
-@@ -89,40 +87,17 @@ static int _mutex_init(MUTEX_IMPL *p)
- 
- static int _mutex_lock(MUTEX_IMPL *p)
- {
--    if (pthread_equal(p->owner, pthread_self())) {
--        /* recursive lock */
--        p->lock_count++;
--        return 0;
--    }
--
--    if (pthread_mutex_lock(&p->mutex)) {
-+    if (pthread_mutex_lock(p)) {
-         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "pthread_mutex_lock() failed !\n");
-         return -1;
-     }
- 
--    p->owner      = pthread_self();
--    p->lock_count = 1;
--
-     return 0;
- }
- 
- static int _mutex_unlock(MUTEX_IMPL *p)
- {
--    if (!pthread_equal(p->owner, pthread_self())) {
--        BD_DEBUG(DBG_BLURAY|DBG_CRIT, "bd_mutex_unlock(): not owner !\n");
--        return -1;
--    }
--
--    p->lock_count--;
--    if (p->lock_count > 0) {
--        return 0;
--    }
--
--    /* unlock */
--
--    p->owner = (pthread_t)-1;
--
--    if (pthread_mutex_unlock(&p->mutex)) {
-+    if (pthread_mutex_unlock(p)) {
-         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "pthread_mutex_unlock() failed !\n");
-         return -1;
-     }
-@@ -132,10 +107,7 @@ static int _mutex_unlock(MUTEX_IMPL *p)
- 
- static int _mutex_destroy(MUTEX_IMPL *p)
- {
--    _mutex_lock(p);
--    _mutex_unlock(p);
--
--    if (pthread_mutex_destroy(&p->mutex)) {
-+    if (pthread_mutex_destroy(p)) {
-         BD_DEBUG(DBG_BLURAY|DBG_CRIT, "pthread_mutex_destroy() failed !\n");
-         return -1;
-     }
-@@ -193,4 +165,3 @@ int bd_mutex_destroy(BD_MUTEX *p)
-     X_FREE(p->impl);
-     return 0;
- }
--