Date: Fri, 10 Feb 2023 19:15:21 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: dc3e6eb04eb0 - 2023Q1 - multimedia/gstreamer1-plugins-zxing: Create a port. Message-ID: <202302101915.31AJFLrF030968@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc3e6eb04eb022e746cab3c2763c2315b89191e6 commit dc3e6eb04eb022e746cab3c2763c2315b89191e6 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-02-08 17:30:47 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-02-10 19:14:47 +0000 multimedia/gstreamer1-plugins-zxing: Create a port. PR: 269383 Reviewed by: tcberner Differential Revision: https://reviews.freebsd.org/D38442 (cherry picked from commit 96196935d8d716a55ccbc74a65cf72fa86d8fd16) --- Mk/Uses/gstreamer.mk | 6 +++++- .../files/patch-ext_zxing_gstzxing.cpp | 20 ++++++++++++++++++++ .../files/patch-ext_zxing_meson.build | 22 ++++++++++++++++++++++ multimedia/gstreamer1-plugins/Makefile.common | 3 ++- textproc/Makefile | 1 + textproc/gstreamer1-plugins-zxing/Makefile | 17 +++++++++++++++++ textproc/gstreamer1-plugins-zxing/distinfo | 5 +++++ textproc/gstreamer1-plugins-zxing/pkg-plist | 1 + 8 files changed, 73 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index e6ab8c830b6f..6a4bfa6fa9d7 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -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 @@ -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 diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_gstzxing.cpp b/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_gstzxing.cpp new file mode 100644 index 000000000000..c570aa80b459 --- /dev/null +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_gstzxing.cpp @@ -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 */ diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_meson.build new file mode 100644 index 000000000000..7f16ede50110 --- /dev/null +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_meson.build @@ -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] diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 136da5652397..ee45e739cab3 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -209,7 +209,8 @@ BAD_GST_ALL_PLUGINS+= \ winscreencap \ x265 \ y4m \ - zbar + zbar \ + zxing BAD_GST_ENABLED_PLUGINS?= diff --git a/textproc/Makefile b/textproc/Makefile index 24dc57dc25bc..4d2e1f61062e 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -251,6 +251,7 @@ SUBDIR += groonga SUBDIR += gsed SUBDIR += gspell + SUBDIR += gstreamer1-plugins-zxing SUBDIR += gtk-doc SUBDIR += gtkspell SUBDIR += gtkspell3 diff --git a/textproc/gstreamer1-plugins-zxing/Makefile b/textproc/gstreamer1-plugins-zxing/Makefile new file mode 100644 index 000000000000..05678c9988c7 --- /dev/null +++ b/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" diff --git a/textproc/gstreamer1-plugins-zxing/distinfo b/textproc/gstreamer1-plugins-zxing/distinfo new file mode 100644 index 000000000000..8d8296c88b34 --- /dev/null +++ b/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 diff --git a/textproc/gstreamer1-plugins-zxing/pkg-plist b/textproc/gstreamer1-plugins-zxing/pkg-plist new file mode 100644 index 000000000000..f527fa9ba64b --- /dev/null +++ b/textproc/gstreamer1-plugins-zxing/pkg-plist @@ -0,0 +1 @@ +lib/gstreamer-%%VERSION%%/libgstzxing.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302101915.31AJFLrF030968>