Import of pkgsrc-2016Q3

2016-11-18 22:39:22 +01:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -1,10 +1,17 @@
-$NetBSD: patch-src_dispatch__common.c,v 1.2 2015/09/13 04:44:49 tnn Exp $
+$NetBSD: patch-src_dispatch__common.c,v 1.4 2015/10/01 13:50:05 tnn Exp $

-Native X has /usr/X11R7/lib/libGL.so.2.
+Deal with hardcoded libGL locations and versions.
+Function must return a value if errx not declared with attr noreturn.

 --- src/dispatch_common.c.orig	2015-07-15 23:46:36.000000000 +0000
 +++ src/dispatch_common.c
-@@ -107,7 +107,7 @@
+@@ -103,11 +103,13 @@
+ #include "dispatch_common.h"
+ 
+ #ifdef __APPLE__
+#ifndef GLX_LIB
+ #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
+#endif
 #elif defined(ANDROID)
 #define GLX_LIB "libGLESv2.so"
 #else
@@ -13,3 +20,11 @@ Native X has /usr/X11R7/lib/libGL.so.2.
 #endif
 
 #ifdef ANDROID
+@@ -672,6 +674,7 @@ epoxy_get_proc_address(const char *name)
+ #endif
+     }
+     errx(1, "Couldn't find current GLX or EGL context.\n");
+    return NULL;
+ #endif
+ }
+