mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'autostart-desktop' into 'master'

Browse source 
meson.build: add back pipewire.desktop autostart entry

See merge request pipewire/pipewire!2574
This commit is contained in:
Siva Mahadevan 2025-10-28 08:23:46 +00:00
commit e6898f2cb6
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -46,6 +46,7 @@ include:
bluez-libs-devel bluez-libs-devel
clang clang
dbus-devel dbus-devel
desktop-file-utils
doxygen doxygen
fdk-aac-free-devel fdk-aac-free-devel
file file
@ -113,6 +114,7 @@ include:
FDO_DISTRIBUTION_VERSION: '22.04' FDO_DISTRIBUTION_VERSION: '22.04'
FDO_DISTRIBUTION_PACKAGES: >- FDO_DISTRIBUTION_PACKAGES: >-
debhelper-compat debhelper-compat
desktop-file-utils
findutils findutils
git git
libapparmor-dev libapparmor-dev
@ -148,12 +150,14 @@ include:
.debian: .debian:
variables: variables:
# Update this tag when you want to trigger a rebuild # Update this tag when you want to trigger a rebuild
BASE_TAG: '2025-08-10.0' BASE_TAG: '2025-08-10.1'
FDO_DISTRIBUTION_VERSION: 'trixie' FDO_DISTRIBUTION_VERSION: 'trixie'
FDO_DISTRIBUTION_PACKAGES: >- FDO_DISTRIBUTION_PACKAGES: >-
build-essential build-essential
desktop-file-utils
dpkg-dev dpkg-dev
findutils findutils
gettext
git git
meson meson
@ -182,6 +186,7 @@ include:
gcc gcc
g++ g++
dbus-dev dbus-dev
desktop-file-utils
doxygen doxygen
elogind-dev elogind-dev
eudev-dev eudev-dev

30
src/daemon/meson.build
View file

@ -144,21 +144,21 @@ custom_target('pipewire-uninstalled',
command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'], command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
) )
#desktop_file = i18n.merge_file( desktop_file = i18n.merge_file(
# input : 'pipewire.desktop.in', input : 'pipewire.desktop.in',
# output : 'pipewire.desktop', output : 'pipewire.desktop',
# po_dir : po_dir, po_dir : po_dir,
# type : 'desktop', type : 'desktop',
# install : true, install : true,
# install_dir : pipewire_sysconfdir / 'xdg' / 'autostart' install_dir : pipewire_sysconfdir / 'xdg' / 'autostart'
#) )
#
#desktop_utils = find_program('desktop-file-validate', required: false) desktop_utils = find_program('desktop-file-validate', required: false)
#if desktop_utils.found() if desktop_utils.found()
# test('Validate desktop file', desktop_utils, test('Validate desktop file', desktop_utils,
# args: [ desktop_file ], args: [ desktop_file ],
# ) )
#endif endif
subdir('filter-chain') subdir('filter-chain')
subdir('systemd') subdir('systemd')