* Update patch and depend on regular 'deadbeef'

	modified:   .SRCINFO
	modified:   PKGBUILD
	modified:   ddb_discord_presence-makefile.patch

3 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4af43742124d..377731f8c686 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = deadbeef-plugin-discord-git
 	pkgdesc = DeaDBeeF Discord rich presence plugin
-	pkgver = r24.g07beb73
+	pkgver = r26.g70c06e1
 	pkgrel = 1
 	url = https://github.com/kuba160/ddb_discord_presence
 	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = git
-	depends = deadbeef-git
+	depends = deadbeef
 	source = ddb_discord_presence::git+https://github.com/kuba160/ddb_discord_presence
 	source = ddb_discord_presence-makefile.patch
 	sha256sums = SKIP
-	sha256sums = 967ae7feb4416b196db7a1e4b32cff779c6d96e4a6009a85e41d160486681d34
+	sha256sums = 2c234522f8854be7ca7222b4929b88259dda8638a62efe377985889bce5d4e84
 
 pkgname = deadbeef-plugin-discord-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e0da8917e657..11341d9443f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,18 @@
 
 _pkgname=ddb_discord_presence
 pkgname=deadbeef-plugin-discord-git
-pkgver=r24.g07beb73
+pkgver=r26.g70c06e1
 pkgrel=1
 pkgdesc="DeaDBeeF Discord rich presence plugin"
 arch=('i686' 'x86_64')
 url="https://github.com/kuba160/ddb_discord_presence"
 license=('BSD')
-depends=('deadbeef-git')
+depends=('deadbeef')
 makedepends=('git')
 source=("${_pkgname}::git+https://github.com/kuba160/${_pkgname}"
         "${_pkgname}-makefile.patch")
 sha256sums=('SKIP'
-            '967ae7feb4416b196db7a1e4b32cff779c6d96e4a6009a85e41d160486681d34')
+            '2c234522f8854be7ca7222b4929b88259dda8638a62efe377985889bce5d4e84')
 
 pkgver() {
   cd "${_pkgname}"
@@ -31,10 +31,12 @@ prepare() {
   patch -p1 -i ../${_pkgname}-makefile.patch
 
   make submodules_load
+  make discord-rpc-patch
 }
 
 build() {
   cd "${_pkgname}"
+  ( cd discord-rpc ; make thirdparty/rapidjson-1.1.0 )
   make COPT="${CFLAGS}" CXXOPT="${CXXFLAGS}"
 }
 
diff --git a/ddb_discord_presence-makefile.patch b/ddb_discord_presence-makefile.patch
index b7cb9acb5444..4ab6ceb2fa86 100644
--- a/ddb_discord_presence-makefile.patch
+++ b/ddb_discord_presence-makefile.patch
@@ -1,14 +1,14 @@
 diff -u -r -N ddb_discord_presence/Makefile ddb_discord_presence-makefile/Makefile
---- ddb_discord_presence/Makefile	2019-08-20 20:57:06.817705453 +0200
-+++ ddb_discord_presence-makefile/Makefile	2019-08-20 20:58:36.464785836 +0200
+--- ddb_discord_presence/Makefile	2020-01-15 09:47:59.792849482 +0100
++++ ddb_discord_presence-makefile/Makefile	2020-01-15 09:49:29.572231291 +0100
 @@ -14,8 +14,8 @@
  CC=gcc
  CXX=g++
  STD=gnu99
--CFLAGS+=-fPIC -I /usr/local/include -I discord-rpc/include -Wall
--CXXFLAGS+=-fPIC -I /usr/local/include -Wall
-+CFLAGS+=$(COPT) -fPIC -I /usr/local/include -I discord-rpc/include -Wall
-+CXXFLAGS+=$(CXXOPT) -fPIC -I /usr/local/include -Wall
+-CFLAGS+=-fPIC -I /usr/local/include -I discord-rpc/include -I . -Wall
+-CXXFLAGS+=-fPIC -I /usr/local/include -I . -Wall
++CFLAGS+=$(COPT) -fPIC -I /usr/local/include -I discord-rpc/include -I . -Wall
++CXXFLAGS+=$(CXXOPT) -fPIC -I /usr/local/include -I . -Wall
  ifeq ($(UNAME_S),Darwin)
      CFLAGS+=-I $(DEADBEEF_OSX)/Contents/Headers
      CXXFLAGS+=-I $(DEADBEEF_OSX)/Contents/Headers