summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD26
2 files changed, 14 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 946bfdd01fb..c91e02e4fd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
# Generated by mksrcinfo v8
-# Mon May 1 15:17:06 UTC 2017
+# Tue Jan 2 13:34:31 UTC 2018
pkgbase = pantheon-camera-git
pkgdesc = The Pantheon Camera Application
- pkgver = r496.d040b1a
+ pkgver = r547.3494a05
pkgrel = 1
url = https://github.com/elementary/camera
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL3
- makedepends = cmake
makedepends = git
makedepends = granite-git
makedepends = intltool
+ makedepends = meson
makedepends = vala
+ depends = appstream
depends = clutter
depends = clutter-gst
depends = clutter-gtk
@@ -25,8 +25,6 @@ pkgbase = pantheon-camera-git
depends = libgranite.so
provides = pantheon-camera
conflicts = pantheon-camera
- conflicts = snap-photobooth
- replaces = snap-photobooth-bzr
source = pantheon-camera::git+https://github.com/elementary/camera.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 062e9b1178e..357d9e0676d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,19 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=pantheon-camera-git
-pkgver=r496.d040b1a
+pkgver=r547.3494a05
pkgrel=1
pkgdesc='The Pantheon Camera Application'
arch=('x86_64')
url='https://github.com/elementary/camera'
license=('GPL3')
groups=('pantheon-unstable')
-depends=('clutter' 'clutter-gst' 'clutter-gtk' 'glib2' 'glibc' 'gstreamer'
- 'gtk3' 'libcanberra'
+depends=('appstream' 'clutter' 'clutter-gst' 'clutter-gtk' 'glib2' 'glibc'
+ 'gstreamer' 'gtk3' 'libcanberra'
'libgranite.so')
-makedepends=('cmake' 'git' 'granite-git' 'intltool' 'vala')
+makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
provides=('pantheon-camera')
-conflicts=('pantheon-camera' 'snap-photobooth')
-replaces=('snap-photobooth-bzr')
+conflicts=('pantheon-camera')
source=('pantheon-camera::git+https://github.com/elementary/camera.git')
sha256sums=('SKIP')
@@ -25,8 +24,6 @@ pkgver() {
}
prepare() {
- cd pantheon-camera
-
if [[ -d build ]]; then
rm -rf build
fi
@@ -34,19 +31,16 @@ prepare() {
}
build() {
- cd pantheon-camera/build
+ cd build
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DGSETTINGS_COMPILE='FALSE'
- make
+ arch-meson ../pantheon-camera
+ ninja
}
package() {
- cd pantheon-camera/build
+ cd build
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja install
}
# vim: ts=2 sw=2 et: