From 10ae8136be1f5ea4a2b1a709fd646e1f8d3797a4 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 1 Apr 2025 17:51:29 +0530 Subject: [PATCH] meson: Bump wrap files, and add non-gitlab fallback mirrors When fdo infra has downtime, gstreamer checkouts become unbuildable. Try to alleviate that. Part-of: --- subprojects/fontconfig.wrap | 11 +++--- subprojects/libdrm.wrap | 10 ++--- subprojects/libnice.wrap | 13 +++++-- ...s-write-utf-8-files-with-LF-newlines.patch | 37 ------------------- ...lways-use-posix-path-even-on-Windows.patch | 0 5 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch rename subprojects/packagefiles/{fontconfig-2.14.2 => fontconfig-2.15.0}/0001-meson-Always-use-posix-path-even-on-Windows.patch (100%) diff --git a/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap index 5f956443df..7b48e66d1b 100644 --- a/subprojects/fontconfig.wrap +++ b/subprojects/fontconfig.wrap @@ -1,9 +1,10 @@ [wrap-file] -directory = fontconfig-2.14.2 -source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.2.tar.xz -source_filename = fontconfig-2.14.2.tar.xz -source_hash = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b -diff_files = fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch, fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch +directory = fontconfig-2.15.0 +source_url = https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.15.0.tar.xz +source_fallback_url = http://deb.debian.org/debian/pool/main/f/fontconfig/fontconfig_2.15.0.orig.tar.xz +source_filename = fontconfig-2.15.0.tar.xz +source_hash = 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e +diff_files = fontconfig-2.15.0/0001-meson-Always-use-posix-path-even-on-Windows.patch [provide] fontconfig = fontconfig_dep diff --git a/subprojects/libdrm.wrap b/subprojects/libdrm.wrap index 45984284d7..e3fb34b11a 100644 --- a/subprojects/libdrm.wrap +++ b/subprojects/libdrm.wrap @@ -1,8 +1,9 @@ [wrap-file] -directory = libdrm-2.4.120 -source_url = https://dri.freedesktop.org/libdrm/libdrm-2.4.120.tar.xz -source_filename = libdrm-2.4.120.tar.xz -source_hash = 3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a +directory = libdrm-2.4.124 +source_url = https://dri.freedesktop.org/libdrm/libdrm-2.4.124.tar.xz +source_fallback_url = http://deb.debian.org/debian/pool/main/libd/libdrm/libdrm_2.4.124.orig.tar.xz +source_filename = libdrm-2.4.124.tar.xz +source_hash = ac36293f61ca4aafaf4b16a2a7afff312aa4f5c37c9fbd797de9e3c0863ca379 [provide] libdrm = ext_libdrm @@ -16,4 +17,3 @@ libdrm_nouveau = ext_libdrm_nouveau libdrm_omap = ext_libdrm_omap libdrm_radeon = ext_libdrm_radeon libdrm_tegra = ext_libdrm_tegra - diff --git a/subprojects/libnice.wrap b/subprojects/libnice.wrap index 3f5ad09f22..299e19c0bc 100644 --- a/subprojects/libnice.wrap +++ b/subprojects/libnice.wrap @@ -1,4 +1,9 @@ -[wrap-git] -directory=libnice -url=https://gitlab.freedesktop.org/libnice/libnice.git -revision=0.1.22 +[wrap-file] +directory = libnice-0.1.22 +source_url = https://nice.freedesktop.org/releases/libnice-0.1.22.tar.gz +source_fallback_url = http://deb.debian.org/debian/pool/main/libn/libnice/libnice_0.1.22.orig.tar.gz +source_filename = libnice-0.1.22.tar.gz +source_hash = a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e + +[provide] +dependency_names = nice diff --git a/subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch b/subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch deleted file mode 100644 index 3b0511784e..0000000000 --- a/subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-write-utf-8-files-with-LF-newlines.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6081263d131848842b916a6d2506c1a612be7f81 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Thu, 13 Jul 2023 07:28:52 +0530 -Subject: [PATCH] meson: Always write utf-8 files with LF newlines - -Otherwise, MSYS2 gperf chokes on the CRLF newlines translated by -`open()`, even though we explicitly write out `\n` - -``` -[1/48] Generating src/fcobjshash.h with a custom command -FAILED: src/fcobjshash.h -"C:\msys64\usr\bin\gperf.EXE" "--pic" "-m" "100" "src/fcobjshash.gperf" "--output-file" "src/fcobjshash.h" -src/fcobjshash.gperf:17: warning: junk after %% is ignored -src/fcobjshash.gperf:2: warning: junk after %} is ignored -src/fcobjshash.gperf:3: junk after declaration -ninja: build stopped: subcommand failed. -``` ---- - src/cutout.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cutout.py b/src/cutout.py -index 6b46529..9fe46ce 100644 ---- a/src/cutout.py -+++ b/src/cutout.py -@@ -29,7 +29,7 @@ if __name__== '__main__': - - stdout = ret.stdout.decode('utf8') - -- with open(args[0].output, 'w') as out: -+ with open(args[0].output, 'w', encoding='utf-8', newline='\n') as out: - write = True - for l in stdout.split('\n'): - l = l.strip('\r') --- -2.41.0 - diff --git a/subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch b/subprojects/packagefiles/fontconfig-2.15.0/0001-meson-Always-use-posix-path-even-on-Windows.patch similarity index 100% rename from subprojects/packagefiles/fontconfig-2.14.2/0001-meson-Always-use-posix-path-even-on-Windows.patch rename to subprojects/packagefiles/fontconfig-2.15.0/0001-meson-Always-use-posix-path-even-on-Windows.patch