* [PR PATCH] change: update droidcamb to v2.1.3
@ 2024-05-13 4:58 ericktucto
2024-05-13 4:59 ` classabbyamp
` (12 more replies)
0 siblings, 13 replies; 19+ messages in thread
From: ericktucto @ 2024-05-13 4:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
There is a new pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
change: update droidcamb to v2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 3277 bytes --]
From 3344db7065b4c8de715116cc70d3ff4c8c8a6430 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Sun, 12 May 2024 23:53:51 -0500
Subject: [PATCH] change: update droidcamb to v2.1.3
---
.../patches/use-ayatana-appindicator.patch | 27 +++----------------
srcpkgs/droidcam/template | 10 ++++---
2 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..f3ceb0ee7e1676 100644
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -1,26 +1,7 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..b7f16c4 100644
+index fbf9f4e..bb7c86a 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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
+@@ -23 +23 @@ JPEG = `pkg-config --libs --cflags libturbojpeg`
+-USBMUXD = `pkg-config --libs --cflags libusbmuxd`
++USBMUXD ?= `pkg-config --libs --cflags libusbmuxd`
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..ffa13bfa1d2699 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# Template file for 'droidcam'
pkgname=droidcam
-version=1.8.2
+version=2.1.3
revision=2
build_style=gnu-makefile
-make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
libayatana-appindicator-devel"
-depends="v4l2loopback"
+depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
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
@@ -24,6 +25,7 @@ do_install() {
vbin droidcam
vbin droidcam-cli
vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+ vinstall icon2.png 644 opt droidcam-icon.png
vinstall droidcam.desktop 644 usr/share/applications
vdoc README.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: change: update droidcamb to v2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
@ 2024-05-13 4:59 ` classabbyamp
2024-05-13 15:09 ` ericktucto
` (11 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2024-05-13 4:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#issuecomment-2106657661
Comment:
commit message should be `droidcam: update to 2.1.3.`
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: change: update droidcamb to v2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
2024-05-13 4:59 ` classabbyamp
@ 2024-05-13 15:09 ` ericktucto
2024-05-13 16:50 ` [PR PATCH] [Updated] " ericktucto
` (10 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-05-13 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New comment by ericktucto on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#issuecomment-2107925325
Comment:
@classabbyamp okay, I'll change commit message
Why there is a error ? [link error](https://github.com/void-linux/void-packages/actions/runs/9057447220/job/24881481152)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] change: update droidcamb to v2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
2024-05-13 4:59 ` classabbyamp
2024-05-13 15:09 ` ericktucto
@ 2024-05-13 16:50 ` ericktucto
2024-05-18 16:23 ` [PR REVIEW] droidcam: update to 2.1.3 classabbyamp
` (9 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-05-13 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
change: update droidcamb to v2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 3332 bytes --]
From c3e8eb3c3930197f805a5862672ac6251fe72c10 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Mon, 13 May 2024 11:50:47 -0500
Subject: [PATCH] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 27 +++----------------
srcpkgs/droidcam/template | 14 +++++-----
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..f3ceb0ee7e1676 100644
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -1,26 +1,7 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..b7f16c4 100644
+index fbf9f4e..bb7c86a 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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
+@@ -23 +23 @@ JPEG = `pkg-config --libs --cflags libturbojpeg`
+-USBMUXD = `pkg-config --libs --cflags libusbmuxd`
++USBMUXD ?= `pkg-config --libs --cflags libusbmuxd`
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..f1ac9c7101211c 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
libayatana-appindicator-devel"
-depends="v4l2loopback"
+depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
+maintainer="Erick Tucto <erick@ericktucto.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
@@ -24,6 +25,7 @@ do_install() {
vbin droidcam
vbin droidcam-cli
vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+ vinstall icon2.png 644 opt droidcam-icon.png
vinstall droidcam.desktop 644 usr/share/applications
vdoc README.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (2 preceding siblings ...)
2024-05-13 16:50 ` [PR PATCH] [Updated] " ericktucto
@ 2024-05-18 16:23 ` classabbyamp
2024-05-19 0:22 ` [PR PATCH] [Updated] " ericktucto
` (8 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2024-05-18 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#discussion_r1605813700
Comment:
```suggestion
maintainer="Orphaned <orphan@voidlinux.org>"
```
while the current maintainer has not contributed in a while, we'd prefer adoptions only happen when the new maintainer has some history of contributions to void, to ensure the package gets the care it needs
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#adopting-a-template
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (3 preceding siblings ...)
2024-05-18 16:23 ` [PR REVIEW] droidcam: update to 2.1.3 classabbyamp
@ 2024-05-19 0:22 ` ericktucto
2024-05-19 0:22 ` [PR REVIEW] " ericktucto
` (7 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-05-19 0:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
droidcam: update to 2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 4282 bytes --]
From c3e8eb3c3930197f805a5862672ac6251fe72c10 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Mon, 13 May 2024 11:50:47 -0500
Subject: [PATCH 1/2] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 27 +++----------------
srcpkgs/droidcam/template | 14 +++++-----
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..f3ceb0ee7e1676 100644
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -1,26 +1,7 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..b7f16c4 100644
+index fbf9f4e..bb7c86a 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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
+@@ -23 +23 @@ JPEG = `pkg-config --libs --cflags libturbojpeg`
+-USBMUXD = `pkg-config --libs --cflags libusbmuxd`
++USBMUXD ?= `pkg-config --libs --cflags libusbmuxd`
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..f1ac9c7101211c 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
libayatana-appindicator-devel"
-depends="v4l2loopback"
+depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
+maintainer="Erick Tucto <erick@ericktucto.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
@@ -24,6 +25,7 @@ do_install() {
vbin droidcam
vbin droidcam-cli
vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+ vinstall icon2.png 644 opt droidcam-icon.png
vinstall droidcam.desktop 644 usr/share/applications
vdoc README.md
}
From d03c6dcb4ec5ea6c7b552fe544d7b6db9d13efa8 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Sat, 18 May 2024 19:22:39 -0500
Subject: [PATCH 2/2] droidcam: update maintainer
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index f1ac9c7101211c..ae3b6564f774d3 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -11,7 +11,7 @@ makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
libayatana-appindicator-devel"
depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="Erick Tucto <erick@ericktucto.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (4 preceding siblings ...)
2024-05-19 0:22 ` [PR PATCH] [Updated] " ericktucto
@ 2024-05-19 0:22 ` ericktucto
2024-06-04 16:07 ` [PR PATCH] [Updated] " ericktucto
` (6 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-05-19 0:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by ericktucto on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#discussion_r1605916368
Comment:
@classabbyamp I'm sorry, I'll change the maintainer
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (5 preceding siblings ...)
2024-05-19 0:22 ` [PR REVIEW] " ericktucto
@ 2024-06-04 16:07 ` ericktucto
2024-06-04 16:24 ` ericktucto
` (5 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-06-04 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
droidcam: update to 2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 4282 bytes --]
From c3e8eb3c3930197f805a5862672ac6251fe72c10 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Mon, 13 May 2024 11:50:47 -0500
Subject: [PATCH 1/2] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 27 +++----------------
srcpkgs/droidcam/template | 14 +++++-----
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
index 32ab453771521e..f3ceb0ee7e1676 100644
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
@@ -1,26 +1,7 @@
diff --git a/Makefile b/Makefile
-index 7be3c15..b7f16c4 100644
+index fbf9f4e..bb7c86a 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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
+@@ -23 +23 @@ JPEG = `pkg-config --libs --cflags libturbojpeg`
+-USBMUXD = `pkg-config --libs --cflags libusbmuxd`
++USBMUXD ?= `pkg-config --libs --cflags libusbmuxd`
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..f1ac9c7101211c 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
libayatana-appindicator-devel"
-depends="v4l2loopback"
+depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
+maintainer="Erick Tucto <erick@ericktucto.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
@@ -24,6 +25,7 @@ do_install() {
vbin droidcam
vbin droidcam-cli
vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+ vinstall icon2.png 644 opt droidcam-icon.png
vinstall droidcam.desktop 644 usr/share/applications
vdoc README.md
}
From d03c6dcb4ec5ea6c7b552fe544d7b6db9d13efa8 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Sat, 18 May 2024 19:22:39 -0500
Subject: [PATCH 2/2] droidcam: update maintainer
---
srcpkgs/droidcam/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index f1ac9c7101211c..ae3b6564f774d3 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -11,7 +11,7 @@ makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
libayatana-appindicator-devel"
depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="Erick Tucto <erick@ericktucto.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.dev47apps.com/"
distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (6 preceding siblings ...)
2024-06-04 16:07 ` [PR PATCH] [Updated] " ericktucto
@ 2024-06-04 16:24 ` ericktucto
2024-06-04 16:32 ` [PR REVIEW] " ericktucto
` (4 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-06-04 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
droidcam: update to 2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 3172 bytes --]
From dfb82b11bdca2eb0db20260239e18f7ec86d2d98 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Tue, 4 Jun 2024 11:24:15 -0500
Subject: [PATCH] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 26 -------------------
srcpkgs/droidcam/template | 14 +++++-----
2 files changed, 8 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
deleted file mode 100644
index 32ab453771521e..00000000000000
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..ae3b6564f774d3 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-devel
libayatana-appindicator-devel"
-depends="v4l2loopback"
+depends="v4l2loopback linux-headers gcc make"
short_desc="Tool for using your android device as a wireless/usb webcam"
-maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
+maintainer="Orphaned <orphan@voidlinux.org>"
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
@@ -24,6 +25,7 @@ do_install() {
vbin droidcam
vbin droidcam-cli
vinstall icon2.png 644 usr/share/pixmaps droidcam-icon.png
+ vinstall icon2.png 644 opt droidcam-icon.png
vinstall droidcam.desktop 644 usr/share/applications
vdoc README.md
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (7 preceding siblings ...)
2024-06-04 16:24 ` ericktucto
@ 2024-06-04 16:32 ` ericktucto
2024-06-09 16:51 ` classabbyamp
` (3 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-06-04 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by ericktucto on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#discussion_r1626307565
Comment:
@classabbyamp I changed the maintainer
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (8 preceding siblings ...)
2024-06-04 16:32 ` [PR REVIEW] " ericktucto
@ 2024-06-09 16:51 ` classabbyamp
2024-06-16 22:32 ` classabbyamp
` (2 subsequent siblings)
12 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2024-06-09 16:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#discussion_r1632351494
Comment:
why are these dependencies added?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (9 preceding siblings ...)
2024-06-09 16:51 ` classabbyamp
@ 2024-06-16 22:32 ` classabbyamp
2024-06-17 21:02 ` [PR PATCH] [Updated] " ericktucto
2024-06-18 16:47 ` ericktucto
12 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2024-06-16 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/50303#discussion_r1641998624
Comment:
what's the point of this?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (10 preceding siblings ...)
2024-06-16 22:32 ` classabbyamp
@ 2024-06-17 21:02 ` ericktucto
2024-06-18 16:47 ` ericktucto
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-06-17 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
droidcam: update to 2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 2872 bytes --]
From 9d6cc49e60c8d561c9d120869d3b61626e4d6d09 Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Mon, 17 Jun 2024 16:01:55 -0500
Subject: [PATCH] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 26 -------------------
srcpkgs/droidcam/template | 11 ++++----
2 files changed, 6 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
deleted file mode 100644
index 32ab453771521e..00000000000000
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..a170ddbdae8b78 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-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="Orphaned <orphan@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
` (11 preceding siblings ...)
2024-06-17 21:02 ` [PR PATCH] [Updated] " ericktucto
@ 2024-06-18 16:47 ` ericktucto
12 siblings, 0 replies; 19+ messages in thread
From: ericktucto @ 2024-06-18 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
There is an updated pull request by ericktucto against master on the void-packages repository
https://github.com/ericktucto/void-packages update-droidcam
https://github.com/void-linux/void-packages/pull/50303
droidcam: update to 2.1.3
This changes are to update version of Droidcam
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my virtual maquine
- x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/50303.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-droidcam-50303.patch --]
[-- Type: text/x-diff, Size: 2872 bytes --]
From 000467377614b302ea5557a5cf72caf1998b9d9d Mon Sep 17 00:00:00 2001
From: Erick Tucto <erick@ericktucto.com>
Date: Tue, 18 Jun 2024 11:47:31 -0500
Subject: [PATCH] droidcam: update to 2.1.3
---
.../patches/use-ayatana-appindicator.patch | 26 -------------------
srcpkgs/droidcam/template | 11 ++++----
2 files changed, 6 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
diff --git a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch b/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
deleted file mode 100644
index 32ab453771521e..00000000000000
--- a/srcpkgs/droidcam/patches/use-ayatana-appindicator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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>
--#include <libappindicator/app-indicator.h>
-+#include <libayatana-appindicator/app-indicator.h>
- #include <X11/Xlib.h>
- #include <stdint.h>
-
diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1c3f1b8b1fc676..a170ddbdae8b78 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,20 +1,21 @@
# 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"
+make_use_env=true
+make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1"
hostmakedepends="pkg-config"
makedepends="pkg-config libjpeg-turbo-devel ffmpeg-devel alsa-lib-devel
speex-devel libusbmuxd-devel libplist-devel gtk+3-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="Orphaned <orphan@voidlinux.org>"
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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
` (3 preceding siblings ...)
2024-05-08 17:56 ` ZeroTrustZeroTouch
@ 2024-05-08 18:00 ` ZeroTrustZeroTouch
4 siblings, 0 replies; 19+ messages in thread
From: ZeroTrustZeroTouch @ 2024-05-08 18:00 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
` (2 preceding siblings ...)
2024-05-08 17:55 ` ZeroTrustZeroTouch
@ 2024-05-08 17:56 ` ZeroTrustZeroTouch
2024-05-08 18:00 ` ZeroTrustZeroTouch
4 siblings, 0 replies; 19+ messages in thread
From: ZeroTrustZeroTouch @ 2024-05-08 17:56 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
2024-05-07 23:54 ` [PR PATCH] [Updated] droidcam: update " ZeroTrustZeroTouch
2024-05-08 17:33 ` ZeroTrustZeroTouch
@ 2024-05-08 17:55 ` ZeroTrustZeroTouch
2024-05-08 17:56 ` ZeroTrustZeroTouch
2024-05-08 18:00 ` ZeroTrustZeroTouch
4 siblings, 0 replies; 19+ messages in thread
From: ZeroTrustZeroTouch @ 2024-05-08 17:55 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
2024-05-07 23:54 ` [PR PATCH] [Updated] droidcam: update " ZeroTrustZeroTouch
@ 2024-05-08 17:33 ` ZeroTrustZeroTouch
2024-05-08 17:55 ` ZeroTrustZeroTouch
` (2 subsequent siblings)
4 siblings, 0 replies; 19+ messages in thread
From: ZeroTrustZeroTouch @ 2024-05-08 17:33 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
@ 2024-05-07 23:54 ` ZeroTrustZeroTouch
2024-05-08 17:33 ` ZeroTrustZeroTouch
` (3 subsequent siblings)
4 siblings, 0 replies; 19+ messages in thread
From: ZeroTrustZeroTouch @ 2024-05-07 23:54 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-06-18 16:47 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
2024-05-13 4:59 ` classabbyamp
2024-05-13 15:09 ` ericktucto
2024-05-13 16:50 ` [PR PATCH] [Updated] " ericktucto
2024-05-18 16:23 ` [PR REVIEW] droidcam: update to 2.1.3 classabbyamp
2024-05-19 0:22 ` [PR PATCH] [Updated] " ericktucto
2024-05-19 0:22 ` [PR REVIEW] " ericktucto
2024-06-04 16:07 ` [PR PATCH] [Updated] " ericktucto
2024-06-04 16:24 ` ericktucto
2024-06-04 16:32 ` [PR REVIEW] " ericktucto
2024-06-09 16:51 ` classabbyamp
2024-06-16 22:32 ` classabbyamp
2024-06-17 21:02 ` [PR PATCH] [Updated] " ericktucto
2024-06-18 16:47 ` ericktucto
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
2024-05-07 23:54 ` [PR PATCH] [Updated] droidcam: update " ZeroTrustZeroTouch
2024-05-08 17:33 ` ZeroTrustZeroTouch
2024-05-08 17:55 ` ZeroTrustZeroTouch
2024-05-08 17:56 ` ZeroTrustZeroTouch
2024-05-08 18:00 ` ZeroTrustZeroTouch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).