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

[Jan Steffens]

    Date: Friday, May 8, 2020 @ 09:57:19
  Author: heftig
Revision: 382776

1.3.4-2: various fixes: restore m4 for celt, add CPPFLAGS, libprovides, nicer cmake invocation

Modified:
  libogg/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 09:40:00 UTC (rev 382775)
+++ PKGBUILD	2020-05-08 09:57:19 UTC (rev 382776)
@@ -4,7 +4,7 @@
 
 pkgname=libogg
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Ogg bitstream and framing library'
 arch=(x86_64)
 url=https://www.xiph.org/ogg/
@@ -15,6 +15,7 @@
   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>
@@ -21,30 +22,25 @@
 
 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
-
-  cmake ../ogg \
-    -G Ninja \
+  local CFLAGS="$CPPFLAGS $CFLAGS" CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+  cmake -Hogg -Bbuild -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_SHARED_LIBS=ON
-  ninja
+  cmake --build build
 }
 
 package() {
-  DESTDIR="${pkgdir}" ninja -C build install
-  install -Dm 644 ogg/COPYING -t "${pkgdir}"/usr/share/licenses/libogg/
+  DESTDIR="${pkgdir}" cmake --build build --target install
+  install -Dm 644 ogg/COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -Dm 644 ogg/ogg.m4 -t "${pkgdir}"/usr/share/aclocal/
 }
 
 # vim: ts=2 sw=2 et: