From cefa63c2af71045d14b65234ae0577533e447aeb Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sun, 16 Nov 2025 20:44:22 +0200 Subject: [PATCH] meson: drop --- CMakeLists.txt | 1 - assets/install/meson.build | 10 --- assets/meson.build | 7 -- docs/meson.build | 2 - example/meson.build | 10 --- hyprctl/meson.build | 27 ------- hyprpm/src/meson.build | 32 -------- meson.build | 151 ------------------------------------- meson_options.txt | 5 -- protocols/meson.build | 119 ----------------------------- src/meson.build | 58 -------------- subprojects/tracy.wrap | 1 - subprojects/udis86.wrap | 5 -- systemd/meson.build | 7 -- 14 files changed, 435 deletions(-) delete mode 100644 assets/install/meson.build delete mode 100644 assets/meson.build delete mode 100644 docs/meson.build delete mode 100644 example/meson.build delete mode 100644 hyprctl/meson.build delete mode 100644 hyprpm/src/meson.build delete mode 100644 meson.build delete mode 100644 meson_options.txt delete mode 100644 protocols/meson.build delete mode 100644 src/meson.build delete mode 100644 subprojects/tracy.wrap delete mode 100644 subprojects/udis86.wrap delete mode 100644 systemd/meson.build diff --git a/CMakeLists.txt b/CMakeLists.txt index f641813ea..014f386ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -511,7 +511,6 @@ add_compile_definitions(DATAROOTDIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}") # installable assets file(GLOB_RECURSE INSTALLABLE_ASSETS "assets/install/*") -list(FILTER INSTALLABLE_ASSETS EXCLUDE REGEX "meson.build") install(FILES ${INSTALLABLE_ASSETS} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/hypr) diff --git a/assets/install/meson.build b/assets/install/meson.build deleted file mode 100644 index 450764695..000000000 --- a/assets/install/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -globber = run_command('sh', '-c', 'find . -type f -not -name "*.build"', check: true) -files = globber.stdout().strip().split('\n') - -foreach file : files - install_data( - file, - install_dir: join_paths(get_option('datadir'), 'hypr'), - install_tag: 'runtime', - ) -endforeach diff --git a/assets/meson.build b/assets/meson.build deleted file mode 100644 index 2a28121dd..000000000 --- a/assets/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -install_data( - 'hyprland-portals.conf', - install_dir: join_paths(get_option('datadir'), 'xdg-desktop-portal'), - install_tag: 'runtime', -) - -subdir('install') diff --git a/docs/meson.build b/docs/meson.build deleted file mode 100644 index 6ff51d1a5..000000000 --- a/docs/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -install_man('Hyprland.1') -install_man('hyprctl.1') diff --git a/example/meson.build b/example/meson.build deleted file mode 100644 index a338644e0..000000000 --- a/example/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -install_data( - 'hyprland.conf', - install_dir: join_paths(get_option('datadir'), 'hypr'), - install_tag: 'runtime', -) -install_data( - 'hyprland.desktop', - install_dir: join_paths(get_option('datadir'), 'wayland-sessions'), - install_tag: 'runtime', -) diff --git a/hyprctl/meson.build b/hyprctl/meson.build deleted file mode 100644 index d6769b84a..000000000 --- a/hyprctl/meson.build +++ /dev/null @@ -1,27 +0,0 @@ -executable( - 'hyprctl', - 'main.cpp', - dependencies: [ - dependency('hyprutils', version: '>= 0.1.1'), - dependency('re2', required: true) - ], - install: true, -) - -install_data( - 'hyprctl.bash', - install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), - install_tag: 'runtime', - rename: 'hyprctl', -) -install_data( - 'hyprctl.fish', - install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), - install_tag: 'runtime', -) -install_data( - 'hyprctl.zsh', - install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), - install_tag: 'runtime', - rename: '_hyprctl', -) diff --git a/hyprpm/src/meson.build b/hyprpm/src/meson.build deleted file mode 100644 index fd914f9d2..000000000 --- a/hyprpm/src/meson.build +++ /dev/null @@ -1,32 +0,0 @@ -globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true) -src = globber.stdout().strip().split('\n') - -executable( - 'hyprpm', - src, - dependencies: [ - dependency('hyprutils', version: '>= 0.1.1'), - dependency('threads'), - dependency('tomlplusplus'), - dependency('glaze', method: 'cmake'), - ], - install: true, -) - -install_data( - '../hyprpm.bash', - install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), - install_tag: 'runtime', - rename: 'hyprpm', -) -install_data( - '../hyprpm.fish', - install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), - install_tag: 'runtime', -) -install_data( - '../hyprpm.zsh', - install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), - install_tag: 'runtime', - rename: '_hyprpm', -) diff --git a/meson.build b/meson.build deleted file mode 100644 index e1e2df949..000000000 --- a/meson.build +++ /dev/null @@ -1,151 +0,0 @@ -project( - 'Hyprland', - 'cpp', - 'c', - version: run_command('cat', join_paths(meson.project_source_root(), 'VERSION'), check: true).stdout().strip(), - default_options: [ - 'warning_level=2', - 'default_library=static', - 'optimization=3', - 'buildtype=release', - 'debug=false', - 'b_lto=false', - 'cpp_std=c++26', - ], - meson_version: '>= 1.1.0', -) - -datarootdir = '-DDATAROOTDIR="' + get_option('prefix') / get_option('datadir') + '"' -add_project_arguments( - [ - '-Wno-unused-parameter', - '-Wno-unused-value', - '-Wno-missing-field-initializers', - '-Wno-narrowing', - '-Wno-pointer-arith', - datarootdir, - '-DHYPRLAND_VERSION="' + meson.project_version() + '"', - ], - language: 'cpp', -) - -cpp_compiler = meson.get_compiler('cpp') -if cpp_compiler.check_header('execinfo.h') - add_project_arguments('-DHAS_EXECINFO', language: 'cpp') -endif - -aquamarine = dependency('aquamarine', version: '>=0.9.3') -hyprcursor = dependency('hyprcursor', version: '>=0.1.7') -hyprgraphics = dependency('hyprgraphics', version: '>=0.1.6') -hyprlang = dependency('hyprlang', version: '>=0.3.2') -hyprutils = dependency('hyprutils', version: '>=0.8.2') - -aq_ver_list = aquamarine.version().split('.') -git = find_program('git', required: false) - -if git.found() - git_hash = run_command(git, 'rev-parse', 'HEAD').stdout().strip() - git_branch = run_command(git, 'branch', '--show-current').stdout().strip() - git_message = run_command(git, 'show', '-s', '--format=%s', '--no-show-signature').stdout().strip() - git_date = run_command(git, 'show', '-s', '--format=%cd', '--date=local', '--no-show-signature').stdout().strip() - git_dirty = run_command(git, 'diff-index', '--quiet', 'HEAD', '--', check: false).returncode() != 0 ? 'dirty' : 'clean' - git_tag = run_command(git, 'describe', '--tags').stdout().strip() - git_commits = run_command(git, 'rev-list', '--count', 'HEAD').stdout().strip() -else - git_hash = 'unknown' - git_branch = 'unknown' - git_message = 'unknown' - git_date = 'unknown' - git_dirty = 'unknown' - git_tag = 'unknown' - git_commits = '0' -endif - -cfg = configuration_data() -cfg.set('GIT_COMMIT_HASH', git_hash) -cfg.set('GIT_BRANCH', git_branch) -cfg.set('GIT_COMMIT_MESSAGE', git_message) -cfg.set('GIT_COMMIT_DATE', git_date) -cfg.set('GIT_DIRTY', git_dirty) -cfg.set('GIT_TAG', git_tag) -cfg.set('GIT_COMMITS', git_commits) -cfg.set('AQUAMARINE_VERSION', aquamarine.version()) -cfg.set('AQUAMARINE_VERSION_MAJOR', aq_ver_list[0]) -cfg.set('AQUAMARINE_VERSION_MINOR', aq_ver_list[1]) -cfg.set('AQUAMARINE_VERSION_PATCH', aq_ver_list[2]) -cfg.set('HYPRLANG_VERSION', hyprlang.version()) -cfg.set('HYPRUTILS_VERSION', hyprutils.version()) -cfg.set('HYPRCURSOR_VERSION', hyprcursor.version()) -cfg.set('HYPRGRAPHICS_VERSION', hyprgraphics.version()) - -version_h = configure_file( - input: 'src/version.h.in', - output: 'version.h', - configuration: cfg -) - -install_headers(version_h, subdir: 'hyprland/src') - -xcb_dep = dependency('xcb', required: get_option('xwayland')) -xcb_composite_dep = dependency('xcb-composite', required: get_option('xwayland')) -xcb_errors_dep = dependency('xcb-errors', required: get_option('xwayland')) -xcb_icccm_dep = dependency('xcb-icccm', required: get_option('xwayland')) -xcb_render_dep = dependency('xcb-render', required: get_option('xwayland')) -xcb_res_dep = dependency('xcb-res', required: get_option('xwayland')) -xcb_xfixes_dep = dependency('xcb-xfixes', required: get_option('xwayland')) -gio_dep = dependency('gio-2.0', required: true) - -if not xcb_dep.found() - add_project_arguments('-DNO_XWAYLAND', language: 'cpp') -endif - -backtrace_dep = cpp_compiler.find_library('execinfo', required: false) -epoll_dep = dependency('epoll-shim', required: false) -inotify_dep = dependency('libinotify', required: false) -re2 = dependency('re2', required: true) - -systemd_option = get_option('systemd') -systemd = dependency('systemd', required: systemd_option) -systemd_option.enable_auto_if(systemd.found()) -if (systemd_option.enabled()) - add_project_arguments('-DUSES_SYSTEMD', language: 'cpp') - subdir('systemd') -endif - -if get_option('buildtype') == 'debug' - add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp') -endif - -run_command('sh', '-c', 'scripts/generateShaderIncludes.sh', check: true) - -globber = run_command('find', 'src', '-name', '*.h*', '-o', '-name', '*.inc', check: true) -headers = globber.stdout().strip().split('\n') -foreach file : headers - install_headers(file, subdir: 'hyprland', preserve_path: true) -endforeach -install_headers(version_h, subdir: 'src') - -tracy = dependency('tracy', static: true, required: get_option('tracy_enable')) -if get_option('tracy_enable') and get_option('buildtype') != 'debugoptimized' - warning('Profiling builds should set -- buildtype = debugoptimized') -endif - -subdir('protocols') -subdir('src') -subdir('hyprctl') -subdir('assets') -subdir('example') -subdir('docs') -if get_option('hyprpm').enabled() - subdir('hyprpm/src') -endif - -pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') -import('pkgconfig').generate( - name: 'Hyprland', - filebase: 'hyprland', - url: 'https://github.com/hyprwm/Hyprland', - description: 'Hyprland header files', - install_dir: pkg_install_dir, - subdirs: ['', 'hyprland/protocols', 'hyprland'], -) diff --git a/meson_options.txt b/meson_options.txt deleted file mode 100644 index e50b4ccee..000000000 --- a/meson_options.txt +++ /dev/null @@ -1,5 +0,0 @@ -option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') -option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration') -option('uwsm', type: 'feature', value: 'enabled', description: 'Enable uwsm integration (only if systemd is enabled)') -option('hyprpm', type: 'feature', value: 'enabled', description: 'Enable hyprpm') -option('tracy_enable', type: 'boolean', value: false , description: 'Enable profiling') diff --git a/protocols/meson.build b/protocols/meson.build deleted file mode 100644 index 33663fa38..000000000 --- a/protocols/meson.build +++ /dev/null @@ -1,119 +0,0 @@ -wayland_protos = dependency( - 'wayland-protocols', - version: '>=1.45', - fallback: 'wayland-protocols', - default_options: ['tests=false'], -) - -hyprland_protos = dependency( - 'hyprland-protocols', - version: '>=0.6.4', - fallback: 'hyprland-protocols', -) - -wayland_protocol_dir = wayland_protos.get_variable('pkgdatadir') -hyprland_protocol_dir = hyprland_protos.get_variable('pkgdatadir') - -hyprwayland_scanner_dep = dependency('hyprwayland-scanner', version: '>=0.3.10', native: true) -hyprwayland_scanner = find_program( - hyprwayland_scanner_dep.get_variable('hyprwayland_scanner'), - native: true, -) - -protocols = [ - 'wlr-gamma-control-unstable-v1.xml', - 'wlr-foreign-toplevel-management-unstable-v1.xml', - 'wlr-output-power-management-unstable-v1.xml', - 'input-method-unstable-v2.xml', - 'virtual-keyboard-unstable-v1.xml', - 'wlr-virtual-pointer-unstable-v1.xml', - 'wlr-output-management-unstable-v1.xml', - 'kde-server-decoration.xml', - 'wlr-layer-shell-unstable-v1.xml', - 'wayland-drm.xml', - 'wlr-data-control-unstable-v1.xml', - 'wlr-screencopy-unstable-v1.xml', - 'xx-color-management-v4.xml', - 'frog-color-management-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-global-shortcuts-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-toplevel-export-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-toplevel-mapping-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-focus-grab-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-ctm-control-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-surface-v1.xml', - hyprland_protocol_dir / 'protocols/hyprland-lock-notify-v1.xml', - wayland_protocol_dir / 'staging/tearing-control/tearing-control-v1.xml', - wayland_protocol_dir / 'staging/fractional-scale/fractional-scale-v1.xml', - wayland_protocol_dir / 'unstable/xdg-output/xdg-output-unstable-v1.xml', - wayland_protocol_dir / 'staging/cursor-shape/cursor-shape-v1.xml', - wayland_protocol_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', - wayland_protocol_dir / 'unstable/relative-pointer/relative-pointer-unstable-v1.xml', - wayland_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', - wayland_protocol_dir / 'staging/alpha-modifier/alpha-modifier-v1.xml', - wayland_protocol_dir / 'staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml', - wayland_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml', - wayland_protocol_dir / 'unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml', - wayland_protocol_dir / 'unstable/text-input/text-input-unstable-v3.xml', - wayland_protocol_dir / 'unstable/text-input/text-input-unstable-v1.xml', - wayland_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml', - wayland_protocol_dir / 'staging/xdg-activation/xdg-activation-v1.xml', - wayland_protocol_dir / 'staging/ext-idle-notify/ext-idle-notify-v1.xml', - wayland_protocol_dir / 'staging/ext-session-lock/ext-session-lock-v1.xml', - wayland_protocol_dir / 'stable/tablet/tablet-v2.xml', - wayland_protocol_dir / 'stable/presentation-time/presentation-time.xml', - wayland_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', - wayland_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml', - wayland_protocol_dir / 'staging/xwayland-shell/xwayland-shell-v1.xml', - wayland_protocol_dir / 'stable/viewporter/viewporter.xml', - wayland_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml', - wayland_protocol_dir / 'staging/drm-lease/drm-lease-v1.xml', - wayland_protocol_dir / 'staging/linux-drm-syncobj/linux-drm-syncobj-v1.xml', - wayland_protocol_dir / 'staging/xdg-dialog/xdg-dialog-v1.xml', - wayland_protocol_dir / 'staging/single-pixel-buffer/single-pixel-buffer-v1.xml', - wayland_protocol_dir / 'staging/security-context/security-context-v1.xml', - wayland_protocol_dir / 'staging/content-type/content-type-v1.xml', - wayland_protocol_dir / 'staging/color-management/color-management-v1.xml', - wayland_protocol_dir / 'staging/xdg-toplevel-tag/xdg-toplevel-tag-v1.xml', - wayland_protocol_dir / 'staging/xdg-system-bell/xdg-system-bell-v1.xml', - wayland_protocol_dir / 'staging/ext-workspace/ext-workspace-v1.xml', - wayland_protocol_dir / 'staging/ext-data-control/ext-data-control-v1.xml', - wayland_protocol_dir / 'staging/pointer-warp/pointer-warp-v1.xml', - wayland_protocol_dir / 'staging/fifo/fifo-v1.xml', - wayland_protocol_dir / 'staging/commit-timing/commit-timing-v1.xml', -] - -wl_protocols = [] -foreach protocol : protocols - wl_protocols += custom_target( - protocol.underscorify(), - input: protocol, - install: true, - install_dir: [false, join_paths(get_option('includedir'), 'hyprland/protocols')], - output: ['@BASENAME@.cpp', '@BASENAME@.hpp'], - command: [hyprwayland_scanner, '@INPUT@', '@OUTDIR@'], - ) -endforeach - -# wayland.xml generation -wayland_scanner = dependency('wayland-scanner', native: true) -wayland_scanner_datadir = wayland_scanner.get_variable('pkgdatadir') - -wayland_xml = wayland_scanner_datadir / 'wayland.xml' -wayland_protocol = custom_target( - wayland_xml.underscorify(), - input: wayland_xml, - install: true, - install_dir: [false, join_paths(get_option('includedir'), 'hyprland/protocols')], - output: ['@BASENAME@.cpp', '@BASENAME@.hpp'], - command: [hyprwayland_scanner, '--wayland-enums', '@INPUT@', '@OUTDIR@'], -) - -lib_server_protos = static_library( - 'server_protos', - wl_protocols + wayland_protocol, -) - -server_protos = declare_dependency( - link_with: lib_server_protos, - sources: wl_protocols + wayland_protocol, -) diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index d0a1590e8..000000000 --- a/src/meson.build +++ /dev/null @@ -1,58 +0,0 @@ -globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true) -src = globber.stdout().strip().split('\n') - -executable( - 'Hyprland', - src, - link_args: '-rdynamic', - cpp_pch: 'pch/pch.hpp', - dependencies: [ - server_protos, - aquamarine, - hyprcursor, - hyprgraphics, - hyprlang, - hyprutils, - dependency('gbm'), - dependency('xcursor'), - dependency('wayland-server'), - dependency('wayland-client'), - dependency('cairo'), - dependency('libdrm'), - dependency('egl'), - dependency('xkbcommon'), - dependency('libinput', version: '>=1.28'), - dependency('re2'), - xcb_dep, - xcb_composite_dep, - xcb_errors_dep, - xcb_icccm_dep, - xcb_render_dep, - xcb_res_dep, - xcb_xfixes_dep, - backtrace_dep, - epoll_dep, - inotify_dep, - gio_dep, - tracy, - - # Try to find canihavesomecoffee's udis86 using pkgconfig - # vmt/udis86 does not provide a .pc file and won't be detected this way - # Falls back to using the subproject through udis86.wrap - dependency('udis86'), - - dependency('pixman-1'), - dependency('gl', 'opengl'), - dependency('threads'), - dependency('pango'), - dependency('pangocairo'), - dependency('uuid'), - ], - install: true, -) - -install_symlink( - 'hyprland', - install_dir: get_option('bindir'), - pointing_to: 'Hyprland', -) diff --git a/subprojects/tracy.wrap b/subprojects/tracy.wrap deleted file mode 100644 index 11b217878..000000000 --- a/subprojects/tracy.wrap +++ /dev/null @@ -1 +0,0 @@ -[wrap-file] diff --git a/subprojects/udis86.wrap b/subprojects/udis86.wrap deleted file mode 100644 index dfb639841..000000000 --- a/subprojects/udis86.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-file] -method = cmake - -[provide] -udis86 = libudis86_dep diff --git a/systemd/meson.build b/systemd/meson.build deleted file mode 100644 index bc62e95ae..000000000 --- a/systemd/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -if (get_option('uwsm').allowed()) - install_data( - 'hyprland-uwsm.desktop', - install_dir: join_paths(get_option('datadir'), 'wayland-sessions'), - install_tag: 'runtime', - ) -endif