Re: [PR PATCH] [Updated] Split gst plugins good1 qt5

Re: [PR PATCH] [Updated] Split gst plugins good1 qt5

[sgn]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages split-gst-plugins-good1-qt5
https://github.com/void-linux/void-packages/pull/22770

Split gst plugins good1 qt5
- I have slow connection these days, I wouldn't want to pull Qt5 update :)
Cc: @Johnnynator @Duncaen 

A patch file from https://github.com/void-linux/void-packages/pull/22770.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-split-gst-plugins-good1-qt5-22770.patch --]
[-- Type: text/x-diff, Size: 5337 bytes --]

From 2d14c582d1a969cafad4cd9dcf3d1d2e6c19e31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 10 Jun 2020 23:32:33 +0700
Subject: [PATCH 1/3] gst-plugins-good1: split qt5 subpackage

---
 srcpkgs/gst-plugins-good1-qt5      |  1 +
 srcpkgs/gst-plugins-good1/template | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/gst-plugins-good1-qt5

diff --git a/srcpkgs/gst-plugins-good1-qt5 b/srcpkgs/gst-plugins-good1-qt5
new file mode 120000
index 00000000000..345681e54e0
--- /dev/null
+++ b/srcpkgs/gst-plugins-good1-qt5
@@ -0,0 +1 @@
+gst-plugins-good1
\ No newline at end of file
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f09a70d1e27..b6dfc687207 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,22 +1,22 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
 version=1.16.2
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)
- $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
 # XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt 'qt5-qmake qt5-host-tools')"
+hostmakedepends="pkg-config intltool glib-devel orc qt5-qmake qt5-host-tools"
 makedepends="
  libpng-devel libxml2-devel libgudev-devel libflac-devel
  libXdamage-devel aalib-devel libcaca-devel
  taglib-devel libsoup-gnome-devel gst-plugins-base1-devel
  pulseaudio-devel orc-devel libXv-devel wavpack-devel
  v4l-utils-devel jack-devel speex-devel libvpx-devel lame-devel
- mpg123-devel twolame-devel $(vopt_if gtk3 gtk+3-devel) $(vopt_if qt 'qt5-devel
- qt5-declarative-devel  qt5-x11extras-devel qt5-wayland-devel')"
+ mpg123-devel twolame-devel qt5-devel qt5-declarative-devel
+ qt5-x11extras-devel qt5-wayland-devel
+ $(vopt_if gtk3 gtk+3-devel)"
 depends="gst-plugins-base1>=${version}"
 short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -26,5 +26,13 @@ distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
 checksum=40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319
 lib32disabled=yes
 
-build_options="gtk3 qt"
-build_options_default="gtk3 qt"
+build_options="gtk3"
+build_options_default="gtk3"
+
+gst-plugins-good1-qt5_package() {
+	short_desc+=" - Qt5 plugins"
+	depends="gst-plugins-good1-${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0/libgstqml*.so
+	}
+}

From 279daf78d245c5debb1b14350795bbce2620a0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 10 Jun 2020 23:33:12 +0700
Subject: [PATCH 2/3] deepin-voice-recorder: revbump to update dependency

---
 srcpkgs/deepin-voice-recorder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/deepin-voice-recorder/template b/srcpkgs/deepin-voice-recorder/template
index ac74149c0e6..dab27614b73 100644
--- a/srcpkgs/deepin-voice-recorder/template
+++ b/srcpkgs/deepin-voice-recorder/template
@@ -1,11 +1,11 @@
 # Template file for 'deepin-voice-recorder'
 pkgname=deepin-voice-recorder
 version=5.0.0
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="qt5-multimedia-devel dtkwidget-devel ffmpeg-devel pulseaudio-devel"
-depends="qt5integration gst-plugins-good1"
+depends="qt5integration gst-plugins-good1-qt5"
 short_desc="Deepin voice recorder"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 4d784f80ad58b459b4d7948a8803d394adab70f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 10 Jun 2020 23:36:42 +0700
Subject: [PATCH 3/3] phonon-qt5-backend-gstreamer: revbump to update
 dependency

Close: #22770
---
 srcpkgs/phonon-qt5-backend-gstreamer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/phonon-qt5-backend-gstreamer/template b/srcpkgs/phonon-qt5-backend-gstreamer/template
index 6f4fd9e0e43..ad484686cc0 100644
--- a/srcpkgs/phonon-qt5-backend-gstreamer/template
+++ b/srcpkgs/phonon-qt5-backend-gstreamer/template
@@ -1,14 +1,14 @@
 # Template file for 'phonon-qt5-backend-gstreamer'
 pkgname=phonon-qt5-backend-gstreamer
 version=4.10.0
-revision=1
+revision=2
 wrksrc=${pkgname/-qt5/}-${version}
 build_style=cmake
 configure_args="-DPHONON_BUILD_PHONON4QT5=ON"
 hostmakedepends="pkg-config extra-cmake-modules"
 makedepends="MesaLib-devel qt5-devel phonon-qt5-devel gst-plugins-base1-devel
- gst-plugins-good1 qt5-x11extras-devel qt5-tools-devel"
-depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1 gst-libav"
+ gst-plugins-good1-qt5 qt5-x11extras-devel qt5-tools-devel"
+depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1-qt5 gst-libav"
 short_desc="Phonon GStreamer backend"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="LGPL-2.1-or-later"