Re: Heads up: transition: xserver 1.16
Thanks. I've checked that xserver-xorg-video-nv (non-free, meant for kfreebsd systems) still builds OK with xorg-video-abi-18, xserver-xorg-core (= 2:1.15.99.903). I don't have hardware available to test it with unfortunately. I can confirm that xserver-xorg-video-nv works under kfreebsd-amd64: NVIDIA Corporation G73 [GeForce 7300 GT] (rev a1) xrandr -q Screen 0: minimum 640 x 400, current 1920 x 1080, maximum 1920 x 1080 default connected 1920x1080+0+0 0mm x 0mm ii xserver-xorg-core 2:1.15.99.904-1 ii xserver-xorg-dev 2:1.15.99.904-1 It remains to upload it into unstable by some DD. Cheers Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/alpine.lnx.2.00.1407172103500.15...@contest.felk.cvut.cz
Re: xserver-xorg-video-nv driver for GNU/kFreeBSD
I cooked with today tagged release and made it available on http://asdfasdf.debian.net/~salinger/xserver-xorg-video-nv/ Should this be uploaded to sid? IMHO yes, please just restrict architecture to kfreebsd-any. It might be valuable for other people, not just me. Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lrh.2.02.1207202323040.1...@sci.felk.cvut.cz
Re: xserver-xorg-video-nv driver for GNU/kFreeBSD
Hi, I cooked with today tagged release and made it available on http://asdfasdf.debian.net/~salinger/xserver-xorg-video-nv/ Petr xserver-xorg-video-nv driver have been removed from unstable. It is replaced by xserver-xorg-video-nouveau driver, but only under Linux, as it requires KMS. I dist-upgraded to wheezy today. My graphics card works with vesa driver, but only with 4:3 aspect, which is really bad for 16:9 LCD :-(. I have been able to mix git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-nv git clone git://git.debian.org/pkg-xorg/attic/driver/xserver-xorg-video-nv.git and build some working version. Would be possible to restore building of video-nv driver under GNU/kFreeBSD only ? Would be possible to get it into wheezy ? -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lrh.2.02.1207171721340.26...@sci.felk.cvut.cz
Bug#681506: xserver-xorg-input-mouse: crash on kfreebsd-*
thanks, I'll probably just apply it as-is. Thank you. Please would you also ask for unblock on -release ? It might interfere with d-i beta1, but you know better which time for migration is better. Thanks Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lrh.2.02.1207171725200.26...@sci.felk.cvut.cz
Bug#681506: xserver-xorg-input-mouse: crash on kfreebsd-*
Package: xserver-xorg-input-mouse
Version: 1:1.7.2-2
Severity: serious
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd
X-Debbugs-Cc: debian-...@lists.debian.org
Hi.
The current version of xserver segfaults under kfreebsd-amd64.
[ 237.968] (II) Using input driver 'mouse' for 'Configured Mouse'
[ 237.968] (**) Option CorePointer on
[ 237.968] (**) Configured Mouse: always reports core events
[ 237.968]
[ 237.968] Backtrace:
[ 237.968] 0: Xorg (xorg_backtrace+0x36) [0x5641a6]
[ 237.968] 1: Xorg (0x40+0x167cc9) [0x567cc9]
[ 237.968] 2: /lib/x86_64-kfreebsd-gnu/libpthread.so.0 (0x8014cc000+0xbf04)
[0x8014d7f04]
It is due to buggy workaround of gcc bug #665390.
Please just replace bsd-array-bounds.diff with attached one.
I believe it will solve also #678124 and
http://lists.debian.org/debian-bsd/2012/07/msg00068.html
PetrIndex: xserver-xorg-input-mouse/src/bsd_mouse.c
===
--- xserver-xorg-input-mouse.orig/src/bsd_mouse.c
+++ xserver-xorg-input-mouse/src/bsd_mouse.c
@@ -139,10 +139,10 @@ CheckProtocol(const char *protocol)
{
int i;
-for (i = 0; internalNames[i]; i++)
+for (i = -1; internalNames[++i];)
if (xf86NameCmp(protocol, internalNames[i]) == 0)
return TRUE;
-for (i = 0; miscNames[i]; i++)
+for (i = -1; miscNames[++i];)
if (xf86NameCmp(protocol, miscNames[i]) == 0)
return TRUE;
return FALSE;
Re: Help needed for mesa
Hi.
xorg-server 1.9 build-depends on mesa with a version higher than the
one available in sid, and both mesa 7.9 and 7.10 FTBFS on non-Linux
for now.
The FTBFS (on kfreebsd-amd64) is due to need of
radeon_gem_get_kernel_name(), which is provided by libdrm-radeon1 on
Linux. It suffices to enable this library in libdrm. After that the
mesa 7.10-2 builds. I am not sure, whether it is the right thing, though.
Petr
diff -u libdrm-2.4.23/debian/control libdrm-2.4.23/debian/control
--- libdrm-2.4.23/debian/control
+++ libdrm-2.4.23/debian/control
@@ -22,7 +22,7 @@
Depends:
libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- libdrm-radeon1 (= ${binary:Version}) [linux-any],
+ libdrm-radeon1 (= ${binary:Version}),
libdrm-nouveau1a (= ${binary:Version}) [linux-any],
libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
@@ -124,7 +124,7 @@
Package: libdrm-radeon1
Section: libs
-Architecture: linux-any
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -137,7 +137,7 @@
Package: libdrm-radeon1-dbg
Section: debug
Priority: extra
-Architecture: linux-any
+Architecture: any
Depends:
libdrm-radeon1 (= ${binary:Version}),
${misc:Depends},
diff -u libdrm-2.4.23/debian/rules libdrm-2.4.23/debian/rules
--- libdrm-2.4.23/debian/rules
+++ libdrm-2.4.23/debian/rules
@@ -37,8 +37,8 @@
LIBKMS=no
confflags += --disable-nouveau-experimental-api
NOUVEAU = no
- confflags += --disable-radeon
- RADEON = no
+ confflags += --enable-radeon
+ RADEON = yes
endif
# only build libdrm-intel on x86
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/pine.lnx.4.62.1102071135100.19...@sci.felk.cvut.cz
Bug#494846: xserver-xorg-video-tga: FTBFS on kfreebsd-amd64 (kfreebsd-amd64 is not in the architecture list)
The package is still built on both kfreebsd-i386 and (linux-)amd64, please enable it also for kfreebsd-amd64. And it's still useless on anything but alpha (and maybe mips?), AFAIK. Unless you can show evidence that DEC 21030 chips were used on other machines... Currently it is built on all but s390 and kfreebsd-amd64, see https://buildd.debian.org/~luk/status/package.php?p=xserver-xorg-video-tga The current situation is highly inconsistent. It will be fine for us to drop it from kfreebsd-i386, amd64, i386 and list it in Packages-arch-specific. I am trying to minimize differencies between kfreebsd-i386/kfreebsd-amd64, see http://glibc-bsd.alioth.debian.org/NOTES.archive the xserver-xorg-video-tga is one of them. Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#542806: xserver-xorg-input-mouse: fdi file for GNU/kFreeBSD, now FTBFS
found 542806 1:1.4.0-3 -- Hi, there should be install -m 644 debian/local/10-x11-input-mouse.fdi ... instead of install -m 644 debian/local/10-x11-mouse.fdi ... Thanks Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#537345: mesa: please enable i686 optimized libraries also on kfreebsd-i386
Package: mesa Severity: wishlist Version: 7.4.4-1 Tags: patch User: glibc-bsd-de...@lists.alioth.debian.org Usertags: kfreebsd Hi, please enable i686 optimized libraries also on kfreebsd-i386. It is sufficent to apply patch bellow and sed -i s/Architecture: i386/Architecture: i386 kfreebsd-i386/ debian/control Thanks in advance. Petr --- debian/scripts/choose-configs +++ debian/scripts/choose-configs @@ -37,7 +37,7 @@ ## ## CPU-optimized configurations ## -ifeq ($(DEB_BUILD_ARCH), i386) +ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386)) SWX11_GLU_CONFIGS += swx11+glu-i386-i686 # DRI_CONFIGS += debian-dri-i386-i686 endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#525475: xorg-server: FTBFS on GNU/kFreeBSD (needs defined(__FreeBSD_kernel__) || twice)
Hi, please note that similar change || defined(__GNU__) is already in git in 20_hurd-i386.diff patch. Please, could you just extend the 20_hurd-i386.diff patch by defined(__FreeBSD_kernel__) ||. After that it is possible to build xserver-xorg-video-nv and get current xorg working under GNU/kFreeBSD at least on my nVidia Corporation G70 [GeForce 7300 GT]. Many thanks. Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#525515: xorg: uninstallable on GNU/kFreeBSD, hurd
Package: xorg Severity: important Version: 1:7.4+1 User: glibc-bsd-de...@lists.alioth.debian.org Usertags: kfreebsd Hi, the current version of xserver-xorg is uninstallable on GNU/kFreeBSD. The problematic parts are Depends: hal (= 0.5.12~git20090406), console-setup (= 1.29), The hal is lacking behind on GNU/kFreeBSD, it does not even exist on hurd, the console-setup depends on Linux specific package. Would be possible to restore previous behaviour and use configuration of input devices from /etc/X11/xorg.conf on non-linux architectures and restrict these depends only for Linux arhitectures ? Thanks in advance Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#525475: xorg-server: FTBFS on GNU/kFreeBSD
Package: xorg-server Severity: important Version: 2:1.6.1-1 Tags: patch User: glibc-bsd-de...@lists.alioth.debian.org Usertags: kfreebsd Hi, the current version fails to build on GNU/kFreeBSD. It needs small tweaks, see bellow. It is just addition defined(__FreeBSD_kernel__) || into two places. It would also be nice if you can ask upstream to include this changes. Thanks in advance Petr only in patch2: unchanged: --- xorg-server-1.6.1.orig/hw/xfree86/os-support/shared/stdResource.c +++ xorg-server-1.6.1/hw/xfree86/os-support/shared/stdResource.c @@ -44,7 +44,7 @@ #include bus/Pci.h #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__DragonFly__) || defined(__sun) + defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__sun) #define xf86StdAccResFromOS xf86AccResFromOS #endif only in patch2: unchanged: --- xorg-server-1.6.1.orig/hw/xfree86/os-support/bus/Pci.h +++ xorg-server-1.6.1/hw/xfree86/os-support/bus/Pci.h @@ -169,7 +169,7 @@ #endif /* !defined(DEBUGPCI) */ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ - defined(__DragonFly__) || defined(__sun) + defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__sun) #define ARCH_PCI_INIT bsdPciInit #endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#521253: libdrm: libdrm-dev uninstallable on GNU/kFreeBSD (depends on linux specific package)
Package: libdrm Severity: important Version: 2.4.5-1 User: glibc-bsd-de...@lists.alioth.debian.org Usertags: kfreebsd Hi, the current version of libdrm-dev is uninstallable on GNU/kFreeBSD. It is due to recently added depends on linux-libc-dev = 2.6.28, which is obviously linux specific. Please could you either 1) depend on linux-libc-dev only on linux architectures, it should suffice to use something like linux-libc-dev [linux-any] = 2.6.28 in debian/control 2) convert depends into conflicts linux-libc-dev 2.6.28 as linux-libc-dev is build-essential on linux architectures Thanks in advance Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#521253: libdrm: libdrm-dev uninstallable on GNU/kFreeBSD (depends on linux specific package)
On Thu, 26 Mar 2009, Julien Cristau wrote: On Thu, 2009-03-26 at 10:02 +0100, Petr Salinger wrote: Please could you either 1) depend on linux-libc-dev only on linux architectures, it should suffice to use something like linux-libc-dev [linux-any] = 2.6.28 in debian/control done, but note that you'll have to fix kfreebsd-kernel-headers to provide the headers that have been removed from libdrm-dev: /usr/include/drm/sis_drm.h /usr/include/drm/i915_drm.h /usr/include/drm/mga_drm.h /usr/include/drm/savage_drm.h /usr/include/drm/i830_drm.h /usr/include/drm/drm.h /usr/include/drm/drm_mode.h /usr/include/drm/i810_drm.h /usr/include/drm/via_drm.h /usr/include/drm/drm_sarea.h /usr/include/drm/radeon_drm.h /usr/include/drm/r128_drm.h as provided by linux-libc-dev 2.6.29 (there are recent changes that will be required to build mesa and xserver-xorg-video-intel). We already have some in /usr/include/dev/drm/ i.e. on kfreebsd-amd64: ls -l /usr/include/dev/drm total 584 -rw-r--r-- 1 root root 22090 Jan 6 12:02 drm.h -rw-r--r-- 1 root root 32947 Jan 6 12:02 drmP.h -rw-r--r-- 1 root root 3968 Jan 6 12:02 drm_atomic.h -rw-r--r-- 1 root root 2468 Jan 6 12:02 drm_linux_list.h -rw-r--r-- 1 root root 26061 Jan 6 12:02 drm_pciids.h -rw-r--r-- 1 root root 2666 Jan 6 12:02 drm_sarea.h -rw-r--r-- 1 root root 8408 Jan 6 12:02 i915_drm.h -rw-r--r-- 1 root root 9047 Jan 6 12:02 i915_drv.h -rw-r--r-- 1 root root 8005 Jan 6 12:02 mach64_drm.h -rw-r--r-- 1 root root 35804 Jan 6 12:02 mach64_drv.h -rw-r--r-- 1 root root 13061 Jan 6 12:02 mga_drm.h -rw-r--r-- 1 root root 19748 Jan 6 12:02 mga_drv.h -rw-r--r-- 1 root root 181469 Jan 6 12:02 mga_ucode.h -rw-r--r-- 1 root root 10527 Jan 6 12:02 r128_drm.h -rw-r--r-- 1 root root 16489 Jan 6 12:02 r128_drv.h -rw-r--r-- 1 root root 69976 Jan 6 12:02 r300_reg.h -rw-r--r-- 1 root root 26625 Jan 6 12:02 radeon_drm.h -rw-r--r-- 1 root root 41421 Jan 6 12:02 radeon_drv.h -rw-r--r-- 1 root root 7182 Jan 6 12:02 savage_drm.h -rw-r--r-- 1 root root 19696 Jan 6 12:02 savage_drv.h -rw-r--r-- 1 root root 2653 Jan 6 12:02 sis_drm.h -rw-r--r-- 1 root root 2061 Jan 6 12:02 sis_drv.h -rw-r--r-- 1 root root 4714 Jan 6 12:02 sis_ds.h -rw-r--r-- 1 root root 1820 Jan 6 12:02 tdfx_drv.h Would be this sufficient or should we add symlink drm - dev/drm in /usr/include/ ? Thanks Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#521253: libdrm: libdrm-dev uninstallable on GNU/kFreeBSD (depends on linux specific package)
Making /usr/include/drm a symlink won't work as libdrm-dev still installs xgi_drm.h, via_3d_reg.h, mach64_drm.h, nouveau_drm.h and r300_reg.h there. You could make symlinks for individual files though. Beware that the versions you have might be too old for current intel mesa and 2d drivers (what I'm seeing on io.debian.net definitely is). They are up-to-date. Hmm :-((( It leads me to questions. Is it good idea to provide some files in drm/ from libdrm-dev and other one's directly from kernel headers ? Would be possible to serve all of them on non-linux architectures from libdrm-dev ? Sorry for these may be dumb questions, I do not know details of drm at all. Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#514409: xkb-data does not support cz_qwerty anymore
Package: xkb-data Version: 1.5-2 I updated from 1.4-1 to 1.5-2 and the keyboard becomes unusable, the backspace does not work, etc. It is due to dropped support of cz_qwerty layout, when I change cz_qwerty into cz keyboard works correctly again. Section InputDevice Identifier Generic Keyboard Driver kbd Option CoreKeyboard Option XkbRules xorg Option XkbModel pc104 # Option XkbLayout us,cz_qwerty Option XkbLayout us,cz Option XkbOptionsgrp:shift_toggle,grp_led:scroll EndSection I really want to use qwerty keyboard with otherwise standard cz layout. Petr -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#499501: xserver-xorg-core: does not detect video devices anymore (kfreebsd-amd64)
I found the cause, there have been change in GNU/kFreeBSD specific headers.
The identification (struct pcisel) have been extended by domain field in
FreeBSD 7.x series. There is a ABI compatibility layer - the reason why
2:1.4.2-1 works. With current interface, the io.pi_sel.pc_domain is not
initialized, it contains garbage, in the first iteration
it have been luckily zeroed - some entries have been found.
In long term, it should properly handle domains, but in short term
(for current sid and our lenny snapshot) please, could you add
the patch bellow. It really does not affect any official release
architectures.
Why should domain be set to 0, as opposed to PCI_DOM_FROM_TAG(tag)?
(I don't really care either way, just trying to understand this.)
I tested xorg-server with suggested modification, it works for me too.
only in patch2:
unchanged:
--- xorg-server-1.4.2.orig/hw/xfree86/os-support/bus/freebsdPci.c
+++ xorg-server-1.4.2/hw/xfree86/os-support/bus/freebsdPci.c
@@ -133,6 +133,7 @@
{
struct pci_io io;
int error;
+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
io.pi_sel.pc_bus = BUS(tag);
io.pi_sel.pc_dev = DFN(tag) 3;
io.pi_sel.pc_func = DFN(tag) 7;
@@ -148,6 +149,7 @@
freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val)
{
struct pci_io io;
+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag);
io.pi_sel.pc_bus = BUS(tag);
io.pi_sel.pc_dev = DFN(tag) 3;
io.pi_sel.pc_func = DFN(tag) 7;
It is important to have the pc_domain field initialized,
the PCI_DOM_FROM_TAG(tag) seems be better compared to plain 0.
Please could you apply your fix. Many thanks.
FWIW, libpciaccess is used in newer versions of X for this, and has:
#if __FreeBSD_version = 700053
#define DOMAIN_SUPPORT 1
#else
#define DOMAIN_SUPPORT 0
#endif
and then sets io.pi_sel.pc_domain if DOMAIN_SUPPORT is non-zero.
IMHO, it is a wrong way of testing. It should be changed as follows.
Should I file a separate bug report against libpciaccess ?
only in patch2:
unchanged:
--- libpciaccess-0.10.3.orig/configure.ac
+++ libpciaccess-0.10.3/configure.ac
@@ -97,6 +97,14 @@
AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
fi
+dnl check for the pci_io.pi_sel.pc_domain
+AC_CHECK_MEMBER([struct pci_io.pi_sel.pc_domain],
+ [AC_DEFINE(HAVE_PCI_IO_PC_DOMAIN,1,[Have the
pci_io.pi_sel.pc_domain member.])],
+ [],
+ [ #include sys/types.h
+ #include sys/pciio.h
+ ])
+
AC_SUBST(PCIACCESS_CFLAGS)
AC_SUBST(PCIACCESS_LIBS)
only in patch2:
unchanged:
--- libpciaccess-0.10.3.orig/src/freebsd_pci.c
+++ libpciaccess-0.10.3/src/freebsd_pci.c
@@ -43,7 +43,7 @@
#include sys/mman.h
#include sys/memrange.h
-#if __FreeBSD_version = 700053
+#if HAVE_PCI_IO_PC_DOMAIN
#define DOMAIN_SUPPORT 1
#else
#define DOMAIN_SUPPORT 0
Petr
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#499501: xserver-xorg-core: does not detect video devices anymore (kfreebsd-amd64)
IMHO, it is a wrong way of testing. It should be changed as follows.
Should I file a separate bug report against libpciaccess ?
I'll try to get the patch applied upstream.
There is one more place to extend, please try to accept
attached patch, cleaner patch,
Petrdiff --git a/configure.ac b/configure.ac
index 67b18f4..1f41f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,14 @@ if test x$have_mtrr_h = xyes; then
AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
fi
+dnl check for the pci_io.pi_sel.pc_domain
+AC_CHECK_MEMBER([struct pci_io.pi_sel.pc_domain],
+ [AC_DEFINE(HAVE_PCI_IO_PC_DOMAIN,1,[Have the
pci_io.pi_sel.pc_domain member.])],
+ [],
+ [ #include sys/types.h
+ #include sys/pciio.h
+ ])
+
AC_SUBST(PCIACCESS_CFLAGS)
AC_SUBST(PCIACCESS_LIBS)
diff --git a/src/common_init.c b/src/common_init.c
index ff24183..8a12691 100644
--- a/src/common_init.c
+++ b/src/common_init.c
@@ -54,7 +54,7 @@ pci_system_init( void )
#ifdef linux
err = pci_system_linux_sysfs_create();
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||
defined(__DragonFly__)
err = pci_system_freebsd_create();
#elif defined(__OpenBSD__)
err = pci_system_openbsd_create();
diff --git a/src/freebsd_pci.c b/src/freebsd_pci.c
index 4b8f7ba..352cac7 100644
--- a/src/freebsd_pci.c
+++ b/src/freebsd_pci.c
@@ -43,12 +43,6 @@
#include sys/mman.h
#include sys/memrange.h
-#if __FreeBSD_version = 700053
-#define DOMAIN_SUPPORT 1
-#else
-#define DOMAIN_SUPPORT 0
-#endif
-
#include pciaccess.h
#include pciaccess_private.h
@@ -168,7 +162,7 @@ pci_device_freebsd_read( struct pci_device * dev, void *
data,
{
struct pci_io io;
-#if DOMAIN_SUPPORT
+#if HAVE_PCI_IO_PC_DOMAIN
io.pi_sel.pc_domain = dev-domain;
#endif
io.pi_sel.pc_bus = dev-bus;
@@ -208,7 +202,7 @@ pci_device_freebsd_write( struct pci_device * dev, const
void * data,
{
struct pci_io io;
-#if DOMAIN_SUPPORT
+#if HAVE_PCI_IO_PC_DOMAIN
io.pi_sel.pc_domain = dev-domain;
#endif
io.pi_sel.pc_bus = dev-bus;
@@ -488,7 +482,7 @@ pci_system_freebsd_create( void )
for ( i = 0; i pciconfio.num_matches; i++ ) {
struct pci_conf *p = pciconf[ i ];
-#if DOMAIN_SUPPORT
+#if HAVE_PCI_IO_PC_DOMAIN
pci_sys-devices[ i ].base.domain = p-pc_sel.pc_domain;
#else
pci_sys-devices[ i ].base.domain = 0;
Bug#499501: xserver-xorg-core: does not detect video devices anymore (kfreebsd-amd64)
Package: xserver-xorg-core Version: 2:1.4.2-6 User: [EMAIL PROTECTED] Usertags: kfreebsd Hi, after upgrade from 2:1.4.2-1 to 2:1.4.2-6 X does not start anymore. Downgrading to 2:1.4.2-1 restores functionality. The important part of diff between startup-logs is bellow. It looks like there have been reduced range of scanned busses. It might be GNU/kFreeBSD specific. Petr --- Xorg.0.log 2008-09-19 12:15:15.0 +0200 +++ Xorg.0.log.old 2008-09-19 12:03:00.0 +0200 @@ -2,9 +2,9 @@ X.Org X Server 1.4.2 Release Date: 11 June 2008 X Protocol Version 11, Revision 0 -Build Operating System: GNU/kFreeBSD Debian (xorg-server 2:1.4.2-1) +Build Operating System: GNU/kFreeBSD Debian (xorg-server 2:1.4.2-6) Current Operating System: GNU/kFreeBSD orion-bsd 7.1-1-amd64 #0 Thu Sep 18 08:40:27 UTC 2008 x86_64 -Build Date: 26 June 2008 03:48:20AM +Build Date: 15 September 2008 01:42:48PM Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. @@ -12,7 +12,7 @@ Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. -(==) Log file: /var/log/Xorg.0.log, Time: Fri Sep 19 12:15:09 2008 +(==) Log file: /var/log/Xorg.0.log, Time: Fri Sep 19 12:03:00 2008 (==) Using config file: /etc/X11/xorg.conf (==) ServerLayout Default Layout (**) |--Screen Default Screen (0) @@ -75,7 +75,7 @@ compiled for 1.4.2, module version = 1.0.0 ABI class: X.Org Video Driver, version 2.0 (--) Using syscons driver with X support (version 134217730.0) -(--) using VT number 7 +(++) using VT number 7 (WW) OS did not count PCI devices, guessing wildly (II) PCI: PCI scan (all values are in hex) @@ -98,12 +98,6 @@ (II) PCI: 00:1f:2: chip 8086,2920 card 1458,b002 rev 02 class 01,01,8a hdr 00 (II) PCI: 00:1f:3: chip 8086,2930 card 1458,5001 rev 02 class 0c,05,00 hdr 00 (II) PCI: 00:1f:5: chip 8086,2926 card 1458,b002 rev 02 class 01,01,85 hdr 00 -(II) PCI: 01:00:0: chip 10de,0393 card 1043,820e rev a1 class 03,00,00 hdr 00 -(II) PCI: 03:00:0: chip 197b,2368 card 1458,b000 rev 00 class 01,01,85 hdr 00 -(II) PCI: 04:00:0: chip 10ec,8168 card 1458,e000 rev 01 class 02,00,00 hdr 00 -(II) PCI: 05:01:0: chip 109e,036e card , rev 11 class 04,00,00 hdr 80 -(II) PCI: 05:01:1: chip 109e,0878 card , rev 11 class 04,80,00 hdr 80 -(II) PCI: 05:07:0: chip 104c,8024 card 1458,1000 rev 00 class 0c,00,10 hdr 00 (II) PCI: End of PCI scan (II) Intel Bridge workaround enabled (II) Host-to-PCI bridge: @@ -146,8 +140,6 @@ [0] -1 0 0xe610 - 0xe61f (0x10) MX[B] (II) PCI-to-ISA bridge: (II) Bus -1: bridge is at (0:31:0), (0,-1,-1), BCTRL: 0x0008 (VGA_EN is set) -(--) PCI:*(1:0:0) nVidia Corporation G70 [GeForce 7300 GT] rev 161, Mem @ 0xe000/24, 0xd000/28, 0xe100/24, I/O @ 0xb000/7 -(--) PCI: (5:1:0) Brooktree Corporation Bt878 Video Capture rev 17, Mem @ 0xe610/12 (II) Addressable bus resource ranges are Quadro FX 3600M, GeForce 9600 GT, GeForce 9600M GT, GeForce 9600M GS, GeForce 9600M GT, GeForce 9500M G, GeForce 8400 GS, GeForce 9300M GS, GeForce 9200M GS, GeForce 9300M GS -(II) Primary Device is: PCI 01:00:0 -(--) Chipset GeForce 7300 GT found +(II) Primary Device is: ISA +(EE) No devices detected. + +Fatal server error: +no screens found -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#499501: xserver-xorg-core: does not detect video devices anymore (kfreebsd-amd64)
tags 499501 +patch
severity 499501 important
thanks
after upgrade from 2:1.4.2-1 to 2:1.4.2-6 X does not start anymore.
Downgrading to 2:1.4.2-1 restores functionality.
The important part of diff between startup-logs is bellow.
It looks like there have been reduced range of scanned busses.
It might be GNU/kFreeBSD specific.
I can't see anything in the diff between -1 and -6 that would change
this. Is it reproducible? Any kernel change?
It is 100% reproducible.
I found the cause, there have been change in GNU/kFreeBSD specific headers.
The identification (struct pcisel) have been extended by domain field in
FreeBSD 7.x series. There is a ABI compatibility layer - the reason why
2:1.4.2-1 works. With current interface, the io.pi_sel.pc_domain is not
initialized, it contains garbage, in the first iteration
it have been luckily zeroed - some entries have been found.
In long term, it should properly handle domains, but in short term
(for current sid and our lenny snapshot) please, could you add
the patch bellow. It really does not affect any official release
architectures.
Many thanks
Petr
only in patch2:
unchanged:
--- xorg-server-1.4.2.orig/hw/xfree86/os-support/bus/freebsdPci.c
+++ xorg-server-1.4.2/hw/xfree86/os-support/bus/freebsdPci.c
@@ -133,6 +133,7 @@
{
struct pci_io io;
int error;
+ io.pi_sel.pc_domain = 0;
io.pi_sel.pc_bus = BUS(tag);
io.pi_sel.pc_dev = DFN(tag) 3;
io.pi_sel.pc_func = DFN(tag) 7;
@@ -148,6 +149,7 @@
freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val)
{
struct pci_io io;
+ io.pi_sel.pc_domain = 0;
io.pi_sel.pc_bus = BUS(tag);
io.pi_sel.pc_dev = DFN(tag) 3;
io.pi_sel.pc_func = DFN(tag) 7;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#498327: xterm: fragile build on GNU/kFreeBSD
Package: xterm Version: 236-1 Tags: patch User: [EMAIL PROTECTED] Usertags: kfreebsd Hi, the current version sometimes fails to build on GNU/kFreeBSD, see http://buildd.debian-ports.org/build.php?pkg=xtermver=236-1arch=kfreebsd-amd64 The problem is timestamp resolution in underlying file system. The make sets subsecond timestamp resolution. Please, could you change debian/rules as shown bellow. Thanks in advance Petr --- debian/rules~ 2008-09-09 09:00:51.0 + +++ debian/rules2008-09-09 09:00:51.0 + @@ -59,7 +59,7 @@ stampdir: $(STAMP_DIR)/stampdir $(STAMP_DIR)/stampdir: mkdir $(STAMP_DIR) - $@ + touch $@ # Set up the package build directory as quilt expects to find it. .PHONY: prepare @@ -69,7 +69,7 @@ echo 2 $(STAMP_DIR)/patches/.version ln -s debian/patches patches ln -s $(STAMP_DIR)/patches .pc - $@ + touch $@ # Apply all patches to the upstream source. .PHONY: patch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494846: xserver-xorg-video-tga: FTBFS on kfreebsd-amd64 (kfreebsd-amd64 is not in the architecture list)
Unavailability of xserver-xorg-video-tga currently makes xserver-xorg-video-all uninstallable on kfreebsd-amd64. The bug is probably here. xserver-xorg-video-all shouldn't depend on xserver-xorg-video-tga on !alpha. I'll fix it in the experimental branch, it's probably not worth it for lenny. But xserver-xorg-video-tga is buildable on kfreebsd-amd64, it is already built on amd64 i386 kfreebsd-i386, so it should be built also on kfreebsd-amd64. It is really sufficient to add it into Architecture: line. For GNU/kFreeBSD it would be helpful to upload xserver-xorg-video-tga with kfreebsd-amd64 enabled into unstable now. Thanks for considering it. Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#494846: xserver-xorg-video-tga: FTBFS on kfreebsd-amd64 (kfreebsd-amd64 is not in the architecture list)
Package: xserver-xorg-video-tga Version: 1:1.1.0-9 Severity: important Tags: patch User: [EMAIL PROTECTED] Usertags: kfreebsd Hi, the current version fails to build on kfreebsd-amd64. It is sufficient to add kfreebsd-amd64 into Architecture: line, similarly as already done for both amd64 and kfreebsd-i386. Unavailability of xserver-xorg-video-tga currently makes xserver-xorg-video-all uninstallable on kfreebsd-amd64. Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#292388: unable to login via xdm - XDM authorization key matches an existing client
severity 292388 important clone 292388 -1 reassign -1 xdm found -1 1:1.1.8-1 retitle -1 xdm:unable to login - XDM authorization key matches an existing client thanks I have got the same problem with xdm, directly after upgrade of libx11-6 from 1.0.3 to 1.1.4 (it is on GNU/kFreeBSD, but it shouldn't matter). The workaround/fix to add DisplayManager*authName:MIT-MAGIC-COOKIE-1 into to /etc/X11/xdm/xdm-config works for me. Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#486444: pkg-config --libs xft does not list -lfontconfig anymore, iceape FTBFS
Package: xft, iceape Severity: important User: [EMAIL PROTECTED] Usertags: kfreebsd Hello, the last change in xft 2.1.12-3 due to #389831 dropped from pkg-config --libs xft -lfontconfig. Current iceape have in gfx/src/shared/Makefile.in: ifdef MOZ_ENABLE_XFT REQUIRES+= pref CPPSRCS += nsFontConfigUtils.cpp LOCAL_INCLUDES += $(MOZ_XFT_CFLAGS) endif The nsFontConfigUtils.cpp uses FcPattern*() calls directly, similarly gfx/src/ps/nsFontMetricsPS.cpp uses them when MOZ_ENABLE_XFT is defined. So iceape with current xft fails to link. It might affect also other mozilla related packages. Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#451149: compiz: FTBFS on GNU/kFreeBSD (due to unsatisfied Build-Depends on libfuse-dev)
Package: compiz Severity: important Version: 0.6.3~git20071104.c9009efd-1 Tags: patch User: [EMAIL PROTECTED] Usertags: kfreebsd Hi, the current version of compiz has unsatisfied Build-Depends on libfuse-dev under non-linux ports. Please, could you exclude linux specific package in Build-Depends by using libfuse-dev (= 2.7.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]. In fact, I doubt it is necessary even on linux ports, as configure is called with --disable-fuse everywhere. Thanks for your cooperation. Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#363910: please include vars.kfreebsd-i386 and vars.kfreebsd-amd64 for next xorg upload
found 363910 1:7.1.0-11 thanks Please, could you just include vars.kfreebsd-i386 and vars.kfreebsd-amd64 for next upload. I do not expect upload with just vars.kfreebsd-i386 and vars.kfreebsd-amd64 added, on the other hand, is there any reason to not include them with some debconf translation or another fix ? Adding vars.kfreebsd-* into debian/scripts/ is really non-invasive wrt release architectures. Many thanks Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#404111: xterm: FTBFS on GNU/kFreeBSD
Package: xterm Severity: important Version: 223-1 Tags: patch Hi, the current version fails to build on GNU/kFreeBSD. It needs small tweaks, see attached patch. It would also be nice if you can ask upstream to include this changes. Thanks in advance Petr only in patch2: unchanged: --- xterm-223.orig/aclocal.m4 +++ xterm-223/aclocal.m4 @@ -2276,7 +2276,7 @@ irix[[56]].*) #(vi CPPFLAGS=$CPPFLAGS -D_SGI_SOURCE ;; -linux*|gnu*) #(vi +linux*|gnu*|k*bsd*-gnu) #(vi CF_GNU_SOURCE ;; mirbsd*) #(vi only in patch2: unchanged: --- xterm-223.orig/configure +++ xterm-223/configure @@ -2827,7 +2827,7 @@ irix[56].*) #(vi CPPFLAGS=$CPPFLAGS -D_SGI_SOURCE ;; -linux*|gnu*) #(vi +linux*|gnu*|k*bsd*-gnu) #(vi echo $as_me:2832: checking if we must define _GNU_SOURCE 5 echo $ECHO_N checking if we must define _GNU_SOURCE... $ECHO_C 6 only in patch2: unchanged: --- xterm-223.orig/main.c +++ xterm-223/main.c @@ -3449,7 +3449,7 @@ /* make /dev/tty work */ ioctl(ttyfd, TCSETCTTY, 0); #endif -#if defined(__GNU__) defined(TIOCSCTTY) +#if ((defined(__GLIBC__) defined(__FreeBSD_kernel__)) || defined(__GNU__)) defined(TIOCSCTTY) /* make /dev/tty work */ ioctl(ttyfd, TIOCSCTTY, 0); #endif
Bug#363910: xorg kfreebsd
found 363910 1:7.1.0-8 thanks Please, could you include vars.kfreebsd-i386 and vars.kfreebsd-amd64 to fix http://experimental.ftbfs.de/build.php?pkg=xorgarch=kfreebsd-i386 Thanks Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#396940: twm: FTBFS on GNU/kFreeBSD (due to manpage suffix)
Package: twm Severity: important Version: 1:1.0.1-4 Tags: patch Hi, the current version fails to build on GNU/kFreeBSD, see http://experimental.ftbfs.de/build.php?pkg=twmarch=kfreebsd-i386 It needs regenerated aclocal.m4 and configure files using recent xorg-macros.m4 to unify manpages suffixes. Please re-run aclocal-1.7; autoconf and change suffixes as shown bellow. Thanks in advance Petr diff -u twm-1.0.1/debian/twm.postinst.in twm-1.0.1/debian/twm.postinst.in --- twm-1.0.1/debian/twm.postinst.in +++ twm-1.0.1/debian/twm.postinst.in @@ -29,7 +29,7 @@ update-alternatives --install /usr/bin/x-window-manager x-window-manager \ /usr/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \ - x-window-manager.1.gz /usr/share/man/man1/twm.1x.gz + x-window-manager.1.gz /usr/share/man/man1/twm.1.gz exit 0 diff -u twm-1.0.1/debian/twm.install twm-1.0.1/debian/twm.install --- twm-1.0.1/debian/twm.install +++ twm-1.0.1/debian/twm.install @@ -3 +3 @@ -usr/share/man/man1/twm.1x +usr/share/man/man1/twm.1 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#363517: xorg-server kfreebsd
found 363517 2:1.1.1-7 thanks Hi, please could you include fixes for kfreebsd ? Please, apply the attached patch and regenerate configure by debian/rules patch ; autoconf. The attached patch creates debian/patches/20_kbsd.patch, and adjust debian/patches/series and debian/xserver-xorg-core.install accordingly. When applied, xorg-server 1.1.1-7 builds on kfreebsd-i386 fine. It would be very nice, if it could be uploaded soon. Thanks in advance Petr diff -u xorg-server-1.1.1/debian/patches/series xorg-server-1.1.1/debian/patches/series --- xorg-server-1.1.1/debian/patches/series +++ xorg-server-1.1.1/debian/patches/series @@ -19,0 +20 @@ +20_kbsd.patch diff -u xorg-server-1.1.1/debian/xserver-xorg-core.install xorg-server-1.1.1/debian/xserver-xorg-core.install --- xorg-server-1.1.1/debian/xserver-xorg-core.install +++ xorg-server-1.1.1/debian/xserver-xorg-core.install @@ -2,6 +2,7 @@ usr/lib/xorg/modules/extensions/*.so usr/lib/xorg/modules/fonts/* usr/lib/xorg/modules/linux/*.so +usr/lib/xorg/modules/freebsd/*.so usr/lib/xorg/modules/multimedia/*.so usr/bin/Xorg usr/share/man/man1/Xserver.1 only in patch2: unchanged: --- xorg-server-1.1.1.orig/debian/patches/20_kbsd.patch +++ xorg-server-1.1.1/debian/patches/20_kbsd.patch @@ -0,0 +1,126 @@ +Index: xorg-server-1.1.1/configure.ac +=== +--- xorg-server-1.1.1.orig/configure.ac2006-09-22 09:16:33.065267000 +0200 xorg-server-1.1.1/configure.ac 2006-09-22 09:17:08.0 +0200 +@@ -246,7 +246,10 @@ + dnl it would be nice to autodetect these *CONS_SUPPORTs + case $host_os in + *freebsd*) +- AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ++ case $host_os in ++ kfreebsd*-gnu) ;; ++ *) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;; ++ esac + AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) + AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) + AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console]) +@@ -1080,7 +1083,7 @@ + ;; + esac + ;; +-freebsd*) ++freebsd* | kfreebsd*-gnu) + XORG_OS=freebsd + XORG_OS_SUBDIR=bsd + XORG_OS_KBD=BSD +@@ -1179,7 +1182,7 @@ + ;; + powerpc*) + case $host_os in +-linux*|freebsd*|netbsd*|openbsd*) ++linux*|freebsd*|netbsd*|openbsd*|kfreebsd*-gnu) + ;; + *) + xorg_bus_ppcpci=yes +@@ -1192,7 +1195,7 @@ + ;; + x86_64*|amd64*) + case $host_os in +-freebsd*) ++freebsd*|kfreebsd*-gnu) + # FreeBSD uses the system pci interface + ;; + *) +@@ -1437,7 +1440,11 @@ + + AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) + if test $ac_cv_header_sys_vm86_h = yes; then +-AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) ++ case $host_os in ++ kfreebsd*-gnu) kdrivevesa=no ;; ++ *) AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) ++ kdrivevesa=yes;; ++ esac + fi + + AC_CHECK_HEADERS([linux/fb.h]) +@@ -1477,7 +1484,7 @@ + AC_SUBST(KDRIVE_LIBS) + AM_CONDITIONAL(TSLIB, false) + AM_CONDITIONAL(H3600_TS, false) +-AM_CONDITIONAL(KDRIVEVESA, [test x$ac_cv_header_sys_vm86_h = xyes]) ++AM_CONDITIONAL(KDRIVEVESA, [test x$kdrivevesa = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test x$ac_cv_header_linux_fb_h = xyes]) + #AM_CONDITIONAL(KDRIVEVESA, false) + #AM_CONDITIONAL(KDRIVEFBDEV, false) +@@ -1532,7 +1539,7 @@ + cygwin*) ;; + solaris*) ;; + darwin*) ;; +- *bsd*) ;; ++ freebsd*|netbsd*|openbsd*) ;; + *) + AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source]) + AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source]) +Index: xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.h +=== +--- xorg-server-1.1.1.orig/hw/xfree86/os-support/bus/Pci.h 2006-09-22 09:16:33.106722000 +0200 xorg-server-1.1.1/hw/xfree86/os-support/bus/Pci.h 2006-09-22 09:17:08.0 +0200 +@@ -332,7 +332,7 @@ + # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge + # endif + #elif defined(__amd64__) || defined(__amd64) +-# if defined(__FreeBSD__) ++# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # define ARCH_PCI_INIT freebsdPciInit + # else + # define ARCH_PCI_INIT ix86PciInit +Index: xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c +=== +--- xorg-server-1.1.1.orig/GL/glx/indirect_dispatch_swap.c 2006-09-22 09:16:33.182567000 +0200 xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c 2006-09-22 09:17:08.0 +0200 +@@ -28,7
Bug#385218: xutils-dev: FTBFS on GNU/kFreeBSD
Package: xutils-dev Version: 1:7.1.ds-3 Hi, thanks for pulling upstream release of util-macros (1.1.1). Unfortunately, inside xutils-dev is still used old one. Affected files can be shown by grep -r k\*bsd . Please could you regenerate aclocal.m4 and configure files inside xutils-dev ? Thanks in advance Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#363517: xorg-server and kfreebsd
found 363517 1:1.0.2-5
found 363517 2:1.1.1-4
thanks
I tried to build xorg-server 1.1.1-4 on kfreebsd-i386,
there are needed following patches
- previous 13_kfreebsd-gnu.diff,
- byteswap patch bellow (submitted upstream as
https://bugs.freedesktop.org/show_bug.cgi?id=8039),
- again sync man pages suffixes with linux (aclocal.m4), changed in 1:1.1.1-2
only for linux
- attached changes to debian packaging - it looks like kdrive is (still) linux
only,
files in usr/lib/xorg/modules/freebsd/*.so are needed for us
With those patches applied (and regenerated configure),
it builds fine for 1.1.1-4.
Petr
--- aclocal.m4~ 2006-08-28 13:12:09.0 +0200
+++ aclocal.m4 2006-08-28 13:12:09.0 +0200
@@ -6654,13 +6654,13 @@
if test x$APP_MAN_SUFFIX = x; then
case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
+# gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;;
*) APP_MAN_SUFFIX=1 ;;
esac
fi
if test x$APP_MAN_DIR = x; then
case $host_os in
- gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
+# gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;;
*) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
esac
fi
@@ -6684,7 +6684,7 @@
fi
if test x$FILE_MAN_DIR = x; then
case $host_os in
- gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
+# gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;;
*) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
esac
fi
https://bugs.freedesktop.org/show_bug.cgi?id=8039
--- GL/glx/indirect_dispatch_swap.c~
+++ GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,7 @@
#include X11/Xmd.h
#include GL/gl.h
#include GL/glxproto.h
-#ifdef __linux__
+#if defined (__linux__) || defined (__GLIBC__)
#include byteswap.h
#elif defined(__OpenBSD__)
#include sys/endian.h
--- GL/glx/indirect_util.c~
+++ GL/glx/indirect_util.c
@@ -28,7 +28,7 @@
#include X11/Xmd.h
#include GL/gl.h
#include GL/glxproto.h
-#ifdef __linux__
+#if defined (__linux__) || defined (__GLIBC__)
#include byteswap.h
#elif defined(__OpenBSD__)
#include sys/endian.h
diff -u xorg-server-1.1.1/debian/control xorg-server-1.1.1/debian/control
--- xorg-server-1.1.1/debian/control2006-08-28 11:47:20.0 +0200
+++ xorg-server-1.1.1/debian/control2006-08-28 13:40:31.0 +0200
@@ -132,7 +132,7 @@
:pserver:[EMAIL PROTECTED]:/cvs/xorg
Package: xserver-xephyr
-Architecture: any
+Architecture: i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel
powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients
Description: Next Generation Nested X Server
diff -u xorg-server-1.1.1/debian/rules xorg-server-1.1.1/debian/rules
--- xorg-server-1.1.1/debian/rules 2006-08-28 11:47:20.0 +0200
+++ xorg-server-1.1.1/debian/rules 2006-08-28 13:41:15.0 +0200
@@ -22,6 +22,8 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -45,8 +47,6 @@
--enable-xtrap \
--enable-dmx \
--enable-vfb \
---enable-kdrive \
---enable-xephyr \
--disable-lbx \
--disable-xprint \
--disable-xorgconfig \
@@ -54,6 +54,10 @@
--with-xkb-path=/usr/share/X11/xkb \
--with-xkb-output=/var/lib/xkb
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ confflags += --enable-kdrive --enable-xephyr
+endif
+
build: patch build-stamp
build-stamp:
dh_testdir
@@ -102,22 +106,22 @@
dh_installdocs
dh_installchangelogs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install -s --sourcedir=debian/tmp --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/serverabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverabiver
- dh_link
- dh_strip --exclude=usr/lib/xorg/modules
+ dh_link -s
+ dh_strip -s --exclude=usr/lib/xorg/modules
find debian/xserver-xorg-core/usr/lib/xorg/modules -name lib*.so | \
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_compress -s
+ dh_fixperms -s
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
# Build architecture-independent
Bug#363517: xorg-server and kfreebsd
- attached changes to debian packaging - it looks like kdrive is (still) linux only, Fixing this should be quite trivial, given that Xephyr is a 'fake' server. Well, I have been confused by mandatory subdir linux, so 2nd attempt. xorg-server 1.1.1-4 builds on kfreebsd-i386 after applying - 13_kfreebsd-gnu.diff from original submit, accepted upstream - kfreebsd-byteswap.diff - submitted upstream - kfreebsd-kdrive.diff - presence of sys/vm86.h is not sufficient for VESA drivers, let hw/kdrive/linux/agp.c compile also on kfreebsd should be submitted upstream ? - kfreebsd-man_suffix.diff - again sync man pages suffixes with linux (aclocal.m4), changed in 1:1.1.1-2 only for linux - kfreebsd-debian.diff - debian packaging, files in usr/lib/xorg/modules/freebsd/*.so are needed for us and regenerating of configure. Petr diff -ur x/xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c --- x/xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c 2006-07-05 20:31:36.0 +0200 +++ xorg-server-1.1.1/GL/glx/indirect_dispatch_swap.c 2006-08-28 11:53:52.0 +0200 @@ -28,7 +28,7 @@ #include X11/Xmd.h #include GL/gl.h #include GL/glxproto.h -#ifdef __linux__ +#if defined (__linux__) || defined (__GLIBC__) #include byteswap.h #elif defined(__OpenBSD__) #include sys/endian.h diff -ur x/xorg-server-1.1.1/GL/glx/indirect_util.c xorg-server-1.1.1/GL/glx/indirect_util.c --- x/xorg-server-1.1.1/GL/glx/indirect_util.c 2006-07-08 00:36:18.0 +0200 +++ xorg-server-1.1.1/GL/glx/indirect_util.c2006-08-28 11:57:42.0 +0200 @@ -28,7 +28,7 @@ #include X11/Xmd.h #include GL/gl.h #include GL/glxproto.h -#ifdef __linux__ +#if defined (__linux__) || defined (__GLIBC__) #include byteswap.h #elif defined(__OpenBSD__) #include sys/endian.h diff -ur x/xorg-server-1.1.1/hw/kdrive/linux/agp.c xorg-server-1.1.1/hw/kdrive/linux/agp.c --- x/xorg-server-1.1.1/hw/kdrive/linux/agp.c 2006-07-05 20:31:39.0 +0200 +++ xorg-server-1.1.1/hw/kdrive/linux/agp.c 2006-08-28 13:38:45.0 +0200 @@ -65,7 +65,7 @@ #include linux/agpgart.h -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include sys/ioctl.h #include sys/agpio.h #endif diff -ur x/xorg-server-1.1.1/configure.ac xorg-server-1.1.1/configure.ac --- x/xorg-server-1.1.1/configure.ac2006-08-28 17:01:11.0 +0200 +++ xorg-server-1.1.1/configure.ac 2006-08-28 16:43:11.0 +0200 @@ -1433,7 +1436,11 @@ AC_CHECK_HEADERS([sys/vm86.h sys/io.h]) if test $ac_cv_header_sys_vm86_h = yes; then -AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) + case $host_os in + kfreebsd*-gnu) kdrivevesa=no ;; + *) AC_DEFINE(KDRIVEVESA, 1, [Build VESA-based kdrive servers]) + kdrivevesa=yes;; + esac fi AC_CHECK_HEADERS([linux/fb.h]) @@ -1473,7 +1480,7 @@ AC_SUBST(KDRIVE_LIBS) AM_CONDITIONAL(TSLIB, false) AM_CONDITIONAL(H3600_TS, false) -AM_CONDITIONAL(KDRIVEVESA, [test x$ac_cv_header_sys_vm86_h = xyes]) +AM_CONDITIONAL(KDRIVEVESA, [test x$kdrivevesa = xyes]) AM_CONDITIONAL(KDRIVEFBDEV, [test x$ac_cv_header_linux_fb_h = xyes]) #AM_CONDITIONAL(KDRIVEVESA, false) #AM_CONDITIONAL(KDRIVEFBDEV, false) diff -ur x/xorg-server-1.1.1/aclocal.m4 xorg-server-1.1.1/aclocal.m4 --- x/xorg-server-1.1.1/aclocal.m4 2006-08-28 16:49:24.0 +0200 +++ xorg-server-1.1.1/aclocal.m42006-08-28 13:12:09.0 +0200 @@ -6654,13 +6654,13 @@ if test x$APP_MAN_SUFFIX = x; then case $host_os in - gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; +# gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; *) APP_MAN_SUFFIX=1 ;; esac fi if test x$APP_MAN_DIR = x; then case $host_os in - gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; +# gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; esac fi @@ -6684,7 +6684,7 @@ fi if test x$FILE_MAN_DIR = x; then case $host_os in - gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; +# gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; esac fi diff -ur x/xorg-server-1.1.1/debian/xserver-xorg-core.install xorg-server-1.1.1/debian/xserver-xorg-core.install --- x/xorg-server-1.1.1/debian/xserver-xorg-core.install2006-08-28 16:49:24.0 +0200 +++ xorg-server-1.1.1/debian/xserver-xorg-core.install 2006-08-28 13:36:25.0 +0200 @@ -2,6 +2,7 @@ usr/lib/xorg/modules/extensions/*.so usr/lib/xorg/modules/fonts/* usr/lib/xorg/modules/linux/*.so +usr/lib/xorg/modules/freebsd/*.so usr/lib/xorg/modules/multimedia/*.so usr/bin/Xorg usr/share/man/man1/Xserver.1
Bug#377023: xdm: FTBFS on GNU/kFreeBSD
Package: xdm Severity: important Version: 1:1.0.5-1 Tags: patch Hi, the current version fails to build on GNU/kFreeBSD. The same problem probably also affects hurd. It needs small tweak for configure.ac/configure. Please find patch bellow. It would also be nice if you can ask upstream to include this change. Thanks in advance Petr only in patch2: unchanged: --- xdm-1.0.5.orig/configure.ac +++ xdm-1.0.5/configure.ac @@ -121,7 +121,7 @@ case $host_os in -linux*) +linux*|*-gnu) OS_CFLAGS=-D_XOPEN_SOURCE SU=su ;; diff -u xdm-1.0.5/configure xdm-1.0.5/configure --- xdm-1.0.5/configure +++ xdm-1.0.5/configure @@ -23376,7 +23376,7 @@ case $host_os in -linux*) +linux*|*-gnu) OS_CFLAGS=-D_XOPEN_SOURCE SU=su ;; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#331517: one more fix for xorg 6.9 on GNU/kFreeBSD
Hi, in last mail I forgot about changes in debian/xserver-xorg.install.kfreebsd-i386, patch is included. Moreover, the file debian/xdmx.install.kfreebsd-i386 can be dropped, because its content is the same as in generic debian/xdmx.install. Regards Petr diff -ur debian/xserver-xorg.install.kfreebsd-i386 debian/xserver-xorg.install.kfreebsd-i386 --- debian/xserver-xorg.install.kfreebsd-i386 2006-01-10 15:18:18.0 +0100 +++ debian/xserver-xorg.install.kfreebsd-i386 2006-01-10 14:45:09.0 +0100 @@ -76,11 +76,9 @@ usr/X11R6/lib/modules/libafb.so usr/X11R6/lib/modules/libcfb.so usr/X11R6/lib/modules/libcfb16.so -usr/X11R6/lib/modules/libcfb24.so usr/X11R6/lib/modules/libcfb32.so -usr/X11R6/lib/modules/libcw.so -usr/X11R6/lib/modules/libdamage.so usr/X11R6/lib/modules/libddc.so +usr/X11R6/lib/modules/libexa.so usr/X11R6/lib/modules/libfb.so usr/X11R6/lib/modules/libi2c.so usr/X11R6/lib/modules/libint10.so @@ -96,12 +94,20 @@ usr/X11R6/lib/modules/libvgahw.so usr/X11R6/lib/modules/libxaa.so usr/X11R6/lib/modules/libxf1bpp.so -usr/X11R6/lib/modules/libxf24_32bpp.so usr/X11R6/lib/modules/libxf4bpp.so usr/X11R6/lib/modules/libxf8_16bpp.so usr/X11R6/lib/modules/libxf8_32bpp.so +usr/X11R6/lib/modules/multimedia/bt829_drv.so +usr/X11R6/lib/modules/multimedia/fi1236_drv.so +usr/X11R6/lib/modules/multimedia/msp3430_drv.so +usr/X11R6/lib/modules/multimedia/tda8425_drv.so +usr/X11R6/lib/modules/multimedia/tda9850_drv.so +usr/X11R6/lib/modules/multimedia/tda9885_drv.so +usr/X11R6/lib/modules/multimedia/theatre200_drv.so +usr/X11R6/lib/modules/multimedia/theatre_detect_drv.so +usr/X11R6/lib/modules/multimedia/theatre_drv.so +usr/X11R6/lib/modules/multimedia/uda1380_drv.so usr/X11R6/lib/modules/freebsd/libdrm.so -usr/X11R6/lib/modules/libint10.so usr/X11R6/man/man1/Xorg.1x usr/X11R6/man/man1/gtf.1x usr/X11R6/man/man4/aiptek.4x
Bug#338290: Can't start X twice on GNU/kFreeBSD
Hi David. Have you seen the annotation that Aurelien did on Jan 2nd in the upstream bug report?: Yes, it is another approach to fix it. In fact, this coding style is already used i.e. in extras/Mesa/src/glx/mini/miniglx_events.c GNU/kFreeBSD has problem with namelen = strlen(sockname.sun_path) + sizeof(sockname.sun_family); It will work with either namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path); or namelen = sizeof(struct sockaddr_un); The first fix is closer to previous code, both are correct. Anyway, I am applying your patch, as it is correct for you. Thanks Petr -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#338290: Can't start X twice on GNU/kFreeBSD
Package: xorg-x11 Version: 6.8.2.dfsg.1-10 Tags: patch Hi, this bug started as http://lists.alioth.debian.org/pipermail/glibc-bsd-devel/2005-November/000628.html On debian/kFreeBSD is not defined HasBSD44Sockets. It shouldn't be problem because FreeBSD kernel 5.4 and 6.0 tries to be compatible with older (BSD43) source code and at least in connect(), bind() ignores value in the field sun_len. It uses only the value addrlen from function in system call. Unfortunately, we are hitted by computing the whole name length as namelen = strlen(sockname.sun_path) + sizeof(sockname.sun_family); instead of portable namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path); Therefore, it is sufficient to correct calculation with sun_path in whole xorg-x11. Moreover, it is mainly correct, only 2 files need fix. ok programs/xdm/prngc.c ok programs/xdm/xdmcp.c ok programs/xdm/netaddr.c patch lib/dps/csconndi.c patch lib/xtrans/Xtranssock.c ok lib/xtrans/Xtranstli.c ok lib/xtrans/Xtranslcl.c ok lib/xtrans/Xtransutil.c ok extras/Mesa/src/glx/mini/miniglx_events.c Submitted also upstream in https://bugs.freedesktop.org/show_bug.cgi?id=4982 The enclosed patch adds debian/patches/freebsd/004_gnu-kbsd_sock_un.diff and inserts it in debian/patches/series. Could you please apply it. Thanks in advance Petr The patch have been tested: -- Forwarded message -- Date: Wed, 9 Nov 2005 03:37:01 + From: Brian M. Carlson [EMAIL PROTECTED] I converted my patch into appropriate form. Can you please test it ? It works, very nicely. A couple caveats: if you rebuild, you must reinstall at least all of the binary packages with the fixed version, otherwise, it doesn't work. Also, after installing the fixed version, I'd consider restarting, otherwise it can't connect. Other than that, no problem. BTW, I don't think these problems are specific to your patch, just that X is finicky like that. You have my vote to submit. -- Brian M. Carlson [EMAIL PROTECTED] Running on GNU/kFreeBSD; i686-pc-kfreebsd-gnu Support alternative kernels in Debian! diff -u xorg-x11-6.8.2.dfsg.1/debian/patches/series xorg-x11-6.8.2.dfsg.1/debian/patches/series --- xorg-x11-6.8.2.dfsg.1/debian/patches/series +++ xorg-x11-6.8.2.dfsg.1/debian/patches/series @@ -149,6 +149,7 @@ freebsd/001_gnu-kbsd.diff -p0 freebsd/002_gnu-kbsd_wacom.diff -p0 freebsd/003_gnu-kbsd_sessreg.diff -p0 +freebsd/004_gnu-kbsd_sock_un.diff -p0 debian/900_debian_config.diff -p0 debian/902_debian_startx_manpage.diff -p0 debian/903_debian_system.twmrc.diff -p0 --- xorg-x11-6.8.2.dfsg.1.orig/debian/patches/freebsd/004_gnu-kbsd_sock_un.diff +++ xorg-x11-6.8.2.dfsg.1/debian/patches/freebsd/004_gnu-kbsd_sock_un.diff @@ -0,0 +1,44 @@ +Index: xc/lib/dps/csconndi.c +=== +--- xc/lib/dps/csconndi.c.orig 2005-02-28 17:35:18.0 + xc/lib/dps/csconndi.c 2005-11-08 08:21:30.0 + +@@ -506,7 +506,7 @@ + sprintf (unaddr.sun_path, %s_%d, CSDPS_UNIX_PATH, port); + + addr = (struct sockaddr *) unaddr; +-addrlen = strlen(unaddr.sun_path) + sizeof(unaddr.sun_family); ++addrlen = strlen(unaddr.sun_path) + offsetof(struct sockaddr_un, sun_path); + + /* + * Open the network connection. +Index: xc/lib/xtrans/Xtranssock.c +=== +--- xc/lib/xtrans/Xtranssock.c.orig2005-11-08 08:20:49.0 + xc/lib/xtrans/Xtranssock.c 2005-11-08 08:21:30.0 + +@@ -1096,7 +1096,7 @@ + sockname.sun_len = strlen(sockname.sun_path); + namelen = SUN_LEN(sockname); + #else +-namelen = strlen(sockname.sun_path) + sizeof(sockname.sun_family); ++namelen = strlen(sockname.sun_path) + offsetof(struct sockaddr_un, sun_path); + #endif + + unlink (sockname.sun_path); +@@ -1979,7 +1979,7 @@ + sockname.sun_len = strlen (sockname.sun_path); + namelen = SUN_LEN (sockname); + #else +-namelen = strlen (sockname.sun_path) + sizeof (sockname.sun_family); ++namelen = strlen (sockname.sun_path) + offsetof(struct sockaddr_un, sun_path); + #endif + + +@@ -1993,7 +1993,7 @@ + return TRANS_CONNECT_FAILED; + } + old_namelen = strlen (old_sockname.sun_path) + +- sizeof (old_sockname.sun_family); ++ offsetof(struct sockaddr_un, sun_path); + #endif + +
