[PR PATCH] Bump Droidcamp to 2.1.3

[PR PATCH] Bump Droidcamp to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

There is a new pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

Bump Droidcamp to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 3507 bytes --]

From 599cabf8a042936f0f7e2922d2a3eac4304be53a Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH] 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 <gtk/gtk.h>
+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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+#include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
- 
+-#endif
+
+#include <X11/Xlib.h>
+#include <stdint.h>
\ 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <gphilliops@zerotrustzerotouch.com>"
 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

Re: [PR PATCH] [Updated] Bump Droidcamp to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 577 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

Bump Droidcamp to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 6743 bytes --]

From 599cabf8a042936f0f7e2922d2a3eac4304be53a Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
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 <gtk/gtk.h>
+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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+#include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
- 
+-#endif
+
+#include <X11/Xlib.h>
+#include <stdint.h>
\ 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <gphilliops@zerotrustzerotouch.com>"
 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 <GPhillips@ZeroTrustZeroTouch.com>
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 <gtk/gtk.h>
+  */
+ 
+ #include <gtk/gtk.h>
 -#ifdef USE_AYATANA_APPINDICATOR
-#include <libayatana-appindicator/app-indicator.h>
+ #include <libayatana-appindicator/app-indicator.h>
 -#else
 -#include <libappindicator/app-indicator.h>
 -#endif
-
-#include <X11/Xlib.h>
-#include <stdint.h>
\ No newline at end of file
+ 
+ #include <X11/Xlib.h>
+ #include <stdint.h>
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 <gphilliops@zerotrustzerotouch.com>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

Re: [PR PATCH] [Updated] droidcam: update to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

droidcam: update to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 7868 bytes --]

From 599cabf8a042936f0f7e2922d2a3eac4304be53a Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH 1/3] 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 <gtk/gtk.h>
+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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+#include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
- 
+-#endif
+
+#include <X11/Xlib.h>
+#include <stdint.h>
\ 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <gphilliops@zerotrustzerotouch.com>"
 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 <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 16:02:57 -0700
Subject: [PATCH 2/3] 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 <gtk/gtk.h>
+  */
+ 
+ #include <gtk/gtk.h>
 -#ifdef USE_AYATANA_APPINDICATOR
-#include <libayatana-appindicator/app-indicator.h>
+ #include <libayatana-appindicator/app-indicator.h>
 -#else
 -#include <libappindicator/app-indicator.h>
 -#endif
-
-#include <X11/Xlib.h>
-#include <stdint.h>
\ No newline at end of file
+ 
+ #include <X11/Xlib.h>
+ #include <stdint.h>
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 <gphilliops@zerotrustzerotouch.com>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

From 3ead19f36359217cfc4b67ab04ee196b02dc1a41 Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 16:54:44 -0700
Subject: [PATCH 3/3] Bump Droidcamp to 2.1.3

Fix copy-paste white space error

Fix doubled lines
---
 srcpkgs/droidcam/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 024a57c36cdf4b..b9bf5979a994bf 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -2,8 +2,6 @@
 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"
@@ -17,7 +15,6 @@ 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

Re: [PR PATCH] [Updated] droidcam: update to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

droidcam: update to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 7895 bytes --]

From 599cabf8a042936f0f7e2922d2a3eac4304be53a Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH 1/3] 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 <gtk/gtk.h>
+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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+#include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
- 
+-#endif
+
+#include <X11/Xlib.h>
+#include <stdint.h>
\ 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <gphilliops@zerotrustzerotouch.com>"
 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 <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 16:02:57 -0700
Subject: [PATCH 2/3] 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 <gtk/gtk.h>
+  */
+ 
+ #include <gtk/gtk.h>
 -#ifdef USE_AYATANA_APPINDICATOR
-#include <libayatana-appindicator/app-indicator.h>
+ #include <libayatana-appindicator/app-indicator.h>
 -#else
 -#include <libappindicator/app-indicator.h>
 -#endif
-
-#include <X11/Xlib.h>
-#include <stdint.h>
\ No newline at end of file
+ 
+ #include <X11/Xlib.h>
+ #include <stdint.h>
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 <gphilliops@zerotrustzerotouch.com>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

From e9eea9e189687f473f3ed185d439a9c97bd2c904 Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 16:54:44 -0700
Subject: [PATCH 3/3] Bump Droidcamp to 2.1.3

Fix copy-paste white space error

Fix doubled lines

droidcam: update to 2.1.3
---
 srcpkgs/droidcam/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 024a57c36cdf4b..b9bf5979a994bf 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -2,8 +2,6 @@
 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"
@@ -17,7 +15,6 @@ 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

Re: [PR PATCH] [Updated] droidcam: update to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

droidcam: update to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 3498 bytes --]

From 29ba023e07e94d25fa8c1c58af2726300f48a129 Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH] Bump Droidcamp to 2.1.3

Bump Droidcamp to 2.1.3

Fix copy-paste white space error

Bump Droidcamp to 2.1.3

Fix copy-paste white space error

Fix doubled lines

droidcam: update to 2.1.3
---
 .../patches/use-ayatana-appindicator.patch    | 39 ++++++++++---------
 srcpkgs/droidcam/template                     |  8 ++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..8660cffcdc08b6 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
+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 --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 @@
+ 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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+ #include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
+-#endif
+ 
  #include <X11/Xlib.h>
  #include <stdint.h>
- 
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..b9bf5979a994bf 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

Re: [PR PATCH] [Updated] droidcam: update to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

droidcam: update to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 3335 bytes --]

From 90ee774f3e08cdac35e57713baf97ba4b8fc8683 Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH] Bump Droidcamp to 2.1.3

---
 .../patches/use-ayatana-appindicator.patch    | 39 ++++++++++---------
 srcpkgs/droidcam/template                     |  8 ++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..8660cffcdc08b6 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
+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 --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 @@
+ 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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+ #include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
+-#endif
+ 
  #include <X11/Xlib.h>
  #include <stdint.h>
- 
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..b9bf5979a994bf 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

Re: [PR PATCH] [Updated] droidcam: update to 2.1.3

[ZeroTrustZeroTouch]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

There is an updated pull request by ZeroTrustZeroTouch against master on the void-packages repository

https://github.com/ZeroTrustZeroTouch/void-packages master
https://github.com/void-linux/void-packages/pull/50238

droidcam: update to 2.1.3

#### Testing the changes
- I tested the changes in this PR: YES

#### Local build testing
- I built this PR locally for my native architecture, (AMD64)


Simple bump and small change to the patch file to sync with up-stream's changes.

A patch file from https://github.com/void-linux/void-packages/pull/50238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-50238.patch --]
[-- Type: text/x-diff, Size: 3337 bytes --]

From f4a00b3aff1e1c41cb4d5ed30507f061f791a63b Mon Sep 17 00:00:00 2001
From: Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>
Date: Tue, 7 May 2024 15:02:50 -0700
Subject: [PATCH] droidcam: update to 2.1.3

---
 .../patches/use-ayatana-appindicator.patch    | 39 ++++++++++---------
 srcpkgs/droidcam/template                     |  8 ++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..8660cffcdc08b6 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
+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 --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 @@
+ 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 <gtk/gtk.h>
+-#ifdef USE_AYATANA_APPINDICATOR
+ #include <libayatana-appindicator/app-indicator.h>
+-#else
 -#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
+-#endif
+ 
  #include <X11/Xlib.h>
  #include <stdint.h>
- 
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..b9bf5979a994bf 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 <ibrokemypie@bastardi.net>"
+maintainer="Glenn Phillips <GPhillips@ZeroTrustZeroTouch.com>"
 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

Re: [PR REVIEW] droidcam: update to 2.1.3

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50238#discussion_r1642105677

Comment:
revert this line please