Updated to 0.20.7

3 files changed, 29 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c04fc6dfbd3..a83adab836b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
-# Generated by mksrcinfo v8
-# Wed Jan 31 08:30:34 UTC 2018
 pkgbase = camorama
-	pkgdesc = Webcam application featuring various image filters
-	pkgver = 0.19
-	pkgrel = 7
-	url = https://git.gnome.org/browse/archive/camorama
+	pkgdesc = GNOME 2 Webcam application featuring various image filters
+	pkgver = 0.20.7.r51.gcde678b
+	pkgrel = 1
+	url = https://github.com/mchehab/camorama
 	arch = x86_64
 	license = GPL2
-	makedepends = intltool
+	makedepends = git
+	makedepends = gnome-common
+	makedepends = v4l-utils
 	depends = libgnomeui
-	source = camorama-0.19.tar.xz::https://git.gnome.org/browse/archive/camorama/snapshot/camorama-0-19.tar.xz
-	source = camorama.patch
-	md5sums = 803f057da811162104133883541fbcb0
-	md5sums = 03892e0cad8402f578579214fb9b054a
+	provides = camorama
+	conflicts = camorama-git
+	source = git+https://github.com/mchehab/camorama.git
+	sha256sums = SKIP
 
 pkgname = camorama
-
diff --git a/PKGBUILD b/PKGBUILD
index 271bf9d1d4fb..f6c814cc7c35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,34 @@
-# Maintainer: Steffen Weber <-boenki-gmx-de->
+# Contributor: Eric Fung <loseurmarbles[AT]gmail[DOT]com>
+# Contributor: Steffen Weber <-boenki-gmx-de->
 # Contributor: Andrea Scarpino <bash.lnx@gmail.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 
 pkgname=camorama
-pkgver=0.19
-pkgrel=7
-pkgdesc="Webcam application featuring various image filters"
-url="https://git.gnome.org/browse/archive/$pkgname"
+pkgver=0.20.7.r51.gcde678b
+pkgrel=1
+pkgdesc="GNOME 2 Webcam application featuring various image filters"
+url="https://github.com/mchehab/camorama"
 arch=('x86_64')
 license=('GPL2')
 depends=('libgnomeui')
-makedepends=('intltool')
-source=($pkgname-$pkgver.tar.xz::$url/snapshot/$pkgname-${pkgver/./-}.tar.xz
-        $pkgname.patch)
-md5sums=('803f057da811162104133883541fbcb0'
-         '03892e0cad8402f578579214fb9b054a')
+makedepends=('git' 'gnome-common' 'v4l-utils')
+provides=("${pkgname}")
+conflicts=("${pkgname}-git")
+source=("git+${url}.git")
+sha256sums=('SKIP')
 
-prepare() {
-  cd "$pkgname-${pkgver/./-}"
-  patch -p0 -i ../$pkgname.patch
+pkgver() {
+    cd "${srcdir}/${pkgname}"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$pkgname-${pkgver/./-}"
-  sh ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/usr/share
+  cd "${srcdir}/${pkgname}"
+  ./autogen.sh --prefix=/usr
   make
 }
 
-check() {
-  cd "$pkgname-${pkgver/./-}"
-  make check
-}
-
 package() {
-  cd "$pkgname-${pkgver/./-}"
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}"
+  DESTDIR="${pkgdir}" make install
 }
diff --git a/camorama.patch b/camorama.patch
deleted file mode 100644
index 8eb7c7c930ca..000000000000
--- a/camorama.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -aur src_orig/camorama-stock-items.h src/camorama-stock-items.h
---- src_orig/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
-+++ src/camorama-stock-items.h	2012-10-22 03:50:31.000000000 +0200
-@@ -1,7 +1,7 @@
- #ifndef CAMORAMA_STOCK_ITEMS_H
- #define CAMORAMA_STOCK_ITEMS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
-diff -aur src_orig/glib-helpers.h src/glib-helpers.h
---- src_orig/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
-+++ src/glib-helpers.h	2012-10-22 03:50:33.000000000 +0200
-@@ -24,7 +24,7 @@
- #ifndef GLIB_HELPERS_H
- #define GLIB_HELPERS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
-diff -aur src_orig/v4l.h src/v4l.h
---- src_orig/v4l.h	2007-09-16 15:36:55.000000000 +0200
-+++ src/v4l.h	2012-10-22 03:50:35.000000000 +0200
-@@ -13,7 +13,7 @@
- #include <fcntl.h>
- #include <gtk/gtk.h>
- #include <linux/types.h>
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <signal.h>
- #include <png.h>
- #include <glade/glade.h>