CVS commit: pkgsrc/graphics/libepoxy

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jun  8 04:31:34 UTC 2017

Modified Files:
        pkgsrc/graphics/libepoxy: Makefile distinfo
        pkgsrc/graphics/libepoxy/patches: patch-configure.ac
Added Files:
        pkgsrc/graphics/libepoxy: options.mk
Removed Files:
        pkgsrc/graphics/libepoxy/patches: patch-src_dispatch__common.h

Log Message:
Changes 1.4.3:
Require Meson 0.39.1; the previous release already had an implicit requirement on this version
Allow disabling EGL support when building Epoxy
Add support for building on Haiku
Update EGL registry from Khronos


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/libepoxy/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/libepoxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libepoxy/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/libepoxy/patches/patch-configure.ac
cvs rdiff -u -r1.7 -r0 \
    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/Makefile
diff -u pkgsrc/graphics/libepoxy/Makefile:1.22 pkgsrc/graphics/libepoxy/Makefile:1.23
--- pkgsrc/graphics/libepoxy/Makefile:1.22      Sat Jun  3 07:54:07 2017
+++ pkgsrc/graphics/libepoxy/Makefile   Thu Jun  8 04:31:34 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2017/06/03 07:54:07 maya Exp $
+# $NetBSD: Makefile,v 1.23 2017/06/08 04:31:34 adam Exp $
 
-DISTNAME=      libepoxy-1.4.2
+DISTNAME=      libepoxy-1.4.3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -18,40 +18,11 @@ GNU_CONFIGURE=              yes
 PKGCONFIG_OVERRIDE+=   epoxy.pc.in
 PYTHON_FOR_BUILD_ONLY= yes
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=           egl glx
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libepoxy
-PKG_SUPPORTED_OPTIONS= x11
-PKG_SUGGESTED_OPTIONS= x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=       --enable-glx=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
-CONFIGURE_ARGS+=       --enable-glx=no
-CONFIGURE_ARGS+=       --enable-egl=no
-.  if !(${OPSYS} == "Darwin" && ${X11_TYPE} == "native")
-PKG_FAIL_REASON+=      "The x11 option must be enabled on this platform/configuration."
-.  endif
-.endif
+.include "options.mk"
 
 pre-configure:
        cd ${WRKSRC} && autoreconf -vif
 
-.include "../../lang/python/tool.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.15 pkgsrc/graphics/libepoxy/distinfo:1.16
--- pkgsrc/graphics/libepoxy/distinfo:1.15      Fri May 26 17:40:44 2017
+++ pkgsrc/graphics/libepoxy/distinfo   Thu Jun  8 04:31:34 2017
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.15 2017/05/26 17:40:44 adam Exp $
+$NetBSD: distinfo,v 1.16 2017/06/08 04:31:34 adam Exp $
 
-SHA1 (libepoxy-1.4.2.tar.gz) = f65b9e3c58e039bf38db1acea48c3904a51b9936
-RMD160 (libepoxy-1.4.2.tar.gz) = 16ca1df6b7073d4117e807e2c20928c7987c3bf1
-SHA512 (libepoxy-1.4.2.tar.gz) = b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89
-Size (libepoxy-1.4.2.tar.gz) = 309973 bytes
-SHA1 (patch-configure.ac) = c4ce423b058975e7322ea782554ecedd449e2249
+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 (patch-configure.ac) = a21e1369028abbb34bd0add634d89747c587d610
 SHA1 (patch-src_dispatch__common.c) = 8ab5351f3ef67cc36aacfc43e7f61e6a7bcc179a
-SHA1 (patch-src_dispatch__common.h) = 30dae2c8b8ea2fa6c9fd77d6016ccb97a63027a3

Index: pkgsrc/graphics/libepoxy/patches/patch-configure.ac
diff -u pkgsrc/graphics/libepoxy/patches/patch-configure.ac:1.6 pkgsrc/graphics/libepoxy/patches/patch-configure.ac:1.7
--- pkgsrc/graphics/libepoxy/patches/patch-configure.ac:1.6     Sat Feb 18 02:37:11 2017
+++ pkgsrc/graphics/libepoxy/patches/patch-configure.ac Thu Jun  8 04:31:34 2017
@@ -1,6 +1,5 @@
-$NetBSD: patch-configure.ac,v 1.6 2017/02/18 02:37:11 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.7 2017/06/08 04:31:34 adam Exp $
 
-Override EGL detection.
 On Darwin, build GLX only for X11 configuration.
 
 --- configure.ac.orig  2017-02-06 16:00:20.000000000 +0000
@@ -14,59 +13,3 @@ On Darwin, build GLX only for X11 config
              [android*], [build_glx=no],
              [build_glx=yes])
    ],
-@@ -87,11 +87,38 @@ AS_CASE([$enable_glx],
-   [AC_MSG_ERROR([Invalid value "$enable_glx" for option "--enable-glx"])]
- ])
- 
-+AC_ARG_ENABLE([egl],
-+              [AC_HELP_STRING([--enable-egl=@<:@auto,yes,no@:>@], [Enable EGL support @<:@default=auto@:>@])],
-+              [enable_egl=$enableval],
-+              [enable_egl=auto])
-+
-+# EGL can be used on different platforms, so we expose a
-+# configure time switch to enable or disable it; in case
-+# the "auto" default value is set, we only enable EGL
-+# support on Linux and Unix
-+AS_CASE([$enable_egl],
-+  [auto], [
-+    AS_CASE([$host_os],
-+            [mingw*], [build_egl=no],
-+            [darwin*], [build_egl=no],
-+            [build_egl=yes])
-+  ],
-+
-+  [yes], [
-+    build_egl=yes
-+  ],
-+
-+  [no], [
-+    build_egl=no
-+  ],
-+
-+  [AC_MSG_ERROR([Invalid value "$enable_egl" for option "--enable-egl"])]
-+])
-+
- # The remaining platform specific API for GL/GLES are enabled
- # depending on the platform we're building for
- AS_CASE([$host_os],
-   [mingw*], [
--    build_egl=no
-     build_wgl=yes
-     has_znow=yes
-     # On windows, the DLL has to have all of its functions
-@@ -107,7 +134,6 @@ AS_CASE([$host_os],
-   ],
- 
-   [darwin*], [
--    build_egl=no
-     build_wgl=no
-     build_apple=yes
-     has_znow=no
-@@ -115,7 +141,6 @@ AS_CASE([$host_os],
-   ],
- 
-   [
--    build_egl=yes
-     build_wgl=no
-     has_znow=yes
-     # On platforms with dlopen, we load everything dynamically and

Added files:

Index: pkgsrc/graphics/libepoxy/options.mk
diff -u /dev/null pkgsrc/graphics/libepoxy/options.mk:1.1
--- /dev/null   Thu Jun  8 04:31:34 2017
+++ pkgsrc/graphics/libepoxy/options.mk Thu Jun  8 04:31:34 2017
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2017/06/08 04:31:34 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libepoxy
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           egl glx
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=       --enable-glx=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
+CONFIGURE_ARGS+=       --enable-glx=no
+CONFIGURE_ARGS+=       --enable-egl=no
+.  if !(${OPSYS} == "Darwin" && ${X11_TYPE} == "native")
+PKG_FAIL_REASON+=      "The x11 option must be enabled on this platform/configuration."
+.  endif
+.endif