openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update fswebcam in -current to 20200725

Browse Source
This commit is contained in:
sthen
2020-10-19 17:07:26 +00:00
parent 39164c6bfe
commit 7562325c6d
5 changed files with 2192 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/fswebcam/Makefile
+2 -3
View File
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2020/10/19 16:59:00 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2020/10/19 17:07:26 sthen Exp $
COMMENT= fswebcam is a small and simple webcam app
DISTNAME= fswebcam-20140113
REVISION= 3
DISTNAME= fswebcam-20200725
CATEGORIES= graphics
graphics/fswebcam/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (fswebcam-20140113.tar.gz) = PuOJ9yp3N3ANIuDJVHILHju63IoNqtZCbCVIm6ncMZk=
SIZE (fswebcam-20140113.tar.gz) = 113226
SHA256 (fswebcam-20200725.tar.gz) = MZppJlB8tS2lBDpc6upsxblJ06yqXzn+B0MnrljWX7U=
SIZE (fswebcam-20200725.tar.gz) = 122110
graphics/fswebcam/patches/patch-fswebcam_c
-25
View File
@@ -1,25 +0,0 @@
$OpenBSD: patch-fswebcam_c,v 1.3 2020/10/19 16:59:00 sthen Exp $
From d5c708782bb947c9a610e413b4c7383dc10c388c Mon Sep 17 00:00:00 2001
From: Ashley Dixon <ash@suugaku.co.uk>
Date: Tue, 21 Jul 2020 02:33:50 +0100
Subject: [PATCH] Fixed usage of gdImageStringFT.
Since libgd 2.3.0, gdImageStringFT does not return NULL for an empty
string, thus convincing fswebcam that the font cannot be found and the
banner must be disabled.
https://github.com/libgd/libgd/issues/615
Index: fswebcam.c
--- fswebcam.c.orig
+++ fswebcam.c
@@ -467,7 +467,7 @@ int fswc_output(fswebcam_config_t *config, char *name,
char *err;
/* Check if drawing text works */
- err = gdImageStringFT(NULL, NULL, 0, config->font, config->fontsize, 0.0, 0, 0, "");
+ err = gdImageStringFT(NULL, NULL, 0, config->font, config->fontsize, 0.0, 0, 0, "A");
if(!err) fswc_draw_banner(config, im);
else
graphics/fswebcam/patches/patch-src_v4l2_c
+26
View File
@@ -0,0 +1,26 @@
$OpenBSD: patch-src_v4l2_c,v 1.1 2020/10/19 17:07:26 sthen Exp $
make these conditional, they're not in older videodev.h
Index: src_v4l2.c
--- src_v4l2.c.orig
+++ src_v4l2.c
@@ -61,14 +61,18 @@ v4l2_palette_t v4l2_palette[] = {
{ SRC_PAL_BGR24, V4L2_PIX_FMT_BGR24 },
{ SRC_PAL_RGB32, V4L2_PIX_FMT_RGB32 },
{ SRC_PAL_BGR32, V4L2_PIX_FMT_BGR32 },
+#ifdef V4L2_PIX_FMT_ABGR32
{ SRC_PAL_ABGR32, V4L2_PIX_FMT_ABGR32 },
+#endif
{ SRC_PAL_YUYV, V4L2_PIX_FMT_YUYV },
{ SRC_PAL_UYVY, V4L2_PIX_FMT_UYVY },
{ SRC_PAL_VYUY, V4L2_PIX_FMT_VYUY },
{ SRC_PAL_YUV420P, V4L2_PIX_FMT_YUV420 },
{ SRC_PAL_BAYER, V4L2_PIX_FMT_SBGGR8 },
{ SRC_PAL_SBGGR8, V4L2_PIX_FMT_SBGGR8 },
+#ifdef V4L2_PIX_FMT_SRGGB8
{ SRC_PAL_SRGGB8, V4L2_PIX_FMT_SRGGB8 },
+#endif
{ SRC_PAL_SGBRG8, V4L2_PIX_FMT_SGBRG8 },
{ SRC_PAL_SGRBG8, V4L2_PIX_FMT_SGRBG8 },
{ SRC_PAL_RGB565, V4L2_PIX_FMT_RGB565 },
graphics/fswebcam/patches/patch-videodev2_h
+2162 -97
View File
File diff suppressed because it is too large Load Diff