From 77b18d1f93ef18ad416c06d9c8c3cb2f43d9ea39 Mon Sep 17 00:00:00 2001 From: Oleksiy Yakovenko Date: Thu, 21 Nov 2024 18:19:18 +0100 Subject: [PATCH] update ddb_discord_presence; add git submodule fetching support --- build | 3 +++ plugins/ddb_discord_presence/make.diff | 24 ---------------------- plugins/ddb_discord_presence/manifest.json | 4 +--- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 plugins/ddb_discord_presence/make.diff diff --git a/build b/build index eab8c20..69f947c 100755 --- a/build +++ b/build @@ -256,6 +256,9 @@ for my $package (@packages) { else { $rev = `cd temp/$package && git rev-parse --short HEAD`; } + if ($manifest->{source}->{submodules}) { + system ("cd $ROOT && git submodule update --init") && die "git submodule update failed\n"; + } } elsif ($manifest->{source}->{type} eq 'hg') { system ("hg clone --config ui.tls=false $manifest->{source}->{url} $ROOT") && die "hg clone failed\n"; diff --git a/plugins/ddb_discord_presence/make.diff b/plugins/ddb_discord_presence/make.diff deleted file mode 100644 index c50f2b3..0000000 --- a/plugins/ddb_discord_presence/make.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Makefile b/Makefile -index 76da33f..629d066 100755 ---- a/Makefile -+++ b/Makefile -@@ -39,12 +39,12 @@ ARTWORK_OBJS=artwork/artwork_internal.o artwork/escape.o artwork/lastfm.o - all: submodules_load libdiscord-rpc.a discord_presence - - discord_presence: -- $(MAKE) -C artwork -+ CFLAGS="$(CFLAGS)" $(MAKE) -C artwork - $(CC) -std=$(STD) -c $(CFLAGS) -c $(PLUGNAME).c - $(CXX) -std=$(STD) -shared $(CXXFLAGS) -o $(PLUGNAME).$(SUFFIX) $(PLUGNAME).o $(ARTWORK_OBJS) $(LIBS) $(CXX_LDFLAGS) $(LDFLAGS) - - libdiscord-rpc.a: discord-rpc-patch -- cd discord-rpc && $(MAKE) -+ cd discord-rpc && CFLAGS="$(CFLAGS)" $(MAKE) - cp discord-rpc/src/libdiscord-rpc.a . - - submodules_load: -@@ -71,3 +71,4 @@ install: - clean: discord-rpc-patch-reverse - cd discord-rpc && git clean -df && git reset --hard - rm -fv $(PLUGNAME).o $(PLUGNAME).$(SUFFIX) -+ rm artwork/*.o diff --git a/plugins/ddb_discord_presence/manifest.json b/plugins/ddb_discord_presence/manifest.json index 7e813dd..50987c6 100644 --- a/plugins/ddb_discord_presence/manifest.json +++ b/plugins/ddb_discord_presence/manifest.json @@ -2,11 +2,9 @@ supported_platforms: ['linux','mac','windows'], source: { type: "git", + submodules: true, url: "https://github.com/kuba160/ddb_discord_presence.git", revision: "1.8", - patches: [ - "make.diff", - ] }, make: { type: "make",