Latest MM 2.0 beta with libgphoto2 support

3 files changed, 25 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d41d513db9b6..32d49cfe3057 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Apr  8 06:14:49 UTC 2017
 pkgbase = micromanager-git
 	pkgdesc = Software package for control of automated microscopes. CMMCore and python2 bindings only.
-	pkgver = 1.4.21.r39.ge60756c
+	pkgver = v2.0.0.beta2.r2147.gc6734e115
 	pkgrel = 1
 	url = http://www.micro-manager.org
 	install = mm.install
@@ -10,13 +12,14 @@ pkgbase = micromanager-git
 	license = BSD LGPL
 	makedepends = git
 	makedepends = swig
+	depends = clang
 	depends = boost
 	depends = libdc1394
 	depends = python2
 	depends = python2-numpy
 	provides = micromanager
 	conflicts = micromanager
-	source = micromanager-git::git+https://github.com/mdcurtis/micromanager-upstream.git#commit=e60756c
+	source = micromanager-git::git+https://github.com/micro-manager/micro-manager.git/#commit=c6734e1151bd59514e4ee629e24b1445f07be6c1
 	source = micromanager-lib.conf
 	md5sums = SKIP
 	md5sums = b7b6a68ce53d8ea1a4a29d187174ee4c
diff --git a/ChangeLog b/ChangeLog
index 5964929be2b1..cca11f62b188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-07 Eugene Dvoretsky <radioxoma at gmail com>
+
+    * Switching to official Micro-manager git repo at GitHub
+    * Tested libgphoto2 support
+    * clang compiler
+
 2015-05-09 Eugene Dvoretsky <radioxoma at gmail com>
 
     1.4.21.r39.ge60756c
diff --git a/PKGBUILD b/PKGBUILD
index ea2f1c4f3c04..de28e996e09f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Visit https://github.com/radioxoma/aur for pull requests or issue solving.
 
 pkgname=micromanager-git
-pkgver=1.4.21.r39.ge60756c
+pkgver=v2.0.0.beta2.r2147.gc6734e115
 pkgrel=1
 epoch=
 pkgdesc="Software package for control of automated microscopes. CMMCore and python2 bindings only."
@@ -10,8 +10,10 @@ arch=('x86_64' 'i686')
 url="http://www.micro-manager.org"
 license=('BSD LGPL')
 groups=()
-depends=('boost' 'libdc1394' 'python2' 'python2-numpy')
+depends=('clang' 'boost' 'libdc1394' 'python2' 'python2-numpy')
 makedepends=('git' 'swig')
+optdepends=('libgphoto2: DSLR camera support'
+            'freeimage: libgphoto2 support')
 checkdepends=()
 optdepends=()
 provides=('micromanager')
@@ -21,16 +23,18 @@ backup=()
 options=()
 install=mm.install
 changelog=ChangeLog
-# Alternative repo: https://github.com/openspim/micromanager/tree/svn/git-svn
-source=($pkgname::git+https://github.com/mdcurtis/micromanager-upstream.git#commit=e60756c
-        'micromanager-lib.conf')
+source=("$pkgname::git+https://github.com/micro-manager/micro-manager.git/#commit=c6734e1151bd59514e4ee629e24b1445f07be6c1"  # Latest commit im 'mm2' branch
+        "micromanager-lib.conf")
 noextract=()
 md5sums=('SKIP'
-         'b7b6a68ce53d8ea1a4a29d187174ee4c') #generate with 'makepkg -g'
+         'b7b6a68ce53d8ea1a4a29d187174ee4c')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  cd "$pkgname"
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 prepare() {
@@ -45,7 +49,8 @@ build() {
         # and closed-source device adapters.
 
         # Feel free to improve package to work with ImageJ or FIJI.
-        ./configure --prefix=/usr --with-java=no --with-python PYTHON="python2"
+        # You can switch to python3 here and in `package()` function.
+        CXXCPP=/usr/bin/cpp ./configure --prefix=/usr --with-java=no --with-python PYTHON="python2"
         make
 }