From 599cabf8a042936f0f7e2922d2a3eac4304be53a Mon Sep 17 00:00:00 2001 From: Glenn Phillips Date: Tue, 7 May 2024 15:02:50 -0700 Subject: [PATCH 1/2] Bump Droidcamp to 2.1.3 --- .../patches/use-ayatana-appindicator.patch | 51 ++++++++++--------- srcpkgs/droidcam/template | 8 +-- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch index 32ab453771521e..7c18af188ce8ce 100644 --- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch +++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch @@ -1,26 +1,27 @@ -diff --git a/Makefile b/Makefile -index 7be3c15..b7f16c4 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT` - CC = gcc - CFLAGS = -Wall -O2 - GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` --GTK += `pkg-config --cflags --libs appindicator3-0.1` -+GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1` - LIBAV = `pkg-config --libs --cflags libswscale libavutil` - LIBS = -lspeex -lasound -lpthread -lm - JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a -diff --git a/src/droidcam.c b/src/droidcam.c -index cad1ee4..28f4000 100644 ---- a/src/droidcam.c -+++ b/src/droidcam.c -@@ -7,7 +7,7 @@ - */ - - #include +diff -ru a/Makefile b/Makefile +--- a/Makefile 2024-05-07 11:35:07.033518288 -0700 ++++ b/Makefile 2024-05-07 11:36:29.228732440 -0700 +@@ -14,7 +14,7 @@ + +CC ?= gcc +CFLAGS ?= +-APPINDICATOR ?= appindicator3-0.1 ++APPINDICATOR ?= ayatana-appindicator3-0.1 + +GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` +GTK += `pkg-config --libs --cflags $(APPINDICATOR)` +diff -ru a/src/droidcam.c b/src/droidcam.c +--- a/src/droidcam.c 2024-05-07 11:51:14.240505923 -0700 ++++ b/src/droidcam.c 2024-05-07 11:51:46.902382940 -0700 +@@ -7,11 +7,7 @@ +*/ + +#include +-#ifdef USE_AYATANA_APPINDICATOR +#include +-#else -#include -+#include - #include - #include - +-#endif + +#include +#include \ No newline at end of file diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template index 1c3f1b8b1fc676..fe24127d243230 100644 --- a/srcpkgs/droidcam/template +++ b/srcpkgs/droidcam/template @@ -1,7 +1,7 @@ # Template file for 'droidcam' pkgname=droidcam -version=1.8.2 -revision=2 +version=2.1.3 +revision=1 build_style=gnu-makefile make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg" hostmakedepends="pkg-config" @@ -10,11 +10,11 @@ makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel libayatana-appindicator-devel" depends="v4l2loopback" short_desc="Tool for using your android device as a wireless/usb webcam" -maintainer="ibrokemypie " +maintainer="Glenn Phillips " license="GPL-2.0-or-later" homepage="https://www.dev47apps.com/" distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz" -checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662 +checksum=0eb46c1ef19bce817b78740600d5451d14f7b279ebfd4605993d81f96aad08db post_patch() { vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop From 995e56c3037f3bd1fd5b13e2b2d5b0417d5cf12a Mon Sep 17 00:00:00 2001 From: Glenn Phillips Date: Tue, 7 May 2024 16:02:57 -0700 Subject: [PATCH 2/2] Bump Droidcamp to 2.1.3 Fix copy-paste white space error --- .../patches/use-ayatana-appindicator.patch | 34 +++++++++---------- srcpkgs/droidcam/template | 5 ++- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch index 7c18af188ce8ce..8660cffcdc08b6 100644 --- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch +++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch @@ -1,27 +1,27 @@ diff -ru a/Makefile b/Makefile ---- a/Makefile 2024-05-07 11:35:07.033518288 -0700 -+++ b/Makefile 2024-05-07 11:36:29.228732440 -0700 +--- a/Makefile 2024-05-07 11:35:07.033518288 -0700 ++++ b/Makefile 2024-05-07 11:36:29.228732440 -0700 @@ -14,7 +14,7 @@ - -CC ?= gcc -CFLAGS ?= + + CC ?= gcc + CFLAGS ?= -APPINDICATOR ?= appindicator3-0.1 +APPINDICATOR ?= ayatana-appindicator3-0.1 - -GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` -GTK += `pkg-config --libs --cflags $(APPINDICATOR)` + + GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11` + GTK += `pkg-config --libs --cflags $(APPINDICATOR)` diff -ru a/src/droidcam.c b/src/droidcam.c ---- a/src/droidcam.c 2024-05-07 11:51:14.240505923 -0700 -+++ b/src/droidcam.c 2024-05-07 11:51:46.902382940 -0700 +--- a/src/droidcam.c 2024-05-07 11:51:14.240505923 -0700 ++++ b/src/droidcam.c 2024-05-07 11:51:46.902382940 -0700 @@ -7,11 +7,7 @@ -*/ - -#include + */ + + #include -#ifdef USE_AYATANA_APPINDICATOR -#include + #include -#else -#include -#endif - -#include -#include \ No newline at end of file + + #include + #include diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template index fe24127d243230..024a57c36cdf4b 100644 --- a/srcpkgs/droidcam/template +++ b/srcpkgs/droidcam/template @@ -2,6 +2,8 @@ pkgname=droidcam version=2.1.3 revision=1 +version=2.1.3 +revision=1 build_style=gnu-makefile make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg" hostmakedepends="pkg-config" @@ -10,11 +12,12 @@ makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel libayatana-appindicator-devel" depends="v4l2loopback" short_desc="Tool for using your android device as a wireless/usb webcam" -maintainer="Glenn Phillips " +maintainer="Glenn Phillips " license="GPL-2.0-or-later" homepage="https://www.dev47apps.com/" distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz" checksum=0eb46c1ef19bce817b78740600d5451d14f7b279ebfd4605993d81f96aad08db +checksum=0eb46c1ef19bce817b78740600d5451d14f7b279ebfd4605993d81f96aad08db post_patch() { vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop