From daf4fddd120513d3097fe33c3b9c6f4cfe8b1298 Mon Sep 17 00:00:00 2001 From: salo Date: Wed, 23 Mar 2005 13:14:20 +0000 Subject: Pullup ticket 382 - requested by Julio M. Merino Vidal threading fix for libopendaap Revisions pulled up: - pkgsrc/audio/libopendaap/Makefile 1.4 - pkgsrc/audio/libopendaap/distinfo 1.8 - pkgsrc/audio/libopendaap/patches/patch-aa 1.3 Module Name: pkgsrc Committed By: jmmv Date: Wed Mar 23 10:52:54 UTC 2005 Modified Files: pkgsrc/audio/libopendaap: Makefile distinfo Added Files: pkgsrc/audio/libopendaap/patches: patch-aa Log Message: Fix a threading problem (mutexattr used after it's destroyed). Patch was in PR pkg/29644 by Antoine Reilles, but I overlooked it. Bump PKGREVISION to 1. --- audio/libopendaap/Makefile | 3 ++- audio/libopendaap/distinfo | 3 ++- audio/libopendaap/patches/patch-aa | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 audio/libopendaap/patches/patch-aa (limited to 'audio') diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile index 864632a163d..73723b3aa66 100644 --- a/audio/libopendaap/Makefile +++ b/audio/libopendaap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2005/03/07 15:30:44 adam Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2005/03/23 13:14:20 salo Exp $ DISTNAME= libopendaap-0.3.0 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://crazney.net/programs/itunes/files/ EXTRACT_SUFX= .tar.bz2 diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo index 752eb22c8c8..5860dd988da 100644 --- a/audio/libopendaap/distinfo +++ b/audio/libopendaap/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.7 2005/03/18 12:17:04 wiz Exp $ +$NetBSD: distinfo,v 1.7.2.1 2005/03/23 13:14:20 salo Exp $ SHA1 (libopendaap-0.3.0.tar.bz2) = 21817a7886ffc8c4d88c621231569562c61356db RMD160 (libopendaap-0.3.0.tar.bz2) = 2218783e40e7f48a7b89b2e27145e4964f7dd687 Size (libopendaap-0.3.0.tar.bz2) = 365682 bytes +SHA1 (patch-aa) = 89798e5b906cb3b92748b61f113542dfc4d7d22a SHA1 (patch-ab) = 3bd01a3038505721149a8ea56f564442b035cee4 SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1 diff --git a/audio/libopendaap/patches/patch-aa b/audio/libopendaap/patches/patch-aa new file mode 100644 index 00000000000..871e209767f --- /dev/null +++ b/audio/libopendaap/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.2.2.1 2005/03/23 13:14:20 salo Exp $ + +--- thread.h.orig 2004-12-14 05:11:09.000000000 +0100 ++++ thread.h +@@ -42,8 +42,8 @@ + pthread_mutexattr_t attr; \ + pthread_mutexattr_init(&attr) ; \ + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \ +- pthread_mutexattr_destroy(&attr) ; \ + pthread_mutex_init(& m, &attr); \ ++ pthread_mutexattr_destroy(&attr) ; \ + } while (0) + #define ts_mutex_lock(m) pthread_mutex_lock(& m) + #define ts_mutex_unlock(m) pthread_mutex_unlock(& m) -- cgit v1.2.3