head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC5:1.1.1.2 xorg-server-21-1-23:1.1.1.2 netbsd-11-0-RC4:1.1.1.2 xorg-server-21-1-22:1.1.1.2 netbsd-11-0-RC3:1.1.1.2 netbsd-11-0-RC2:1.1.1.2 netbsd-11-0-RC1:1.1.1.2 xorg-server-21-1-21:1.1.1.2 xorg-server-21-1-20:1.1.1.2 netbsd-11:1.1.1.2.0.4 netbsd-11-base:1.1.1.2 xorg-server-21-1-18:1.1.1.2 xorg-server-21-1-16:1.1.1.2 netbsd-10-1-RELEASE:1.1.1.2 xorg-server-21-1-14:1.1.1.2 xorg-server-21-1-13:1.1.1.2 netbsd-10-0-RELEASE:1.1.1.2 netbsd-10-0-RC6:1.1.1.2 netbsd-10-0-RC5:1.1.1.2 netbsd-10-0-RC4:1.1.1.2 netbsd-10-0-RC3:1.1.1.2 netbsd-10-0-RC2:1.1.1.2 netbsd-10-0-RC1:1.1.1.2 xorg-server-21-1-9:1.1.1.2 xorg-server-21-1-8:1.1.1.2 xorg-server-21-1-7:1.1.1.2 xorg-server-21-1-6:1.1.1.2 xorg-server-21-1-5:1.1.1.2 netbsd-10:1.1.1.2.0.2 netbsd-10-base:1.1.1.2 xorg-server-21-1-4:1.1.1.2 xorg-server-21-1-3:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.1 date 2022.07.15.02.13.00; author mrg; state Exp; branches 1.1.1.1; next ; commitid gzj6xwMO9FqKXVLD; 1.1.1.1 date 2022.07.15.02.13.00; author mrg; state Exp; branches; next 1.1.1.2; commitid gzj6xwMO9FqKXVLD; 1.1.1.2 date 2022.07.15.09.08.56; author mrg; state Exp; branches; next ; commitid nva2CO5ZqMVwgYLD; desc @@ 1.1 log @Initial revision @ text @# mach interface mig = find_program('mig') mach_startup = custom_target('mach_startup', command: [mig, '-sheader', '@@OUTPUT0@@', '-header', '@@OUTPUT2@@', '-server', '@@OUTPUT1@@', '-user', '@@OUTPUT3@@', '@@INPUT@@'], input: 'mach_startup.defs', output: ['mach_startupServer.h', 'mach_startupServer.c', 'mach_startup.h', 'mach_startupUser.c'], ) mach_startup_dep = declare_dependency( sources: mach_startup[2] # mach_startup.h ) # common defines xquartz_defs = [ bundle_id_def, '-DXSERVER_VERSION="@@0@@"'.format(meson.project_version()), '-DX11BINDIR="@@0@@"'.format(join_paths(get_option('prefix'), get_option('bindir'))), ] # X11.bin x11appdir = join_paths(bundle_root, 'Contents/MacOS') x11_bin_deps = [ meson.get_compiler('c').find_library('Xplugin'), dependency('Carbon', method: 'extraframework'), cocoa, dependency('CoreAudio', method: 'extraframework'), dependency('IOKit', method: 'extraframework') ] if build_glx x11_bin_deps += [dependency('OpenGL', method: 'extraframework')] endif if build_sparkle x11_bin_deps += sparkle endif x11_bin_libs = [ libXquartz, libXquartzXpr, libxpbproxy, libxserver_fb, libxserver, libxserver_xkb_stubs, ] if build_glx x11_bin_libs += [libcglcore, libxserver_glx, libglxvnd] endif x11_bin = executable('X11.bin', [ 'bundle-main.c', mach_startup[1], # mach_startupServer.c mach_startup[3], # mach_startupUser.c ], link_with: x11_bin_libs, dependencies: [xproto_dep, x11_bin_deps, mach_startup_dep], include_directories: [inc, '..', top_dir_inc], c_args: xquartz_defs, link_args: ['-Objc'], install: true, install_dir: x11appdir, ) # Xquartz xquartz_deps = [ dependency('CoreServices', method: 'extraframework'), ] xquartz = executable('Xquartz', [ 'stub.c', 'launchd_fd.c', mach_startup[3], # mach_startupUser.c ], include_directories: inc, c_args: xquartz_defs, dependencies: [xquartz_deps, mach_startup_dep], install: true, ) @ 1.1.1.1 log @initial import of xorg-server-21.1.3 @ text @@ 1.1.1.2 log @initial import of xorg-server-21.1.4 @ text @a72 11 # X11 (Bundle trampoline) x11 = executable('X11', [ 'bundle_trampoline.c', ], c_args: xquartz_defs, link_args: ['-Objc'], install: true, install_dir: x11appdir, ) @