[arch-commits] Commit in flac/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, February 21, 2022 @ 19:25:20
  Author: heftig
Revision: 437870

1.3.4-1: with cmake

Modified:
  flac/trunk/PKGBUILD

----------+
 PKGBUILD |   58 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-21 19:23:05 UTC (rev 437869)
+++ PKGBUILD	2022-02-21 19:25:20 UTC (rev 437870)
@@ -3,59 +3,55 @@
 
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
-pkgver=1.3.3
-pkgrel=3
+pkgver=1.3.4
+pkgrel=1
 pkgdesc='Free Lossless Audio Codec'
 url='https://xiph.org/flac/'
 arch=('x86_64')
 license=('BSD' 'GPL')
 depends=('gcc-libs' 'libogg')
-makedepends=('nasm' 'doxygen')
-source=(https://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz
-        https://github.com/xiph/flac/commit/2e7931c.patch
-        https://github.com/xiph/flac/commit/ced7f68.patch)
-sha512sums=('d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28'
-            '56182fb46cbefcd34137ec0e93ec540bc029e1e2cb4787444178ee941ae03cc73bd360c87ec3735a6ca524044d28f22253fe37a42fdb93aea7def65178ea663b'
-            'c5f17f6afa7358ba1dd610b7fe9d576f217ac7f71a8edf7833cfa2ed6a971a8d2c69468e96c35b97ffb6b019cb1be89dc23fe839ee19e445a6eef6cc74d2f435')
+makedepends=('nasm' 'doxygen' 'cmake' 'ninja')
+source=(https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz)
+sha512sums=('4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9')
 
 prepare() {
-  cd ${pkgbase}-${pkgver}
-  # CVE-2020-0499
-  patch -p1 -i ../2e7931c.patch
-  # Add some overflow checks for residual bits calculation
-  patch -p1 -i ../ced7f68.patch
+  cd flac-${pkgver}
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --disable-sse
-  make
+  cmake -S flac-${pkgver} -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/share/man/man1 \
+    -DBUILD_SHARED_LIBS=ON \
+    -DWITH_STACK_PROTECTOR=OFF
+  cmake --build build
 }
 
 check() {
-  cd ${pkgbase}-${pkgver}
-  make check
+  FLAC__TEST_LEVEL=0 cmake --build build --target test
 }
 
 package_flac() {
-  options=('!docs')
   provides=('libFLAC.so' 'libFLAC++.so')
 
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 COPYING.Xiph -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  DESTDIR="${pkgdir}" cmake --install build
+
+  install -Dm 644 flac-${pkgver}/src/*/*.m4 -t "${pkgdir}/usr/share/aclocal"
+
+  mkdir -p doc/usr/share
+  mv {"${pkgdir}",doc}/usr/share/doc
+
+  install -Dm 644 flac-${pkgver}/COPYING.Xiph -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_flac-doc() {
   pkgdesc+=' documentation'
-  depends=('flac')
+  depends=()
 
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" -C doc install
-  sed -i "s|${srcdir}/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}/FLAC.tag"
-  install -Dm 644 COPYING.Xiph -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  mv doc/* "$pkgdir"
+
+  install -Dm 644 flac-${pkgver}/COPYING.Xiph -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set sw=2 et: