summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/mesa-dri/Makefile2
-rw-r--r--graphics/mesa-dri/files/patch-src_gallium_state__trackers_xvmc_Makefile.in11
-rw-r--r--graphics/mesa-dri/files/patch-src_gallium_targets_xvmc_Makefile.in11
-rw-r--r--x11/libX11/Makefile4
-rw-r--r--x11/libX11/distinfo6
-rw-r--r--x11/libX11/files/patch-src_util_makekeys.c14
-rw-r--r--x11/libX11/pkg-plist1
-rw-r--r--x11/libXvMC/Makefile4
-rw-r--r--x11/libXvMC/distinfo6
-rw-r--r--x11/libXvMC/pkg-plist2
-rw-r--r--x11/xorgproto/Makefile5
-rw-r--r--x11/xorgproto/distinfo6
-rw-r--r--x11/xorgproto/pkg-plist38
13 files changed, 41 insertions, 69 deletions
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 8e4565b7227a..1ea7421798cd 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
diff --git a/graphics/mesa-dri/files/patch-src_gallium_state__trackers_xvmc_Makefile.in b/graphics/mesa-dri/files/patch-src_gallium_state__trackers_xvmc_Makefile.in
new file mode 100644
index 000000000000..040beb9808a7
--- /dev/null
+++ b/graphics/mesa-dri/files/patch-src_gallium_state__trackers_xvmc_Makefile.in
@@ -0,0 +1,11 @@
+--- src/gallium/state_trackers/xvmc/Makefile.in.orig 2019-10-21 15:12:43 UTC
++++ src/gallium/state_trackers/xvmc/Makefile.in
+@@ -674,7 +674,7 @@ AM_CFLAGS = \
+ noinst_LTLIBRARIES = libxvmctracker.la
+ libxvmctracker_la_SOURCES = $(C_SOURCES)
+ noinst_HEADERS = tests/testlib.h
+-TEST_LIBS = $(XVMC_LIBS) -lXvMCW $(VL_LIBS) $(XCB_DRI3_LIBS)
++TEST_LIBS = $(XVMC_LIBS) -lXv -lXvMCW $(VL_LIBS) $(XCB_DRI3_LIBS)
+ tests_test_context_SOURCES = tests/test_context.c tests/testlib.c
+ tests_test_context_LDADD = $(TEST_LIBS)
+ tests_test_surface_SOURCES = tests/test_surface.c tests/testlib.c
diff --git a/graphics/mesa-dri/files/patch-src_gallium_targets_xvmc_Makefile.in b/graphics/mesa-dri/files/patch-src_gallium_targets_xvmc_Makefile.in
new file mode 100644
index 000000000000..732bd3f9a7d2
--- /dev/null
+++ b/graphics/mesa-dri/files/patch-src_gallium_targets_xvmc_Makefile.in
@@ -0,0 +1,11 @@
+--- src/gallium/targets/xvmc/Makefile.in.orig 2019-10-21 16:05:11 UTC
++++ src/gallium/targets/xvmc/Makefile.in
+@@ -718,7 +718,7 @@ libXvMCgallium_la_LIBADD = $(top_builddir)/src/gallium
+ $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
+ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+- $(top_builddir)/src/util/libmesautil.la $(XVMC_LIBS) \
++ $(top_builddir)/src/util/libmesautil.la $(XVMC_LIBS) -lXv \
+ $(VL_LIBS) $(XCB_DRI3_LIBS) $(LIBDRM_LIBS) \
+ $(GALLIUM_COMMON_LIB_DEPS) $(am__append_13) $(am__append_14) \
+ $(am__append_15)
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 82ce094a6675..3c9646e7a813 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libX11
-PORTVERSION= 1.6.8
+PORTVERSION= 1.6.9
PORTEPOCH= 1
CATEGORIES= x11
@@ -12,7 +12,7 @@ COMMENT= X11 library
LICENSE= MIT
USES= cpe perl5 xorg xorg-cat:lib
-USE_XORG= xau xdmcp xtrans xorgproto xcb
+USE_XORG= xau xcb xdmcp xtrans xorgproto
USE_PERL5= build
CPE_VENDOR= x
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index c70c8bc636d1..5b379742e9bf 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560786095
-SHA256 (xorg/lib/libX11-1.6.8.tar.bz2) = b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
-SIZE (xorg/lib/libX11-1.6.8.tar.bz2) = 2395911
+TIMESTAMP = 1571332179
+SHA256 (xorg/lib/libX11-1.6.9.tar.bz2) = 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
+SIZE (xorg/lib/libX11-1.6.9.tar.bz2) = 2283814
diff --git a/x11/libX11/files/patch-src_util_makekeys.c b/x11/libX11/files/patch-src_util_makekeys.c
deleted file mode 100644
index bdde9d79f3d5..000000000000
--- a/x11/libX11/files/patch-src_util_makekeys.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/util/makekeys.c.orig 2019-06-17 14:47:35 UTC
-+++ src/util/makekeys.c
-@@ -35,8 +35,10 @@ from The Open Group.
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
-+#include <inttypes.h>
-
--#include "../Xresinternal.h"
-+typedef uint32_t Signature;
-
- #define KTNUM 4000
-
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 75c03fff9729..31bf18449bfa 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -10,6 +10,7 @@ include/X11/Xregion.h
include/X11/Xresource.h
include/X11/Xutil.h
include/X11/cursorfont.h
+include/X11/extensions/XKBgeom.h
lib/X11/XErrorDB
lib/X11/Xcms.txt
lib/X11/locale/C/Compose
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 32b5c140e576..0bb62009f996 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libXvMC
-PORTVERSION= 1.0.11
+PORTVERSION= 1.0.12
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe xorg xorg-cat:lib
-USE_XORG= x11 xext xv xorgproto
+USE_XORG= x11 xext xorgproto xv
CPE_VENDOR= x
CPE_PRODUCT= libxvmc
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
index 157b5d7f4572..fd3e52715635 100644
--- a/x11/libXvMC/distinfo
+++ b/x11/libXvMC/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560363169
-SHA256 (xorg/lib/libXvMC-1.0.11.tar.bz2) = 4a2e34d444a683a7c010b01b23cefe2b8043a063ce4dc6a9b855836b5262622d
-SIZE (xorg/lib/libXvMC-1.0.11.tar.bz2) = 303516
+TIMESTAMP = 1569372181
+SHA256 (xorg/lib/libXvMC-1.0.12.tar.bz2) = 6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd
+SIZE (xorg/lib/libXvMC-1.0.12.tar.bz2) = 306581
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
index 54ebf75fdefc..cb92a2836389 100644
--- a/x11/libXvMC/pkg-plist
+++ b/x11/libXvMC/pkg-plist
@@ -1,3 +1,4 @@
+include/X11/extensions/vldXvMC.h
include/X11/extensions/XvMClib.h
lib/libXvMC.a
lib/libXvMC.so
@@ -8,4 +9,5 @@ lib/libXvMCW.so
lib/libXvMCW.so.1
lib/libXvMCW.so.1.0.0
libdata/pkgconfig/xvmc.pc
+libdata/pkgconfig/xvmc-wrapper.pc
%%DOCSDIR%%/XvMC_API.txt
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index dba4da7a39f0..e412932af0d6 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xorgproto
-PORTVERSION= 2019.1
+PORTVERSION= 2019.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -12,8 +12,7 @@ USES= xorg-cat:proto
CONFIGURE_ARGS= --without-fop \
--without-xmlto \
--without-xsltproc \
- --disable-specs \
- --enable-legacy
+ --disable-specs
pre-patch:
@${MKDIR} ${WRKSRC}/man
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index 2597454b3848..ad397c4b13be 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561020414
-SHA256 (xorg/proto/xorgproto-2019.1.tar.bz2) = a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b
-SIZE (xorg/proto/xorgproto-2019.1.tar.bz2) = 865840
+TIMESTAMP = 1571331081
+SHA256 (xorg/proto/xorgproto-2019.2.tar.bz2) = 46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e
+SIZE (xorg/proto/xorgproto-2019.2.tar.bz2) = 847374
diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist
index 896e4fe6b99e..443b69e70d98 100644
--- a/x11/xorgproto/pkg-plist
+++ b/x11/xorgproto/pkg-plist
@@ -5,8 +5,6 @@ include/GL/glxtokens.h
include/GL/internal/glcore.h
include/X11/DECkeysym.h
include/X11/HPkeysym.h
-include/X11/PM/PM.h
-include/X11/PM/PMproto.h
include/X11/Sunkeysym.h
include/X11/X.h
include/X11/XF86keysym.h
@@ -34,15 +32,11 @@ include/X11/dri/xf86driproto.h
include/X11/dri/xf86dristr.h
include/X11/extensions/EVI.h
include/X11/extensions/EVIproto.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
-include/X11/extensions/Xeviestr.h
include/X11/extensions/XI.h
include/X11/extensions/XI2.h
include/X11/extensions/XI2proto.h
include/X11/extensions/XIproto.h
include/X11/extensions/XKB.h
-include/X11/extensions/XKBgeom.h
include/X11/extensions/XKBproto.h
include/X11/extensions/XKBsrv.h
include/X11/extensions/XKBstr.h
@@ -72,15 +66,10 @@ include/X11/extensions/dpmsproto.h
include/X11/extensions/dri2proto.h
include/X11/extensions/dri2tokens.h
include/X11/extensions/dri3proto.h
-include/X11/extensions/evieproto.h
-include/X11/extensions/fontcache.h
-include/X11/extensions/fontcacheP.h
-include/X11/extensions/fontcachstr.h
include/X11/extensions/ge.h
include/X11/extensions/geproto.h
include/X11/extensions/lbx.h
include/X11/extensions/lbxproto.h
-include/X11/extensions/lgewire.h
include/X11/extensions/mitmiscconst.h
include/X11/extensions/mitmiscproto.h
include/X11/extensions/multibufconst.h
@@ -108,11 +97,6 @@ include/X11/extensions/shmstr.h
include/X11/extensions/syncconst.h
include/X11/extensions/syncproto.h
include/X11/extensions/syncstr.h
-include/X11/extensions/vldXvMC.h
-include/X11/extensions/windowswm.h
-include/X11/extensions/windowswmstr.h
-include/X11/extensions/xcalibrateproto.h
-include/X11/extensions/xcalibratewire.h
include/X11/extensions/xcmiscproto.h
include/X11/extensions/xcmiscstr.h
include/X11/extensions/xf86bigfont.h
@@ -125,10 +109,6 @@ include/X11/extensions/xf86dga1str.h
include/X11/extensions/xf86dgaconst.h
include/X11/extensions/xf86dgaproto.h
include/X11/extensions/xf86dgastr.h
-include/X11/extensions/xf86misc.h
-include/X11/extensions/xf86mscstr.h
-include/X11/extensions/xf86rush.h
-include/X11/extensions/xf86rushstr.h
include/X11/extensions/xf86vm.h
include/X11/extensions/xf86vmproto.h
include/X11/extensions/xf86vmstr.h
@@ -138,13 +118,6 @@ include/X11/extensions/xtestconst.h
include/X11/extensions/xtestext1const.h
include/X11/extensions/xtestext1proto.h
include/X11/extensions/xtestproto.h
-include/X11/extensions/xtrapbits.h
-include/X11/extensions/xtrapddmi.h
-include/X11/extensions/xtrapdi.h
-include/X11/extensions/xtrapemacros.h
-include/X11/extensions/xtraplib.h
-include/X11/extensions/xtraplibp.h
-include/X11/extensions/xtrapproto.h
include/X11/fonts/FS.h
include/X11/fonts/FSproto.h
include/X11/fonts/font.h
@@ -160,37 +133,26 @@ libdata/pkgconfig/damageproto.pc
libdata/pkgconfig/dmxproto.pc
libdata/pkgconfig/dri2proto.pc
libdata/pkgconfig/dri3proto.pc
-libdata/pkgconfig/evieproto.pc
libdata/pkgconfig/fixesproto.pc
-libdata/pkgconfig/fontcacheproto.pc
libdata/pkgconfig/fontsproto.pc
libdata/pkgconfig/glproto.pc
libdata/pkgconfig/inputproto.pc
libdata/pkgconfig/kbproto.pc
-libdata/pkgconfig/lg3dproto.pc
libdata/pkgconfig/presentproto.pc
-libdata/pkgconfig/printproto.pc
libdata/pkgconfig/randrproto.pc
libdata/pkgconfig/recordproto.pc
libdata/pkgconfig/renderproto.pc
libdata/pkgconfig/resourceproto.pc
libdata/pkgconfig/scrnsaverproto.pc
-libdata/pkgconfig/trapproto.pc
libdata/pkgconfig/videoproto.pc
-libdata/pkgconfig/windowswmproto.pc
-libdata/pkgconfig/xcalibrateproto.pc
libdata/pkgconfig/xcmiscproto.pc
libdata/pkgconfig/xextproto.pc
libdata/pkgconfig/xf86bigfontproto.pc
libdata/pkgconfig/xf86dgaproto.pc
libdata/pkgconfig/xf86driproto.pc
-libdata/pkgconfig/xf86rushproto.pc
-libdata/pkgconfig/xf86miscproto.pc
libdata/pkgconfig/xf86vidmodeproto.pc
libdata/pkgconfig/xineramaproto.pc
libdata/pkgconfig/xproto.pc
-libdata/pkgconfig/xproxymngproto.pc
-man/man7/Xprint.7.gz
%%DOCSDIR%%/PM_spec
%%DOCSDIR%%/compositeproto.txt
%%DOCSDIR%%/damageproto.txt