CVS commit: [pkgsrc-2017Q1] pkgsrc/graphics/libepoxy

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr 29 18:08:25 UTC 2017

Modified Files:
        pkgsrc/graphics/libepoxy [pkgsrc-2017Q1]: distinfo
        pkgsrc/graphics/libepoxy/patches [pkgsrc-2017Q1]:
            patch-src_dispatch__common.h

Log Message:
Pullup ticket #5320 - requested by sevan
graphics/libepoxy: build fix

Revisions pulled up:
- graphics/libepoxy/distinfo                                    1.14
- graphics/libepoxy/patches/patch-src_dispatch__common.h        1.7

---
   Module Name:    pkgsrc
   Committed By:   dsainty
   Date:           Wed Apr 19 07:34:12 UTC 2017

   Modified Files:
           pkgsrc/graphics/libepoxy: distinfo
           pkgsrc/graphics/libepoxy/patches: patch-src_dispatch__common.h

   Log Message:
   The generic EGL/GLX/WGL defaults are suitable for Darwin as BUILD_EGL
   will be
   correct, and possibly not zero.

   No revision bump required - this change fixes the build if the EGL = 0 guess
   was incorrect, and no change if it was correct.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 pkgsrc/graphics/libepoxy/distinfo
cvs rdiff -u -r1.6 -r1.6.2.1 \
    pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libepoxy/distinfo
diff -u pkgsrc/graphics/libepoxy/distinfo:1.13 pkgsrc/graphics/libepoxy/distinfo:1.13.2.1
--- pkgsrc/graphics/libepoxy/distinfo:1.13      Sat Mar 18 20:18:39 2017
+++ pkgsrc/graphics/libepoxy/distinfo   Sat Apr 29 18:08:25 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2017/03/18 20:18:39 adam Exp $
+$NetBSD: distinfo,v 1.13.2.1 2017/04/29 18:08:25 bsiegert Exp $
 
 SHA1 (libepoxy-1.4.1.tar.gz) = 8d7007360cd2c24e87eaa322b1dbbb86787ace5e
 RMD160 (libepoxy-1.4.1.tar.gz) = e986fc0c4ffd9d6272938947bc7ccc0a268d0035
@@ -6,4 +6,4 @@ SHA512 (libepoxy-1.4.1.tar.gz) = 6656df4
 Size (libepoxy-1.4.1.tar.gz) = 309759 bytes
 SHA1 (patch-configure.ac) = c4ce423b058975e7322ea782554ecedd449e2249
 SHA1 (patch-src_dispatch__common.c) = 8ab5351f3ef67cc36aacfc43e7f61e6a7bcc179a
-SHA1 (patch-src_dispatch__common.h) = 94a5cd88dd0cae1b0dc936446ca2e00e49ae07c7
+SHA1 (patch-src_dispatch__common.h) = 30dae2c8b8ea2fa6c9fd77d6016ccb97a63027a3

Index: pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h
diff -u pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h:1.6 pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h:1.6.2.1
--- pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h:1.6   Sat Feb 18 14:00:05 2017
+++ pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.h       Sat Apr 29 18:08:25 2017
@@ -1,8 +1,20 @@
-$NetBSD: patch-src_dispatch__common.h,v 1.6 2017/02/18 14:00:05 joerg Exp $
+$NetBSD: patch-src_dispatch__common.h,v 1.6.2.1 2017/04/29 18:08:25 bsiegert Exp $
+
+The generic defaults are suitable for Darwin as BUILD_EGL will be correct,
+and possibly not zero.
 
 --- src/dispatch_common.h.orig 2017-02-06 16:00:20.000000000 +0000
 +++ src/dispatch_common.h
-@@ -36,7 +36,7 @@
+@@ -27,16 +27,12 @@
+ #define PLATFORM_HAS_EGL 0
+ #define PLATFORM_HAS_GLX ENABLE_GLX
+ #define PLATFORM_HAS_WGL 1
+-#elif defined(__APPLE__)
+-#define PLATFORM_HAS_EGL 0
+-#define PLATFORM_HAS_GLX ENABLE_GLX
+-#define PLATFORM_HAS_WGL 0
+ #elif defined(ANDROID)
+ #define PLATFORM_HAS_EGL 1
  #define PLATFORM_HAS_GLX 0
  #define PLATFORM_HAS_WGL 0
  #else