gitlab-ci, build: -Drelocatable renamed as -Drelocatable-bundle and…

… changed into a combo in babl and GEGL.

.gitlab-ci.yml

@@ -342,7 +342,7 @@ deps-debian:
   image: !reference [deps-debian-nonreloc, image]
   variables:
     GIT_STRATEGY: none
-    RELOCATABLE_OPTION: '-Drelocatable=enabled'
+    RELOCATABLE_OPTION: '-Drelocatable-bundle=yes'
     PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
   script:
     - !reference [deps-debian-nonreloc, script]

build/linux/snap/snapcraft.yaml

@@ -108,7 +108,7 @@ parts:
     meson-parameters:
       - -Dprefix=/usr
       - -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - -Drelocatable=enabled
+      - -Drelocatable-bundle=yes
       - -Dpkgconfig.relocatable=true
       - -Dgi-docgen=disabled
       - -Dwith-docs=false
@@ -135,7 +135,7 @@ parts:
     meson-parameters:
       - -Dprefix=/usr
       - -Dlibdir=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - -Drelocatable=enabled
+      - -Drelocatable-bundle=yes
       - -Dpkgconfig.relocatable=true
       - -Dgi-docgen=disabled
       - -Ddocs=false