Xfbdev on ARAnyM
Hi *,
I was wondering about X yesterday and found out that Geert
only patched kdrive, not the fbdev module, and that Julien
Cristau (again) threw a club onto our way and disabled the
Xfbdev server entirely.
Find attached a debdiff of what I built: the X server version
with Geert’s patch already included but not yet build-depending
on stuff not built on Debian/m68k yet (thus not 1.15 final),
with a patch to make it build (R_SP) and reverting not building
the Xfbdev server.
I can successfully run this:
root@moba:~ # cat .xserverrc
exec /usr/bin/Xfbdev -retro -nolisten tcp "$@"
root@moba:~ # cat .xinitrc
#!/bin/mksh
xterm &
exec evilwm
But! I do not get to have any mouse or keyboard input.
I’ve uploaded it to “unreleased”, so feel free to play with
this past about 14:00 UTC today (when it should hit the mirrors).
bye,
//mirabilos
--
22:59⎜<Vutral> glaub ich termkit is kompliziert | glabe nicht das man
damit schneller arbeitet | reizüberflutung │ wie windows │ alles evil
zuviel bilder │ wie ein spiel | 23:00⎜<Vutral> die meisten raffen auch
nicht mehr von windows | 23:01⎜<Vutral> bilderbücher sind ja auch nich
wirklich verbreitet als erwachsenen literatur ‣ who needs GUIs thus?
diff -u xorg-server-1.14.99.3/debian/changelog xorg-server-1.14.99.3/debian/changelog
--- xorg-server-1.14.99.3/debian/changelog
+++ xorg-server-1.14.99.3/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.14.99.3-1+m68k.1) unreleased; urgency=medium
+
+ * Revert commit 90a0da67701659f9f9c949251ab1483d1dc0a8ab
+ "Stop building Xfbdev." by Julien Cristau, we clearly need it.
+ * Fix R_SP clash: apply patch from Message #5 (Closes: #729337).
+
+ -- Thorsten Glaser <tg@mirbsd.de> Wed, 19 Mar 2014 21:51:06 +0100
+
xorg-server (2:1.14.99.3-1) experimental; urgency=low
* New upstream snapshot.
diff -u xorg-server-1.14.99.3/debian/control xorg-server-1.14.99.3/debian/control
--- xorg-server-1.14.99.3/debian/control
+++ xorg-server-1.14.99.3/debian/control
@@ -311,6 +311,22 @@
.
This package is built from the X.org xserver module.
+Package: xserver-xfbdev
+Architecture: linux-any
+Depends:
+ xserver-common (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Provides: xserver
+Description: Linux framebuffer device tiny X server
+ xserver-xfbdev is a Linux framebuffer device tiny X server based on the
+ kdrive X server.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xserver module.
+
Package: xserver-xorg-core-dbg
Architecture: any
Depends:
diff -u xorg-server-1.14.99.3/debian/rules xorg-server-1.14.99.3/debian/rules
--- xorg-server-1.14.99.3/debian/rules
+++ xorg-server-1.14.99.3/debian/rules
@@ -44,8 +44,10 @@
ifeq ($(DEB_HOST_ARCH_OS), linux)
+ build_xfbdev = --enable-xfbdev
selinux = --enable-xselinux
else
+ build_xfbdev = --disable-xfbdev
selinux = --disable-xselinux
endif
@@ -111,7 +113,6 @@
--disable-xquartz \
--disable-xwin \
--disable-xfake \
- --disable-xfbdev \
--disable-install-setuid
confflags_main = \
only in patch2:
unchanged:
--- xorg-server-1.14.99.3.orig/debian/xserver-xfbdev.install
+++ xorg-server-1.14.99.3/debian/xserver-xfbdev.install
@@ -0,0 +1 @@
+main/usr/bin/Xfbdev usr/bin
only in patch2:
unchanged:
--- xorg-server-1.14.99.3.orig/hw/xfree86/x86emu/x86emu/regs.h
+++ xorg-server-1.14.99.3/hw/xfree86/x86emu/x86emu/regs.h
@@ -39,6 +39,9 @@
#ifndef __X86EMU_REGS_H
#define __X86EMU_REGS_H
+/* we sometimes clash with system headers, so pull them in here */
+#include <signal.h>
+
/*---------------------- Macros and type definitions ----------------------*/
#ifdef PACK
@@ -117,6 +120,14 @@
};
/* 8 bit registers */
+#undef R_AH
+#undef R_AL
+#undef R_BH
+#undef R_BL
+#undef R_CH
+#undef R_CL
+#undef R_DH
+#undef R_DL
#define R_AH gen.A.I8_reg.h_reg
#define R_AL gen.A.I8_reg.l_reg
#define R_BH gen.B.I8_reg.h_reg
@@ -127,18 +138,32 @@
#define R_DL gen.D.I8_reg.l_reg
/* 16 bit registers */
+#undef R_AX
+#undef R_BX
+#undef R_CX
+#undef R_DX
#define R_AX gen.A.I16_reg.x_reg
#define R_BX gen.B.I16_reg.x_reg
#define R_CX gen.C.I16_reg.x_reg
#define R_DX gen.D.I16_reg.x_reg
/* 32 bit extended registers */
+#undef R_EAX
+#undef R_EBX
+#undef R_ECX
+#undef R_EDX
#define R_EAX gen.A.I32_reg.e_reg
#define R_EBX gen.B.I32_reg.e_reg
#define R_ECX gen.C.I32_reg.e_reg
#define R_EDX gen.D.I32_reg.e_reg
/* special registers */
+#undef R_SP
+#undef R_BP
+#undef R_SI
+#undef R_DI
+#undef R_IP
+#undef R_FLG
#define R_SP spc.SP.I16_reg.x_reg
#define R_BP spc.BP.I16_reg.x_reg
#define R_SI spc.SI.I16_reg.x_reg
@@ -147,14 +172,12 @@
#define R_FLG spc.FLAGS
/* special registers */
-#define R_SP spc.SP.I16_reg.x_reg
-#define R_BP spc.BP.I16_reg.x_reg
-#define R_SI spc.SI.I16_reg.x_reg
-#define R_DI spc.DI.I16_reg.x_reg
-#define R_IP spc.IP.I16_reg.x_reg
-#define R_FLG spc.FLAGS
-
-/* special registers */
+#undef R_ESP
+#undef R_EBP
+#undef R_ESI
+#undef R_EDI
+#undef R_EIP
+#undef R_EFLG
#define R_ESP spc.SP.I32_reg.e_reg
#define R_EBP spc.BP.I32_reg.e_reg
#define R_ESI spc.SI.I32_reg.e_reg
@@ -163,6 +186,12 @@
#define R_EFLG spc.FLAGS
/* segment registers */
+#undef R_CS
+#undef R_DS
+#undef R_SS
+#undef R_ES
+#undef R_FS
+#undef R_GS
#define R_CS seg.CS
#define R_DS seg.DS
#define R_SS seg.SS
Reply to: