[pkgsrc/trunk]: pkgsrc/graphics/libepoxy Changes 1.4.3:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/libepoxy Changes 1.4.3:
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:17:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/02ef22360077
branches:  trunk
changeset: 363404:02ef22360077
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 08 04:31:34 2017 +0000

description:
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

diffstat:

 graphics/libepoxy/Makefile                             |  37 +----------
 graphics/libepoxy/distinfo                             |  13 +--
 graphics/libepoxy/options.mk                           |  30 +++++++++
 graphics/libepoxy/patches/patch-configure.ac           |  59 +-----------------
 graphics/libepoxy/patches/patch-src_dispatch__common.h |  25 -------
 5 files changed, 41 insertions(+), 123 deletions(-)

diffs (208 lines):

diff -r b386b70affe6 -r 02ef22360077 graphics/libepoxy/Makefile
--- a/graphics/libepoxy/Makefile        Thu Jun 08 01:28:10 2017 +0000
+++ b/graphics/libepoxy/Makefile        Thu Jun 08 04:31:34 2017 +0000
@@ -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 @@
 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 "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-.include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b386b70affe6 -r 02ef22360077 graphics/libepoxy/distinfo
--- a/graphics/libepoxy/distinfo        Thu Jun 08 01:28:10 2017 +0000
+++ b/graphics/libepoxy/distinfo        Thu Jun 08 04:31:34 2017 +0000
@@ -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
diff -r b386b70affe6 -r 02ef22360077 graphics/libepoxy/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libepoxy/options.mk      Thu Jun 08 04:31:34 2017 +0000
@@ -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
diff -r b386b70affe6 -r 02ef22360077 graphics/libepoxy/patches/patch-configure.ac
--- a/graphics/libepoxy/patches/patch-configure.ac      Thu Jun 08 01:28:10 2017 +0000
+++ b/graphics/libepoxy/patches/patch-configure.ac      Thu Jun 08 04:31:34 2017 +0000
@@ -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 @@
              [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
diff -r b386b70affe6 -r 02ef22360077 graphics/libepoxy/patches/patch-src_dispatch__common.h
--- a/graphics/libepoxy/patches/patch-src_dispatch__common.h    Thu Jun 08 01:28:10 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_dispatch__common.h,v 1.7 2017/04/19 07:34:12 dsainty 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
-@@ -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
--#define PLATFORM_HAS_EGL 1
-+#define PLATFORM_HAS_EGL BUILD_EGL
- #define PLATFORM_HAS_GLX ENABLE_GLX
- #define PLATFORM_HAS_WGL 0
- #endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/print/ghostscript-gpl Fix build with cups 2.2.0
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated graphics/libepoxy to 1.4.3
Previous by Thread: [pkgsrc/trunk]: pkgsrc/print/ghostscript-gpl Fix build with cups 2.2.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated graphics/libepoxy to 1.4.3
Indexes:
Home | Main Index | Thread Index | Old Index