CVS commit: pkgsrc/graphics/libepoxy

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 27 17:04:04 UTC 2019

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

Log Message:
libepoxy: Don't hardcode the libEGL version number.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/libepoxy/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/libepoxy/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c

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/Makefile
diff -u pkgsrc/graphics/libepoxy/Makefile:1.24 pkgsrc/graphics/libepoxy/Makefile:1.25
--- pkgsrc/graphics/libepoxy/Makefile:1.24      Thu Apr 25 07:32:58 2019
+++ pkgsrc/graphics/libepoxy/Makefile   Mon May 27 17:04:04 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2019/04/25 07:32:58 maya Exp $
+# $NetBSD: Makefile,v 1.25 2019/05/27 17:04:04 nia Exp $
 
 DISTNAME=      libepoxy-1.4.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}

Index: pkgsrc/graphics/libepoxy/distinfo
diff -u pkgsrc/graphics/libepoxy/distinfo:1.17 pkgsrc/graphics/libepoxy/distinfo:1.18
--- pkgsrc/graphics/libepoxy/distinfo:1.17      Thu Jun  8 12:37:33 2017
+++ pkgsrc/graphics/libepoxy/distinfo   Mon May 27 17:04:04 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2017/06/08 12:37:33 adam Exp $
+$NetBSD: distinfo,v 1.18 2019/05/27 17:04:04 nia Exp $
 
 SHA1 (libepoxy-1.4.3.tar.gz) = 4a375660b9928c29a52c4dbe2220c0813617f390
 RMD160 (libepoxy-1.4.3.tar.gz) = 2b1d083ce8e17e2885099c08fc745b7b7ae5d630
@@ -6,4 +6,4 @@ SHA512 (libepoxy-1.4.3.tar.gz) = 41c7a4e
 Size (libepoxy-1.4.3.tar.gz) = 310823 bytes
 SHA1 (patch-configure.ac) = a21e1369028abbb34bd0add634d89747c587d610
 SHA1 (patch-registry_egl.xml) = 37923cc2be65ab2dead9af8ff062702ab5d63392
-SHA1 (patch-src_dispatch__common.c) = 8ab5351f3ef67cc36aacfc43e7f61e6a7bcc179a
+SHA1 (patch-src_dispatch__common.c) = 83f4dff2d2573bf6677bd9726f2a740c0ec0b5ea

Index: pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c
diff -u pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.5 pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.6
--- pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.5   Fri Feb 17 15:17:09 2017
+++ pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c       Mon May 27 17:04:04 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_dispatch__common.c,v 1.5 2017/02/17 15:17:09 wiz Exp $
+$NetBSD: patch-src_dispatch__common.c,v 1.6 2019/05/27 17:04:04 nia Exp $
 
 Deal with hardcoded libGL locations and versions.
 
---- src/dispatch_common.c.orig 2017-02-06 16:00:20.000000000 +0000
+--- src/dispatch_common.c.orig 2017-06-06 09:55:43.000000000 +0000
 +++ src/dispatch_common.c
 @@ -174,11 +174,13 @@
  #include "dispatch_common.h"
@@ -19,3 +19,12 @@ Deal with hardcoded libGL locations and 
  #endif
  
  #ifdef ANDROID
+@@ -190,7 +192,7 @@
+ #define GLES1_LIB "libGLES_CM.dll"
+ #define GLES2_LIB "libGLESv2.dll"
+ #else
+-#define EGL_LIB "libEGL.so.1"
++#define EGL_LIB "libEGL.so"
+ #define GLES1_LIB "libGLESv1_CM.so.1"
+ #define GLES2_LIB "libGLESv2.so.2"
+ #endif