Revision & update

2 files changed, 27 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8d13d8f4e29..6e873a7e3ebd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = mjpg-streamer-git
 	pkgdesc = Stream mjpeg frames from a webcam via http
-	pkgver = a48d422
+	pkgver = r346.501f636
 	pkgrel = 1
-	url = http://sourceforge.net/projects/mjpg-streamer
+	epoch = 1
+	url = https://github.com/jacksonliam/mjpg-streamer
 	arch = i686
 	arch = x86_64
 	arch = arm
-	license = GPL
+	license = GPL2
 	makedepends = git
-	makedepends = gcc
+	makedepends = cmake
 	depends = libjpeg-turbo
 	depends = imagemagick
-	provides = mjpg-streamer-git
+	provides = mjpg-streamer
 	conflicts = mjpg-streamer
-	conflicts = mjpg-streamer-svn
-	source = mjpg-streamer-git::git+https://github.com/codewithpassion/mjpg-streamer.git
-	md5sums = SKIP
+	source = git+https://github.com/jacksonliam/mjpg-streamer.git
+	sha256sums = SKIP
 
 pkgname = mjpg-streamer-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f39061b75e7..46b8002e188b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,33 @@
-# This is a mjpg-streamer PKGBUILD file.
-# Maintainer: Yunhui Fu <yhfudev@gmail.com>
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Yunhui Fu <yhfudev@gmail.com>
 # Contributor: Tri Le <trile7@gmail.com>
 
 pkgname=mjpg-streamer-git
-pkgver=a48d422
+epoch=1
+pkgver=r346.501f636
 pkgrel=1
 pkgdesc="Stream mjpeg frames from a webcam via http"
-arch=('i686' 'x86_64' 'arm')
-url="http://sourceforge.net/projects/mjpg-streamer"
-license=('GPL')
-depends=('libjpeg-turbo' imagemagick)
-
-svnmod=mjpg-streamer
-
-provides=("${pkgname}")
-conflicts=('mjpg-streamer' 'mjpg-streamer-svn')
-
-makedepends=("git" "gcc")
-
-source=(
-    "${pkgname}::git+https://github.com/codewithpassion/mjpg-streamer.git"
-    )
-md5sums=(
-    SKIP
-    )
-
-pkgver_git() {
-    cd "${srcdir}/${pkgname}"
-    local ver="$(git show | grep commit | awk '{print $2}' )"
-    #printf "r%s" "${ver//[[:alpha:]]}"
-    echo ${ver:0:7}
-}
-
-pkgver_svn() {
-    cd "${srcdir}/${pkgname}"
-    local ver="$(svn info | grep Revision | awk '{print $2}' )"
-    #printf "r%s" "${ver//[[:alpha:]]}"
-    echo ${ver:0:7}
-}
+arch=(i686 x86_64 arm)
+url="https://github.com/jacksonliam/mjpg-streamer"
+license=(GPL2)
+depends=(libjpeg-turbo imagemagick)
+provides=(mjpg-streamer)
+conflicts=(mjpg-streamer)
+makedepends=(git cmake)
+source=("git+https://github.com/jacksonliam/mjpg-streamer.git")
+sha256sums=(SKIP)
 
 pkgver() {
-    pkgver_git
-}
-
-prepare() {
-    cd "${srcdir}/${pkgname}/mjpg-streamer"
-
-    #patch -p1 < ${srcdir}/uvc.patch
-
-    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
-    # sed -i "s/PLUGINS += input_gspcav1.so/# PLUGINS += input_gspcav1.so/" Makefile
+  cd "${pkgname/-git/}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}/mjpg-streamer"
-
-    msg "Starting make..."
-    make clean all || return 1
+  cd "${pkgname/-git/}/mjpg-streamer-experimental"
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}/mjpg-streamer"
-
-    mkdir -p ${pkgdir}/usr/share/${svnmod}/www/
-    mkdir -p ${pkgdir}/usr/lib
-    install *.so ${pkgdir}/usr/lib/
-    install -m 644 www/* ${pkgdir}/usr/share/${svnmod}/www/
-    install -m 755 www/functions.js ${pkgdir}/usr/share/${svnmod}/www/
-    mkdir -p ${pkgdir}/usr/bin
-    install mjpg_streamer ${pkgdir}/usr/bin/
-    install -m 644 CHANGELOG LICENSE README start.sh ${pkgdir}/usr/share/${svnmod}/
+  cd "${pkgname/-git/}/mjpg-streamer-experimental"
+  make DESTDIR="${pkgdir}" install
 }