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

[Jan Steffens]

    Date: Thursday, September 12, 2019 @ 18:34:03
  Author: heftig
Revision: 362308

3.34.0-1

Modified:
  cheese/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-12 17:56:44 UTC (rev 362307)
+++ PKGBUILD	2019-09-12 18:34:03 UTC (rev 362308)
@@ -2,8 +2,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=cheese
-pkgver=3.32.1
-pkgrel=2
+pkgver=3.34.0
+pkgrel=1
 pkgdesc="Take photos and videos with your webcam, with fun graphical effects"
 url="https://wiki.gnome.org/Apps/Cheese"
 arch=(x86_64)
@@ -10,10 +10,10 @@
 license=(GPL)
 depends=(gtk3 gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good clutter-gst clutter-gtk
          libcanberra librsvg gnome-desktop libgudev dconf gnome-video-effects)
-makedepends=(intltool gobject-introspection itstool vala gnome-common git appstream-glib)
+makedepends=(gobject-introspection vala git appstream-glib meson yelp-tools)
+checkdepends=(xorg-server-xvfb)
 groups=(gnome)
-options=(!emptydirs)
-_commit=f968f45985a93a75ce20236615bf8ff5586174ce  # gnome-3-32
+_commit=61ff7a2c26b618cb24be7ca3c050530671055602  # master
 source=("git+https://gitlab.gnome.org/GNOME/cheese.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -24,23 +24,21 @@
 
 prepare() {
   cd $pkgname
-  git tag -f 3.32.1 f968f45985a93a75ce20236615bf8ff5586174ce  # Fixup missing tag
-  NOCONFIGURE=1 ./autogen.sh
+  git tag -f 3.34.0 61ff7a2c26b618cb24be7ca3c050530671055602  # Fixup missing tag
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-static --disable-schemas-compile --libexecdir=/usr/lib/cheese \
-      --enable-gtk-doc
+  arch-meson $pkgname build -D tests=true
+  ninja -C build
+}
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+check() (
+  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/data}"
+  export GSETTINGS_SCHEMA_DIR
 
-  make
-}
+  xvfb-run meson test -C build --print-errorlogs
+)
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
 }