CVS commit: pkgsrc

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Wed Jul 10 22:36:50 UTC 2019

Modified Files:
        pkgsrc/pkgtools/x11-links: Makefile buildlink3.mk xorg.mk
Added Files:
        pkgsrc/graphics/libepoxy: builtin.mk
        pkgsrc/multimedia/libvdpau: builtin.mk
        pkgsrc/pkgtools/x11-links/files: xorg.libepoxy xorg.libvdpau

Log Message:
Add libepoxy and libvdpau.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libepoxy/builtin.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/libvdpau/builtin.mk
cvs rdiff -u -r1.190 -r1.191 pkgsrc/pkgtools/x11-links/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/pkgtools/x11-links/xorg.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.libepoxy \
    pkgsrc/pkgtools/x11-links/files/xorg.libvdpau

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.190 pkgsrc/pkgtools/x11-links/Makefile:1.191
--- pkgsrc/pkgtools/x11-links/Makefile:1.190    Wed Jun 12 01:04:39 2019
+++ pkgsrc/pkgtools/x11-links/Makefile  Wed Jul 10 22:36:49 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.190 2019/06/12 01:04:39 gutteridge Exp $
+# $NetBSD: Makefile,v 1.191 2019/07/10 22:36:49 rjs 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.19
+PKGNAME=       x11-links-1.20
 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.81 pkgsrc/pkgtools/x11-links/buildlink3.mk:1.82
--- pkgsrc/pkgtools/x11-links/buildlink3.mk:1.81        Wed Jun 12 01:04:39 2019
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk     Wed Jul 10 22:36:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.81 2019/06/12 01:04:39 gutteridge Exp $
+# $NetBSD: buildlink3.mk,v 1.82 2019/07/10 22:36:49 rjs 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.19
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.20
 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.32 pkgsrc/pkgtools/x11-links/xorg.mk:1.33
--- pkgsrc/pkgtools/x11-links/xorg.mk:1.32      Wed Mar 20 21:06:39 2019
+++ pkgsrc/pkgtools/x11-links/xorg.mk   Wed Jul 10 22:36:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.32 2019/03/20 21:06:39 wiz Exp $
+# $NetBSD: xorg.mk,v 1.33 2019/07/10 22:36:49 rjs Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -9,9 +9,11 @@ FILES_LIST=    ${FILESDIR}/xorg
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/libepoxy/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
+.include "../../multimedia/libvdpau/buildlink3.mk"
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/evieext/buildlink3.mk"

Added files:

Index: pkgsrc/graphics/libepoxy/builtin.mk
diff -u /dev/null pkgsrc/graphics/libepoxy/builtin.mk:1.1
--- /dev/null   Wed Jul 10 22:36:50 2019
+++ pkgsrc/graphics/libepoxy/builtin.mk Wed Jul 10 22:36:49 2019
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.1 2019/07/10 22:36:49 rjs Exp $
+
+BUILTIN_PKG:=  libepoxy
+PKGCONFIG_FILE.libepoxy=       ${X11BASE}/lib/pkgconfig/epoxy.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"

Index: pkgsrc/multimedia/libvdpau/builtin.mk
diff -u /dev/null pkgsrc/multimedia/libvdpau/builtin.mk:1.1
--- /dev/null   Wed Jul 10 22:36:50 2019
+++ pkgsrc/multimedia/libvdpau/builtin.mk       Wed Jul 10 22:36:49 2019
@@ -0,0 +1,7 @@
+# $NetBSD: builtin.mk,v 1.1 2019/07/10 22:36:49 rjs Exp $
+
+BUILTIN_PKG:=  libvdpau
+PKGCONFIG_FILE.libvdpau=       ${X11BASE}/lib/pkgconfig/vdpau.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+.include "../../mk/x11.builtin.mk"

Index: pkgsrc/pkgtools/x11-links/files/xorg.libepoxy
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.libepoxy:1.1
--- /dev/null   Wed Jul 10 22:36:50 2019
+++ pkgsrc/pkgtools/x11-links/files/xorg.libepoxy       Wed Jul 10 22:36:49 2019
@@ -0,0 +1,15 @@
+# $NetBSD: xorg.libepoxy,v 1.1 2019/07/10 22:36:49 rjs Exp $
+#
+include/epoxy/common.h
+include/epoxy/egl.h
+include/epoxy/egl_generated.h
+include/epoxy/gl.h
+include/epoxy/gl_generated.h
+include/epoxy/glx.h
+include/epoxy/glx_generated.h
+lib/libepoxy.a
+lib/libepoxy.so
+lib/libepoxy.so.0
+lib/libepoxy.so.0.0
+lib/libepoxy.so.0.1
+lib/pkgconfig/epoxy.pc
Index: pkgsrc/pkgtools/x11-links/files/xorg.libvdpau
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.libvdpau:1.1
--- /dev/null   Wed Jul 10 22:36:50 2019
+++ pkgsrc/pkgtools/x11-links/files/xorg.libvdpau       Wed Jul 10 22:36:49 2019
@@ -0,0 +1,9 @@
+# $NetBSD: xorg.libvdpau,v 1.1 2019/07/10 22:36:49 rjs Exp $
+#
+include/vdpau/vdpau.h
+include/vdpau/vdpau_x11.h
+lib/libvdpau.a
+lib/libvdpau.so
+lib/libvdpau.so.1
+lib/libvdpau.so.1.0
+lib/pkgconfig/vdpau.pc