[BACK]Return to patch-ak CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / audio / jack / patches
File: [cvs.NetBSD.org] / pkgsrc / audio / jack / patches / Attic / patch-ak (download)

Revision 1.3, Sat Jul 4 16:18:28 2015 UTC (8 years, 2 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3
Changes since 1.2: +2 -2 lines 

Remove USE_X11BASE and X11PREFIX.

$NetBSD: patch-ak,v 1.3 2015/07/04 16:18:28 joerg Exp $

Yuck.  At least let's attempt to make this somewhat sane.
When I have the time and figure out the Right Thing(tm)
to do, perhaps I'll rewrite some of the shm code.

--- libjack/unlock.c.orig	2008-11-11 17:36:29.000000000 -0500
+++ libjack/unlock.c
@@ -44,8 +44,9 @@ static char* whitelist[] = {
 static char* library_roots[] = {
 	"/lib",
 	"/usr/lib",
+	"@PREFIX@",	  /* pkgsrc prefix */
+	"@X11BASE@/lib",
 	"/usr/local/lib",
-	"/usr/X11R6/lib",
 	"/opt/lib",       /* solaris-y */   
 	"/opt/local/lib", /* common on OS X */
 	NULL
@@ -63,7 +64,7 @@ cleanup_mlock ()
 	int whoknows;
 	int looks_like_library;
 
-	snprintf (path, sizeof(path), "/proc/%d/maps", getpid());
+	snprintf (path, sizeof(path), "@JACKD_PROCFS_PATH@/%d/maps", getpid());
 
 	if ((map = fopen (path, "r")) == NULL) {
 		jack_error ("can't open map file");