From 8049385e298410cf06ede7f6aa3b31ca65912702 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Tue, 5 May 2020 15:16:58 +0200
Subject: [PATCH] Change the relative path to the bitsery patch file

Meson has been changing its behavior around, and this is now also the
behavior I'm getting when doing a clean build for the yabridge-git AUR
package.
---
 .github/workflows/build.yml |  9 ++-------
 README.md                   | 20 --------------------
 subprojects/bitsery.wrap    |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f4b176f..a70b1e09 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,13 +63,8 @@ jobs:
             install
       - name: Build the binaries
         run: |
-          # Ubuntu resolves the relative paths used in the meson wrap files
-          # relatively to the current working directory, so we have to setup the
-          # project directly from the build directory
-          mkdir build
-          cd build
-          meson setup --buildtype=release --cross-file ../cross-wine.conf -Duse-bitbridge=true
-          ninja
+          meson setup --buildtype=release --cross-file cross-wine.conf -Duse-bitbridge=true build
+          ninja -C build
       - name: Create an archive for the binaries
         run: |
           set -e
diff --git a/README.md b/README.md
index d3d80e8b..668cc87b 100644
--- a/README.md
+++ b/README.md
@@ -178,26 +178,6 @@ meson setup --buildtype=release --cross-file cross-wine.conf build
 ninja -C build
 ```
 
-If you're getting an error similar to this:
-
-```shell
-meson.build:45:0: ERROR: could not get file:../subprojects/bitsery-patch.tar.xz is the internet available?
-```
-
-Then you could try to start the build from the build directory. This seems to be
-caused by Meson resolving relative paths differently on different distributions.
-
-```shell
-# Remove any already downloaded and Meson subprojects, since this will otherwise
-# cause a conflict
-git clean -Xf subprojects/
-
-mkdir -p build
-cd build
-meson setup --buildtype=release --cross-file ../cross-wine.conf
-ninja
-```
-
 ### 32-bit bitbridge
 
 It is also possible to compile a host application for yabridge that's compatible
diff --git a/subprojects/bitsery.wrap b/subprojects/bitsery.wrap
index e69e3c54..3e5878b4 100644
--- a/subprojects/bitsery.wrap
+++ b/subprojects/bitsery.wrap
@@ -5,6 +5,6 @@ source_url = https://github.com/fraillt/bitsery/archive/d24dfe14f5a756c0f8ad3d56
 source_filename = bitsery-d24dfe14f5a756c0f8ad3d56ae6949ecc2c99b2e.zip
 source_hash = 1a3219e0818db6fa95677deb29087ddccf99087c0777c9313719122062186ae7
 
-patch_url = file:../subprojects/bitsery-patch.tar.xz
+patch_url = file:./subprojects/bitsery-patch.tar.xz
 patch_filename = bitsery-patch.tar.xz
 patch_hash = bdbd46d6be1c3ecf7b8b48f43ab0bd7837458e49ddeef81fee3ac0bdc89767ea