From 3b73d3e69ec83656a3cda7d709e949d5733fddfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Sat, 8 Mar 2025 15:31:20 +0100
Subject: [PATCH] libdvdnav: add patches to fix clang64

Fixes clang64 binaries. See individual patches for more details.

Fixes: #23211
---
 mingw-w64-libdvdnav/PKGBUILD | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-libdvdnav/PKGBUILD b/mingw-w64-libdvdnav/PKGBUILD
index be8a72451c..74a126b2e8 100644
--- a/mingw-w64-libdvdnav/PKGBUILD
+++ b/mingw-w64-libdvdnav/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libdvdnav
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=6.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The library for xine-dvdnav plugin (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -13,15 +13,35 @@ license=("GPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-libdvdread")
 source=("https://download.videolan.org/pub/videolan/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.bz2"{,.asc}
+        https://code.videolan.org/videolan/libdvdnav/-/merge_requests/29.patch
+        https://code.videolan.org/videolan/libdvdnav/-/merge_requests/54.patch
+        https://code.videolan.org/videolan/libdvdnav/-/merge_requests/56.patch
         001-no-undefined.patch)
 sha256sums=('c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48'
             'SKIP'
+            'e6448f248debd8eb642b2d0f818e04fc4202d4ca51cab4d24dc5b6d630833926'
+            '23eedbf73859c0ac919e6777c6503a85b5443f47ed4f4ba6c6bd77e6c993b39f'
+            'e759480d05bf3079a2845039f75e1f83f0693dcdf5673c585a7d211fd70523db'
             'c3329ad100f733786c8f263eff499b6dde97b186646db3494a03394c3eb7a0fa')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
+_apply_patch_with_msg() {
+  for _patch in "$@"
+  do
+    msg2 "Applying ${_patch}"
+    patch -p1 -i "${srcdir}/${_patch}"
+  done
+}
+
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  patch -p1 -i "${srcdir}"/001-no-undefined.patch
+
+  _apply_patch_with_msg \
+    29.patch \
+    54.patch \
+    56.patch \
+    001-no-undefined.patch
+
   autoreconf -fvi
 }