extra/flac: removed stackrealign patch (is in upstream), disabled pandoc for manpages

2 files changed, 10 insertions, 29 deletions

diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index c266c030..22f2f095 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -1,25 +1,18 @@
-# See http://lists.xiph.org/pipermail/flac-dev/2022-March/006514.html
-# -mstackrealign gets also added to nasm compilation, which results in 'no such option'
-# See also FS32#242
-source+=('flac-1.3.4-no-mstackrealign-for-nasm.patch')
-sha512sums+=('88c8f12321f1a16d5fa742ce66f84c31a1fec5a5095355bece314fe3aca8e35bccbf112762e719148af58c65a968d6c0060d93d6371b84d1b853a2d6eadc15c0')
-eval "$(
-  {
-    declare -f prepare || \
-    printf 'prepare() {\n}\n'
-  } \
-  | sed '
-    $i cd "$srcdir/$pkgname-$pkgver" \
-       patch -Np1 -i "$srcdir/flac-1.3.4-no-mstackrealign-for-nasm.patch"
-  '
-)"
-
 # disable SSE on i686 and i486
 if [ "$CARCH" = 'i686' -o "$CARCH" = 'i486' ]; then
   eval "$(
     declare -f build | \
       sed '
-        s/cmake -S/cmake -DWITH_SSE=OFF -S/
+        s/cmake -S flac /cmake -S flac -DWITH_SSE=OFF /
       '
   )"
 fi
+
+# no Haskell, no pandoc
+makedepends=(${makedepends[@]//pandoc/})
+eval "$(
+  declare -f build | \
+    sed '
+      s/-DINSTALL_MANPAGES=ON/-DINSTALL_MANPAGES=OFF/
+    '
+)"
diff --git a/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch b/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch
deleted file mode 100644
index fc651c77..00000000
--- a/extra/flac/flac-1.3.4-no-mstackrealign-for-nasm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rauN flac-1.3.4/CMakeLists.txt flac-1.3.4-no-mstackrealign-for-nasm-patch/CMakeLists.txt
---- flac-1.3.4/CMakeLists.txt	2022-02-14 06:21:14.011609811 +0100
-+++ flac-1.3.4-no-mstackrealign-for-nasm-patch/CMakeLists.txt	2022-03-10 09:54:48.719704370 +0100
-@@ -97,7 +97,7 @@
- endif()
- 
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686" AND HAVE_STACKREALIGN_FLAG)
--    add_compile_options(-mstackrealign)
-+    add_compile_options($<$<COMPILE_LANGUAGE:C>:-mstackrealign>)
- endif()
- 
- include_directories("include")