Thu Apr 25 09:03:06 2019 UTC ()
x11-links 1.17: add libgbm

Helps qt5-qtbase PLIST issues (it fails an EGL configure check)


(maya)
diff -r1.187 -r1.188 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.78 -r1.79 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.MesaLib
cvs diff -r1.187 -r1.188 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2019/04/20 15:06:14 1.187
+++ pkgsrc/pkgtools/x11-links/Makefile 2019/04/25 09:03:06 1.188
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.187 2019/04/20 15:06:14 leot Exp $ 1# $NetBSD: Makefile,v 1.188 2019/04/25 09:03:06 maya Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7PKGNAME= x11-links-1.16 7PKGNAME= x11-links-1.17
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.netbsd.org/docs/pkgsrc/ 11HOMEPAGE= https://www.netbsd.org/docs/pkgsrc/
12COMMENT= Shadow tree of links to native X11 headers and libraries 12COMMENT= Shadow tree of links to native X11 headers and libraries
13LICENSE= original-bsd 13LICENSE= original-bsd
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.if ${OPSYS} == "OpenBSD" 16.if ${OPSYS} == "OpenBSD"
17CHECK_SHLIBS_SUPPORTED= no 17CHECK_SHLIBS_SUPPORTED= no
18.endif 18.endif
19 19
20NOT_FOR_PLATFORM= DragonFly-*-* 20NOT_FOR_PLATFORM= DragonFly-*-*
cvs diff -r1.78 -r1.79 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2019/04/20 15:06:14 1.78
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2019/04/25 09:03:06 1.79
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.78 2019/04/20 15:06:14 leot Exp $ 1# $NetBSD: buildlink3.mk,v 1.79 2019/04/25 09:03:06 maya Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5# 5#
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.16 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.17
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the helper programs, headers and libraries to be symlinked 19# Force all of the helper programs, headers and libraries to be symlinked
20# into ${BUILDLINK_X11_DIR}. 20# into ${BUILDLINK_X11_DIR}.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xorg.MesaLib (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.MesaLib 2019/04/20 15:06:14 1.4
+++ pkgsrc/pkgtools/x11-links/files/xorg.MesaLib 2019/04/25 09:03:06 1.5
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: xorg.MesaLib,v 1.4 2019/04/20 15:06:14 leot Exp $ 1# $NetBSD: xorg.MesaLib,v 1.5 2019/04/25 09:03:06 maya Exp $
2# 2#
3include/EGL/egl.h 3include/EGL/egl.h
4include/EGL/eglext.h 4include/EGL/eglext.h
5include/EGL/eglextchromium.h 5include/EGL/eglextchromium.h
6include/EGL/eglmesaext.h 6include/EGL/eglmesaext.h
7include/EGL/eglplatform.h 7include/EGL/eglplatform.h
8include/GL/GLwDrawA.h 8include/GL/GLwDrawA.h
9include/GL/GLwDrawAP.h 9include/GL/GLwDrawAP.h
10include/GL/GLwMDrawA.h 10include/GL/GLwMDrawA.h
11include/GL/GLwMDrawAP.h 11include/GL/GLwMDrawAP.h
12include/GL/gl.h 12include/GL/gl.h
13include/GL/gl_mangle.h 13include/GL/gl_mangle.h
14include/GL/glext.h 14include/GL/glext.h
15include/GL/glx.h 15include/GL/glx.h
16include/GL/glx_mangle.h 16include/GL/glx_mangle.h
17include/GL/glxext.h 17include/GL/glxext.h
18include/GL/glxint.h 18include/GL/glxint.h
19include/GL/glxmd.h 19include/GL/glxmd.h
20include/GL/glxproto.h 20include/GL/glxproto.h
21include/GL/glxtokens.h 21include/GL/glxtokens.h
22include/GL/internal/dri_interface.h 22include/GL/internal/dri_interface.h
23include/GL/internal/glcore.h 23include/GL/internal/glcore.h
24include/GL/internal/sarea.h 24include/GL/internal/sarea.h
25include/GL/osmesa.h 25include/GL/osmesa.h
26include/KHR/khrplatform.h 26include/KHR/khrplatform.h
 27include/gbm.h
27lib/libEGL.a 28lib/libEGL.a
28lib/libEGL.so 29lib/libEGL.so
29lib/libEGL.so.0 30lib/libEGL.so.0
30lib/libEGL.so.0.0 31lib/libEGL.so.0.0
31lib/libEGL.so.1.0 32lib/libEGL.so.1.0
32lib/libGL.1.2.dylib 33lib/libGL.1.2.dylib
33lib/libGL.1.dylib 34lib/libGL.1.dylib
34lib/libGL.a 35lib/libGL.a
35lib/libGL.dylib 36lib/libGL.dylib
36lib/libGL.so 37lib/libGL.so
37lib/libGL.so.1 38lib/libGL.so.1
38lib/libGL.so.1.0.2 39lib/libGL.so.1.0.2
39lib/libGL.so.1.2 40lib/libGL.so.1.2
@@ -48,17 +49,23 @@ lib/libGL.so.2.0 @@ -48,17 +49,23 @@ lib/libGL.so.2.0
48lib/libGL.so.9.0 49lib/libGL.so.9.0
49lib/libGL.so.9.1 50lib/libGL.so.9.1
50lib/libGLw.1.0.dylib 51lib/libGLw.1.0.dylib
51lib/libGLw.1.dylib 52lib/libGLw.1.dylib
52lib/libGLw.a 53lib/libGLw.a
53lib/libGLw.dylib 54lib/libGLw.dylib
54lib/libGLw.so 55lib/libGLw.so
55lib/libGLw.so.1 56lib/libGLw.so.1
56lib/libGLw.so.1.0 57lib/libGLw.so.1.0
57lib/libGLw.so.2 58lib/libGLw.so.2
58lib/libGLw.so.2.0 59lib/libGLw.so.2.0
59lib/libGLw.so.5.1 60lib/libGLw.so.5.1
60lib/libGLw.so.6.0 61lib/libGLw.so.6.0
 62lib/libgbm.a
 63lib/libgbm.so
 64lib/libgbm.so.0
 65lib/libgbm.so.0.0
 66lib/libgbm.so.1.0
61lib/pkgconfig/dri.pc 67lib/pkgconfig/dri.pc
62lib/pkgconfig/egl.pc 68lib/pkgconfig/egl.pc
 69lib/pkgconfig/gbm.pc
63lib/pkgconfig/gl.pc 70lib/pkgconfig/gl.pc
64lib/pkgconfig/glw.pc 71lib/pkgconfig/glw.pc