[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2024-04-22 Thread Ronny Gutbrod 
commit: 55d4a5e3ddf60149b2d4d1e355c3cbfcce3b5fbc
Author: tastytea  tastytea  de>
AuthorDate: Tue Apr 23 02:16:00 2024 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Tue Apr 23 02:16:17 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55d4a5e3

media-plugins/gst-plugins-qt5: fix build deps

Closes: https://bugs.gentoo.org/930405
Signed-off-by: tastytea  tastytea.de>

 media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild
index ca9db75f22..d5aa598e3c 100644
--- a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
)
 "
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools"
 
 GST_PLUGINS_BUILD_DIR="qt"

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2024-04-20 Thread Anna Vyalkova 
commit: 7439c96e3349411b05d752e9c4cc44a0ec5502bb
Author: Anna (cybertailor) Vyalkova  sysrq  in>
AuthorDate: Sat Apr 20 17:34:59 2024 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Sat Apr 20 17:41:25 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7439c96e

media-plugins/gst-plugins-qt5: add 1.22.11, drop 1.20.2

Signed-off-by: Anna (cybertailor) Vyalkova  sysrq.in>

 media-plugins/gst-plugins-qt5/Manifest |  2 +-
 .../gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild  | 35 ---
 .../gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild | 52 ++
 media-plugins/gst-plugins-qt5/metadata.xml |  2 +-
 4 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index 8035d1759b..8e4edfc3e5 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -1,2 +1,2 @@
-DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 
45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1
 SHA512 
a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933
 DIST gst-plugins-good-1.20.3.tar.xz 3417252 BLAKE2B 
5f288541598d2c308fbb1d5e36e54e8dd4c6e9d7dd71f41b778fbdfe883ed48e8d13fa53d05518cc671de029d804f7dc1d93396de9d199d45ec131230926d33c
 SHA512 
98bb2dd428edaa1a5846fb47b1f42a1e99541faf05cdb0fb632d4a1a1e4fb2c1f9d1229bf0aa2ddcbce139533e9fd51f8f9a1175cd8a8729c5179750ca84afa1
+DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B 
d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf
 SHA512 
e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild
deleted file mode 100644
index b6c1d6838c..00
--- a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer-meson qmake-utils
-
-DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
-KEYWORDS="~amd64"
-IUSE="+egl wayland +X"
-
-REQUIRED_USE="
-   wayland? ( egl )
-"
-
-RDEPEND="
-   >=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
-   media-libs/mesa[egl(+)?,X?]
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   egl? ( dev-qt/qtgui:5[eglfs] )
-   wayland? ( dev-qt/qtwayland:5 )
-   X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD_DIR="qt"
-
-src_prepare() {
-   export PATH="${PATH}:$(qt5_get_bindir)"
-   default
-}

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild
new file mode 100644
index 00..ca9db75f22
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.22.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GST_ORG_MODULE=gst-plugins-good
+inherit gstreamer-meson qmake-utils
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE="+X eglfs wayland"
+REQUIRED_USE="
+   || ( X eglfs wayland )
+   eglfs? ( kernel_linux )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   >=media-libs/gst-plugins-base-${PV}:${SLOT}[X?,opengl,wayland?]
+   media-libs/mesa[wayland?,X?]
+   X? ( dev-qt/qtx11extras:5 )
+   eglfs? (
+   dev-qt/qtgui:5[eglfs]
+   media-libs/gst-plugins-base:${SLOT}[egl]
+   )
+   wayland? (
+   dev-qt/qtwayland:5
+   media-libs/gst-plugins-base:${SLOT}[egl]
+   )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}
+
+multilib_src_configure() {
+   local emesonargs=(
+   $(meson_feature X qt-x11)
+   $(meson_feature eglfs qt-egl)
+   $(meson_feature wayland qt-wayland)
+   )
+
+   gstreamer_multilib_src_configure
+}

diff --git a/media-plugins/gst-plugins-qt5/metadata.xml 
b/media-plugins/gst-plugins-qt5/metadata.xml
index 2cb1dfb156..420e576c92 100644
--- a/media-plugins/gst-plugins-qt5/metadata.xml
+++ b/media-plugins/gst-plugins-qt5/metadata.xml
@@ -14,7 +14,7 @@
* qmlglsrc – A video src that captures a window from a QML view


-   Enable EGL support.
+   Enable EGL

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-09-16 Thread Ronny Gutbrod 
commit: ea4183e0f45214e38098fc4685e9a369d8b2dcc1
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Fri Sep 16 23:35:37 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Sat Sep 17 00:50:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea4183e0

media-plugins/gst-plugins-qt5: add 1.20.3

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |  1 +
 .../gst-plugins-qt5/gst-plugins-qt5-1.20.3.ebuild  | 37 ++
 2 files changed, 38 insertions(+)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index f6a87ac30..598929ab6 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -2,3 +2,4 @@ DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d009632
 DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 
551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895
 SHA512 
e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
 DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 
62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4
 SHA512 
6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e
 DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 
45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1
 SHA512 
a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933
+DIST gst-plugins-good-1.20.3.tar.xz 3417252 BLAKE2B 
5f288541598d2c308fbb1d5e36e54e8dd4c6e9d7dd71f41b778fbdfe883ed48e8d13fa53d05518cc671de029d804f7dc1d93396de9d199d45ec131230926d33c
 SHA512 
98bb2dd428edaa1a5846fb47b1f42a1e99541faf05cdb0fb632d4a1a1e4fb2c1f9d1229bf0aa2ddcbce139533e9fd51f8f9a1175cd8a8729c5179750ca84afa1

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.3.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.3.ebuild
new file mode 100644
index 0..25b190457
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson qmake-utils
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE="+egl wayland +X"
+
+REQUIRED_USE="
+   wayland? ( egl )
+"
+
+RDEPEND="
+   >=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
+   media-libs/mesa[egl(+)?,wayland?,X?]
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   egl? ( dev-qt/qtgui:5[eglfs] )
+   wayland? ( dev-qt/qtwayland:5 )
+   X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/, media-plugins/gst-plugins-qt5/files/

2022-09-16 Thread Ronny Gutbrod 
commit: c18f09feebce39919d056aef5db4fd33c8b78fc3
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Fri Sep 16 23:36:33 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Sat Sep 17 00:50:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c18f09fe

media-plugins/gst-plugins-qt5: drop 1.18.4, 1.18.6, 1.20.1

match media-libs/gst-plugins-good

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |   3 -
 ...t-dont-use-volatile-to-mean-atomic-1.18.4.patch | 249 -
 .../gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild  |  39 
 .../gst-plugins-qt5/gst-plugins-qt5-1.18.6.ebuild  |  35 ---
 .../gst-plugins-qt5/gst-plugins-qt5-1.20.1.ebuild  |  35 ---
 5 files changed, 361 deletions(-)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index 598929ab6..8035d1759 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -1,5 +1,2 @@
-DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898
 SHA512 
764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
-DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 
551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895
 SHA512 
e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
-DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 
62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4
 SHA512 
6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e
 DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 
45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1
 SHA512 
a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933
 DIST gst-plugins-good-1.20.3.tar.xz 3417252 BLAKE2B 
5f288541598d2c308fbb1d5e36e54e8dd4c6e9d7dd71f41b778fbdfe883ed48e8d13fa53d05518cc671de029d804f7dc1d93396de9d199d45ec131230926d33c
 SHA512 
98bb2dd428edaa1a5846fb47b1f42a1e99541faf05cdb0fb632d4a1a1e4fb2c1f9d1229bf0aa2ddcbce139533e9fd51f8f9a1175cd8a8729c5179750ca84afa1

diff --git 
a/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
 
b/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
deleted file mode 100644
index fd12de3ee..0
--- 
a/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 612102fdbc3f813bf9d3406165692b5f742e51a6 Mon Sep 17 00:00:00 2001
-From: Matthew Waters 
-Date: Thu, 18 Mar 2021 19:52:53 +1100
-Subject: [PATCH] gst: don't use volatile to mean atomic
-
-volatile is not sufficient to provide atomic guarantees and real atomics
-should be used instead.  GCC 11 has started warning about using volatile
-with atomic operations.
-
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
-
-Discovered in 
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
-
-Part-of: 


- ext/jack/gstjack.c |  6 +++---
- ext/jack/gstjackaudiosink.c|  2 +-
- ext/jack/gstjackaudiosrc.c |  2 +-
- ext/pulse/pulsesink.h  |  2 +-
- ext/qt/gstqsgtexture.cc|  2 +-
- ext/qt/gstqtglutility.cc   |  2 +-
- ext/qt/qtglrenderer.cc |  6 +++---
- ext/qt/qtitem.cc   |  2 +-
- ext/qt/qtwindow.cc |  4 ++--
- ext/vpx/gstvpxdec.c|  2 +-
- ext/vpx/gstvpxenc.c| 16 
- gst/audioparsers/gstac3parse.h |  2 +-
- sys/rpicamsrc/gstrpicamsrc.c   |  2 +-
- sys/ximage/ximageutil.c|  2 +-
- 14 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
-index ca98dc405..fdd507d87 100644
 a/ext/jack/gstjack.c
-+++ b/ext/jack/gstjack.c
-@@ -28,7 +28,7 @@
- GType
- gst_jack_connect_get_type (void)
- {
--  static volatile gsize jack_connect_type = 0;
-+  static gsize jack_connect_type = 0;
- 
-   if (g_once_init_enter (_connect_type)) {
- static const GEnumValue jack_connect_enums[] = {
-@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void)
- GType
- gst_jack_transport_get_type (void)
- {
--  static volatile gsize type = 0;
-+  static gsize type = 0;
- 
-   if (g_once_init_enter ()) {
- static const GFlagsValue flag_values[] = {
-@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-09-16 Thread Ronny Gutbrod 
commit: 1bf206c927c4b24b357c4a6813b97d061821c2ae
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Fri Sep 16 23:32:01 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Sat Sep 17 00:49:48 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bf206c9

media-plugins/gst-plugins-qt5: update metadata

- change DTD URL to HTTPS
- fix indentation
- add remote-id

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/metadata.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/media-plugins/gst-plugins-qt5/metadata.xml 
b/media-plugins/gst-plugins-qt5/metadata.xml
index bae7748a8..a8f2ad465 100644
--- a/media-plugins/gst-plugins-qt5/metadata.xml
+++ b/media-plugins/gst-plugins-qt5/metadata.xml
@@ -1,19 +1,23 @@
 
-http://www.gentoo.org/dtd/metadata.dtd;>
+https://www.gentoo.org/dtd/metadata.dtd;>
 

gen...@tastytea.de
Ronny (tastytea) Gutbrod


-   GStreamer plugin for the Qt Qml elements
+   GStreamer plugin for the Qt Qml elements
 
-   Includes the following elements:
-   * qmlgloverlay – A filter that renders a QML scene onto a video stream
-   * qmlglsink – A video sink that renders to a QQuickItem
-   * qmlglsrc – A video src that captures a window from a QML view
-
+   Includes the following elements:
+   * qmlgloverlay – A filter that renders a QML scene onto a video 
stream
+   * qmlglsink – A video sink that renders to a QQuickItem
+   * qmlglsrc – A video src that captures a window from a QML view
+   

Enable EGL support.

+   
+   gstreamer/gstreamer
+   
+

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-05-19 Thread Ronny Gutbrod 
commit: 2de22646d0398338f2a9ca35d2c436a5c152b9e8
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Thu May 19 14:04:27 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Thu May 19 14:05:56 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2de22646

media-plugins/gst-plugins-qt5: add 1.20.2

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |  1 +
 .../gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild  | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index 403e0b24d..f6a87ac30 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -1,3 +1,4 @@
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898
 SHA512 
764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 
551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895
 SHA512 
e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
 DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 
62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4
 SHA512 
6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e
+DIST gst-plugins-good-1.20.2.tar.xz 3411008 BLAKE2B 
45eb497d240bf9b05cfbf85babe5ef85fb8a7f25f1b470f131f319064e1dc04f334d4b7dede4f0aedd73dca01605b7e00e2ddc587bcf9ccce6989a9e99776cb1
 SHA512 
a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild
new file mode 100644
index 0..b6c1d6838
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson qmake-utils
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+KEYWORDS="~amd64"
+IUSE="+egl wayland +X"
+
+REQUIRED_USE="
+   wayland? ( egl )
+"
+
+RDEPEND="
+   >=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
+   media-libs/mesa[egl(+)?,X?]
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   egl? ( dev-qt/qtgui:5[eglfs] )
+   wayland? ( dev-qt/qtwayland:5 )
+   X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-05-11 Thread Ronny Gutbrod 
commit: 9a47329558d30c96b79d089068cbaa08cbdda6f5
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Wed May 11 11:27:34 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Wed May 11 11:39:22 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9a473295

media-plugins/gst-plugins-qt5: add 1.20.1

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |  1 +
 .../gst-plugins-qt5/gst-plugins-qt5-1.20.1.ebuild  | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index 340a5e1c7..403e0b24d 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -1,2 +1,3 @@
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898
 SHA512 
764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 
551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895
 SHA512 
e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5
+DIST gst-plugins-good-1.20.1.tar.xz 3415220 BLAKE2B 
62a0e0b4d60412350c3aad692e7b3d0dd5c7ebed098e21e7d4d7c599ffec9be5795c88cbdece0b219d1aad607ad1a0209a376a8f3543793c9c905cb1401e92c4
 SHA512 
6e56f6290465da03bfe162228829e51091896b2c5fe9d1d0718f663a3ab14edf5c790b37998a783981b9c77034252e7dee9fec5136f92ced44c4898e2fbd402e

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.1.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.1.ebuild
new file mode 100644
index 0..b6c1d6838
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.20.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson qmake-utils
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+KEYWORDS="~amd64"
+IUSE="+egl wayland +X"
+
+REQUIRED_USE="
+   wayland? ( egl )
+"
+
+RDEPEND="
+   >=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
+   media-libs/mesa[egl(+)?,X?]
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   egl? ( dev-qt/qtgui:5[eglfs] )
+   wayland? ( dev-qt/qtwayland:5 )
+   X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-05-10 Thread Ronny Gutbrod 
commit: abcc907ef70e6d9468e421e3be4a02e9fc07fd67
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Tue May 10 23:22:25 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Tue May 10 23:23:06 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=abcc907e

media-plugins/gst-plugins-qt5: add 1.18.6

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |  1 +
 .../gst-plugins-qt5/gst-plugins-qt5-1.18.6.ebuild  | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
index b8849d87d..340a5e1c7 100644
--- a/media-plugins/gst-plugins-qt5/Manifest
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -1 +1,2 @@
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898
 SHA512 
764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
+DIST gst-plugins-good-1.18.6.tar.xz 3296552 BLAKE2B 
551ae9cf9beb512ae418db20cd50dc8826ed60421a40d6c9c9fc558f32c9db2a9bada309a8075306542c53382ecb728dac3dd6252d1efc7255cffde0bea35895
 SHA512 
e0be5f1eaffe65d7871f23e42645fa4cee30953d16d54c4f4707c094859659cff1e4609b086afebaf08777b6d01dcba4f4b2b338e722bf729e9ed0482a2417a5

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.6.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.6.ebuild
new file mode 100644
index 0..b6c1d6838
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson qmake-utils
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+KEYWORDS="~amd64"
+IUSE="+egl wayland +X"
+
+REQUIRED_USE="
+   wayland? ( egl )
+"
+
+RDEPEND="
+   >=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
+   media-libs/mesa[egl(+)?,X?]
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   egl? ( dev-qt/qtgui:5[eglfs] )
+   wayland? ( dev-qt/qtwayland:5 )
+   X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-05-10 Thread Ronny Gutbrod 
commit: ae3b369ffed925fdb52f80b8d5fa412122d1c94a
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Tue May 10 23:13:10 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Tue May 10 23:23:01 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae3b369f

media-plugins/gst-plugins-qt5: Search moc in qt5_get_bindir

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
index 8be3c0310..b446d44ab 100644
--- a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 GST_ORG_MODULE=gst-plugins-good
 
-inherit gstreamer-meson
+inherit gstreamer-meson qmake-utils
 
 DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
 KEYWORDS="~amd64"
@@ -32,3 +32,8 @@ PATCHES=(
 )
 
 GST_PLUGINS_BUILD_DIR="qt"
+
+src_prepare() {
+   export PATH="${PATH}:$(qt5_get_bindir)"
+   default
+}

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-01-11 Thread Ronny Gutbrod 
commit: c9bfb03287379ab063515c2d2e6ae031acc93e9f
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Wed Jan 12 01:44:15 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Wed Jan 12 01:49:05 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c9bfb032

media-plugins/gst-plugins-qt5: Remove unused flag, better mesa fix.

>From .

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
index d0c271dfc..8be3c0310 100644
--- a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
@@ -9,7 +9,7 @@ inherit gstreamer-meson
 
 DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
 KEYWORDS="~amd64"
-IUSE="+egl orc wayland +X"
+IUSE="+egl wayland +X"
 
 REQUIRED_USE="
wayland? ( egl )
@@ -17,10 +17,7 @@ REQUIRED_USE="
 
 RDEPEND="
>=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
-   || (
-   =media-libs/mesa-21.3.2[X?]
-   )
+   media-libs/mesa[egl(+)?,X?]
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/

2022-01-11 Thread Ronny Gutbrod 
commit: 03409396a372510d2c9351d0a883e0330faa22f7
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Tue Jan 11 23:50:31 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Tue Jan 11 23:54:26 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=03409396

media-plugins/gst-plugins-qt5: Fix mesa dep and copyright header.

>=media-libs/mesa-21.3.2 always compiles with egl support.

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild 
b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
index c11f6a888..d0c271dfc 100644
--- a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,10 @@ REQUIRED_USE="
 
 RDEPEND="
>=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
-   media-libs/mesa[egl?,X?]
+   || (
+   =media-libs/mesa-21.3.2[X?]
+   )
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5

[gentoo-commits] repo/proj/guru:dev commit in: media-plugins/gst-plugins-qt5/, media-plugins/gst-plugins-qt5/files/

2021-10-04 Thread Ronny Gutbrod 
commit: cea32f337b4edb06fe86ca6f969c385f2d0d6d94
Author: Nicolas Werner  hotmail  de>
AuthorDate: Sun Jul 25 22:40:31 2021 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Mon Oct  4 11:42:41 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cea32f33

media-plugins/gst-plugins-qt5: new package

Dependency for >net-im/nheko-0.8.2.

Bug: https://bugs.gentoo.org/810814
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Nicolas Werner  hotmail.de>
Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 media-plugins/gst-plugins-qt5/Manifest |   1 +
 ...t-dont-use-volatile-to-mean-atomic-1.18.4.patch | 249 +
 .../gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild  |  34 +++
 media-plugins/gst-plugins-qt5/metadata.xml |  19 ++
 4 files changed, 303 insertions(+)

diff --git a/media-plugins/gst-plugins-qt5/Manifest 
b/media-plugins/gst-plugins-qt5/Manifest
new file mode 100644
index 0..b8849d87d
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 
8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898
 SHA512 
764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86

diff --git 
a/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
 
b/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
new file mode 100644
index 0..fd12de3ee
--- /dev/null
+++ 
b/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
@@ -0,0 +1,249 @@
+From 612102fdbc3f813bf9d3406165692b5f742e51a6 Mon Sep 17 00:00:00 2001
+From: Matthew Waters 
+Date: Thu, 18 Mar 2021 19:52:53 +1100
+Subject: [PATCH] gst: don't use volatile to mean atomic
+
+volatile is not sufficient to provide atomic guarantees and real atomics
+should be used instead.  GCC 11 has started warning about using volatile
+with atomic operations.
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
+
+Discovered in 
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
+
+Part-of: 

+---
+ ext/jack/gstjack.c |  6 +++---
+ ext/jack/gstjackaudiosink.c|  2 +-
+ ext/jack/gstjackaudiosrc.c |  2 +-
+ ext/pulse/pulsesink.h  |  2 +-
+ ext/qt/gstqsgtexture.cc|  2 +-
+ ext/qt/gstqtglutility.cc   |  2 +-
+ ext/qt/qtglrenderer.cc |  6 +++---
+ ext/qt/qtitem.cc   |  2 +-
+ ext/qt/qtwindow.cc |  4 ++--
+ ext/vpx/gstvpxdec.c|  2 +-
+ ext/vpx/gstvpxenc.c| 16 
+ gst/audioparsers/gstac3parse.h |  2 +-
+ sys/rpicamsrc/gstrpicamsrc.c   |  2 +-
+ sys/ximage/ximageutil.c|  2 +-
+ 14 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
+index ca98dc405..fdd507d87 100644
+--- a/ext/jack/gstjack.c
 b/ext/jack/gstjack.c
+@@ -28,7 +28,7 @@
+ GType
+ gst_jack_connect_get_type (void)
+ {
+-  static volatile gsize jack_connect_type = 0;
++  static gsize jack_connect_type = 0;
+ 
+   if (g_once_init_enter (_connect_type)) {
+ static const GEnumValue jack_connect_enums[] = {
+@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void)
+ GType
+ gst_jack_transport_get_type (void)
+ {
+-  static volatile gsize type = 0;
++  static gsize type = 0;
+ 
+   if (g_once_init_enter ()) {
+ static const GFlagsValue flag_values[] = {
+@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer jclient)
+ GType
+ gst_jack_client_get_type (void)
+ {
+-  static volatile gsize jack_client_type = 0;
++  static gsize jack_client_type = 0;
+ 
+   if (g_once_init_enter (_client_type)) {
+ /* hackish, but makes it show up nicely in gst-inspect */
+diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
+index ee7cea8c0..6e8d04ae5 100644
+--- a/ext/jack/gstjackaudiosink.c
 b/ext/jack/gstjackaudiosink.c
+@@ -131,7 +131,7 @@ gst_jack_audio_sink_free_channels (GstJackAudioSink * sink)
+ static GType
+ gst_jack_ring_buffer_get_type (void)
+ {
+-  static volatile gsize ringbuffer_type = 0;
++  static gsize ringbuffer_type = 0;
+ 
+   if (g_once_init_enter (_type)) {
+ static const GTypeInfo ringbuffer_info = {
+diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
+index 1d2cf82ee..d43a447a7 100644
+--- a/ext/jack/gstjackaudiosrc.c
 b/ext/jack/gstjackaudiosrc.c
+@@ -151,7 +151,7 @@ gst_jack_audio_src_free_channels (GstJackAudioSrc * src)
+ static GType
+ gst_jack_ring_buffer_get_type (void)
+ {
+-  static volatile gsize ringbuffer_type = 0;
++  static gsize ringbuffer_type = 0;
+ 
+   if (g_once_init_enter (_type)) {
+ static const GTypeInfo ringbuffer_info = { sizeof 
(GstJackRingBufferClass),
+diff --git