Skip to content

Commit

Permalink
multimedia/gstreamer1-plugins-zxing: Create a port.
Browse files Browse the repository at this point in the history
PR:		269383

Reviewed by: tcberner

Differential Revision: https://reviews.freebsd.org/D38442

(cherry picked from commit 9619693)
  • Loading branch information
arrowd committed Feb 10, 2023
1 parent 8174fbc commit dc3e6eb
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Mk/Uses/gstreamer.mk
Expand Up @@ -51,7 +51,8 @@ _GST1_PLUGINS_graphics= aalib cairo gdkpixbuf gl jpeg kms libcaca libvisual \
_GST1_PLUGINS_multimedia= aom assrender bad dash dts dv dvdread \
editing-services gnonlin good hls libav libde265 \
mpeg2dec mpeg2enc mplex mm openh264 resindvd rtmp \
smoothstreaming theora ttml ugly v4l2 vpx x264 x265
smoothstreaming theora ttml ugly v4l2 vpx x264 x265 \
zxing
_GST1_PLUGINS_net= srtp
_GST1_PLUGINS_security= dtls
_GST1_PLUGINS_sysutils= cdio
Expand Down Expand Up @@ -360,6 +361,9 @@ gst-x264_IMPL= ugly
gst-x265_PORT= multimedia/gstreamer${_GST_VER}-plugins-x265
gst-x265_IMPL= bad

gst-zxing_PORT= textproc/gstreamer${_GST_VER}-plugins-zxing
gst-zxing_IMPL= bad

#==== Net Plugins Section

gst-srtp_PORT= net/gstreamer${_GST_VER}-plugins-srtp
Expand Down
@@ -0,0 +1,20 @@
--- ext/zxing/gstzxing.cpp.orig 2022-12-19 23:34:46 UTC
+++ ext/zxing/gstzxing.cpp
@@ -368,7 +368,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter
auto result = ReadBarcode ({(unsigned char *)data, width, height, zxing->image_format}, hints);
if (result.isValid ()) {
GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s",
- TextUtfEncoding::ToUtf8 (result.text ()).c_str (),
+ result.text ().c_str (),
ToString (result.format ()));
} else {
goto out;
@@ -396,7 +396,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter
"running-time", G_TYPE_UINT64, running_time,
"type", G_TYPE_STRING, ToString (result.format ()),
"symbol", G_TYPE_STRING,
- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), NULL);
+ result.text ().c_str (), NULL);

if (zxing->attach_frame) {
/* create a sample from image */
@@ -0,0 +1,22 @@
--- ext/zxing/meson.build.orig 2022-12-19 23:34:46 UTC
+++ ext/zxing/meson.build
@@ -2,16 +2,17 @@ zxing_sources = [
'gstzxing.cpp',
'gstzxingplugin.c',
]
-zxing_dep = dependency('zxing', version : '>= 1.1.1', required : get_option('zxing'))
+zxing_dep = dependency('zxing', version : '>= 1.4.0', required : get_option('zxing'))
if zxing_dep.found()
gstzxing = library('gstzxing',
zxing_sources,
c_args : gst_plugins_bad_args,
+ cpp_args: '-DZX_USE_UTF8',
include_directories : [configinc],
dependencies : [gstvideo_dep, zxing_dep],
install : true,
install_dir : plugins_install_dir,
- override_options : ['cpp_std=c++11'],
+ override_options : ['cpp_std=c++17'],
)
pkgconfig.generate(gstzxing, install_dir : plugins_pkgconfig_install_dir)
plugins += [gstzxing]
3 changes: 2 additions & 1 deletion multimedia/gstreamer1-plugins/Makefile.common
Expand Up @@ -209,7 +209,8 @@ BAD_GST_ALL_PLUGINS+= \
winscreencap \
x265 \
y4m \
zbar
zbar \
zxing

BAD_GST_ENABLED_PLUGINS?=

Expand Down
1 change: 1 addition & 0 deletions textproc/Makefile
Expand Up @@ -251,6 +251,7 @@
SUBDIR += groonga
SUBDIR += gsed
SUBDIR += gspell
SUBDIR += gstreamer1-plugins-zxing
SUBDIR += gtk-doc
SUBDIR += gtkspell
SUBDIR += gtkspell3
Expand Down
17 changes: 17 additions & 0 deletions textproc/gstreamer1-plugins-zxing/Makefile
@@ -0,0 +1,17 @@
PORTREVISION= 0
CATEGORIES= textproc multimedia

COMMENT= GStreamer plugin for QR recognition

LIB_DEPENDS= libZXing.so:textproc/zxing-cpp

USES+= compiler:c++17-lang

GST_PLUGIN= zxing
DIST= bad

MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins

PLIST= ${.CURDIR}/pkg-plist

.include "${MASTERDIR}/Makefile"
5 changes: 5 additions & 0 deletions textproc/gstreamer1-plugins-zxing/distinfo
@@ -0,0 +1,5 @@
TIMESTAMP = 1675876341
SHA256 (gst-plugins-bad-1.20.5.tar.xz) = f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363
SIZE (gst-plugins-bad-1.20.5.tar.xz) = 6237720
SHA256 (7cfc3130a7906c199861d2ef331a07d749a4b769.patch) = 4e30a1899652d46e20ca54cd463f8d41cbd80efd0c686698285e06e01a615fd7
SIZE (7cfc3130a7906c199861d2ef331a07d749a4b769.patch) = 2574
1 change: 1 addition & 0 deletions textproc/gstreamer1-plugins-zxing/pkg-plist
@@ -0,0 +1 @@
lib/gstreamer-%%VERSION%%/libgstzxing.so

0 comments on commit dc3e6eb

Please sign in to comment.