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

[Jan Steffens]

    Date: Friday, May 8, 2020 @ 09:58:25
  Author: heftig
Revision: 625581

1.3.4-2: various fixes: add CPPFLAGS, libprovides, nicer cmake invocation

Modified:
  lib32-libogg/trunk/PKGBUILD

----------+
 PKGBUILD |   56 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 09:33:40 UTC (rev 625580)
+++ PKGBUILD	2020-05-08 09:58:25 UTC (rev 625581)
@@ -2,45 +2,49 @@
 
 pkgname=lib32-libogg
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Ogg bitstream and framing library (32-bit)'
-arch=('x86_64')
-url='https://www.xiph.org/ogg/'
-license=('BSD')
+arch=(x86_64)
+url=https://www.xiph.org/ogg/
+license=(BSD)
 depends=(lib32-glibc libogg)
-makedepends=(cmake ninja)
-source=("https://downloads.xiph.org/releases/ogg/libogg-${pkgver}.tar.xz")
-sha256sums=('c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe')
+makedepends=(
+  cmake
+  git
+  ninja
+)
+provides=(libogg.so)
+source=(git+https://github.com/xiph/ogg.git?signed#tag=3328abd152508614f7ce4cd491dc98d14eba7ffc)
+sha256sums=(SKIP)
+validpgpkeys=(B7B00AEE1F960EEA0FED66FB9259A8F2D2D44C84) # Ralph Giles <giles at thaumas.net>
 
+pkgver() {
+  cd ogg
+  git describe --tags | sed 's/^v//'
+}
+
 prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
+  cd ogg
 }
 
 build() {
-  cd build
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  cmake ../libogg-${pkgver} \
-    -G Ninja \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_INSTALL_LIBDIR='/usr/lib32' \
-    -DBUILD_SHARED_LIBS='ON' \
-    -DINSTALL_DOCS=OFF
-  ninja
+  local CFLAGS="$CPPFLAGS $CFLAGS" CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+  cmake -Hogg -Bbuild -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+    -DINSTALL_DOCS=OFF \
+    -DBUILD_SHARED_LIBS=ON
+  cmake --build build
 }
 
 package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-  rm -rf "$pkgdir"/usr/include
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s libogg "$pkgdir/usr/share/licenses/$pkgname"
+  DESTDIR="${pkgdir}" cmake --build build --target install
+  rm -r "$pkgdir"/usr/include
+  install -Dm 644 ogg/COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 # vim: ts=2 sw=2 et: