CVS commit: pkgsrc/graphics/libepoxy

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan  1 21:16:12 UTC 2020

Modified Files:
        pkgsrc/graphics/libepoxy: Makefile PLIST buildlink3.mk distinfo
            options.mk
Removed Files:
        pkgsrc/graphics/libepoxy/patches: patch-configure.ac

Log Message:
libepoxy: updated to 1.5.4

1.5.4:
Don't build GLX tests if X11 support is disabled
Add unit tests for epoxy_gl_version()
Reduce the size of the binary by reusing static strings
Fix build on Solaris
Update the GL registries


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/libepoxy/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libepoxy/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libepoxy/buildlink3.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/libepoxy/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libepoxy/options.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/libepoxy/patches/patch-configure.ac

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.27 pkgsrc/graphics/libepoxy/Makefile:1.28
--- pkgsrc/graphics/libepoxy/Makefile:1.27      Sun Sep  1 20:38:34 2019
+++ pkgsrc/graphics/libepoxy/Makefile   Wed Jan  1 21:16:12 2020
@@ -1,37 +1,43 @@
-# $NetBSD: Makefile,v 1.27 2019/09/01 20:38:34 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2020/01/01 21:16:12 adam Exp $
 
-DISTNAME=      libepoxy-1.5.3
+DISTNAME=      libepoxy-1.5.4
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=anholt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/anholt/libepoxy/
+HOMEPAGE=      https://github.com/anholt/libepoxy
 COMMENT=       Library for OpenGL function pointer management
 LICENSE=       mit
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
-USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config autoconf autoreconf automake
-GNU_CONFIGURE=         yes
+USE_TOOLS+=            pkg-config
 PKGCONFIG_OVERRIDE+=   epoxy.pc.in
 PYTHON_FOR_BUILD_ONLY= tool
 
 PLIST_VARS+=           egl
 
-pre-configure:
-       cd ${WRKSRC} && autoreconf -vif
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dglx=no
+.endif
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .if !empty(MESALIB_SUPPORTS_EGL:M[Yy][Ee][Ss])
-PLIST.egl=             yes
+PLIST.egl=     yes
+MESON_ARGS+=   -Degl=yes
 .else
-CONFIGURE_ARGS+=       --disable-egl
+MESON_ARGS+=   -Degl=no
 .endif
 
 .include "options.mk"
+
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/src
+
+.include "../../devel/meson/build.mk"
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libepoxy/PLIST
diff -u pkgsrc/graphics/libepoxy/PLIST:1.4 pkgsrc/graphics/libepoxy/PLIST:1.5
--- pkgsrc/graphics/libepoxy/PLIST:1.4  Fri Feb 17 15:17:09 2017
+++ pkgsrc/graphics/libepoxy/PLIST      Wed Jan  1 21:16:12 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/02/17 15:17:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/01/01 21:16:12 adam Exp $
 include/epoxy/common.h
 ${PLIST.egl}include/epoxy/egl.h
 ${PLIST.egl}include/epoxy/egl_generated.h
@@ -6,5 +6,7 @@ include/epoxy/gl.h
 include/epoxy/gl_generated.h
 ${PLIST.glx}include/epoxy/glx.h
 ${PLIST.glx}include/epoxy/glx_generated.h
-lib/libepoxy.la
+lib/libepoxy.so
+lib/libepoxy.so.0
+lib/libepoxy.so.0.0.0
 lib/pkgconfig/epoxy.pc

Index: pkgsrc/graphics/libepoxy/buildlink3.mk
diff -u pkgsrc/graphics/libepoxy/buildlink3.mk:1.3 pkgsrc/graphics/libepoxy/buildlink3.mk:1.4
--- pkgsrc/graphics/libepoxy/buildlink3.mk:1.3  Wed Sep  4 16:38:06 2019
+++ pkgsrc/graphics/libepoxy/buildlink3.mk      Wed Jan  1 21:16:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2019/09/04 16:38:06 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/01/01 21:16:12 adam Exp $
 
 BUILDLINK_TREE+=       libepoxy
 
@@ -8,7 +8,9 @@ LIBEPOXY_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libepoxy+=       libepoxy>=1.2
 BUILDLINK_PKGSRCDIR.libepoxy?=         ../../graphics/libepoxy
 
+.if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.endif
 .endif # LIBEPOXY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libepoxy

Index: pkgsrc/graphics/libepoxy/distinfo
diff -u pkgsrc/graphics/libepoxy/distinfo:1.19 pkgsrc/graphics/libepoxy/distinfo:1.20
--- pkgsrc/graphics/libepoxy/distinfo:1.19      Sat Aug 31 13:50:09 2019
+++ pkgsrc/graphics/libepoxy/distinfo   Wed Jan  1 21:16:12 2020
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.19 2019/08/31 13:50:09 nia Exp $
+$NetBSD: distinfo,v 1.20 2020/01/01 21:16:12 adam Exp $
 
-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 (libepoxy-1.5.4.tar.xz) = d08d805b3307005e2197741012f9f4bc9739cd31
+RMD160 (libepoxy-1.5.4.tar.xz) = 3ae1a3a59ecc1f273a0b2712626819ad4ee26844
+SHA512 (libepoxy-1.5.4.tar.xz) = 7bde6fe7164aaa88b6e476dafb13391c551c530267936a1456e242d2bf648117f319788ba089100b3f773444098a894db6d27326b47dc4ae26db4766308d7510
+Size (libepoxy-1.5.4.tar.xz) = 227180 bytes
 SHA1 (patch-registry_egl.xml) = 37923cc2be65ab2dead9af8ff062702ab5d63392
 SHA1 (patch-src_dispatch__common.c) = bfc147f2b0d7eebb567ab08517382246a30ee799

Index: pkgsrc/graphics/libepoxy/options.mk
diff -u pkgsrc/graphics/libepoxy/options.mk:1.2 pkgsrc/graphics/libepoxy/options.mk:1.3
--- pkgsrc/graphics/libepoxy/options.mk:1.2     Sat Aug 31 13:50:09 2019
+++ pkgsrc/graphics/libepoxy/options.mk Wed Jan  1 21:16:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/08/31 13:50:09 nia Exp $
+# $NetBSD: options.mk,v 1.3 2020/01/01 21:16:12 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libepoxy
 PKG_SUPPORTED_OPTIONS= x11
@@ -6,21 +6,21 @@ PKG_SUGGESTED_OPTIONS=        x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           glx
+PLIST_VARS+=   glx
 
 .if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=       --enable-glx=yes
-CONFIGURE_ARGS+=       --enable-x11=yes
+MESON_ARGS+=   -Dglx=yes
+MESON_ARGS+=   -Dx11=true
 PLIST.glx=     yes
 .include "../../x11/libX11/buildlink3.mk"
 .  if ${OPSYS} == "Darwin" && ${X11_TYPE} == "modular"
-CPPFLAGS+=             -DGLX_LIB=\"${PREFIX}/lib/libGL.dylib\"
+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-x11=no
-.  else
+MESON_ARGS+=   -Dglx=no
+MESON_ARGS+=   -Dx11=false
+.  elif ${OPSYS} != "Darwin"
 PKG_FAIL_REASON+=      "The x11 option must be enabled on this platform/configuration."
 .  endif
 .endif