From 85661b90471f20beff721434d68ce0a394d249c9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 16 Sep 2022 18:27:50 -0500
Subject: [PATCH] [multilib-staging] -> [multilib] 'lib32-libsndfile-1.1.0-2'
 move

---
 x86_64/multilib-staging/PKGBUILD              | 66 -------------------
 x86_64/multilib/PKGBUILD                      |  6 +-
 ...D95CAB6D80D262244A1750A47620E801E47E95.asc |  0
 ...91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc |  0
 ...1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc |  0
 5 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 x86_64/multilib-staging/PKGBUILD
 rename x86_64/{multilib-staging => multilib}/keys/pgp/31D95CAB6D80D262244A1750A47620E801E47E95.asc (100%)
 rename x86_64/{multilib-staging => multilib}/keys/pgp/6A91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc (100%)
 rename x86_64/{multilib-staging => multilib}/keys/pgp/9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc (100%)

diff --git a/x86_64/multilib-staging/PKGBUILD b/x86_64/multilib-staging/PKGBUILD
deleted file mode 100644
index 32e0ab7..0000000
--- a/x86_64/multilib-staging/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Maintainer: Nathan Owens <ndowens@artixlinux.org>
-# Maintainer: David Runge <dvzrv@archlinux.org>
-
-_name=libsndfile
-pkgname=lib32-$_name
-pkgver=1.1.0
-pkgrel=2
-pkgdesc="A C library for reading and writing files containing sampled audio data (32-bit)"
-arch=(x86_64)
-url="https://libsndfile.github.io/libsndfile/"
-license=(LGPL2.1)
-depends=(lib32-opus $_name=$pkgver)
-makedepends=(cmake lib32-alsa-lib lib32-flac lib32-libogg lib32-libvorbis
-lib32-sqlite python)
-provides=(libsndfile.so)
-options=(debug)
-source=(https://github.com/$_name/$_name/releases/download/$pkgver/$_name-$pkgver.tar.xz{,.asc})
-sha512sums=('d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006'
-            'SKIP')
-b2sums=('ff2d27bff460c4d3c549bdf70c84c6f17a2c3e10674a44216ed83e657e603ddfbc33afe0827676fc4f5dc7745a9fb6aa866023fe589d0c00714477e3a246e5f2'
-        'SKIP')
-validpgpkeys=(
-  '6A91A5CF22C24C99A35E013FCFDCF91FB242ACED'  # Erik de Castro Lopo <erikd@mega-nerd.com>
-  '9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C'  # evpobr evpobr@gmail.com
-  '31D95CAB6D80D262244A1750A47620E801E47E95'  # David Seifert soap@gentoo.org
-)
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  # tests can only be built with static libs
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DCMAKE_PREFIX_PATH=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib32 \
-        -Wno-dev \
-        -B build-test \
-        -S $_name-$pkgver
-  make VERBOSE=1 -C build-test
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DBUILD_SHARED_LIBS=ON \
-        -DCMAKE_PREFIX_PATH=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib32 \
-        -Wno-dev \
-        -B build \
-        -S $_name-$pkgver
-  make VERBOSE=1 -C build
-}
-
-check() {
-  make test -C build-test
-}
-
-package() {
-  depends+=(libFLAC.so libogg.so libvorbis.so libvorbisenc.so)
-
-  make DESTDIR="$pkgdir" install -C build
-  install -vDm 644 $_name-$pkgver/{AUTHORS,ChangeLog,README} -t "$pkgdir/usr/share/doc/$pkgname"
-
-  # remove everything that is provided by libsndfile
-  rm -rf "$pkgdir/usr/"{bin,include,share/{man,doc/$_name}}
-}
diff --git a/x86_64/multilib/PKGBUILD b/x86_64/multilib/PKGBUILD
index d10d040..32e0ab7 100644
--- a/x86_64/multilib/PKGBUILD
+++ b/x86_64/multilib/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Nathan Owens <ndowens@artixlinux.org>
 # Maintainer: David Runge <dvzrv@archlinux.org>
 
 _name=libsndfile
 pkgname=lib32-$_name
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library for reading and writing files containing sampled audio data (32-bit)"
 arch=(x86_64)
 url="https://libsndfile.github.io/libsndfile/"
@@ -33,6 +33,7 @@ build() {
   # tests can only be built with static libs
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE='None' \
+        -DCMAKE_PREFIX_PATH=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib32 \
         -Wno-dev \
         -B build-test \
@@ -42,6 +43,7 @@ build() {
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE='None' \
         -DBUILD_SHARED_LIBS=ON \
+        -DCMAKE_PREFIX_PATH=/usr \
         -DCMAKE_INSTALL_LIBDIR=lib32 \
         -Wno-dev \
         -B build \
diff --git a/x86_64/multilib-staging/keys/pgp/31D95CAB6D80D262244A1750A47620E801E47E95.asc b/x86_64/multilib/keys/pgp/31D95CAB6D80D262244A1750A47620E801E47E95.asc
similarity index 100%
rename from x86_64/multilib-staging/keys/pgp/31D95CAB6D80D262244A1750A47620E801E47E95.asc
rename to x86_64/multilib/keys/pgp/31D95CAB6D80D262244A1750A47620E801E47E95.asc
diff --git a/x86_64/multilib-staging/keys/pgp/6A91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc b/x86_64/multilib/keys/pgp/6A91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc
similarity index 100%
rename from x86_64/multilib-staging/keys/pgp/6A91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc
rename to x86_64/multilib/keys/pgp/6A91A5CF22C24C99A35E013FCFDCF91FB242ACED.asc
diff --git a/x86_64/multilib-staging/keys/pgp/9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc b/x86_64/multilib/keys/pgp/9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc
similarity index 100%
rename from x86_64/multilib-staging/keys/pgp/9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc
rename to x86_64/multilib/keys/pgp/9B1CFD2E92239C4B288E025F9D0D1F1CCB35FF8C.asc