Add SDL3 wrap.

ci_config.json

@@ -1081,6 +1081,24 @@
       "libjack-dev"
     ]
   },
+  "sdl3": {
+      "alpine_packages": [
+      "libudev-zero-dev",
+      "dbus-dev",
+      "pipewire-dev",
+      "wayland-dev"
+    ],
+    "debian_packages": [
+      "libudev-dev",
+      "libdbus-1-dev",
+      "libpipewire-0.3-dev",
+      "libwayland-dev",
+      "libwayland-bin",
+      "libxkbcommon-dev",
+      "libegl-dev",
+      "libgl-dev"
+    ]
+  },
   "sds": {
     "build_on": {
       "windows": false

releases.json

@@ -3383,6 +3383,14 @@
       "2.0.12-1"
     ]
   },
+  "sdl3": {
+    "dependency_names": [
+      "sdl3"
+    ],
+    "versions": [
+        "3.2.4-2"
+    ]
+  },
   "sds": {
     "dependency_names": [
       "sds"

subprojects/packagefiles/sdl3/meson.build

@@ -0,0 +1,316 @@
+project('sdl3', 'c',
+    version : '3.2.4',
+    license : 'zlib',
+    meson_version : '>=1.6',
+    default_options : ['c_std=none'],
+)
+
+cc = meson.get_compiler('c')
+
+varr = meson.project_version().split('.')
+
+sdl_major = varr[0].to_int()
+sdl_minor = varr[1].to_int()
+sdl_patch = varr[2].to_int()
+
+cdata = configuration_data()
+
+cdata.set('HAVE_LIBC', 1)
+cdata.set('SDL_DEFAULT_ASSERT_LEVEL', true)
+
+sdl_deps = [dependency('threads'),
+            dependency('dl', required: false),
+            cc.find_library('m', required: false)]
+
+add_project_arguments('-DUSING_GENERATED_CONFIG_H', language: 'c')
+add_project_arguments('-DSDL_BUILD_MAJOR_VERSION=@0@'.format(sdl_major),
+    '-DSDL_BUILD_MINOR_VERSION=@0@'.format(sdl_minor),
+    '-DSDL_BUILD_MICRO_VERSION=@0@'.format(sdl_patch),
+    language: 'c')
+
+basic_headers = [
+['float.h', 'HAVE_FLOAT_H'],
+['stdarg.h', 'HAVE_STDARG_H'],
+['stddef.h', 'HAVE_STDDEF_H'],
+['stdint.h', 'HAVE_STDINT_H'],
+['iconv.h', 'HAVE_ICONV_H'],
+['inttypes.h', 'HAVE_INTTYPES_H'],
+['limits.h', 'HAVE_LIMITS_H'],
+['malloc.h', 'HAVE_MALLOC_H'],
+['math.h', 'HAVE_MATH_H'],
+['memory.h', 'HAVE_MEMORY_H'],
+['signal.h', 'HAVE_SIGNAL_H'],
+['stdio.h', 'HAVE_STDIO_H'],
+['stdlib.h', 'HAVE_STDLIB_H'],
+['strings.h', 'HAVE_STRINGS_H'],
+['string.h', 'HAVE_STRING_H'],
+['sys/types.h', 'HAVE_SYS_TYPES_H'],
+['wchar.h', 'HAVE_WCHAR_H'],
+['pthread_np.h', 'HAVE_PTHREAD_NP_H'],
+['linux/input.h', 'HAVE_LINUX_INPUT_H'],
+['ddraw.h', 'HAVE_DDRAW_H'],
+['dsound.h', 'HAVE_DSOUND_H'],
+['dinput.h', 'HAVE_DINPUT_H'],
+]
+
+foreach i: basic_headers
+  hname = i[0]
+  define = i[1]
+  cdata.set10(define, cc.has_header(hname))
+endforeach
+
+check_functions = [
+# check token ['HAVE_GCC_ATOMICS']
+# check token ['HAVE_GCC_SYNC_LOCK_TEST_AND_SET']
+# check token ['HAVE_LIBC']
+# check token ['HAVE_LIBC']
+  ['HAVE_DLOPEN', 'dlopen', '#include<dlfcn.h>'],
+  ['HAVE_MALLOC', 'malloc', '#include<stdlib.h>'],
+  ['HAVE_FDATASYNC', 'fdatasync', '#include<unistd.h>'],
+  ['HAVE_GETENV', 'getenv', '#include<stdlib.h>'],
+# check token ['HAVE_GETHOSTNAME']
+  ['HAVE_SETENV', 'setenv', '#include<stdlib.h>'],
+  ['HAVE_PUTENV', 'putenv', '#include<stdlib.h>'],
+  ['HAVE_UNSETENV', 'unsetenv', '#include<stdlib.h>'],
+  ['HAVE_ABS', 'abs', '#include<stdlib.h>'],
+  ['HAVE_BCOPY', 'bcopy', '#include<strings.h>'],
+  ['HAVE_MEMSET', 'memset', '#include<string.h>'],
+  ['HAVE_MEMCPY', 'memcpy', '#include<string.h>'],
+  ['HAVE_MEMMOVE', 'memmove', '#include<string.h>'],
+  ['HAVE_MEMCMP', 'memcmp', '#include<string.h>'],
+# check token ['HAVE_WCSLEN']
+# check token ['HAVE_WCSNLEN']
+# check token ['HAVE_WCSLCPY']
+# check token ['HAVE_WCSLCAT']
+# check token ['HAVE_WCSSTR']
+# check token ['HAVE_WCSCMP']
+# check token ['HAVE_WCSNCMP']
+# check token ['HAVE_WCSTOL']
+  ['HAVE_STRLEN', 'strlen', '#include<string.h>'],
+  ['HAVE_STRNLEN', 'strnlen', '#include<string.h>'],
+  ['HAVE_STRLCPY', 'strlcpy', '#include<string.h>'],
+  ['HAVE_STRLCAT', 'strlcat', '#include<string.h>'],
+# check token ['HAVE_STRPBRK']
+  ['HAVE__STRREV', '_strrev', '#include<string.h>'],
+  ['HAVE_INDEX', 'index', '#include<strings.h>'],
+  ['HAVE_RINDEX', 'rindex', '#include<strings.h>'],
+  ['HAVE_STRCHR', 'strchr', '#include<string.h>'],
+  ['HAVE_STRRCHR', 'strrchr', '#include<string.h>'],
+  ['HAVE_STRSTR', 'strstr', '#include<string.h>'],
+# check token ['HAVE_STRNSTR']
+  ['HAVE_STRTOK_R', 'strtok_r', '#include<string.h>'],
+# check token ['HAVE_ITOA']
+# check token ['HAVE__LTOA']
+# check token ['HAVE__UITOA']
+# check token ['HAVE__ULTOA']
+  ['HAVE_STRTOL', 'strtol', '#include<stdlib.h>'],
+  ['HAVE_STRTOUL', 'strtoul', '#include<stdlib.h>'],
+# check token ['HAVE__I64TOA']
+# check token ['HAVE__UI64TOA']
+  ['HAVE_STRTOLL', 'strtoll', '#include<stdlib.h>'],
+  ['HAVE_STRTOULL', 'strtoull', '#include<stdlib.h>'],
+  ['HAVE_STRTOD', 'strtod', '#include<stdlib.h>'],
+  ['HAVE_ATOI', 'atoi', '#include<stdlib.h>'],
+  ['HAVE_ATOF', 'atof', '#include<stdlib.h>'],
+  ['HAVE_STRCMP', 'strcmp', '#include<string.h>'],
+  ['HAVE_STRNCMP', 'strncmp', '#include<string.h>'],
+  ['HAVE_VSSCANF', 'vsscanf', '#include<stdio.h>'],
+  ['HAVE_VSNPRINTF', 'vsnprintf', '#include<stdio.h>'],
+  ['HAVE_ACOS', 'acos', '#include<math.h>'],
+  ['HAVE_ACOSF', 'acosf', '#include<math.h>'],
+  ['HAVE_ASIN', 'asin', '#include<math.h>'],
+  ['HAVE_ASINF', 'asinf', '#include<math.h>'],
+  ['HAVE_ATAN', 'atan', '#include<math.h>'],
+  ['HAVE_ATANF', 'atanf', '#include<math.h>'],
+  ['HAVE_ATAN2', 'atan2', '#include<math.h>'],
+  ['HAVE_ATAN2F', 'atan2f', '#include<math.h>'],
+  ['HAVE_CEIL', 'ceil', '#include<math.h>'],
+  ['HAVE_CEILF', 'ceilf', '#include<math.h>'],
+  ['HAVE_COPYSIGN', 'copysign', '#include<math.h>'],
+  ['HAVE_COPYSIGNF', 'copysignf', '#include<math.h>'],
+# check token ['HAVE__COPYSIGN']
+  ['HAVE_COS', 'cos', '#include<math.h>'],
+  ['HAVE_COSF', 'cosf', '#include<math.h>'],
+  ['HAVE_EXP', 'exp', '#include<math.h>'],
+  ['HAVE_EXPF', 'expf', '#include<math.h>'],
+  ['HAVE_FABS', 'fabs', '#include<math.h>'],
+  ['HAVE_FABSF', 'fabsf', '#include<math.h>'],
+  ['HAVE_FLOOR', 'floor', '#include<math.h>'],
+  ['HAVE_FLOORF', 'floorf', '#include<math.h>'],
+  ['HAVE_FMOD', 'fmod', '#include<math.h>'],
+  ['HAVE_FMODF', 'fmodf', '#include<math.h>'],
+  ['HAVE_ISINF', 'isinf', '#include<math.h>'],
+    ['HAVE_ISINFF', 'isinff', '#include<math.h>'],
+# check token ['HAVE_ISINF_FLOAT_MACRO']
+  ['HAVE_ISNAN', 'isnan', '#include<math.h>'],
+  ['HAVE_ISNANF', 'isnanf', '#include<math.h>'],
+# check token ['HAVE_ISNAN_FLOAT_MACRO']
+  ['HAVE_LOG', 'log', '#include<math.h>'],
+  ['HAVE_LOGF', 'logf', '#include<math.h>'],
+  ['HAVE_LOG10', 'log10', '#include<math.h>'],
+  ['HAVE_LOG10F', 'log10f', '#include<math.h>'],
+# check token ['HAVE_LROUND']
+# check token ['HAVE_LROUNDF']
+# check token ['HAVE_MODF']
+# check token ['HAVE_MODFF']
+  ['HAVE_POW', 'pow', '#include<math.h>'],
+# check token ['HAVE_POWF']
+  ['HAVE_ROUND', 'round', '#include<math.h>'],
+# check token ['HAVE_ROUNDF']
+  ['HAVE_SCALBN', 'scalbn', '#include<math.h>'],
+# check token ['HAVE_SCALBNF']
+  ['HAVE_SIN', 'sin', '#include<math.h>'],
+  ['HAVE_SINF', 'sinf', '#include<math.h>'],
+  ['HAVE_SQRT', 'sqrt', '#include<math.h>'],
+  ['HAVE_SQRTF', 'sqrtf', '#include<math.h>'],
+# check token ['HAVE_TAN']
+# check token ['HAVE_TANF']
+# check token ['HAVE_TRUNC']
+# check token ['HAVE_TRUNCF']
+# check token ['HAVE__FSEEKI64']
+# check token ['HAVE_FOPEN64']
+  ['HAVE_FSEEKO', 'fseeko', '#include<stdio.h>'],
+  ['HAVE_FSEEKO64', 'fseeko64', '#include<stdio.h>'],
+# check token ['HAVE_MEMFD_CREATE']
+# check token ['HAVE_POSIX_FALLOCATE']
+  ['HAVE_SIGACTION', 'sigaction', '#include<signal.h>'],
+# check token ['HAVE_SA_SIGACTION']
+# check token ['HAVE_ST_MTIM']
+  ['HAVE_SETJMP', 'setjmp', '#include<setjmp.h>'],
+  ['HAVE_NANOSLEEP', 'nanosleep', '#include<time.h>'],
+  ['HAVE_GMTIME_R', 'gmtime_r', '#include<time.h>'],
+# check token ['HAVE_LOCALTIME_R']
+# check token ['HAVE_NL_LANGINFO']
+  ['HAVE_SYSCONF', 'sysconf', '#include<unistd.h>'],
+  ['HAVE_SYSCTLBYNAME', 'sysctlbyname', '#include<sys/sysctl.h>'],
+  ['HAVE_CLOCK_GETTIME', 'clock_gettime', '#include<time.h>'],
+  ['HAVE_GETPAGESIZE', 'getpagesize', '#include<unistd.h>'],
+# check token ['HAVE_ICONV']
+  ['HAVE_PTHREAD_SETNAME_NP', 'pthread_setname_np', '#include<pthread.h>'],
+  ['HAVE_PTHREAD_SET_NAME_NP', 'pthread_set_name_np', '#include<pthread.h>'],
+  ['HAVE_SEM_TIMEDWAIT', 'sem_timedwait', '#include<semaphore.h>'],
+# check token ['HAVE_GETAUXVAL']
+# check token ['HAVE_ELF_AUX_INFO']
+  ['HAVE_POLL', 'poll', '#include<poll.h>'],
+# check token ['HAVE__EXIT']
+# check token ['HAVE_FCITX']
+  ['HAVE_INOTIFY_INIT1', 'inotify_init1', '#include<sys/inotify.h>'],
+# check token ['HAVE_INOTIFY']
+# check token ['HAVE_LIBUSB']
+# check token ['HAVE_O_CLOEXEC']
+]
+
+foreach f : check_functions
+  if cc.has_function(f.get(1), prefix : f.get(2), dependencies: [sdl_deps])
+    cdata.set(f.get(0), 1)
+  endif
+endforeach
+
+sources = []
+
+if host_machine.system() == 'darwin'
+  add_languages('objc', native: false)
+  add_project_arguments('-fobjc-arc', language: 'objc')
+endif
+
+if host_machine.system() == 'linux'
+  cdata.set('SDL_PLATFORM_LINUX', 1)
+  cdata.set('SDL_THREAD_PTHREAD', 1)
+  cdata.set('HAVE_STRLEN', 1)
+  cdata.set('SDL_LOADSO_DLOPEN', 1)
+  cdata.set('SDL_PROCESS_POSIX', 1)
+  cdata.set('SDL_INPUT_LINUXEV', 1)
+  cdata.set('SDL_VIDEO_RENDER_OGL', 1)
+  cdata.set('SDL_GPU_VULKAN', 1)
+  cdata.set('SDL_VIDEO_VULKAN', 1)
+  cdata.set('SDL_VIDEO_RENDER_VULKAN', 1)
+  cdata.set('SDL_TIMER_UNIX', 1)
+  sdl_deps += dependency('libudev')
+  sdl_deps += dependency('dbus-1')
+  sdl_deps += dependency('libpipewire-0.3')
+  sdl_deps += dependency('wayland-client')
+  sdl_deps += dependency('wayland-egl')
+  sdl_deps += dependency('wayland-cursor')
+  sdl_deps += dependency('xkbcommon')
+  sdl_deps += dependency('xkbcommon')
+  cdata.set('HAVE_DBUS_DBUS_H', 1)
+  wayland_scanner = find_program('wayland-scanner')
+  subdir('wayland-protocols')
+elif host_machine.system() == 'windows'
+  cdata.set('SDL_PLATFORM_WIN32', 1)
+  cdata.set('SDL_THREAD_WINDOWS', 1)
+  cdata.set('SDL_THREAD_GENERIC_COND_SUFFIX', 1)
+  cdata.set('SDL_THREAD_GENERIC_RWLOCK_SUFFIX', 1)
+  cdata.set('SDL_LOADSO_WINDOWS', 1)
+  cdata.set('SDL_PROCESS_WINDOWS', 1)
+  cdata.set('SDL_SENSOR_WINDOWS', 1)
+  cdata.set('SDL_POWER_WINDOWS', 1)
+  cdata.set('SDL_VIDEO_RENDER_D3D12', 1)
+  cdata.set('SDL_GPU_VULKAN', 1)
+  cdata.set('SDL_GPU_D3D12', 1)
+  cdata.set('SDL_VIDEO_VULKAN', 1)
+  cdata.set('SDL_VIDEO_RENDER_VULKAN', 1)
+  cdata.set('SDL_XINPUT', 1)
+  cdata.set('SDL_TIMER_WINDOWS', 1)
+  sdl_deps += cc.find_library('version')
+  sdl_deps += cc.find_library('Imm32')
+  sdl_deps += cc.find_library('SetupAPI')
+  sdl_deps += cc.find_library('Winmm')
+elif host_machine.subsystem() == 'macos'
+  cdata.set('SDL_PLATFORM_APPLE', 1)
+  cdata.set('SDL_THREAD_PTHREAD', 1)
+  cdata.set('SDL_THREAD_PTHREAD_RECURSIVE_MUTEX', 1)
+  cdata.set('SDL_LOADSO_DLOPEN', 1)
+  cdata.set('SDL_PROCESS_POSIX', 1)
+  cdata.set('SDL_FILESYSTEM_COCOA', 1)
+  cdata.set('SDL_FSOPS_POSIX', 1)
+  cdata.set('SDL_SENSOR_DUMMY', 1)
+  cdata.set('SDL_POWER_MACOSX', 1)
+  cdata.set('SDL_VIDEO_RENDER_GPU', 1)
+  cdata.set('SDL_GPU_VULKAN', 1)
+  cdata.set('SDL_GPU_METAL', 1)
+  cdata.set('SDL_VIDEO_VULKAN', 1)
+  cdata.set('SDL_VIDEO_METAL', 1)
+  cdata.set('SDL_VIDEO_RENDER_VULKAN', 1)
+  cdata.set('SDL_XINPUT', 1)
+  cdata.set('SDL_TIMER_UNIX', 1)
+  sdl_deps += dependency('appleframeworks',
+                         modules: ['CoreFoundation',
+                                   'Cocoa',
+                                   'CoreAudio',
+                                   'CoreGraphics',
+                                   'CoreHaptics',
+                                   'GameController',
+                                   'ForceFeedback',
+                                   'IOKit',
+                                   'Foundation',
+                                   'QuartzCore',
+                                   'Metal',
+                                   ])
+else
+  error('Platform not yet supported.')
+endif
+
+if get_option('default_library') == 'both' and cc.get_argument_syntax() == 'msvc'
+  error('default_library=both not supported when compiling with MSVC')
+endif
+
+subdir('src')
+
+# FIXME, this is to work around a bug in upstream headers
+cdata.set('SDL_LIBDECOR_VERSION_MAJOR', 99)
+cdata.set('SDL_LIBDECOR_VERSION_MINOR', 99)
+cdata.set('SDL_LIBDECOR_VERSION_PATCH', 99)
+
+configure_file(input: 'include/build_config/SDL_build_config.h.cmake',
+    output: 'SDL_build_config.h',
+    configuration: cdata,
+    format: 'cmake')
+
+sdl_lib = library('SDL3', sources,
+  include_directories: ['include', 'src'],
+  dependencies: sdl_deps,
+  install: true)
+
+sdl3_dep = declare_dependency(include_directories: 'include',
+  link_with: sdl_lib)

subprojects/packagefiles/sdl3/src/atomic/meson.build

@@ -0,0 +1,4 @@
+sources += files(
+  'SDL_spinlock.c',
+  'SDL_atomic.c',
+)

subprojects/packagefiles/sdl3/src/audio/aaudio/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_aaudio.c',
+)

subprojects/packagefiles/sdl3/src/audio/alsa/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_alsa_audio.c',
+)

subprojects/packagefiles/sdl3/src/audio/coreaudio/meson.build

@@ -0,0 +1 @@
+sources += files('SDL_coreaudio.m')

subprojects/packagefiles/sdl3/src/audio/directsound/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_directsound.c',
+)

subprojects/packagefiles/sdl3/src/audio/disk/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_diskaudio.c',
+)

subprojects/packagefiles/sdl3/src/audio/dsp/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_dspaudio.c',
+)

subprojects/packagefiles/sdl3/src/audio/dummy/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_dummyaudio.c',
+)

subprojects/packagefiles/sdl3/src/audio/jack/meson.build

@@ -0,0 +1,3 @@
+sources += files(
+  'SDL_jackaudio.c',
+)