Revamp and bump version.

2 files changed, 56 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3f542ae2d37..c915fd72c936 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = obs-plugin-input-overlay
-	pkgdesc = obs-studio plugin to show keyboard, gamepad and mouse input on stream, legacy v4 branch with D-pad fix for Linux.
-	pkgver = 4.8
-	pkgrel = 2
+	pkgdesc = obs-studio plugin to show keyboard, gamepad and mouse input on stream.
+	pkgver = 5.0.0
+	pkgrel = 1
 	url = https://github.com/univrsal/input-overlay
 	arch = x86_64
+	groups = obs-plugins
 	license = GPL
 	makedepends = git
+	makedepends = cmake
 	depends = obs-studio
-	depends = libuiohook
-	provides = obs-input-overlay
-	conflicts = obs-input-overlay
-	source = git+https://github.com/univrsal/input-overlay.git#branch=legacy
-	sha256sums = SKIP
+	source = git+https://github.com/univrsal/input-overlay.git#tag=v5.0.0
+	source = obs-plugin-input-overlay-netlib::git+https://github.com/univrsal/netlib.git
+	source = obs-plugin-input-overlay-libgamepad::git+https://github.com/univrsal/libgamepad.git
+	source = obs-plugin-input-overlay-libuiohook::git+https://github.com/kwhat/libuiohook.git
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = obs-plugin-input-overlay
diff --git a/PKGBUILD b/PKGBUILD
index 1558ea3619dc..a7690f63a92a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,50 @@
-# Maintainer: Yidaozhan Ya <yidaozhan_ya@outlook.com>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Yidaozhan Ya <yidaozhan_ya@outlook.com>
 # Contributor: Artem Klevtsov <a.a.klevtsov@gmail.com>
 
-pkgname=obs-plugin-input-overlay
-pkgver=4.8
-pkgrel=2
-#groups=('obs-plugins')
-pkgdesc="obs-studio plugin to show keyboard, gamepad and mouse input on stream, legacy v4 branch with D-pad fix for Linux."
+_pkgname='input-overlay'
+pkgname=obs-plugin-${_pkgname}
+pkgver=5.0.0
+pkgrel=1
+groups=('obs-plugins')
+pkgdesc='obs-studio plugin to show keyboard, gamepad and mouse input on stream.'
 arch=("x86_64")
-url="https://github.com/univrsal/input-overlay"
-license=("GPL")
-provides=("obs-input-overlay")
-conflicts=("obs-input-overlay")
-depends=("obs-studio" "libuiohook")
-makedepends=("git")
-source=("git+https://github.com/univrsal/input-overlay.git#branch=legacy")
-sha256sums=('SKIP')
+url="https://github.com/univrsal/${_pkgname}"
+license=('GPL')
+depends=('obs-studio')
+makedepends=('git' 'cmake')
+source=(
+	"git+https://github.com/univrsal/${_pkgname}.git#tag=v${pkgver}"
+	"$pkgname-netlib::git+https://github.com/univrsal/netlib.git"
+	"$pkgname-libgamepad::git+https://github.com/univrsal/libgamepad.git"
+	"$pkgname-libuiohook::git+https://github.com/kwhat/libuiohook.git")
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
+
+_srcdir="${_pkgname}"
+
+prepare() {
+	cd "${_srcdir}"
+	git submodule init
+	git config 'submodule.deps/netlib.url' "$srcdir/$pkgname-netlib"
+	git config 'submodule.deps/libgamepad.url' "$srcdir/$pkgname-libgamepad"
+	git config 'submodule.deps/libuiohook.url' "$srcdir/$pkgname-libuiohook"
+	git -c 'protocol.file.allow=always' submodule update
+}
+
 build() {
-    cd "${srcdir}/input-overlay"
-    git submodule update --init --recursive
-    sed 's#LibObs#libobs#' CMakeLists.txt -i
-    cmake .
-    make
+	cmake -S "${_srcdir}" -B 'build' -DCMAKE_BUILD_TYPE='None' -DCMAKE_INSTALL_PREFIX='/usr'
+	cmake --build 'build'
 }
+
 package() {
-    cd "${srcdir}/input-overlay"
-    mkdir -p "${pkgdir}/usr/lib/obs-plugins/"
-    mkdir -p "${pkgdir}/usr/share/obs/obs-plugins/input-overlay/locale/"
-    mkdir -p "${pkgdir}/usr/share/obs/obs-plugins/input-overlay/presets/"
-    cp ./input-overlay.so "${pkgdir}/usr/lib/obs-plugins/"
-    chmod 755 "${pkgdir}/usr/lib/obs-plugins/input-overlay.so"
-    cp -R data/locale/* "${pkgdir}/usr/share/obs/obs-plugins/input-overlay/locale/"
-    cp -R presets/* "${pkgdir}/usr/share/obs/obs-plugins/input-overlay/presets/"
-    cd "${pkgdir}/usr/share/obs/obs-plugins/input-overlay/presets/"
-    for f in *.zip; do unzip -d "${f%*.zip}" "$f"; done
-    rm -f *.zip
+	cd "${_srcdir}"
+	install -dm755 "${pkgdir}/usr/lib/obs-plugins"
+	install -dm755 "${pkgdir}/usr/share/obs/obs-plugins/${_pkgname}/locale"
+	install -dm755 "${pkgdir}/usr/share/obs/obs-plugins/${_pkgname}/presets"
+	install -Dm755 "${srcdir}/build/${_pkgname}.so" -t "${pkgdir}/usr/lib/obs-plugins/"
+	cp -R 'data/locale'/* "${pkgdir}/usr/share/obs/obs-plugins/${_pkgname}/locale/"
+	cp -R 'presets'/* "${pkgdir}/usr/share/obs/obs-plugins/${_pkgname}/presets/"
 }