Merge branch 'autostart-desktop' into 'master'

meson.build: add back pipewire.desktop autostart entry

See merge request pipewire/pipewire!2574

.gitlab-ci.yml

@@ -46,6 +46,7 @@ include:
       bluez-libs-devel
       clang
       dbus-devel
+      desktop-file-utils
       doxygen
       fdk-aac-free-devel
       file
@@ -113,6 +114,7 @@ include:
     FDO_DISTRIBUTION_VERSION: '22.04'
     FDO_DISTRIBUTION_PACKAGES: >-
       debhelper-compat
+      desktop-file-utils
       findutils
       git
       libapparmor-dev
@@ -148,12 +150,14 @@ include:
 .debian:
   variables:
      # 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_PACKAGES: >-
       build-essential
+      desktop-file-utils
       dpkg-dev
       findutils
+      gettext
       git
       meson
 
@@ -182,6 +186,7 @@ include:
       gcc
       g++
       dbus-dev
+      desktop-file-utils
       doxygen
       elogind-dev
       eudev-dev

src/daemon/meson.build

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