CVS commit: pkgsrc/graphics/libepoxy

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 31 13:50:09 UTC 2019

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

Log Message:
libepoxy: Update to 1.5.3

Changes since 1.5.2:

    Disable EGL on macOS
    Fix build on macOS [#176, Emmanuele Bassi]
    Add macOS tests
    Fix build with uClibc [#181, Emmanuele Bassi]
    Fix GLES3 symbol lookup [Adam Jackson]
    Fix conditional compilation [#184, Zhao Zhili]
    Require Meson 0.47
    Fix Autotools build with EGL-X11 support [#188, Emmanuele Bassi]

Changes since 1.5.1:

    Fix the detection of the -z,relro linker flag
    Query the EGL context version when bootstrapping on GLES [Adam Jackson]
    Avoid inadvertedly loading libraries when probing for them [Adam Jackson]
    Issue #169: Fix build on FreeBSD [Ting-Wei Lan]
    Consistently use abort() instead of exit() for internal state checks
    Issue #171: Fix a performance regression in the global function pointer
    trampolines introduced by using -Bsymbolic-functions
    Improve performance when using GL function pointers like glAlphaFunc [Adam Jackson]

Changes since 1.5.0:

    Do no add pkg-config dependencies on gl on systems that do not use
    pkg-config, like macOS and Windows [Tom Schoonjans, #156]
    Generalise checks for dlvsym [Ross Burton, #158]
    Add an option for disabling building the test suite [Ross Burton]
    Typo fixes in the comments and documentation [luz.paz, #159]
    Simplify the Meson configuration logic for EGL and GLX [Eric
    Engestrom, #162]
    Use assert when no context is found [Adam Jackson, #166]
    Remove a test superceded by GLVND [#165]
    Avoid Meson warnings when testing for linker arguments

Changes from Epoxy 1.4.3

    Bump the Meson dependency to 0.44.1
    Include Xlib.h in the tests that use X11 API
    Update the GL registry to OpenGL 4.6
    Add gl and egl private dependencies in the pkg-config file
    Allow building Epoxy without X11 support
    Rename the Meson configuration options to be more idiomatic
    New API:
        epoxy_set_resolver_failure_handler()
        epoxy_glsl_version()
        epoxy_extension_in_string()

Issues fixed

    #128 - Fix macOS linker flags [Tom Schoonjans]
    #129 - Use GLVND if available [Adam Jackson]
    #134 - Add fallback definition for EGL_CAST [Daniel Stone]
    #133 - Try even harder to not load GLX [Adam Jackson]
    #138 - Fix the libOpenGL soname [Adam Jackson]
    #137 - Update differences with GLEW [Nigel Stewart]
    #131 - Add epoxy_set_resolver_failure_handler() [Adam Jackson]
    #140 - Fix pointer mismatch on Windows 10 [danem]
    #141 - Define visibility flags for static builds [Dylan Baker]
    #136 - Expose epoxy_extension_in_string() [Lyude Paul]
    #151 - Use correct guard for Android builds [Robert Bragg]
    #154 - Fix dlwrap for glvnd [Adam Jackson]
    #155 - Respect DLOPEN_LIBS [Michał Górny]
    #143 - Fix printf family usage [Ikey Doherty]
    #152 - Do not use OPENGL_LIB on Android
    #145 - Add epoxy_glsl_version()


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/libepoxy/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/libepoxy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/libepoxy/options.mk
cvs rdiff -u -r1.6 -r1.7 \
    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.25 pkgsrc/graphics/libepoxy/Makefile:1.26
--- pkgsrc/graphics/libepoxy/Makefile:1.25      Mon May 27 17:04:04 2019
+++ pkgsrc/graphics/libepoxy/Makefile   Sat Aug 31 13:50:09 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2019/05/27 17:04:04 nia Exp $
+# $NetBSD: Makefile,v 1.26 2019/08/31 13:50:09 nia Exp $
 
-DISTNAME=      libepoxy-1.4.3
-PKGREVISION=   2
+DISTNAME=      libepoxy-1.5.3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=anholt/}
-GITHUB_TAG=    ${PKGVERSION_NOREV}
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/anholt/libepoxy/
@@ -17,13 +17,19 @@ USE_LIBTOOL=                yes
 USE_TOOLS+=            pkg-config autoconf autoreconf automake
 GNU_CONFIGURE=         yes
 PKGCONFIG_OVERRIDE+=   epoxy.pc.in
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY= tool
 
-.include "options.mk"
+PLIST_VARS+=           egl
 
 pre-configure:
        cd ${WRKSRC} && autoreconf -vif
 
+.include "../../graphics/MesaLib/buildlink3.mk"
+.if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
+PLIST.egl=             yes
+.endif
+
+.include "options.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libepoxy/distinfo
diff -u pkgsrc/graphics/libepoxy/distinfo:1.18 pkgsrc/graphics/libepoxy/distinfo:1.19
--- pkgsrc/graphics/libepoxy/distinfo:1.18      Mon May 27 17:04:04 2019
+++ pkgsrc/graphics/libepoxy/distinfo   Sat Aug 31 13:50:09 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2019/05/27 17:04:04 nia Exp $
+$NetBSD: distinfo,v 1.19 2019/08/31 13:50:09 nia Exp $
 
-SHA1 (libepoxy-1.4.3.tar.gz) = 4a375660b9928c29a52c4dbe2220c0813617f390
-RMD160 (libepoxy-1.4.3.tar.gz) = 2b1d083ce8e17e2885099c08fc745b7b7ae5d630
-SHA512 (libepoxy-1.4.3.tar.gz) = 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
-Size (libepoxy-1.4.3.tar.gz) = 310823 bytes
+SHA1 (libepoxy-1.5.3.tar.xz) = e00d0bf270a99ded2a2f4abe7874b765cd338d1f
+RMD160 (libepoxy-1.5.3.tar.xz) = a080ba5e96c28fde206d387760e490e7639d19f6
+SHA512 (libepoxy-1.5.3.tar.xz) = 746dfe2a0a91319abd3906c75f81f6b895117f39120e0d8897db1daec1b6d2e91e1318f0dfe588c81907727b0a6dd1a7e4a819ee6b3063a23875312570464720
+Size (libepoxy-1.5.3.tar.xz) = 220540 bytes
 SHA1 (patch-configure.ac) = a21e1369028abbb34bd0add634d89747c587d610
 SHA1 (patch-registry_egl.xml) = 37923cc2be65ab2dead9af8ff062702ab5d63392
-SHA1 (patch-src_dispatch__common.c) = 83f4dff2d2573bf6677bd9726f2a740c0ec0b5ea
+SHA1 (patch-src_dispatch__common.c) = bfc147f2b0d7eebb567ab08517382246a30ee799

Index: pkgsrc/graphics/libepoxy/options.mk
diff -u pkgsrc/graphics/libepoxy/options.mk:1.1 pkgsrc/graphics/libepoxy/options.mk:1.2
--- pkgsrc/graphics/libepoxy/options.mk:1.1     Thu Jun  8 04:31:34 2017
+++ pkgsrc/graphics/libepoxy/options.mk Sat Aug 31 13:50:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/06/08 04:31:34 adam Exp $
+# $NetBSD: options.mk,v 1.2 2019/08/31 13:50:09 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libepoxy
 PKG_SUPPORTED_OPTIONS= x11
@@ -6,25 +6,21 @@ PKG_SUGGESTED_OPTIONS=        x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           egl glx
+PLIST_VARS+=           glx
 
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --enable-glx=yes
+CONFIGURE_ARGS+=       --enable-x11=yes
 PLIST.glx=     yes
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-
-CONFIGURE_ARGS+=       --enable-egl=${MESALIB_SUPPORTS_EGL}
-.  if !empty(MESALIB_SUPPORTS_EGL:Myes)
-PLIST.egl=             yes
-.  endif
 .  if ${OPSYS} == "Darwin" && ${X11_TYPE} == "modular"
 CPPFLAGS+=             -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\"
 .  endif
 .else # ! x11
+.  if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=       --enable-glx=no
-CONFIGURE_ARGS+=       --enable-egl=no
-.  if !(${OPSYS} == "Darwin" && ${X11_TYPE} == "native")
+CONFIGURE_ARGS+=       --enable-x11=no
+.  else
 PKG_FAIL_REASON+=      "The x11 option must be enabled on this platform/configuration."
 .  endif
 .endif

Index: pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c
diff -u pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.6 pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.7
--- pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c:1.6   Mon May 27 17:04:04 2019
+++ pkgsrc/graphics/libepoxy/patches/patch-src_dispatch__common.c       Sat Aug 31 13:50:09 2019
@@ -1,30 +1,35 @@
-$NetBSD: patch-src_dispatch__common.c,v 1.6 2019/05/27 17:04:04 nia Exp $
+$NetBSD: patch-src_dispatch__common.c,v 1.7 2019/08/31 13:50:09 nia Exp $
 
 Deal with hardcoded libGL locations and versions.
 
---- src/dispatch_common.c.orig 2017-06-06 09:55:43.000000000 +0000
+--- src/dispatch_common.c.orig 2018-10-04 23:40:48.000000000 +0000
 +++ src/dispatch_common.c
-@@ -174,11 +174,13 @@
+@@ -174,7 +174,9 @@
  #include "dispatch_common.h"
  
- #ifdef __APPLE__
+ #if defined(__APPLE__)
 +#ifndef GLX_LIB
  #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
 +#endif
- #elif defined(ANDROID)
- #define GLX_LIB "libGLESv2.so"
- #else
--#define GLX_LIB "libGL.so.1"
-+#define GLX_LIB "libGL.so"
- #endif
- 
- #ifdef ANDROID
-@@ -190,7 +192,7 @@
- #define GLES1_LIB "libGLES_CM.dll"
+ #define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL"
+ #define GLES1_LIB "libGLESv1_CM.so"
+ #define GLES2_LIB "libGLESv2.so"
+@@ -189,12 +191,12 @@
  #define GLES2_LIB "libGLESv2.dll"
+ #define OPENGL_LIB "OPENGL32"
  #else
+-#define GLVND_GLX_LIB "libGLX.so.1"
+-#define GLX_LIB "libGL.so.1"
 -#define EGL_LIB "libEGL.so.1"
+-#define GLES1_LIB "libGLESv1_CM.so.1"
+-#define GLES2_LIB "libGLESv2.so.2"
+-#define OPENGL_LIB "libOpenGL.so.0"
++#define GLVND_GLX_LIB "libGLX.so"
++#define GLX_LIB "libGL.so"
 +#define EGL_LIB "libEGL.so"
- #define GLES1_LIB "libGLESv1_CM.so.1"
- #define GLES2_LIB "libGLESv2.so.2"
++#define GLES1_LIB "libGLESv1_CM.so"
++#define GLES2_LIB "libGLESv2.so"
++#define OPENGL_LIB "libOpenGL.so"
  #endif
+ 
+ #ifdef __GNUC__