xserver: Branch 'xorg-server-1.2-apple'
Ben Byer
bbyer at kemper.freedesktop.org
Mon Oct 29 00:07:48 PDT 2007
GL/Makefile.am | 11 ++---------
configure.ac | 2 +-
dix/dixfonts.c | 4 ++--
hw/Makefile.am | 11 ++---------
hw/darwin/Makefile.am | 5 +++--
hw/darwin/quartz/quartzKeyboard.c | 3 ++-
6 files changed, 12 insertions(+), 24 deletions(-)
New commits:
commit 5d1193aa3153653d679fd2d0aba61dc4964f098d
Author: Ben Byer <bbyer at bbyer.local>
Date: Mon Oct 29 00:07:29 2007 -0700
finished committing downstream changes
diff --git a/GL/Makefile.am b/GL/Makefile.am
index b9337ba..4e8337a 100644
--- a/GL/Makefile.am
+++ b/GL/Makefile.am
@@ -1,16 +1,9 @@
-SUBDIRS = glx mesa
+SUBDIRS = glx mesa apple
-# someone could get really crazy someday and add support for the SI...
-
-# xwin/darwin/xfree86 have their accel support under the DDX
-
-APPLE_EXTRAS = \
- apple/aglGlx.c \
- apple/indirect.c
WINDOWS_EXTRAS = \
windows/ChangeLog \
windows/glwindows.h \
windows/glwrap.c \
windows/indirect.c
-EXTRA_DIST = symlink-mesa.sh $(APPLE_EXTRAS) $(WINDOWS_EXTRAS)
+EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS)
diff --git a/configure.ac b/configure.ac
index 1f1a8dc..72cd2e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,7 +1649,7 @@ return 0;}
AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:])
AC_SUBST([APPLE_APPLICATIONS_DIR])
- CFLAGS="${CFLAGS} -D__DARWIN__"
+ CFLAGS="${CFLAGS} -D__DARWIN__ -DDARWIN_WITH_QUARTZ"
PLIST_VERSION_STRING=$PACKAGE_VERSION
AC_SUBST([PLIST_VERSION_STRING])
PLIST_VENDOR_WEB=$VENDOR_WEB
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index f10011e..e085bd0 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1632,9 +1632,9 @@ FreeFontPath(FontPathElementPtr *list, int n, Bool force)
found++;
}
if (list[i]->refcount != found) {
- ErrorF("FreeFontPath: FPE \"%.*s\" refcount is %d, should be %d; fixing.\n",
+ /* ErrorF("FreeFontPath: FPE \"%.*s\" refcount is %d, should be %d; fixing.\n",
list[i]->name_length, list[i]->name,
- list[i]->refcount, found);
+ list[i]->refcount, found); */
list[i]->refcount = found; /* ensure it will get freed */
}
}
diff --git a/hw/Makefile.am b/hw/Makefile.am
index d00d6fb..a1918ab 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -1,11 +1,3 @@
-if DMX
-DMX_SUBDIRS = dmx
-endif
-
-if XORG
-XORG_SUBDIRS = xfree86
-endif
-
if XVFB
XVFB_SUBDIRS = vfb
endif
@@ -30,7 +22,7 @@ if XPRINT
XPRINT_SUBDIRS = xprint
endif
-# need to add darwin support here
+DARWIN_SUBDIRS = darwin
SUBDIRS = \
$(XORG_SUBDIRS) \
@@ -40,6 +32,7 @@ SUBDIRS = \
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \
$(KDRIVE_SUBDIRS) \
+ $(DARWIN_SUBDIRS) \
$(XPRINT_SUBDIRS)
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index aa4fbee..9222f57 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -1,6 +1,7 @@
noinst_LIBRARIES = libdarwinShared.a
libdarwin_XINPUT_SRCS = darwinXinput.c
+# -O2 inexplicably causes quartzKeyboard.o to break?!
AM_CFLAGS = @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ -I../../miext/rootless
@@ -79,7 +80,7 @@ XDarwin_LDADD = \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \
- $(XSERVER_LIBS)
+ $(XSERVER_LIBS) -lXplugin
Xquartz_LDADD = \
$(top_builddir)/dix/dixfonts.lo \
@@ -105,7 +106,7 @@ Xquartz_LDADD = \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \
- $(XSERVER_LIBS)
+ $(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin
XDarwin_LDFLAGS = \
-XCClinker -Objc \
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index b330793..f9c5963 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -166,7 +166,8 @@ DarwinModeSystemKeymapSeed (void)
return seed;
}
-static inline UniChar
+//static inline UniChar
+UniChar
macroman2ucs (unsigned char c)
{
/* Precalculated table mapping MacRoman-128 to Unicode. Generated
More information about the xorg-commit
mailing list