summaryrefslogtreecommitdiff
path: root/graphics/libepoxy
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-09-24 22:51:29 +0000
committertnn <tnn@pkgsrc.org>2015-09-24 22:51:29 +0000
commit916c53baa607b8a1fb5d7167469ddcdce5505f22 (patch)
treec5d73d684455e3c96af3fadb7417d07d79139ef2 /graphics/libepoxy
parent77e66d27953d5418ae3e6deca7a261ed7801b85b (diff)
downloadpkgsrc-916c53baa607b8a1fb5d7167469ddcdce5505f22.tar.gz
PR pkg/50256: pretend to return NULL in epoxy_get_proc_address after errx()
Diffstat (limited to 'graphics/libepoxy')
-rw-r--r--graphics/libepoxy/distinfo4
-rw-r--r--graphics/libepoxy/patches/patch-src_dispatch__common.c11
2 files changed, 12 insertions, 3 deletions
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index 0ae1625707d..9408de1c74f 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/09/14 14:40:37 gdt Exp $
+$NetBSD: distinfo,v 1.6 2015/09/24 22:51:29 tnn Exp $
SHA1 (libepoxy-1.3.1.tar.gz) = 94d98d83a50d2f607ee9986b622a48df00d5926c
RMD160 (libepoxy-1.3.1.tar.gz) = 1fbdcd713b3b95d7b5fc5dd80b81c4ffcf27214f
Size (libepoxy-1.3.1.tar.gz) = 284227 bytes
SHA1 (patch-configure.ac) = 0aa95317a5a3a3b110ff21b6e7754666831f2ca0
-SHA1 (patch-src_dispatch__common.c) = e69b5e5b6f68a95f10ecbbdb8b1c9ab6695fe24c
+SHA1 (patch-src_dispatch__common.c) = 51fdcd76c1a4c002b4ca59e5f92387115a5d4496
SHA1 (patch-src_dispatch__common.h) = 74e00806fea01cf9de4171707441fa1f39fe5316
diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.c b/graphics/libepoxy/patches/patch-src_dispatch__common.c
index bfd090a460c..53dc266d304 100644
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.c
+++ b/graphics/libepoxy/patches/patch-src_dispatch__common.c
@@ -1,6 +1,7 @@
-$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.3 2015/09/24 22:51:29 tnn Exp $
Native X has /usr/X11R7/lib/libGL.so.2.
+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
@@ -13,3 +14,11 @@ Native X has /usr/X11R7/lib/libGL.so.2.
#endif
#ifdef ANDROID
+@@ -672,6 +672,7 @@ epoxy_get_proc_address(const char *name)
+ #endif
+ }
+ errx(1, "Couldn't find current GLX or EGL context.\n");
++ return NULL;
+ #endif
+ }
+