From nobody Fri Feb 10 16:51:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PD09h2L9pz3pJ3W; Fri, 10 Feb 2023 16:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PD09g3mrCz4cBM; Fri, 10 Feb 2023 16:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676047863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNutdxAOu5l7NGHrylJlW0c8YHhwEEydtIVwkt/lFdc=; b=tB1qTsQyafJgdXCaHG7mZZVcC/IDKTHor9l5VEpq8f3Bxa5GPSvYsyL2LLahtPYtWftpPU suCqtfoOTV3RY86NXu8Kaxxzyd9SyVdAmURq86LBBw+EK+4ARzNs0UZUQ7cuRCySK3PTT/ zlIgprXhhYRnwFAFhWHQ6UYeVIW3xuoPLRhCtygaCQ+yE43I3TBkqxRVqEdfUuGRg1AqiV 96UZiVgE3dfz2d5mvSUm1qgy3voEsZUFmpUokR1CJQpgjXEgZ7jVfdvXqlMbsPiNy4wHQg f4zTCQrnd5GcaAY+L60+Y7dqbTERjCiqu5apiDbvUlxWJFxc14SIVtI7hUdTpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676047863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNutdxAOu5l7NGHrylJlW0c8YHhwEEydtIVwkt/lFdc=; b=Zmd9Wy65zf4u38M7FlNSS5ZIVb1fqGYrb60P6r3/ftcWlfhtQbNDwY3PBAfcvPYbzcv6uj Qyyd6Olegh17j2sXxJFf2yk6s75b5ENoUUn4fwtYuDkbPDaHRd7+jZm8opQR7UiJDoTP3b KV8SRqcBsXgmciR7nU47RMzIh4j1hTpvXvSGD7CinTGUm03hQnO/x1iFWJdvNaL5n20kfO TEYr5fpiKiCsDjCtaMBWjSMSkUyoN/gmZDmWEQOYBGGs27jvtcRQ2IzzwE+65Jkysnyuyu mzjR0ClnXwGZZlPgd4IiWZYLM+z3906IWoYGmQIbeul02SiAqt+zfIvMT3mCXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676047863; a=rsa-sha256; cv=none; b=yf4d9HYQ0NMFf18GUCuPwsz2GSP3bPYzRoutl0JHyPAqU+0V05Q3t4aHrhMxfXKwy7EETu ut2monCeKAkuFj8agziAy5k/JwNgsv6Bc3pgRRpY5lIHhMVUKgTE7PignZwqjNXJYgMCpp H0t9mzI1B5BszKjiZ9/En2r7GzsFWvz0SilMMCQlBKWlGRLE6iFz0YDvgYaBRjhw6+rGnu vGpgQQS+zzO+mCAXq3hGRa3BOcVbqRMiR60b58507ULtWmUqbwKgFLrEvnCKzcKa+Oe+/r q6Y0xCR1F9V6buehXJ70r/ONOeNpcL8RPNMTr2GZOtejSlANPNm5QCp0BtP3SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PD09f55RjzQm5; Fri, 10 Feb 2023 16:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31AGp2Ui023909; Fri, 10 Feb 2023 16:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AGp2cF023908; Fri, 10 Feb 2023 16:51:02 GMT (envelope-from git) Date: Fri, 10 Feb 2023 16:51:02 GMT Message-Id: <202302101651.31AGp2cF023908@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 96196935d8d7 - main - multimedia/gstreamer1-plugins-zxing: Create a port. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96196935d8d716a55ccbc74a65cf72fa86d8fd16 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=96196935d8d716a55ccbc74a65cf72fa86d8fd16 commit 96196935d8d716a55ccbc74a65cf72fa86d8fd16 Author: Gleb Popov AuthorDate: 2023-02-08 17:30:47 +0000 Commit: Gleb Popov CommitDate: 2023-02-10 16:50:27 +0000 multimedia/gstreamer1-plugins-zxing: Create a port. PR: 269383 Reviewed by: tcberner Differential Revision: https://reviews.freebsd.org/D38442 --- Mk/Uses/gstreamer.mk | 6 +++++- .../files/patch-ext_zxing_gstzxing.cpp | 25 ++++++++++++++++++++++ .../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, 78 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..c53370be6528 --- /dev/null +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_zxing_gstzxing.cpp @@ -0,0 +1,25 @@ +--- ext/zxing/gstzxing.cpp.orig 2022-12-19 23:34:46 UTC ++++ ext/zxing/gstzxing.cpp +@@ -368,8 +368,8 @@ 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 (), +- ToString (result.format ())); ++ result.text ().c_str (), ++ ToString (result.format ()).c_str()); + } else { + goto out; + } +@@ -394,9 +394,9 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter + "timestamp", G_TYPE_UINT64, timestamp, + "stream-time", G_TYPE_UINT64, stream_time, + "running-time", G_TYPE_UINT64, running_time, +- "type", G_TYPE_STRING, ToString (result.format ()), ++ "type", G_TYPE_STRING, ToString (result.format ()).c_str(), + "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 51e7353f43e6..94bf087dd26a 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -254,6 +254,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