better version number

1 files changed, 16 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6263e817e31c..f75629113de2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: David Mazieres (http://www.scs.stanford.edu/~dm/addr/)
 pkgname=obs-motion-effect-git
-pkgver=1.2.1.r3.167596a
-obsver=$(obs --version | sed -e 's/[^0-9]*//;s/-.*//')
+obsver=$(obs --version | sed -e 's/[^0-9]*//;s/\(-\|\.[^0-9]\).*//' 2>/dev/null)
+pkgver=1.2.1.r3.167596a+obs25.0.8
 pkgrel=1
-pkgdesc="obs-studio plugin for source item animation"
+pkgdesc="v4l2-output for obs-studio"
 arch=(x86_64)
 url="https://github.com/CatxFish/motion-effect"
 license=('GPL')
 groups=()
 depends=(obs-studio)
-makedepends=('git' 'obs-studio' 'cmake')
+makedepends=('git' 'cmake')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 replaces=()
@@ -19,21 +19,25 @@ install=
 pkgstem=${pkgname%-git}
 pkgstem=${pkgstem#obs-}
 source=("${pkgstem}::git+${url}.git"
-	"obs-studio-$obsver.tar.gz::https://github.com/obsproject/obs-studio/archive/$obsver.tar.gz"
-)
+        obs-studio::git+https://github.com/obsproject/obs-studio.git)
 noextract=()
 sha256sums=('SKIP' 'SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgstem}"
-	#printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-        printf "%s" "$(git describe --tags --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	cd "$srcdir"
+	local obs v4l2sink
+	obs="$(git -C obs-studio describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	gitver="$(git -C "$pkgstem" describe --tags --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+        printf "%s+obs%s" "$gitver" "$obs"
 }
 
 prepare() {
-	mkdir -p "$srcdir/build"
-	cd "$srcdir/build"
-	cmake -DLIBOBS_INCLUDE_DIR="../obs-studio-$obsver/libobs" -DCMAKE_INSTALL_PREFIX=/usr "../${pkgstem}"
+	cd "$srcdir"
+	# If obs is installed, then try to match installed version
+	test -z "$obsver" || git -C obs-studio checkout "$obsver"
+	mkdir -p build
+	cd build
+	cmake -DLIBOBS_INCLUDE_DIR="../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr "../${pkgstem}"
 }
 
 build() {