diff options
author | Albert Nguyen | 2015-06-24 15:13:27 +0700 |
---|---|---|
committer | Albert Nguyen | 2015-06-24 15:13:27 +0700 |
commit | b0f1e0db0a4a336a69fbf2c7e39edf157ac50fd5 (patch) | |
tree | eebe64f5b555d11b1eb5406b6dbed306d9bbbd6b | |
download | aur-b0f1e0db0a4a336a69fbf2c7e39edf157ac50fd5.tar.gz |
First commit
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 42 | ||||
-rw-r--r-- | uvc.patch | 34 |
3 files changed, 98 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..f3e9882344ff --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,22 @@ +# 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 + license = GPL + makedepends = gcc + 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 + +pkgname = mjpg-streamer + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..4f25aaf2339e --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,42 @@ +# Contributor: Ross Melin <rdmelin@gmail.com> +# Contributor: Tri Le <trile7@gmail.com> +# Contributor: libc <primehunter326@gmail.com> +# Contributor: Albert Nguyen <albertbmnguyen@yahoo.com> + +pkgname=mjpg-streamer +pkgver=r63 +pkgrel=5 +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 +} + +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/ +} + +md5sums=('1c424b5441a2bf8379cdecd7dbebc935' 'edcdd714d87411d0daba9f8a336d6b82') diff --git a/uvc.patch b/uvc.patch new file mode 100644 index 000000000000..54906bc3bab2 --- /dev/null +++ b/uvc.patch @@ -0,0 +1,34 @@ +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); |