labwc: treat title text and blank space as one double-tap target

README.md

@@ -49,7 +49,7 @@ are experimental. See orchard's
 
 The desktop finds the hardware at login. On the iPad 6 and iPad 7 (A10) it
 draws on the GPU, and Firefox plays H.264 video, YouTube included, through the
-hardware video decoder. On every other device it draws in software, as before.
+hardware video decoder. On G5P devices it uses a matched private Zink/EGL/GBM/GLES and Vulkan stack from the same Orchard Mesa commit. Firefox selects hardware WebRender and WebGL only in that G5P session. Other devices keep the software default.
 To start an A10 device on the software desktop once, boot with
 `modprobe.blacklist=powervr`.
 

desktop/build

@@ -22,7 +22,8 @@ FILES = {
     'libva_v4l2_request_source': INPUTS / 'libva-v4l2_request-1.2-2-gcac6ece.tar.gz',
 }
 # Source-built on 64-bit boards only: the A10 GPU's Vulkan driver and the VA-API video bridge.
-HARDWARE_PACKAGES = {'vulkan-powervr-orchard.pkg.tar.zst': ('gpu_recipe_sha256', 'packages/vulkan-powervr-orchard'),
+HARDWARE_PACKAGES = {'mesa-g5p-orchard.pkg.tar.zst': ('g5p_recipe_sha256', 'packages/mesa-g5p-orchard'),
+                     'vulkan-powervr-orchard.pkg.tar.zst': ('gpu_recipe_sha256', 'packages/vulkan-powervr-orchard'),
                      'libva-v4l2-request.pkg.tar.zst': ('video_bridge_recipe_sha256', 'packages/libva-v4l2-request')}
 # Prebuilt on 64-bit boards: packages published by their own repositories,
 # downloaded at build time and pinned by SHA-256 in arm64/inputs.json.

desktop/build-labwc

@@ -35,10 +35,12 @@ def main():
     patch = HERE / 'labwc/0001-cancel-super-tap-on-pointer.patch'
     edge_patch = HERE / 'labwc/0002-bottom-edge-swipe.patch'
     transitions_patch = HERE / 'labwc/0003-session-transitions.patch'
+    title_tap_patch = HERE / 'labwc/0005-title-double-tap.patch'
     overview_patch = HERE / 'labwc/0004-overview.patch'
     if (sha(patch) != pin['patch_sha256'] or sha(edge_patch) != pin['edge_patch_sha256']
             or sha(transitions_patch) != pin['transitions_patch_sha256']
-            or sha(overview_patch) != pin['overview_patch_sha256']):
+            or sha(overview_patch) != pin['overview_patch_sha256']
+            or sha(title_tap_patch) != pin['title_tap_patch_sha256']):
         parser.error('Labwc patch differs from pin')
     data = args.archive.read_bytes() if args.archive else urllib.request.urlopen(pin['url'], timeout=30).read()
     if hashlib.sha256(data).hexdigest() != pin['sha256']:
@@ -60,7 +62,7 @@ def main():
                 target.parent.mkdir(parents=True, exist_ok=True)
                 target.write_bytes(archive.extractfile(entry).read())
                 target.chmod(entry.mode & 0o777)
-        for item in (patch, edge_patch, transitions_patch, overview_patch):
+        for item in (patch, edge_patch, transitions_patch, overview_patch, title_tap_patch):
             subprocess.run(['patch', '--batch', '--fuzz=0', '-p1', '-i', str(item.resolve())], cwd=source, check=True)
         recipe = '''
 set -eu
@@ -81,6 +83,7 @@ cc --version > "$ORCHARD_OUTPUT/compiler.txt"
         shutil.copyfile(edge_patch, output / edge_patch.name)
         shutil.copyfile(transitions_patch, output / transitions_patch.name)
         shutil.copyfile(overview_patch, output / overview_patch.name)
+        shutil.copyfile(title_tap_patch, output / title_tap_patch.name)
         (output / 'source.tar.gz').write_bytes(data)
         record = {'schema': 1, 'architecture': args.architecture, 'source': pin, 'compiler_image': image_id,
                   'build_options': ['release', 'nofallback', 'xwayland=enabled', 'nls=enabled', 'labnag=disabled'],

desktop/build-sources

@@ -162,6 +162,16 @@ PKGDEST="$build/result" PKGEXT='.pkg.tar.zst' makepkg --noconfirm --nodeps > "$b
 package=$(ls "$build"/result/vulkan-powervr-orchard-*-$OMARCHY_ARCH.pkg.tar.zst)
 bsdtar -tf "$package" usr/lib/libvulkan_powervr_mesa.so usr/share/vulkan/icd.d/powervr_mesa_icd.json >/dev/null
 cp "$package" "$ORCHARD_WORK/result/vulkan-powervr-orchard.pkg.tar.zst"
+'''
+            if args.architecture == 'aarch64':
+                script += r'''
+mkdir -p "$build/g5p"
+cp "$ORCHARD_RECIPE"/packages/mesa-g5p-orchard/{PKGBUILD,gpu-probe.c} "$build/g5p/"
+cd "$build/g5p"
+PKGDEST="$build/result" PKGEXT='.pkg.tar.zst' makepkg --noconfirm --nodeps
+package=$(ls "$build"/result/mesa-g5p-orchard-*-$OMARCHY_ARCH.pkg.tar.zst)
+bsdtar -tf "$package" opt/orchard/g5p/share/drirc.d/00-mesa-defaults.conf opt/orchard/g5p/libexec/omarchy-g5p-probe >/dev/null
+cp "$package" "$ORCHARD_WORK/result/mesa-g5p-orchard.pkg.tar.zst"
 '''
             buildenv.run(image, ['bash', '-euc', script],
                          [(work, '/work', False), (HERE, '/recipe', True)],
@@ -173,7 +183,7 @@ cp "$package" "$ORCHARD_WORK/result/vulkan-powervr-orchard.pkg.tar.zst"
             if args.architecture == 'armv7h':
                 names.append('omacalc.pkg.tar.zst')
             else:
-                names += ['vulkan-powervr-orchard.pkg.tar.zst', 'libva-v4l2-request.pkg.tar.zst']
+                names += ['mesa-g5p-orchard.pkg.tar.zst', 'vulkan-powervr-orchard.pkg.tar.zst', 'libva-v4l2-request.pkg.tar.zst']
             for name in names[1:]:
                 check_package(built / name, args.architecture)
             files = {name: sha(built / name) for name in names}
@@ -187,6 +197,7 @@ cp "$package" "$ORCHARD_WORK/result/vulkan-powervr-orchard.pkg.tar.zst"
             if args.architecture == 'armv7h':
                 meta['omacalc_recipe_sha256'] = recipe_sha(HERE / 'packages/omacalc')
             else:
+                meta['g5p_recipe_sha256'] = recipe_sha(HERE / 'packages/mesa-g5p-orchard')
                 meta['gpu_recipe_sha256'] = recipe_sha(gpu)
                 meta['video_bridge_recipe_sha256'] = recipe_sha(bridge)
             (built / 'manifest.json').write_text(json.dumps(meta, indent=2) + '\n')