This is the mail archive of the
cygwin-xfree
mailing list for the Cygwin XFree86 project.
Re: Still seeking a Cygwin/X maintainer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Reini Urban wrote:
| You same to have no problem to update it regularly on your site.
|
| Don't you want to do it to catch up with GNOME and gtk2?
I had wanted to ever since modular X117.0, and the client code works
beautifully, but as I've mentioned several times, I got stuck on the
server not finding the fonts. Therefore, I was resigned to using Xming,
which while missing the MIT-SHM extension, is a fairly good substitute.
~ But a BYOS (S=server) situation didn't seem appropriate for the distro,
so modular X117.0 stayed in Ports, where I've been keeping it relatively
up to date.
A recent hint to the cygwin-xfree list about using a static-only
libXfont allowed XWin to launch, but now:
1) the resulting build (1.3) had no X extensions available (not sure why);
2) the current version (1.4) doesn't compile due to API changes
elsewhere in the common code.
Now I have much less time than I used to for Cygwin development, so I
have yet to figure out either of these issues. If the 1.3 server can be
made to work, maintaining the client code is no big deal; I've already
done most of the work, and being modular, several people should be able
to maintain X11 together.
In case someone else with the Ports' X11R7 is actually interested in
helping to figure this out:
1) rm -f /usr/lib/libXfont.*;
2) build and install a static libXfont (.cygport attached);
3) build xorg-server-1.3.0.0 (.cygport and patch attached). The build
will stop during Xprint, but XWin will have already been built. Try
launching the resulting XWin, run xdpyinfo, and no extensions are
available.
I really need another set of eyes to figure out what I'm missing. If
anyone can figure out what's wrong with XWin, I'll be happy to look into
it further.
Yaakov
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFH2fpIpiWmPGlmQSMRCPWNAJ0SlvfhKp+OsJA/Mm2NRLC32en3xQCg1d/u
1DkGbjcbSsgn2xSuJB7H0GY=
=OVEa
-----END PGP SIGNATURE-----
inherit xorg
CYGCONF_ARGS="--enable-static --disable-shared
--with-encodingsdir=/usr/share/fonts/encodings"
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/indirect_dispatch_swap.c src/xorg-server-1.3.0.0/GL/glx/indirect_dispatch_swap.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/indirect_dispatch_swap.c 2007-03-05 12:38:58.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/indirect_dispatch_swap.c 2007-12-31 04:38:36.703125000 -0600
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/indirect_program.c src/xorg-server-1.3.0.0/GL/glx/indirect_program.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/indirect_program.c 2007-03-05 12:38:58.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/indirect_program.c 2007-12-31 04:37:39.921875000 -0600
@@ -46,7 +46,7 @@
#include "dispatch.h"
#include "glapioffsets.h"
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/indirect_reqsize.c src/xorg-server-1.3.0.0/GL/glx/indirect_reqsize.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/indirect_reqsize.c 2007-01-30 00:03:18.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/indirect_reqsize.c 2007-12-31 04:38:44.671875000 -0600
@@ -31,7 +31,7 @@
#include "indirect_size.h"
#include "indirect_reqsize.h"
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
# include <byteswap.h>
# define SWAP_32(v) do { (v) = bswap_32(v); } while(0)
#else
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/indirect_texture_compression.c src/xorg-server-1.3.0.0/GL/glx/indirect_texture_compression.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/indirect_texture_compression.c 2007-03-05 12:38:58.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/indirect_texture_compression.c 2007-12-31 04:39:15.968750000 -0600
@@ -39,7 +39,7 @@
#include "glthread.h"
#include "dispatch.h"
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/indirect_util.c src/xorg-server-1.3.0.0/GL/glx/indirect_util.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/indirect_util.c 2007-01-30 00:03:18.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/indirect_util.c 2007-12-31 04:39:20.875000000 -0600
@@ -28,7 +28,7 @@
#include <X11/Xmd.h>
#include <GL/gl.h>
#include <GL/glxproto.h>
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/GL/glx/swap_interval.c src/xorg-server-1.3.0.0/GL/glx/swap_interval.c
--- origsrc/xorg-server-1.3.0.0/GL/glx/swap_interval.c 2007-03-05 12:38:58.000000000 -0600
+++ src/xorg-server-1.3.0.0/GL/glx/swap_interval.c 2007-12-31 04:41:14.062500000 -0600
@@ -40,7 +40,7 @@
#include "dispatch.h"
#include "glapioffsets.h"
-#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__) || defined(__CYGWIN__)
#include <byteswap.h>
#elif defined(__OpenBSD__)
#include <sys/endian.h>
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/configure.ac src/xorg-server-1.3.0.0/configure.ac
--- origsrc/xorg-server-1.3.0.0/configure.ac 2007-04-19 20:23:40.000000000 -0500
+++ src/xorg-server-1.3.0.0/configure.ac 2007-12-31 03:16:26.640625000 -0600
@@ -1426,7 +1426,7 @@
mingw*) XWIN="yes" ;;
*) XWIN="no" ;;
esac
- XWIN_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $LAYER_LIB $XPSTUBS_LIB $OS_LIB $SHADOW_LIB"
+ XWIN_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $XI_LIB $RANDR_LIB $RENDER_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XPSTUBS_LIB $OS_LIB $LBX_LIB"
AC_SUBST([XWIN_LIBS])
fi
AC_MSG_RESULT([$XWIN])
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/hw/xwin/InitInput.c src/xorg-server-1.3.0.0/hw/xwin/InitInput.c
--- origsrc/xorg-server-1.3.0.0/hw/xwin/InitInput.c 2006-11-16 12:01:26.000000000 -0600
+++ src/xorg-server-1.3.0.0/hw/xwin/InitInput.c 2007-12-31 03:16:26.640625000 -0600
@@ -31,9 +31,6 @@
#include <xwin-config.h>
#endif
#include "win.h"
-#ifdef XWIN_CLIPBOARD
-# include "../../Xext/xf86miscproc.h"
-#endif
#include "dixstruct.h"
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/hw/xwin/Makefile.am src/xorg-server-1.3.0.0/hw/xwin/Makefile.am
--- origsrc/xorg-server-1.3.0.0/hw/xwin/Makefile.am 2006-11-16 12:01:26.000000000 -0600
+++ src/xorg-server-1.3.0.0/hw/xwin/Makefile.am 2007-12-31 03:16:26.640625000 -0600
@@ -121,6 +121,7 @@
winpriv.h \
winresource.h \
winwindow.h \
+ $(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/fb/fbcmap.c \
$(SRCS_CLIPBOARD) \
@@ -151,7 +152,7 @@
$(XWIN_LIBS) \
$(XWINMODULES_LIBS)
-XWin_LDFLAGS = -mwindows -static
+XWin_LDFLAGS = -mwindows
winprefsyacc.h: winprefsyacc.c
winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x autom4te.cache -x config.cache -x config.log -x config.status -x config.h -x config.h.in -x ABOUT-NLS -x Makefile.in.in -x Makevars.template -x '*SlackBuild*' -x '*.egg-info' -x '*.class' -x '*.pyc' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x COPYING -x INSTALL -x compile -x config-ml.in -x config.guess -x config.sub -x depcomp -x elisp-comp -x install-sh -x ltmain.sh -x mdate-sh -x missing -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x config.rpath -x Makefile.in -x makefile.in -x configure -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x intltool.m4 -x intltool-extract -x intltool-extract.in -x intltool-merge -x intltool-merge.in -x intltool-update -x intltool-update.in -x xf86Build.h -x include origsrc/xorg-server-1.3.0.0/hw/xwin/winmultiwindowwm.c src/xorg-server-1.3.0.0/hw/xwin/winmultiwindowwm.c
--- origsrc/xorg-server-1.3.0.0/hw/xwin/winmultiwindowwm.c 2006-09-18 01:04:18.000000000 -0500
+++ src/xorg-server-1.3.0.0/hw/xwin/winmultiwindowwm.c 2007-12-31 03:16:26.656250000 -0600
@@ -52,14 +52,7 @@
#include <X11/cursorfont.h>
/* Windows headers */
-#ifdef __CYGWIN__
-/* Fixups to prevent collisions between Windows and X headers */
-#define ATOM DWORD
-
-#include <windows.h>
-#else
-#include <Xwindows.h>
-#endif
+#include <X11/Xwindows.h>
/* Local headers */
#include "objbase.h"
inherit xorg
MESA_VERSION=6.5.2
SRC_URI+=" mirror://sourceforge/mesa3d/MesaLib-${MESA_VERSION}.tar.bz2"
DIFF_EXCLUDES="xf86Build.h include"
FONTPATH="/usr/share/fonts"
src_compile() {
cd ${S}
cygautoreconf
cd ${B}
cygconf \
--disable-static \
--disable-builddocs \
--disable-composite \
--disable-dmx \
--disable-fontcache \
--disable-install-libxf86config \
--disable-install-setuid \
--disable-xf86dga \
--disable-xf86misc \
--disable-xf86vidmode \
--disable-xorgcfg \
--with-fontdir=${FONTPATH} \
--with-log-dir=/tmp \
--with-mesa-source=${S}/../Mesa-${MESA_VERSION} \
--with-os-name='Cygwin' \
--with-os-vendor='Cygwin' \
--with-builder-addr='cygwin-xfree@cygwin.com' \
--with-vendor-string='Cygwin/X' \
--with-vendor-string-short='Cygwin/X' \
--with-vendor-web='http://x.cygwin.com/'
cygmake
}
src_install() {
cd ${B}
cyginstall sdkdir=/usr/include/xorg
# The SDK is only used for building Xorg drivers (which aren't
# applicable to XWin), so we remove it to avoid confusion
rm -fr ${D}/usr/include ${D}/usr/lib/pkgconfig ${D}/usr/share/aclocal
dosym XWin.exe /usr/bin/X
newdoc ${S}/hw/xwin/_usr_X11R6_lib_X11_system.XWinrc sample.XWinrc
}
--
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
Problem reports: http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ: http://x.cygwin.com/docs/faq/