xserver: Branch 'xorg-server-1.2-apple' - 2 commits
Ben Byer
bbyer at kemper.freedesktop.org
Mon Nov 12 00:44:16 PST 2007
configure.ac | 60 ++++++------
hw/darwin/Makefile.am | 185 +++------------------------------------
hw/darwin/launcher/bundle-main.c | 8 +
hw/darwin/quartz/Makefile.am | 14 --
4 files changed, 53 insertions(+), 214 deletions(-)
New commits:
commit 0e87a3018681b1fe449ba59292a995737043787c
Author: Ben Byer <bbyer at bbyer.local>
Date: Mon Nov 12 00:44:11 2007 -0800
And now we kill XDarwinApp -- credit, Jeremy Huddleston
diff --git a/configure.ac b/configure.ac
index 3a046ce..a203560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,10 +456,10 @@ AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RG
AC_ARG_WITH(dri-driver-path, AS_HELP_STRING([--with-dri-driver-path=PATH], [Path to DRI drivers (default: ${libdir}/dri)]),
[ DRI_DRIVER_PATH="$withval" ],
[ DRI_DRIVER_PATH="${libdir}/dri" ])
-APPLE_APPLICATIONS_DIR="${bindir}/Applications"
-AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: ${bindir}/Applications)]),
+APPLE_APPLICATIONS_DIR="/Applications/Utilities"
+AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),
[ APPLE_APPLICATIONS_DIR="${withval}" ].
- [ APPLE_APPLICATIONS_DIR="${bindir}/Applications" ])
+ [ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])
AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
[BUILDDOCS=$enableval],
@@ -511,9 +511,8 @@ AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (d
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: no)]), [XVFB=$enableval], [XVFB=no])
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: no)]), [XNEST=$enableval], [XNEST=no])
AC_ARG_ENABLE(xdarwin, AS_HELP_STRING([--enable-xdarwin], [Build XDarwin server (default: auto)]), [XDARWIN=$enableval], [XDARWIN=auto])
-AC_ARG_ENABLE(xdarwinapp, AS_HELP_STRING([--enable-xdarwinapp], [Build XDarwin.app server (default: no)]), [XDARWINAPP=$enableval], [XDARWINAPP=no])
AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--disable-xquartz], [Build Xquartz server on Darwin (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
-AC_ARG_ENABLE(x11app, AS_HELP_STRING([--enable-x11app], [Build Apple's X11.app wrapper for Xquartz (default: no)]), [X11APP=$enableval], [X11APP=no])
+AC_ARG_ENABLE(x11app, AS_HELP_STRING([--enable-x11app], [Build Apple's X11.app wrapper for Xquartz (default: auto)]), [X11APP=$enableval], [X11APP=auto])
AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build Xprint extension and server (default: no)]), [XPRINT=$enableval], [XPRINT=no])
AC_ARG_ENABLE(xgl, AS_HELP_STRING([--enable-xgl], [Build Xgl server (default: no)]), [XGL=$enableval], [XGL=no])
@@ -1479,7 +1478,6 @@ AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])
AM_CONDITIONAL(CFB, [test "x$XORG" = xyes])
AM_CONDITIONAL(AFB, [test "x$XORG" = xyes])
AM_CONDITIONAL([BUILD_DARWIN],[test "X$build_darwin" = Xyes])
-AM_CONDITIONAL([XQUARTZ],[test "X$XQUARTZ" = Xyes])
dnl Xprint DDX
@@ -1603,7 +1601,7 @@ AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
dnl Darwin / OS X DDX
-AC_MSG_CHECKING([whether to build XDarwin (Mac OS X) DDX])
+AC_MSG_CHECKING([whether to build XDarwin/Xquartz])
if test "x$XDARWIN" = xauto; then
case $host_os in
darwin*) XDARWIN="yes" ;;
@@ -1613,25 +1611,33 @@ fi
AC_MSG_RESULT([$XDARWIN])
if test "x$XDARWIN" = xyes; then
- if test "X$XQUARTZ" = Xauto; then
- AC_CACHE_CHECK([for Carbon framework],xorg_cv_Carbon_framework,[
- save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -framework Carbon"
- AC_LINK_IFELSE([char FSFindFolder();
-int main() {
-FSFindFolder();
-return 0;}
- ],[xorg_cv_Carbon_framework=yes],
- [xorg_cv_Carbon_framework=no])
- LDFLAGS=$save_LDFLAGS])
- if test "X$xorg_cv_Carbon_framework" = Xyes; then
- AC_DEFINE([DARWIN_WITH_QUARTZ],[1],
- [Have Quartz])
- XQUARTZ=yes
- else
- XQUARTZ=no
- fi
- fi
+ if test "X$XQUARTZ" = Xauto; then
+ AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -framework Carbon"
+ AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],
+ [xorg_cv_Carbon_framework=yes],
+ [xorg_cv_Carbon_framework=no])
+ LDFLAGS=$save_LDFLAGS])
+
+ if test "X$xorg_cv_Carbon_framework" = Xyes; then
+ AC_DEFINE([DARWIN_WITH_QUARTZ],[1],[Have Quartz])
+ XQUARTZ=yes
+ else
+ XQUARTZ=no
+ fi
+ fi
+
+ if test "x$X11APP" = xauto; then
+ AC_MSG_CHECKING([whether to build X11.app])
+ if test "x$XQUARTZ" = xyes ; then
+ X11APP=yes
+ else
+ X11APP=no
+ fi
+ AC_MSG_RESULT([$X11APP])
+ fi
+
# glxAGL / glxCGL don't work yet
# AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[
# save_LDFLAGS=$LDFLAGS
@@ -1686,8 +1692,8 @@ _AM_DEPENDENCIES([OBJC])
AM_CONDITIONAL(HAVE_XPLUGIN, [test "x$ac_cv_lib_Xplugin_xp_init" = xyes])
AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, [test "x$xorg_cv_AGL_framework" = xyes])
AM_CONDITIONAL(XDARWIN, [test "x$XDARWIN" = xyes])
-AM_CONDITIONAL(XDARWINAPP, [test "x$XDARWINAPP" = xyes])
AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])
+AM_CONDITIONAL(X11APP,[test "X$X11APP" = Xyes])
dnl kdrive DDX
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 545ff2f..ccaacfd 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = @XORG_INCS@ -I../../miext/rootless
DEFS = @DEFS@ -DUSE_NEW_CLUT -DBUILD_DATE=\"$(BUILD_DATE)\"
if XQUARTZ
-XQUARTZ_SUBDIRS = bundle quartz
+XQUARTZ_SUBDIRS = quartz
endif
SUBDIRS = \
@@ -16,14 +16,17 @@ SUBDIRS = \
utils \
.
-darwinappdir = /Applications/Utilities/XDarwin.app
-
libdarwinShared_a_SOURCES = darwin.c \
darwinEvents.c \
darwinKeyboard.c \
$(darwin_XINPUT_SRCS)
+if XQUARTZ
bin_PROGRAMS = Xquartz
+else
+bin_PROGRAMS = XDarwin
+endif
+
XDarwin_SOURCES = \
$(top_srcdir)/fb/fbcmap.c \
$(top_srcdir)/mi/miinitext.c \
@@ -126,185 +129,27 @@ XDarwin_CFLAGS = -DINXDARWIN
Xquartz_CFLAGS = -DINXQUARTZ -DHAS_CG_MACH_PORT -DHAS_KL_API -DHAVE_XORG_CONFIG_H
Xquartz_OBJCFLAGS = -DINXQUARTZ -DHAS_CG_MACH_PORT -DHAS_KL_API -DHAVE_XORG_CONFIG_H
-if XQUARTZ
-macosdir = $(darwinappdir)/Contents/MacOS
-
-DEFS += -DDARWIN_WITH_QUARTZ -DXFree86Server
-
-macos_PROGRAMS =
-macos_SCRIPTS = x11app
+if X11APP
+bin_SCRIPTS = x11app x11launcher
x11app:
- cd apple && xcodebuild
+ cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
-XDarwinApp_SOURCES = \
- $(top_srcdir)/fb/fbcmap.c \
- $(top_srcdir)/mi/miinitext.c \
- $(top_srcdir)/Xi/stubs.c
-
-XDarwinApp_LDADD = \
- $(top_builddir)/dix/dixfonts.lo \
- $(top_builddir)/dix/libdix.la \
- $(top_builddir)/os/libos.la \
- ./quartz/XApplication.o \
- ./libdarwinShared.a \
- ./quartz/libXQuartz.a \
- $(top_builddir)/dix/libxpstubs.la \
- $(top_builddir)/miext/shadow/libshadow.la \
- $(top_builddir)/fb/libfb.la \
- $(top_builddir)/composite/libcomposite.la \
- $(top_builddir)/damageext/libdamageext.la \
- $(top_builddir)/miext/damage/libdamage.la \
- $(top_builddir)/xfixes/libxfixes.la \
- $(top_builddir)/miext/cw/libcw.la \
- $(top_builddir)/Xext/libXext.la \
- $(top_builddir)/xkb/libxkb.la \
- $(top_builddir)/xkb/libxkbstubs.la \
- $(top_builddir)/Xi/libXi.la \
- $(top_builddir)/dbe/libdbe.la \
- $(top_builddir)/record/librecord.la \
- $(top_builddir)/XTrap/libxtrap.la \
- $(XGLX_LIBS) \
- $(top_builddir)/miext/rootless/librootless.la \
- $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
- $(top_builddir)/miext/rootless/accel/librlAccel.la \
- @XORG_LIBS@ \
- -lXau -lXdmcp -lXfont -lfreetype \
- $(top_builddir)/fb/libfb.la
-
-XDarwinApp_LDFLAGS = \
- -XCClinker -Objc \
- -Wl,-u,_miDCInitialize \
- -Wl,-framework,Carbon \
- -Wl,-framework,ApplicationServices \
- -Wl,-framework,Cocoa \
- -Wl,-framework,CoreAudio \
- -Wl,-framework,IOKit
-
-HOOK_TARGETS = xquartz-install-hook
-
-
-crplugindir = $(darwinappdir)/Contents/Resources/cr.bundle/Contents/MacOS
-crplugin_LTLIBRARIES =
-cr_la_SOURCES =
-cr_la_LIBADD = \
- quartz/cr/crAppleWM.o \
- quartz/cr/crFrame.o \
- quartz/cr/crScreen.o \
- quartz/fullscreen/quartzCursor.o \
- quartz/cr/XView.o \
- $(top_builddir)/miext/rootless/librootless.la \
- $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
- $(top_builddir)/miext/rootless/accel/librlAccel.la
-cr_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
- -Wl,-framework,Cocoa \
- -Wl,-framework,Carbon \
- -XCClinker -ObjC \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-cr_la_DEPENDENCIES = XDarwinApp
-
-fullscreenplugindir = $(darwinappdir)/Contents/Resources/fullscreen.bundle/Contents/MacOS
-fullscreenplugin_LTLIBRARIES =
-fullscreen_la_SOURCES =
-fullscreen_la_LIBADD = \
- quartz/fullscreen/fullscreen.o \
- quartz/fullscreen/quartzCursor.o \
- $(top_builddir)/miext/shadow/libshadow.la
-
-fullscreen_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-fullscreen_la_DEPENDENCIES = XDarwinApp
-
-if GLX
-glxMesaplugindir = $(darwinappdir)/Contents/Resources/glxMesa.bundle/Contents/MacOS
-glxMesaplugin_LTLIBRARIES =
-glxMesa_la_SOURCES =
-glxMesa_la_LIBADD = \
- $(top_builddir)/GL/glx/libglx.la \
- $(top_builddir)/GL/mesa/libGLcore.la
-glxMesa_la_LDFLAGS = -shrext '' \
- -Wl,-framework,AGL \
- -Wl,-framework,OpenGL \
- -XCClinker -ObjC \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-glxMesa_la_DEPENDENCIES = XDarwinApp
-endif
-
-endif
-
-xprplugindir = $(darwinappdir)/Contents/Resources/xpr.bundle/Contents/MacOS
-xprplugin_LTLIBRARIES =
-xpr_la_SOURCES =
-xpr_la_LIBADD = \
- quartz/xpr/appledri.o \
- quartz/xpr/dri.o \
- quartz/xpr/xprAppleWM.o \
- quartz/xpr/xprCursor.o \
- quartz/xpr/xprFrame.o \
- quartz/xpr/xprScreen.o \
- quartz/xpr/x-hash.o \
- quartz/xpr/x-hook.o \
- quartz/xpr/x-list.o \
- $(top_builddir)/miext/rootless/librootless.la \
- $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
- $(top_builddir)/miext/rootless/accel/librlAccel.la
-xpr_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
- -lXplugin \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-xpr_la_DEPENDENCIES = XDarwinApp
-
-
-if HAVE_AGL_FRAMEWORK
-glxCGLplugindir = $(darwinappdir)/Contents/Resources/glxCGL.bundle/Contents/MacOS
-glxCGLplugin_LTLIBRARIES =
-glxCGL_la_SOURCES =
-glxCGL_la_LIBADD = \
- $(top_builddir)/GL/glx/glxext.o \
- $(top_builddir)/GL/glx/libglx.a \
- $(top_builddir)/GL/apple/libAGLcore.a
-glxCGL_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
- -Wl,-framework,AGL \
- -Wl,-framework,OpenGL \
- -XCClinker -ObjC \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-glxCGL_la_DEPENDENCIES = XDarwinApp
-
-
-glxAGLplugindir = $(darwinappdir)/Contents/Resources/glxAGL.bundle/Contents/MacOS
-glxAGLplugin_LTLIBRARIES =
-glxAGL_la_SOURCES =
-glxAGL_la_LIBADD = \
- $(top_builddir)/GL/glx/glxext.o \
- $(top_builddir)/GL/glx/libglx.a \
- $(top_builddir)/GL/apple/libAGLcore.a
-glxAGL_la_LDFLAGS = -shrext '' \
- -Wl,-framework,AGL \
- -Wl,-framework,OpenGL \
- -XCClinker -ObjC \
- -XCClinker -bundle_loader -XCClinker XDarwinApp \
- -module -avoid-version -no-undefined
-glxAGL_la_DEPENDENCIES = XDarwinApp
+x11launcher:
+ cd launcher && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
+x11app-install-hook:
+ cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefixdir) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
+ cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
+HOOK_TARGETS = x11app-install-hook
endif
man1_MANS = XDarwin.man
-uninstall-hook:
- rm -rf $(DESTDIR)$(macosdir)/XDarwin
-
install-data-hook: $(HOOK_TARGETS)
-xquartz-install-hook:
- cd apple && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=/usr/X11 DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
- cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=/Applications/Utilities DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO
-
EXTRA_DIST = \
darwin.c \
darwinClut8.h \
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
index 0d236be..baa7d44 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/darwin/quartz/Makefile.am
@@ -25,20 +25,6 @@ libXQuartz_a_SOURCES = \
quartzStartup.c \
pseudoramiX.c
-bin_PROGRAMS = XDarwinStartup
-
-XDarwinStartup_SOURCES = XDarwinStartup.c
-XDarwinStartup_LDFLAGS = -Wl,-framework,CoreFoundation \
- -Wl,-framework,ApplicationServices
-XDarwinStartupCFLAGS = -DXBINDIR="${bindir}"
-XDARWINROOT = @APPLE_APPLICATIONS_DIR@
-BINDIR = $(bindir)
-install-exec-local:
- -(cd $(DESTDIR)$(BINDIR); rm X; $(LN_S) XDarwinStartup X)
-
-man1_MANS = XDarwinStartup.man
-
-
EXTRA_DIST = \
applewmExt.h \
keysym2ucs.h \
commit 057b1c0a65f6fb375d7601720247827bb6860446
Author: Ben Byer <bbyer at bbyer.local>
Date: Mon Nov 12 00:27:30 2007 -0800
Patch to fix various issues with the launcher, courtesy of Jeremy Huddleston
diff --git a/hw/darwin/launcher/bundle-main.c b/hw/darwin/launcher/bundle-main.c
index 988c04f..ca62553 100644
--- a/hw/darwin/launcher/bundle-main.c
+++ b/hw/darwin/launcher/bundle-main.c
@@ -37,7 +37,7 @@
int main (int argc, char **argv) {
char *command = DEFAULT_APP;
- const char *newargv[5];
+ const char *newargv[7];
int child;
@@ -60,8 +60,10 @@ int main (int argc, char **argv) {
newargv[0] = "/usr/bin/login";
newargv[1] = "-fp";
newargv[2] = getlogin();
- newargv[3] = command;
- newargv[4] = NULL;
+ newargv[3] = "/bin/sh";
+ newargv[4] = "-c";
+ newargv[5] = command;
+ newargv[6] = NULL;
child = fork();
More information about the xorg-commit
mailing list