pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/x11-links Apply patch from Bernd Ernesti in P...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/540e09b7443e
branches:  trunk
changeset: 576065:540e09b7443e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon May 31 21:20:02 2010 +0000

description:
Apply patch from Bernd Ernesti in PR 43392, updating the package
for recent changes in NetBSD-current's xsrc.

Bump version.

diffstat:

 pkgtools/x11-links/Makefile                    |   4 +-
 pkgtools/x11-links/buildlink3.mk               |   4 +-
 pkgtools/x11-links/files/xfree.MesaLib         |   9 ++++-
 pkgtools/x11-links/files/xorg                  |  22 +---------
 pkgtools/x11-links/files/xorg.bigreqsproto     |   4 +-
 pkgtools/x11-links/files/xorg.evieext          |   4 +-
 pkgtools/x11-links/files/xorg.glu              |   3 +-
 pkgtools/x11-links/files/xorg.inputproto       |   5 ++-
 pkgtools/x11-links/files/xorg.libX11           |   4 +-
 pkgtools/x11-links/files/xorg.libXevie         |   3 +-
 pkgtools/x11-links/files/xorg.libXext          |  21 ++++++++++-
 pkgtools/x11-links/files/xorg.libdrm           |  27 +++++++++++++-
 pkgtools/x11-links/files/xorg.pixman           |   3 +-
 pkgtools/x11-links/files/xorg.recordproto      |   5 ++-
 pkgtools/x11-links/files/xorg.xcmiscproto      |   4 +-
 pkgtools/x11-links/files/xorg.xextproto        |  51 ++++++++++++++-----------
 pkgtools/x11-links/files/xorg.xf86bigfontproto |   5 ++-
 pkgtools/x11-links/files/xorg.xf86dgaproto     |  19 +++++++++-
 pkgtools/x11-links/files/xorg.xf86driproto     |   6 ++-
 pkgtools/x11-links/files/xorg.xf86vidmodeproto |   6 ++-
 20 files changed, 148 insertions(+), 61 deletions(-)

diffs (truncated from 466 to 300 lines):

diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/Makefile
--- a/pkgtools/x11-links/Makefile       Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/Makefile       Mon May 31 21:20:02 2010 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.112 2010/05/30 12:55:17 martin Exp $
+# $NetBSD: Makefile,v 1.113 2010/05/31 21:20:02 wiz 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.
 
-DISTNAME=      x11-links-0.48
+DISTNAME=      x11-links-0.49
 CATEGORIES=    pkgtools x11
 PKGREVISION=   1
 MASTER_SITES=  # empty
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/buildlink3.mk
--- a/pkgtools/x11-links/buildlink3.mk  Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/buildlink3.mk  Mon May 31 21:20:02 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/04/30 03:37:44 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/05/31 21:20:02 wiz Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=0.48
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=0.49
 BUILDLINK_PKGSRCDIR.x11-links?=        ../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=        build
 
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xfree.MesaLib
--- a/pkgtools/x11-links/files/xfree.MesaLib    Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xfree.MesaLib    Mon May 31 21:20:02 2010 +0000
@@ -1,18 +1,23 @@
-# $NetBSD: xfree.MesaLib,v 1.5 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xfree.MesaLib,v 1.6 2010/05/31 21:20:02 wiz Exp $
 #
 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/GL/xmesa.h
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
 lib/libGL.a
 lib/libGL.so
 lib/libGL.so.1
@@ -37,3 +42,5 @@
 lib/libOSMesa.dylib
 lib/libOSMesa.4.dylib
 lib/libOSMesa.4.0.dylib
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg
--- a/pkgtools/x11-links/files/xorg     Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg     Mon May 31 21:20:02 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.13 2009/12/30 17:10:32 tron Exp $
+# $NetBSD: xorg,v 1.14 2010/05/31 21:20:02 wiz Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported Xorg (and some XFree) distributions, minus the set of files
@@ -249,8 +249,6 @@
 include/X11/extensions/XKM.h
 include/X11/extensions/XKMformat.h
 include/X11/extensions/XResproto.h
-include/X11/extensions/Xevie.h
-include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xinerama.h
 include/X11/extensions/XvMClib.h
 include/X11/extensions/damageproto.h
@@ -264,19 +262,11 @@
 include/X11/extensions/panoramiXproto.h
 include/X11/extensions/panoramiXwrap.h
 include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
 include/X11/extensions/scrnsaver.h
 include/X11/extensions/xevieplaceholder.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
 include/X11/extensions/xf86misc.h
 include/X11/extensions/xf86mscstr.h
 include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
 include/X11/extensions/xtrapbits.h
 include/X11/extensions/xtrapddmi.h
 include/X11/extensions/xtrapdi.h
@@ -460,13 +450,6 @@
 lib/libXxf86vm.1.0.0.dylib
 lib/libXxf86vm.1.dylib
 lib/libXxf86vm.dylib
-lib/libXxf86dga.a
-lib/libXxf86dga.so
-lib/libXxf86dga.so.1
-lib/libXxf86dga.so.1.0
-lib/libXxf86dga.so.1.1
-lib/libXxf86dga.so.2
-lib/libXxf86dga.so.2.0
 lib/libXxf86misc.a
 lib/libXxf86misc.so
 lib/libXxf86misc.so.1
@@ -540,6 +523,8 @@
 lib/libxkbui.so.1.0
 lib/libxkbui.so.2
 lib/libxkbui.so.2.0
+lib/pkgconfig/xaw6.pc
+lib/pkgconfig/xaw7.pc
 lib/pkgconfig/xfontcache.pc
 lib/pkgconfig/xi.pc
 lib/pkgconfig/xkbfile.pc
@@ -547,6 +532,5 @@
 lib/pkgconfig/xp.pc
 lib/pkgconfig/xprintapputil.pc
 lib/pkgconfig/xvmc.pc
-lib/pkgconfig/xxf86dga.pc
 lib/pkgconfig/xxf86misc.pc
 lib/pkgconfig/xxf86vm.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.bigreqsproto
--- a/pkgtools/x11-links/files/xorg.bigreqsproto        Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto        Mon May 31 21:20:02 2010 +0000
@@ -1,3 +1,5 @@
-# $NetBSD: xorg.bigreqsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.bigreqsproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/bigreqsproto.h
+include/X11/extensions/bigreqstr.h
 lib/pkgconfig/bigreqsproto.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.evieext
--- a/pkgtools/x11-links/files/xorg.evieext     Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.evieext     Mon May 31 21:20:02 2010 +0000
@@ -1,3 +1,5 @@
-# $NetBSD: xorg.evieext,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.evieext,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/Xeviestr.h
+include/X11/extensions/evieproto.h
 lib/pkgconfig/evieproto.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.glu
--- a/pkgtools/x11-links/files/xorg.glu Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.glu Mon May 31 21:20:02 2010 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.glu,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.glu,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
 include/GL/glu.h
+include/GL/glu_mangle.h
 lib/libGLU.a
 lib/libGLU.so
 lib/libGLU.so.1
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.inputproto
--- a/pkgtools/x11-links/files/xorg.inputproto  Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.inputproto  Mon May 31 21:20:02 2010 +0000
@@ -1,6 +1,9 @@
-# $NetBSD: xorg.inputproto,v 1.1 2008/01/05 16:08:53 tron Exp $
+# $NetBSD: xorg.inputproto,v 1.2 2010/05/31 21:20:02 wiz Exp $
 #
 include/X11/extensions/XI.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
 include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
 include/X11/extensions/XIproto.h
 lib/pkgconfig/inputproto.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.libX11
--- a/pkgtools/x11-links/files/xorg.libX11      Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.libX11      Mon May 31 21:20:02 2010 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: xorg.libX11,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libX11,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
+include/X11/Xcmsint.h
+include/X11/Xlcint.h
 include/X11/Xlib.h
 include/X11/XlibConf.h
 include/X11/Xlibint.h
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.libXevie
--- a/pkgtools/x11-links/files/xorg.libXevie    Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.libXevie    Mon May 31 21:20:02 2010 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.libXevie,v 1.3 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.libXevie,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/Xevie.h
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.libXext
--- a/pkgtools/x11-links/files/xorg.libXext     Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.libXext     Mon May 31 21:20:02 2010 +0000
@@ -1,5 +1,24 @@
-# $NetBSD: xorg.libXext,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXext,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
+include/X11/extensions/dpms.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/security.h
+include/X11/extensions/shape.h
+include/X11/extensions/sync.h
+include/X11/extensions/xtestext1.h
 lib/libXext.6.3.dylib
 lib/libXext.6.4.0.dylib
 lib/libXext.6.4.dylib
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.libdrm
--- a/pkgtools/x11-links/files/xorg.libdrm      Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.libdrm      Mon May 31 21:20:02 2010 +0000
@@ -1,5 +1,27 @@
-# $NetBSD: xorg.libdrm,v 1.3 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.libdrm,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/libdrm/drm.h
+include/libdrm/drm_mode.h
+include/libdrm/drm_sarea.h
+include/libdrm/i915_drm.h
+include/libdrm/intel_bufmgr.h
+include/libdrm/mach64_drm.h
+include/libdrm/mga_drm.h
+include/libdrm/nouveau_drm.h
+include/libdrm/r128_drm.h
+include/libdrm/radeon_bo.h
+include/libdrm/radeon_bo_gem.h
+include/libdrm/radeon_bo_int.h
+include/libdrm/radeon_cs.h
+include/libdrm/radeon_cs_gem.h
+include/libdrm/radeon_cs_int.h
+include/libdrm/radeon_drm.h
+include/libdrm/savage_drm.h
+include/libdrm/sis_drm.h
+include/libdrm/via_drm.h
+include/libkms/libkms.h
+include/xf86drm.h
+include/xf86drmMode.h
 include/X11/xf86drm.h
 include/X11/xf86mm.h
 lib/libdrm.a
@@ -9,4 +31,7 @@
 lib/libdrm.so.2.4
 lib/libdrm.so.3
 lib/libdrm.so.3.1
+lib/libdrm.so.3.2
 lib/pkgconfig/libdrm.pc
+lib/pkgconfig/libdrm_intel.pc
+lib/pkgconfig/libdrm_radeon.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.pixman
--- a/pkgtools/x11-links/files/xorg.pixman      Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.pixman      Mon May 31 21:20:02 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.pixman,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.pixman,v 1.6 2010/05/31 21:20:02 wiz Exp $
 #
 include/pixman-1/pixman.h
 include/pixman-1/pixman-version.h
@@ -14,5 +14,6 @@
 lib/libpixman-1.so.1.0
 lib/libpixman-1.so.2
 lib/libpixman-1.so.2.0
+lib/libpixman-1.so.2.1
 lib/libpixman-1.so.15.0
 lib/pkgconfig/pixman-1.pc
diff -r bd2642772bc1 -r 540e09b7443e pkgtools/x11-links/files/xorg.recordproto
--- a/pkgtools/x11-links/files/xorg.recordproto Mon May 31 20:38:26 2010 +0000
+++ b/pkgtools/x11-links/files/xorg.recordproto Mon May 31 21:20:02 2010 +0000
@@ -1,3 +1,6 @@
-# $NetBSD: xorg.recordproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.recordproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #



Home | Main Index | Thread Index | Old Index