Fix mingw-w64-gstreamer and use git to obtain source

2 files changed, 52 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0271b3b5eab1..3dc45a81f606 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = mingw-w64-flac
 	pkgdesc = Free Lossless Audio Codec (mingw-w64)
 	pkgver = 1.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://flac.sourceforge.net/
 	arch = any
 	license = BSD
 	license = GPL
+	makedepends = git
 	makedepends = mingw-w64-cmake
 	makedepends = ninja
 	makedepends = nasm
@@ -14,7 +15,7 @@ pkgbase = mingw-w64-flac
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = https://github.com/xiph/flac/releases/download/1.4.1/flac-1.4.1.tar.xz
-	sha256sums = 91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6
+	source = git+https://github.com/xiph/flac#commit=b6fbd6b3d97e2da4481bdbd25176f263fd6a5e75
+	b2sums = SKIP
 
 pkgname = mingw-w64-flac
diff --git a/PKGBUILD b/PKGBUILD
index d6807406eb47..d9ea9543615c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,57 +3,65 @@
 
 pkgname=mingw-w64-flac
 pkgver=1.4.1
-pkgrel=1
+_commit=b6fbd6b3d97e2da4481bdbd25176f263fd6a5e75  # tags/1.4.1
+pkgrel=2
 pkgdesc="Free Lossless Audio Codec (mingw-w64)"
 url="http://flac.sourceforge.net/"
 arch=('any')
 license=('BSD' 'GPL')
 depends=('mingw-w64-libogg' 'mingw-w64-crt')
-makedepends=('mingw-w64-cmake' 'ninja' 'nasm')
+makedepends=('git' 'mingw-w64-cmake' 'ninja' 'nasm')
 options=('staticlibs' '!buildflags' '!strip')
-source=("https://github.com/xiph/flac/releases/download/${pkgver}/flac-${pkgver}.tar.xz")
-sha256sums=('91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6')
+source=("git+https://github.com/xiph/flac#commit=$_commit")
+b2sums=('SKIP')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-_pkgname="${pkgname#mingw-w64-}"
+
+prepare() {
+  cd flac
+
+  # Fix GStreamer
+  # https://bugs.archlinux.org/task/76120
+  git cherry-pick -n 3d55a9dc6c14317b4766db96bb52e2fd95e920a9
+}
 
 build() {
-    for _arch in ${_architectures}; do
-        ${_arch}-cmake -S ${_pkgname}-${pkgver} -B build/${_arch}-static -G Ninja \
-            -DCMAKE_BUILD_TYPE=None \
-            -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DBUILD_DOCS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DBUILD_PROGRAMS=OFF \
-            -DBUILD_TESTING=OFF \
-            -DWITH_STACK_PROTECTOR=OFF \
-            -DINSTALL_MANPAGES=OFF \
-            -DNDEBUG=ON
-
-        ${_arch}-cmake -S ${_pkgname}-${pkgver} -B build/${_arch} -G Ninja \
-            -DCMAKE_BUILD_TYPE=None \
-            -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
-            -DBUILD_SHARED_LIBS=ON \
-            -DBUILD_DOCS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DBUILD_PROGRAMS=OFF \
-            -DBUILD_TESTING=OFF \
-            -DWITH_STACK_PROTECTOR=OFF \
-            -DINSTALL_MANPAGES=OFF \
-            -DNDEBUG=ON
-
-        cmake --build build/${_arch}-static
-        cmake --build build/${_arch}
-    done
+  for _arch in ${_architectures}; do
+    ${_arch}-cmake -S flac -B build/${_arch}-static -G Ninja \
+      -DCMAKE_BUILD_TYPE=None \
+      -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DBUILD_DOCS=OFF \
+      -DBUILD_EXAMPLES=OFF \
+      -DBUILD_PROGRAMS=OFF \
+      -DBUILD_TESTING=OFF \
+      -DWITH_STACK_PROTECTOR=OFF \
+      -DINSTALL_MANPAGES=OFF \
+      -DNDEBUG=ON
+
+    ${_arch}-cmake -S flac -B build/${_arch} -G Ninja \
+      -DCMAKE_BUILD_TYPE=None \
+      -DCMAKE_INSTALL_PREFIX=/usr/${_arch} \
+      -DBUILD_SHARED_LIBS=ON \
+      -DBUILD_DOCS=OFF \
+      -DBUILD_EXAMPLES=OFF \
+      -DBUILD_PROGRAMS=OFF \
+      -DBUILD_TESTING=OFF \
+      -DWITH_STACK_PROTECTOR=OFF \
+      -DINSTALL_MANPAGES=OFF \
+      -DNDEBUG=ON
+
+    cmake --build build/${_arch}-static
+    cmake --build build/${_arch}
+  done
 }
 
 package() {
-    for _arch in ${_architectures}; do
-        DESTDIR="${pkgdir}" cmake --install build/${_arch}-static
-        DESTDIR="${pkgdir}" cmake --install build/${_arch}
-        install -Dm644 ${_pkgname}-${pkgver}/src/*/*.m4 -t "${pkgdir}/usr/${_arch}/share/aclocal"
-        ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
-        ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
-    done
+  for _arch in ${_architectures}; do
+    DESTDIR="${pkgdir}" cmake --install build/${_arch}-static
+    DESTDIR="${pkgdir}" cmake --install build/${_arch}
+    install -Dm644 flac/src/*/*.m4 -t "${pkgdir}/usr/${_arch}/share/aclocal"
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
+  done
 }