diff options
| -rw-r--r-- | graphics/libepoxy/builtin.mk | 7 | ||||
| -rw-r--r-- | multimedia/libvdpau/builtin.mk | 7 | ||||
| -rw-r--r-- | pkgtools/x11-links/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
| -rw-r--r-- | pkgtools/x11-links/files/xorg.libepoxy | 15 | ||||
| -rw-r--r-- | pkgtools/x11-links/files/xorg.libvdpau | 9 | ||||
| -rw-r--r-- | pkgtools/x11-links/xorg.mk | 4 |
7 files changed, 45 insertions, 5 deletions
diff --git a/graphics/libepoxy/builtin.mk b/graphics/libepoxy/builtin.mk new file mode 100644 index 00000000000..6b400c4e265 --- /dev/null +++ b/graphics/libepoxy/builtin.mk @@ -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" diff --git a/multimedia/libvdpau/builtin.mk b/multimedia/libvdpau/builtin.mk new file mode 100644 index 00000000000..75db7cf3b1e --- /dev/null +++ b/multimedia/libvdpau/builtin.mk @@ -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" diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 6542ed18425..70b1aa80d0c 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 6d45ccd3db3..aa9f243103e 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -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 diff --git a/pkgtools/x11-links/files/xorg.libepoxy b/pkgtools/x11-links/files/xorg.libepoxy new file mode 100644 index 00000000000..1a37b10dbcf --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libepoxy @@ -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 diff --git a/pkgtools/x11-links/files/xorg.libvdpau b/pkgtools/x11-links/files/xorg.libvdpau new file mode 100644 index 00000000000..80d181c2992 --- /dev/null +++ b/pkgtools/x11-links/files/xorg.libvdpau @@ -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 diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 375e2f2536d..35f6cd7e2d5 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -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" |