rebased onto latest code from main fork

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b5caf9cf309..29787d916cde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = picom-ibhagwan-git
 	pkgdesc = iBhagwan's compton|picom fork (X compositor) with dual_kawase blur and rounded corners
-	pkgver = 1383_Next.102.g44b4970_2020.08.03
+	pkgver = 1577_Next.296.g6d87428_2021.02.05
 	pkgrel = 1
 	url = https://github.com/ibhagwan/picom
 	arch = i686
@@ -37,10 +37,8 @@ pkgbase = picom-ibhagwan-git
 	conflicts = compton-git
 	conflicts = picom
 	conflicts = picom-git
-	replaces = compton-git
-	replaces = picom-git
 	options = !strip
-	source = git+https://github.com/ibhagwan/picom.git
+	source = git+https://github.com/ibhagwan/picom.git#branch=next-rebase
 	md5sums = SKIP
 
 pkgname = picom-ibhagwan-git
diff --git a/PKGBUILD b/PKGBUILD
index a0f6c1b8e154..95884365ad94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=picom-ibhagwan-git
 _gitname=picom
-pkgver=1383_Next.102.g44b4970_2020.08.03
+pkgver=1577_Next.296.g6d87428_2021.02.05
 pkgrel=1
 pkgdesc="iBhagwan's compton|picom fork (X compositor) with dual_kawase blur and rounded corners"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ provides=('compton' 'compton-git' 'picom' 'picom-git')
 conflicts=('compton' 'compton-git' 'picom' 'picom-git')
 #replaces=('compton-git' 'picom-git')
 options=('!strip')
-source=(git+"https://github.com/ibhagwan/${_gitname}.git")
+source=(git+"https://github.com/ibhagwan/${_gitname}.git#branch=next-rebase")
 md5sums=("SKIP")
 
 pkgver() {