Update to r67-1

3 files changed, 42 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3e9882344ff..d6a402c8c5fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,18 @@
-# Generated by makepkg 4.2.1
-# Mon Apr 20 07:37:10 UTC 2015
 pkgbase = mjpg-streamer
 	pkgdesc = Stream mjpeg frames from a webcam via http
-	pkgver = r63
-	pkgrel = 5
-	url = http://sourceforge.net/projects/mjpg-streamer
-	arch = any
-	groups = multimedia
+	pkgver = r67
+	pkgrel = 1
+	url = https://github.com/jacksonliam/mjpg-streamer
+	arch = i686
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
 	license = GPL
 	makedepends = gcc
+	makedepends = cmake
 	depends = libjpeg
-	depends = imagemagick
-	provides = mjpeg-streamer
-	options = !makeflags
-	source = http://downloads.sourceforge.net/project/mjpg-streamer/mjpg-streamer/Sourcecode/mjpg-streamer-r63.tar.gz
-	source = uvc.patch
-	md5sums = 1c424b5441a2bf8379cdecd7dbebc935
-	md5sums = edcdd714d87411d0daba9f8a336d6b82
+	source = https://github.com/jacksonliam/mjpg-streamer/archive/f387bb44e6c087271b763b27da998bf2e06c4f5d.tar.gz
+	sha1sums = 298ad7adebe3876b87d4e19f76e4d2425fd0c9ff
 
 pkgname = mjpg-streamer
 
diff --git a/PKGBUILD b/PKGBUILD
index 4f25aaf2339e..d7dd61a2c2e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,41 @@
 # Contributor: Tri Le <trile7@gmail.com>
 # Contributor: libc <primehunter326@gmail.com>
 # Contributor: Albert Nguyen <albertbmnguyen@yahoo.com>
+# Contributor: Maxim Devaev <mdevaev@gmail.com>
 
-pkgname=mjpg-streamer
-pkgver=r63
-pkgrel=5
+
+pkgname="mjpg-streamer"
+pkgver="r67"
+pkgrel="1"
 pkgdesc="Stream mjpeg frames from a webcam via http"
-arch=('any')
-url="http://sourceforge.net/projects/mjpg-streamer"
-license=('GPL')
-groups=(multimedia)
-depends=(libjpeg imagemagick)
-makedepends=(gcc)
-provides=(mjpeg-streamer)
-options=(!makeflags)
-source=("http://downloads.sourceforge.net/project/mjpg-streamer/mjpg-streamer/Sourcecode/$pkgname-$pkgver.tar.gz" "uvc.patch")
-
-prepare() {
-  cd "$srcdir"
-  patch -p0 < uvc.patch
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f -print0 | xargs -0 sed -i s/videodev.h/videodev2.h/g
-  sed -i "s/make -C plugins\/input_gspcav1/# make -C plugins\/input_gspcav1/" Makefile
-  sed -i "s/cp plugins\/input_gspcav1\/input_gspcav1.so/# cp plugins\/input_gspcav1\/input_gspcav1.so/" Makefile
+url="https://github.com/jacksonliam/mjpg-streamer"
+license=("GPL")
+arch=("i686" "x86_64" "armv6h" "armv7h")
+depends=("libjpeg")
+makedepends=("gcc" "cmake")
+
+_commit="f387bb44e6c087271b763b27da998bf2e06c4f5d"
+source=("https://github.com/jacksonliam/mjpg-streamer/archive/$_commit.tar.gz")
+sha1sums=("298ad7adebe3876b87d4e19f76e4d2425fd0c9ff")
+
+
+build() {
+	cd "$srcdir/mjpg-streamer-$_commit/mjpg-streamer-experimental"
+
+	unset CPPFLAGS
+	unset LDFLAGS
+	unset CXXFLAGS
+	unset CHOST
+	unset CFLAGS
+
+	[ -d _build ] || mkdir _build
+	[ -f _build/Makefile ] || (cd _build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) ..)
+	make -C _build
+	cp _build/mjpg_streamer .
+	find _build -name "*.so" -type f -exec cp {} . \;
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make clean all || return 1
-  mkdir -p $pkgdir/usr/share/mjpeg-streamer/www/
-  mkdir -p $pkgdir/usr/lib
-  install *.so $pkgdir/usr/lib/
-  install -m 644 www/* $pkgdir/usr/share/mjpeg-streamer/www/
-  install -m 755 www/functions.js $pkgdir/usr/share/mjpeg-streamer/www/
-  mkdir -p $pkgdir/usr/bin
-  install mjpg_streamer $pkgdir/usr/bin/
-  install -m 644 CHANGELOG LICENSE README start.sh $pkgdir/usr/share/mjpeg-streamer/
+	cd "$srcdir/mjpg-streamer-$_commit/mjpg-streamer-experimental"
+	make DESTDIR=$pkgdir install
 }
-
-md5sums=('1c424b5441a2bf8379cdecd7dbebc935' 'edcdd714d87411d0daba9f8a336d6b82')
diff --git a/uvc.patch b/uvc.patch
deleted file mode 100644
index 54906bc3bab2..000000000000
--- a/uvc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rupN mjpg-streamer-r63/plugins/input_uvc/input_uvc.c mjpg-streamer-r63-patch/plugins/input_uvc/input_uvc.c
---- mjpg-streamer-r63/plugins/input_uvc/input_uvc.c	2008-06-16 18:23:51.000000000 +0700
-+++ mjpg-streamer-r63-patch/plugins/input_uvc/input_uvc.c	2015-02-24 14:46:17.544148293 +0700
-@@ -706,7 +706,7 @@ void *cam_thread( void *arg ) {
-     }
-     else {
-       DBG("copying frame\n");
--      pglobal->size = memcpy_picture(pglobal->buf, videoIn->tmpbuffer, videoIn->buf.bytesused);
-+      pglobal->size = memcpy_picture(pglobal->buf, videoIn->tmpbuffer, videoIn->currPictSize);
-     }
- 
- #if 0
-diff -rupN mjpg-streamer-r63/plugins/input_uvc/v4l2uvc.c mjpg-streamer-r63-patch/plugins/input_uvc/v4l2uvc.c
---- mjpg-streamer-r63/plugins/input_uvc/v4l2uvc.c	2008-06-16 18:23:51.000000000 +0700
-+++ mjpg-streamer-r63-patch/plugins/input_uvc/v4l2uvc.c	2015-02-24 14:48:42.381979926 +0700
-@@ -333,6 +333,7 @@ int uvcGrab(struct vdIn *vd)
-       */
- 
-       memcpy(vd->tmpbuffer, vd->mem[vd->buf.index], vd->buf.bytesused);
-+      vd->currPictSize = vd->buf.bytesused;
- 
-       if (debug)
-         fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused);
-diff -rupN mjpg-streamer-r63/plugins/input_uvc/v4l2uvc.h mjpg-streamer-r63-patch/plugins/input_uvc/v4l2uvc.h
---- mjpg-streamer-r63/plugins/input_uvc/v4l2uvc.h	2008-06-16 18:23:51.000000000 +0700
-+++ mjpg-streamer-r63-patch/plugins/input_uvc/v4l2uvc.h	2015-02-24 14:49:26.164355180 +0700
-@@ -73,6 +73,7 @@ struct vdIn {
-     int framecount;
-     int recordstart;
-     int recordtime;
-+    int currPictSize
- };
- 
- int init_videoIn(struct vdIn *vd, char *device, int width, int height, int fps, int format, int grabmethod);