CVS commit: pkgsrc

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Jan 24 14:25:00 UTC 2017

Modified Files:
        pkgsrc/pkgtools/x11-links: Makefile buildlink3.mk xorg.mk
Added Files:
        pkgsrc/pkgtools/x11-links/files: xorg.MesaLib xorg.libXpresent
            xorg.presentproto
        pkgsrc/x11/libXpresent: builtin.mk

Log Message:
add missing xorg present and Mesa support.  bump revision.

allows tigervnc to build.

thanks to dmcmahill for testing.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/pkgtools/x11-links/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/x11-links/xorg.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.MesaLib \
    pkgsrc/pkgtools/x11-links/files/xorg.libXpresent \
    pkgsrc/pkgtools/x11-links/files/xorg.presentproto
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libXpresent/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/x11-links/Makefile
diff -u pkgsrc/pkgtools/x11-links/Makefile:1.172 pkgsrc/pkgtools/x11-links/Makefile:1.173
--- pkgsrc/pkgtools/x11-links/Makefile:1.172    Sun Jul 10 13:28:41 2016
+++ pkgsrc/pkgtools/x11-links/Makefile  Tue Jan 24 14:25:00 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.172 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: Makefile,v 1.173 2017/01/24 14:25:00 mrg Exp $
 #
 # NOTE:        If you update this package, then you'll likely need to also update
 #      the x11-links dependency in buildlink3.mk to the correct version,
 #      usually the most recent.
 
-PKGNAME=       x11-links-1.02
+PKGNAME=       x11-links-1.03
 CATEGORIES=    pkgtools x11
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -u pkgsrc/pkgtools/x11-links/buildlink3.mk:1.67 pkgsrc/pkgtools/x11-links/buildlink3.mk:1.68
--- pkgsrc/pkgtools/x11-links/buildlink3.mk:1.67        Sun Jul 10 13:28:41 2016
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk     Tue Jan 24 14:25:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.67 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.68 2017/01/24 14:25:00 mrg Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=      x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.02
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.03
 BUILDLINK_PKGSRCDIR.x11-links?=        ../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=        build
 

Index: pkgsrc/pkgtools/x11-links/xorg.mk
diff -u pkgsrc/pkgtools/x11-links/xorg.mk:1.27 pkgsrc/pkgtools/x11-links/xorg.mk:1.28
--- pkgsrc/pkgtools/x11-links/xorg.mk:1.27      Sun Jul 10 13:28:41 2016
+++ pkgsrc/pkgtools/x11-links/xorg.mk   Tue Jan 24 14:25:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.27 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: xorg.mk,v 1.28 2017/01/24 14:25:00 mrg Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -43,6 +43,7 @@ FILES_LIST=   ${FILESDIR}/xorg
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXpresent/buildlink3.mk"
 .include "../../x11/libXprintUtil/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
@@ -53,6 +54,7 @@ FILES_LIST=   ${FILESDIR}/xorg
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/presentproto/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/recordproto/buildlink3.mk"

Added files:

Index: pkgsrc/pkgtools/x11-links/files/xorg.MesaLib
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.MesaLib:1.1
--- /dev/null   Tue Jan 24 14:25:00 2017
+++ pkgsrc/pkgtools/x11-links/files/xorg.MesaLib        Tue Jan 24 14:25:00 2017
@@ -0,0 +1,61 @@
+# $NetBSD: xorg.MesaLib,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/GL/internal/dri_interface.h
+include/GL/internal/glcore.h
+include/GL/internal/sarea.h
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glext.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/osmesa.h
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
+lib/libGL.a
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.0.2
+lib/libGL.so.1.2
+lib/libGL.so.2
+lib/libGL.so.2.0
+lib/libGL.so.9.0
+lib/libGL.so.9.1
+lib/libGL.so.10.0
+lib/libGL.so.12.0
+lib/libGL.so.13.0
+lib/libGL.so.14.0
+lib/libGL.so.15.0
+lib/libGL.so.16.0
+lib/libGL.dylib
+lib/libGL.1.dylib
+lib/libGL.1.2.dylib
+lib/libGLw.a
+lib/libGLw.so
+lib/libGLw.so.1
+lib/libGLw.so.1.0
+lib/libGLw.so.2
+lib/libGLw.so.2.0
+lib/libGLw.so.5.1
+lib/libGLw.so.6.0
+lib/libGLw.dylib
+lib/libGLw.1.dylib
+lib/libGLw.1.0.dylib
+lib/libEGL.a
+lib/libEGL.so
+lib/libEGL.so.0
+lib/libEGL.so.0.0
+lib/libEGL.so.1.0
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
+lib/pkgconfig/egl.pc
Index: pkgsrc/pkgtools/x11-links/files/xorg.libXpresent
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.libXpresent:1.1
--- /dev/null   Tue Jan 24 14:25:00 2017
+++ pkgsrc/pkgtools/x11-links/files/xorg.libXpresent    Tue Jan 24 14:25:00 2017
@@ -0,0 +1,10 @@
+# $NetBSD: xorg.libXpresent,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/X11/extensions/Xpresent.h
+lib/libXpresent.a
+lib/libXpresent.la
+lib/libXpresent.so
+lib/libXpresent.so.1
+lib/libXpresent.so.1.0
+lib/pkgconfig/xpresent.pc
+man/man3/Xpresent.3
Index: pkgsrc/pkgtools/x11-links/files/xorg.presentproto
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.presentproto:1.1
--- /dev/null   Tue Jan 24 14:25:00 2017
+++ pkgsrc/pkgtools/x11-links/files/xorg.presentproto   Tue Jan 24 14:25:00 2017
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.presentproto,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/X11/extensions/presentproto.h
+include/X11/extensions/presenttokens.h
+lib/pkgconfig/presentproto.pc
+share/doc/presentproto/presentproto.txt

Index: pkgsrc/x11/libXpresent/builtin.mk
diff -u /dev/null pkgsrc/x11/libXpresent/builtin.mk:1.1
--- /dev/null   Tue Jan 24 14:25:00 2017
+++ pkgsrc/x11/libXpresent/builtin.mk   Tue Jan 24 14:25:00 2017
@@ -0,0 +1,17 @@
+# $NetBSD: builtin.mk,v 1.1 2017/01/24 14:25:00 mrg Exp $
+
+BUILTIN_PKG:=  libXpresent
+PKGCONFIG_FILE.libXpresent=    ${X11BASE}/lib/pkgconfig/xpresent.pc
+PKGCONFIG_FILE.libXpresent+=   ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xpresent.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"
+
+CHECK_BUILTIN.libXpresent?=    no
+.if !empty(CHECK_BUILTIN.libXpresent:M[nN][oO])
+
+.  if !empty(USE_BUILTIN.libXpresent:M[nN][oO])
+BUILDLINK_API_DEPENDS.presentproto+=   presentproto>=1.0
+.  endif
+
+.endif  # CHECK_BUILTIN.libXpresent