From: ZeroTrustZeroTouch <ZeroTrustZeroTouch@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] droidcam: update to 2.1.3
Date: Wed, 08 May 2024 19:56:31 +0200 [thread overview]
Message-ID: <20240508175631.3DAE025E13@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50238@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2024-05-08 17:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 22:07 [PR PATCH] Bump Droidcamp " ZeroTrustZeroTouch
2024-05-07 23:10 ` [PR PATCH] [Updated] " 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 [this message]
2024-05-08 18:00 ` ZeroTrustZeroTouch
2024-06-17 3:30 ` [PR REVIEW] " classabbyamp
2024-06-26 3:46 ` [PR PATCH] [Closed]: " classabbyamp
2024-05-13 4:58 [PR PATCH] change: update droidcamb to v2.1.3 ericktucto
2024-05-19 0:22 ` [PR PATCH] [Updated] droidcam: update to 2.1.3 ericktucto
2024-06-04 16:07 ` ericktucto
2024-06-04 16:24 ` ericktucto
2024-06-17 21:02 ` ericktucto
2024-06-18 16:47 ` ericktucto
2024-06-26 1:57 ` ericktucto
2024-06-26 2:02 ` ericktucto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240508175631.3DAE025E13@inbox.vuxu.org \
--to=zerotrustzerotouch@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).