From b4c3874aeb4fa6856f566d7dad65d1d88d202fd4 Mon Sep 17 00:00:00 2001 From: prlw1 Date: Sun, 14 Jun 2015 21:50:07 +0000 Subject: libepoxy looks for libGL.so.1. This matches the pkgsrc version, but native X has libGL.so.2. Split the difference and look for libGL.so. --- graphics/libepoxy/Makefile | 4 ++-- graphics/libepoxy/distinfo | 3 ++- graphics/libepoxy/patches/patch-src_dispatch__common.c | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 graphics/libepoxy/patches/patch-src_dispatch__common.c (limited to 'graphics/libepoxy') diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile index 3d40686ddae..83b5a06a567 100644 --- a/graphics/libepoxy/Makefile +++ b/graphics/libepoxy/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2015/06/13 19:13:10 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2015/06/14 21:50:07 prlw1 Exp $ DISTNAME= libepoxy-1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=anholt/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo index 759c20db609..5afe931ecd8 100644 --- a/graphics/libepoxy/distinfo +++ b/graphics/libepoxy/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2015/06/13 19:13:10 tnn Exp $ +$NetBSD: distinfo,v 1.3 2015/06/14 21:50:07 prlw1 Exp $ SHA1 (libepoxy-1.2.tar.gz) = e700520711b9e4fa07c286aa36e431d8ad4133f5 RMD160 (libepoxy-1.2.tar.gz) = fc5c11eacb437b437c4d6b185a79dc1d6a4467df Size (libepoxy-1.2.tar.gz) = 267110 bytes SHA1 (patch-configure.ac) = 6651693923d0384806a400e54c9dcec8553f06c4 +SHA1 (patch-src_dispatch__common.c) = 09132e4da31ff799563e2f7aae0b1af42a87701f SHA1 (patch-src_dispatch__common.h) = a95512892d4f0172366b19246602f00db6c03dc6 diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.c b/graphics/libepoxy/patches/patch-src_dispatch__common.c new file mode 100644 index 00000000000..82002127d71 --- /dev/null +++ b/graphics/libepoxy/patches/patch-src_dispatch__common.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_dispatch__common.c,v 1.1 2015/06/14 21:50:07 prlw1 Exp $ + +Native X has /usr/X11R7/lib/libGL.so.2. + +--- src/dispatch_common.c.orig 2014-05-14 00:22:08.000000000 +0000 ++++ src/dispatch_common.c +@@ -105,7 +105,7 @@ + #ifdef __APPLE__ + #define GLX_LIB "/opt/X11/lib/libGL.1.dylib" + #else +-#define GLX_LIB "libGL.so.1" ++#define GLX_LIB "libGL.so" + #endif + + struct api { -- cgit v1.2.3