Date: Friday, January 13, 2023 @ 10:53:37
  Author: heftig
Revision: 1383244

1.3.0-2

Modified:
  lib32-libwebp/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-13 10:18:23 UTC (rev 1383243)
+++ PKGBUILD    2023-01-13 10:53:37 UTC (rev 1383244)
@@ -6,12 +6,13 @@
 
 pkgname=lib32-libwebp
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="WebP library (32-bit)"
 url="https://developers.google.com/speed/webp/";
 arch=(x86_64)
 license=(BSD)
 depends=(lib32-glibc libwebp)
+makedepends=(cmake ninja)
 provides=(libwebp{,decoder,demux,mux}.so libsharpyuv.so)
 options=(debug)
 
source=(https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz{,.asc})
@@ -20,34 +21,39 @@
 validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D') # WebP release 
signing key
 
 build() {
-  cd libwebp-$pkgver
+  local cmake_options=(
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib32
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_SKIP_INSTALL_RPATH=ON
+    -DBUILD_SHARED_LIBS=ON
+    -DWEBP_BUILD_{C,D,GIF2,IMG2,V}WEBP=OFF
+    -DWEBP_BUILD_EXTRAS=OFF
+  )
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib32 \
-    --disable-static \
-    --enable-swap-16bit-csp \
-    --enable-everything
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  # Mimic autotools build without --enable-asserts
+  CFLAGS+=" -DNDEBUG"
+  CXXFLAGS+=" -DNDEBUG"
+
+  cmake -S libwebp-$pkgver -B build -G Ninja "${cmake_options[@]}"
+  cmake --build build
 }
 
 check() {
-  cd libwebp-$pkgver
-  make check
+  cd build
+  ctest --output-on-failure --stop-on-failure -j$(nproc)
 }
 
 package() {
-  cd libwebp-$pkgver
-
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
   rm -r "$pkgdir"/usr/{bin,include,share}
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 \
+    libwebp-$pkgver/COPYING
 }
 
 # vim:set sw=2 sts=-1 et:

Reply via email to