pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
modular-xorg-server-dfbsd: Update wip/modular-xorg-server to 1.19.2
Module Name: pkgsrc-wip
Committed By: David Shao <davshao%gmail.com@localhost>
Pushed By: dshao
Date: Wed Mar 8 15:30:18 2017 -0800
Changeset: b6886a2525bd38f17515df02109467a07cbb009d
Modified Files:
modular-xorg-server-dfbsd/Makefile
modular-xorg-server-dfbsd/Makefile.common
modular-xorg-server-dfbsd/PLIST
modular-xorg-server-dfbsd/TODO
modular-xorg-server-dfbsd/distinfo
modular-xorg-server-dfbsd/options.mk
modular-xorg-server-dfbsd/patches/patch-config_devd.c
modular-xorg-server-dfbsd/patches/patch-configure
modular-xorg-server-dfbsd/patches/patch-hw_xfree86_common_xf86Xinput.c
modular-xorg-server-dfbsd/patches/patch-hw_xfree86_dri2_dri2.c
modular-xorg-server-dfbsd/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
Log Message:
modular-xorg-server-dfbsd: Update wip/modular-xorg-server to 1.19.2
Changes:
* Bug fix update to upstream 1.19.2
* pkgsrc configure no longer works, need full autoreconf.
* Added dri3 option enabled by default
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b6886a2525bd38f17515df02109467a07cbb009d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
modular-xorg-server-dfbsd/Makefile | 3 +++
modular-xorg-server-dfbsd/Makefile.common | 7 +++---
modular-xorg-server-dfbsd/PLIST | 2 +-
modular-xorg-server-dfbsd/TODO | 7 ++++++
modular-xorg-server-dfbsd/distinfo | 20 ++++++++---------
modular-xorg-server-dfbsd/options.mk | 26 ++++++++++++++++------
.../patches/patch-config_devd.c | 19 +++++++++++-----
modular-xorg-server-dfbsd/patches/patch-configure | 16 +++++++++++--
.../patches/patch-hw_xfree86_common_xf86Xinput.c | 9 ++++++++
.../patches/patch-hw_xfree86_dri2_dri2.c | 8 +++----
.../patch-hw_xfree86_os-support_bsd_i386__video.c | 16 +++++++++++--
11 files changed, 98 insertions(+), 35 deletions(-)
diffs:
diff --git a/modular-xorg-server-dfbsd/Makefile b/modular-xorg-server-dfbsd/Makefile
index 73a3f19c24..3cbaae4c22 100644
--- a/modular-xorg-server-dfbsd/Makefile
+++ b/modular-xorg-server-dfbsd/Makefile
@@ -18,4 +18,7 @@ CONFIGURE_ARGS+= --disable-kdrive
.include "options.mk"
+pre-patch:
+ cd ${WRKSRC} && autoreconf -vif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/modular-xorg-server-dfbsd/Makefile.common b/modular-xorg-server-dfbsd/Makefile.common
index 85dda37aa0..70de57ff31 100644
--- a/modular-xorg-server-dfbsd/Makefile.common
+++ b/modular-xorg-server-dfbsd/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.14 2017/01/12 00:26:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2017/02/22 10:42:41 wiz Exp $
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
-XORG_VERSION= 1.19.1
+XORG_VERSION= 1.19.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,7 @@ LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
USE_LANGUAGES+= c99
PKGCONFIG_OVERRIDE+= xorg-server.pc.in
@@ -184,3 +184,4 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/modular-xorg-server-dfbsd/PLIST b/modular-xorg-server-dfbsd/PLIST
index 2d1a237b64..4a8db4432f 100644
--- a/modular-xorg-server-dfbsd/PLIST
+++ b/modular-xorg-server-dfbsd/PLIST
@@ -34,7 +34,7 @@ include/xorg/dixgrabs.h
include/xorg/dixstruct.h
${PLIST.dri}include/xorg/dri.h
${PLIST.dri}include/xorg/dri2.h
-${PLIST.dri}include/xorg/dri3.h
+${PLIST.dri3}include/xorg/dri3.h
${PLIST.dri}include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/events.h
diff --git a/modular-xorg-server-dfbsd/TODO b/modular-xorg-server-dfbsd/TODO
index 9efedebccf..3077ec0e42 100644
--- a/modular-xorg-server-dfbsd/TODO
+++ b/modular-xorg-server-dfbsd/TODO
@@ -4,3 +4,10 @@ Waiting for devd patches required on latest FreeBSD and DragonFly
submitted in
pkg/50200 (x11/modular-xorg-server)
to be accepted.
+
+Normal pkgsrc configure no longer works, need full autoreconf instead.
+Put autoreconf in pre-patch because not sure how else to apply
+patches to configure.
+
+Unsure whether RegisterBlockAndWakeupHandlers() and
+RemoveBlockAndWakeupHandlers() are used anymore after 1.19 API shift.
diff --git a/modular-xorg-server-dfbsd/distinfo b/modular-xorg-server-dfbsd/distinfo
index 818dba3d3d..1265841ad2 100644
--- a/modular-xorg-server-dfbsd/distinfo
+++ b/modular-xorg-server-dfbsd/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.80 2017/01/12 00:26:35 wiz Exp $
+$NetBSD: distinfo,v 1.81 2017/01/28 21:47:55 maya Exp $
-SHA1 (xorg-server-1.19.1.tar.bz2) = 13c81e0ebb6ac1359a611d0503805c6dc0315477
-RMD160 (xorg-server-1.19.1.tar.bz2) = 6434b1b6946a84ba5a829556ea8cfdf60a510863
-SHA512 (xorg-server-1.19.1.tar.bz2) = 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
-Size (xorg-server-1.19.1.tar.bz2) = 6041792 bytes
+SHA1 (xorg-server-1.19.2.tar.bz2) = da3ee5149de78ec9795bed1c94072e1c8f4bc473
+RMD160 (xorg-server-1.19.2.tar.bz2) = b482770769cb49fe9d448b3e8d418968d9718d7a
+SHA512 (xorg-server-1.19.2.tar.bz2) = 258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16
+Size (xorg-server-1.19.2.tar.bz2) = 5969543 bytes
SHA1 (patch-config_config-backends.h) = f44868caa51e972a76949f73ac6083640af2c351
SHA1 (patch-config_config.c) = 5a3fe4cb6c2170335ab547f438386cff77a9c152
-SHA1 (patch-config_devd.c) = 99b7e1885b5a87b81bbb5f4ef822188aa0710bd1
-SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
+SHA1 (patch-config_devd.c) = c4f968f66903c858e0bb65cafb5229be77f10a2f
+SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
SHA1 (patch-hw_xfree86_common_xf86Config.c) = 7964ac8d32d4fcea113c8950661ab921c63ad9d0
SHA1 (patch-hw_xfree86_common_xf86Globals.c) = 870100ea740b2c0bc1261355d3fcdf17ec50f64f
-SHA1 (patch-hw_xfree86_common_xf86Xinput.c) = d3cfebf67740c03883b0e65b0adb307f5e9c0fe1
+SHA1 (patch-hw_xfree86_common_xf86Xinput.c) = 5217a62409708b085a1f83bb0401376e030fb34f
SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 896825ba12646431cba603938d118acbdde305dd
SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
-SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
+SHA1 (patch-hw_xfree86_dri2_dri2.c) = 44aa2e3d15a8985e2541a405b8a5ec7b7813b29f
SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
-SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
+SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = 9bd30fa3ed7c73afd0b15e5cf5286de439f19351
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 7f6f517c71..1901846538 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -1,32 +1,44 @@
-# $NetBSD: options.mk,v 1.16 2016/11/22 16:02:54 wiz Exp $
+# $NetBSD: options.mk,v 1.17 2017/02/21 14:56:14 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
PKG_SUPPORTED_OPTIONS+= devd
PKG_SUGGESTED_OPTIONS= inet6
.if ${X11_TYPE} == "modular"
-PKG_SUPPORTED_OPTIONS+= dri
+PKG_SUPPORTED_OPTIONS+= dri dri3
PKG_SUGGESTED_OPTIONS+= dri
+PKG_SUGGESTED_OPTIONS+= dri3
.endif
+# dri3 requires kernel support for dma_buf
+# .if ${OPSYS} == "Linux"
+# PKG_SUGGESTED_OPTIONS+= dri3
+# .endif
+
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= devd
.endif
-# Enabled in FreeBSD ports / DragonFly dports
-CONFIGURE_ARGS+= --enable-record=yes
-
.include "../../mk/bsd.options.mk"
PLIST_VARS+= dri dtrace
+PLIST_VARS+= dri3
.if !empty(PKG_OPTIONS:Mdri)
+
+.if !empty(PKG_OPTIONS:Mdri3)
+CONFIGURE_ARGS+= --enable-dri3
+PLIST.dri3= yes
+.include "../../x11/dri3proto/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-dri3
+.endif
+
.include "../../graphics/libepoxy/buildlink3.mk"
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/dri2proto/buildlink3.mk"
-.include "../../x11/dri3proto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
.include "../../x11/presentproto/buildlink3.mk"
@@ -34,7 +46,6 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
PLIST.dri= yes
CONFIGURE_ARGS+= --enable-dri
CONFIGURE_ARGS+= --enable-dri2
-CONFIGURE_ARGS+= --enable-dri3
CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --enable-glamor
CONFIGURE_ARGS+= --enable-present
@@ -46,6 +57,7 @@ CONFIGURE_ARGS+= --disable-dri
CONFIGURE_ARGS+= --disable-dri2
CONFIGURE_ARGS+= --disable-dri3
CONFIGURE_ARGS+= --disable-glx
+CONFIGURE_ARGS+= --disable-glamor
CONFIGURE_ARGS+= --disable-present
pre-build: disable-modesetting
.PHONY: disable-modesetting
diff --git a/modular-xorg-server-dfbsd/patches/patch-config_devd.c b/modular-xorg-server-dfbsd/patches/patch-config_devd.c
index 1553ac1e11..fa0ab677cc 100644
--- a/modular-xorg-server-dfbsd/patches/patch-config_devd.c
+++ b/modular-xorg-server-dfbsd/patches/patch-config_devd.c
@@ -4,9 +4,9 @@ devd support to detect devices from FreeBSD ports / DragonFly dports
Further fix to use SetNotifyFd / RemoveNotifyFd
---- config/devd.c.orig 2016-11-19 17:36:01.195812000 +0000
+--- config/devd.c.orig 2017-02-27 17:13:49.368381000 +0000
+++ config/devd.c
-@@ -0,0 +1,564 @@
+@@ -0,0 +1,571 @@
+/*
+ * Copyright (c) 2012 Baptiste Daroussin
+ * Copyright (c) 2013, 2014 Alex Kozlov
@@ -72,7 +72,7 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+static int sock_devd;
+static bool is_console_kbd = false;
+static bool is_kbdmux = false;
-+OsTimerPtr rtimer;
++static OsTimerPtr rtimer = NULL;
+
+struct hw_type {
+ const char *driver;
@@ -428,6 +428,7 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+ disconnect_devd(sock_devd);
+ rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);
+ LogMessage(X_WARNING, "config/devd: devd socket is lost\n");
++ free(buf);
+ return -1;
+ }
+ if (c == '\n')
@@ -456,10 +457,10 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+ return sz;
+}
+
++#if 0
+static void
+wakeup_handler(void *data, int err)
+{
-+/*
+ char *line = NULL;
+ char *walk;
+
@@ -484,8 +485,8 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+ break;
+ }
+ free(line);
-+*/
+}
++#endif
+
+static void
+devdInputHandlerNotify(int sock, int read, void *data)
@@ -507,16 +508,18 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+ case DEVD_EVENT_REMOVE:
+ device_removed(line + 1);
+ break;
-+ default:
++ default:
+ break;
+ }
+ free(line);
+}
+
++#if 0
+static void
+block_handler(void *data, struct timeval **tv)
+{
+}
++#endif
+
+int
+config_devd_init(void)
@@ -548,7 +551,9 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+ if ((sock_devd = connect_devd()) < 0)
+ return 0;
+
++#if 0
+ RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
++#endif
+
+ return 1;
+}
@@ -565,7 +570,9 @@ Further fix to use SetNotifyFd / RemoveNotifyFd
+
+ disconnect_devd(sock_devd);
+
++#if 0
+ RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
++#endif
+
+ is_console_kbd = false;
+}
diff --git a/modular-xorg-server-dfbsd/patches/patch-configure b/modular-xorg-server-dfbsd/patches/patch-configure
index 2704aeafbf..6d4e33aed5 100644
--- a/modular-xorg-server-dfbsd/patches/patch-configure
+++ b/modular-xorg-server-dfbsd/patches/patch-configure
@@ -1,11 +1,13 @@
-$NetBSD: patch-configure,v 1.3 2015/06/29 11:12:45 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2017/01/28 21:47:55 maya Exp $
Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
(c.f. patch-hw_xfree86_os-support_bsd_i386.c)
+for netbsd, force pass pthread configure checks (pthread not needed)
+
--- configure.orig 2015-02-10 22:49:52.000000000 +0000
+++ configure
-@@ -22680,7 +22680,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
+@@ -23235,7 +23235,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
$as_echo "#define USE_DEV_IO 1" >>confdefs.h
;;
*netbsd*)
@@ -14,3 +16,13 @@ Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
SYS_LIBS=-lx86_64
;;
+@@ -25079,7 +25079,8 @@ case ${host_os} in
+ netbsd*)
+ # use libc stubs, don't link against libpthread, to allow
+ # dynamic loading
+- ax_pthread_flags=""
++ ax_pthread_flags="none"
++ ax_pthread_ok="yes"
+ ;;
+ esac
+
diff --git a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_common_xf86Xinput.c b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_common_xf86Xinput.c
index 1932b5ce0b..01d708e8bf 100644
--- a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_common_xf86Xinput.c
+++ b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_common_xf86Xinput.c
@@ -4,6 +4,15 @@ devd support to detect devices from FreeBSD ports / DragonFly dports
--- hw/xfree86/common/xf86Xinput.c.orig 2017-01-04 21:32:10.000000000 +0000
+++ hw/xfree86/common/xf86Xinput.c
+@@ -871,7 +871,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, D
+ {
+ InputDriverPtr drv = NULL;
+ DeviceIntPtr dev = NULL;
+- Bool paused;
++ Bool paused = 0;
+ int rval;
+ char *path = NULL;
+
@@ -1034,6 +1034,7 @@ NewInputDeviceRequest(InputOption *optio
if (strcmp(key, "_source") == 0 &&
(strcmp(value, "server/hal") == 0 ||
diff --git a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_dri2_dri2.c b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_dri2_dri2.c
index 81f431291c..43d15a93ae 100644
--- a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_dri2_dri2.c
+++ b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_dri2_dri2.c
@@ -9,9 +9,9 @@ dri2.c:320:27: note: initialize the variable 'ref' to silence this warning
dri2.c:601:27: note: initialize the variable 'ref' to silence this warning
DRI2DrawableRefPtr ref;
---- hw/xfree86/dri2/dri2.c.orig 2015-01-26 18:42:23.000000000 +0000
+--- hw/xfree86/dri2/dri2.c.orig 2017-01-06 15:03:50.000000000 +0000
+++ hw/xfree86/dri2/dri2.c
-@@ -279,7 +279,7 @@ typedef struct DRI2DrawableRefRec {
+@@ -312,7 +312,7 @@ typedef struct DRI2DrawableRefRec {
static DRI2DrawableRefPtr
DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
{
@@ -20,7 +20,7 @@ dri2.c:601:27: note: initialize the variable 'ref' to silence this warning
xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
if (ref->id == id)
-@@ -359,7 +359,7 @@ static int
+@@ -392,7 +392,7 @@ static int
DRI2DrawableGone(void *p, XID id)
{
DRI2DrawablePtr pPriv = p;
@@ -29,7 +29,7 @@ dri2.c:601:27: note: initialize the variable 'ref' to silence this warning
WindowPtr pWin;
PixmapPtr pPixmap;
DrawablePtr pDraw;
-@@ -676,7 +676,7 @@ static void
+@@ -713,7 +713,7 @@ static void
DRI2InvalidateDrawable(DrawablePtr pDraw)
{
DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
diff --git a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_os-support_bsd_i386__video.c b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
index 3427d35f7d..457eb083c2 100644
--- a/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
+++ b/modular-xorg-server-dfbsd/patches/patch-hw_xfree86_os-support_bsd_i386__video.c
@@ -1,8 +1,20 @@
$NetBSD: patch-hw_xfree86_os-support_bsd_i386__video.c,v 1.1 2015/04/25 11:47:03 tnn Exp $
---- hw/xfree86/os-support/bsd/i386_video.c.orig 2015-01-17 23:42:52.000000000 +0000
+Added patch from FreeBSD ports / DragonFly dports
+
+--- hw/xfree86/os-support/bsd/i386_video.c.orig 2017-01-05 21:19:31.000000000 +0000
+++ hw/xfree86/os-support/bsd/i386_video.c
-@@ -42,6 +42,9 @@
+@@ -32,6 +32,9 @@
+ #include "xf86Priv.h"
+
+ #include <errno.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <sys/types.h>
++#endif
+ #include <sys/mman.h>
+
+ #include "xf86_OSlib.h"
+@@ -42,6 +45,9 @@
#else
#define MAP_FLAGS (MAP_FILE | MAP_SHARED)
#endif
Home |
Main Index |
Thread Index |
Old Index