From 6db7d2dd824ed6add8fa7a0e2d9b62820683c01c Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 27 Nov 2011 03:31:04 +0000
Subject: [PATCH] kamoso renamed, qtgstreamer rebuild

---
 kamoso-git/PKGBUILD      | 50 ----------------------------------------
 kamoso/PKGBUILD          | 33 ++++++++++++++++++++++++++
 qtgstreamer-git/PKGBUILD | 12 +++++-----
 3 files changed, 39 insertions(+), 56 deletions(-)
 delete mode 100644 kamoso-git/PKGBUILD
 create mode 100644 kamoso/PKGBUILD

diff --git a/kamoso-git/PKGBUILD b/kamoso-git/PKGBUILD
deleted file mode 100644
index 9989ffac5..000000000
--- a/kamoso-git/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# contributor: alex@eyeos.org, aleixpol@kde.org
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname=kamoso-git
-_pkgname=kamoso
-pkgver=20111108
-pkgrel=1
-pkgdesc="Kamoso is an application to take pictures and videos out of your webcam."
-url="https://projects.kde.org/projects/playground/multimedia/kamoso/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('kde-workspace' 'qtgstreamer-git' 'kipi-plugins')
-makedepends=('cmake' 'git' 'automoc4')
-conflicts=('kamoso')
-
-_gitroot='git://anongit.kde.org/kamoso'
-_gitname='kamoso'
-
-build() {
-    cd "$srcdir"
-    msg "Connecting to gitorious GIT server...."
-    if [ -d ${srcdir}/$_gitname ] ; then
-        cd $_gitname
-        git pull . master
-        git submodule update --init
-        msg "The local files are updated."
-    else
-        git clone git://anongit.kde.org/kamoso
-        cd $_gitname
-        git submodule update --init
-    fi
-    msg "GIT checkout done."
-
-    cd ..
-    if [ -d build ] ; then
-        rm -rf build
-    fi
-    mkdir build
-    cd build
-    cmake ${srcdir}/$_gitname \
-    -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-    make || return 1
-    make DESTDIR=$startdir/pkg install
-}
\ No newline at end of file
diff --git a/kamoso/PKGBUILD b/kamoso/PKGBUILD
new file mode 100644
index 000000000..97dcfd24b
--- /dev/null
+++ b/kamoso/PKGBUILD
@@ -0,0 +1,33 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# contributor: alex@eyeos.org, aleixpol@kde.org
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=kamoso
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="Kamoso is an application to take pictures and videos out of your webcam."
+url="https://projects.kde.org/projects/playground/multimedia/kamoso/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('kde-workspace' 'qtgstreamer-git' 'kipi-plugins')
+makedepends=('cmake' 'git' 'automoc4')
+conflicts=('kamoso-git')
+source=("http://www.chakra-linux.org/sources/$pkgname/$pkgname-$pkgver.tar.xz")
+md5sums=('bb4beeb2326857f5492ff4fb68ea15a3')
+
+build() {
+    cd "$srcdir/$pkgname"
+    cmake ${srcdir}/$pkgname \
+    -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
+    -DCMAKE_BUILD_TYPE=Release 
+    make 
+}
+
+package(){
+  cd "${srcdir}/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
\ No newline at end of file
diff --git a/qtgstreamer-git/PKGBUILD b/qtgstreamer-git/PKGBUILD
index faa937943..f032fab0f 100644
--- a/qtgstreamer-git/PKGBUILD
+++ b/qtgstreamer-git/PKGBUILD
@@ -7,7 +7,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=qtgstreamer-git
-pkgver=20110922
+pkgver=20111127
 pkgrel=1
 pkgdesc="Gstreamer bindings for C++/Qt."
 arch=('i686' 'x86_64')
@@ -26,24 +26,24 @@ build() {
   msg "Connecting to GIT server...."
 
   if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin || return 1
+    cd $_gitname && git pull origin 
     msg "The local files are updated."
   else
-    git clone $_gitroot $_gitname || return 1
+    git clone $_gitroot $_gitname 
   fi
 
   msg "GIT checkout done or server timeout"
   msg "Starting make..."
 
   rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" || return 1
+  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" 
   cd "$srcdir/$_gitname-build"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr . || return 1
+  cmake -DCMAKE_INSTALL_PREFIX=/usr . 
   make || return 1
 }
 
 package() {
   cd "$srcdir/$_gitname-build"
-  make DESTDIR="$pkgdir/" install || return 1
+  make DESTDIR="$pkgdir/" install 
 }
\ No newline at end of file