* [PR PATCH] gst-plugins-good1: add qt option
@ 2019-06-14 17:38 voidlinux-github
2019-06-14 18:38 ` [PR PATCH] [Updated] " voidlinux-github
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-14 17:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
There is a new pull request by hadrianw against master on the void-packages repository
https://github.com/hadrianw/void-packages gst-plugins-good1
https://github.com/void-linux/void-packages/pull/12457
gst-plugins-good1: add qt option
With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
A patch file from https://github.com/void-linux/void-packages/pull/12457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-plugins-good1-12457.patch --]
[-- Type: application/text/x-diff, Size: 3212 bytes --]
From b4aa955b2d797a12c176f9c84e9d9ee8de9c988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:12:57 +0200
Subject: [PATCH 1/2] gst-plugins-good1: explicit enable and disable of gtk3 in
configure
Do not depend on auto handling of gtk3 option.
---
srcpkgs/gst-plugins-good1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f4d640ef740..94672591750 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -5,7 +5,8 @@ revision=1
wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
# XXX: libdv, dv1394 and shout2 modules.
hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
makedepends="
From da8546d9cdd51d09d8185a85a332b12367e7a5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:26:19 +0200
Subject: [PATCH 2/2] gst-plugins-good1: add qt option
If disabled disable also examples as they require qt.
---
srcpkgs/gst-plugins-good1/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 94672591750..63718a740d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -6,17 +6,18 @@ wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)
+ $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt '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) qt5-devel
- qt5-declarative-devel qt5-x11extras-devel qt5-wayland-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')"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -25,5 +26,5 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 qt"
+build_options_default="gtk3 qt"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gst-plugins-good1: add qt option
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
2019-06-14 18:38 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-14 18:38 ` voidlinux-github
2019-06-15 13:35 ` voidlinux-github
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-14 18:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by hadrianw against master on the void-packages repository
https://github.com/hadrianw/void-packages gst-plugins-good1
https://github.com/void-linux/void-packages/pull/12457
gst-plugins-good1: add qt option
With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
A patch file from https://github.com/void-linux/void-packages/pull/12457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-plugins-good1-12457.patch --]
[-- Type: application/text/x-diff, Size: 4320 bytes --]
From b4aa955b2d797a12c176f9c84e9d9ee8de9c988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:12:57 +0200
Subject: [PATCH 1/3] gst-plugins-good1: explicit enable and disable of gtk3 in
configure
Do not depend on auto handling of gtk3 option.
---
srcpkgs/gst-plugins-good1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f4d640ef740..94672591750 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -5,7 +5,8 @@ revision=1
wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
# XXX: libdv, dv1394 and shout2 modules.
hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
makedepends="
From da8546d9cdd51d09d8185a85a332b12367e7a5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:26:19 +0200
Subject: [PATCH 2/3] gst-plugins-good1: add qt option
If disabled disable also examples as they require qt.
---
srcpkgs/gst-plugins-good1/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 94672591750..63718a740d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -6,17 +6,18 @@ wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)
+ $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt '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) qt5-devel
- qt5-declarative-devel qt5-x11extras-devel qt5-wayland-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')"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -25,5 +26,5 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 qt"
+build_options_default="gtk3 qt"
From c88232f823fdbf1e82eae813629bf0d1d7481d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:38:05 +0200
Subject: [PATCH 3/3] gst-plugins-good1: fix xlint issues
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 63718a740d1..532935efaaa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -3,7 +3,6 @@ pkgname=gst-plugins-good1
version=1.16.0
revision=1
wrksrc="${pkgname/1/}-${version}"
-lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
-Dgtk3=$(vopt_if gtk3 enabled disabled)
@@ -25,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+lib32disabled=yes
build_options="gtk3 qt"
build_options_default="gtk3 qt"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gst-plugins-good1: add qt option
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
@ 2019-06-14 18:38 ` voidlinux-github
2019-06-14 18:38 ` voidlinux-github
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-14 18:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by hadrianw against master on the void-packages repository
https://github.com/hadrianw/void-packages gst-plugins-good1
https://github.com/void-linux/void-packages/pull/12457
gst-plugins-good1: add qt option
With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
A patch file from https://github.com/void-linux/void-packages/pull/12457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-plugins-good1-12457.patch --]
[-- Type: application/text/x-diff, Size: 4320 bytes --]
From b4aa955b2d797a12c176f9c84e9d9ee8de9c988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:12:57 +0200
Subject: [PATCH 1/3] gst-plugins-good1: explicit enable and disable of gtk3 in
configure
Do not depend on auto handling of gtk3 option.
---
srcpkgs/gst-plugins-good1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f4d640ef740..94672591750 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -5,7 +5,8 @@ revision=1
wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
# XXX: libdv, dv1394 and shout2 modules.
hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
makedepends="
From da8546d9cdd51d09d8185a85a332b12367e7a5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:26:19 +0200
Subject: [PATCH 2/3] gst-plugins-good1: add qt option
If disabled disable also examples as they require qt.
---
srcpkgs/gst-plugins-good1/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 94672591750..63718a740d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -6,17 +6,18 @@ wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)
+ $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt '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) qt5-devel
- qt5-declarative-devel qt5-x11extras-devel qt5-wayland-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')"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -25,5 +26,5 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 qt"
+build_options_default="gtk3 qt"
From c88232f823fdbf1e82eae813629bf0d1d7481d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:38:05 +0200
Subject: [PATCH 3/3] gst-plugins-good1: fix xlint issues
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 63718a740d1..532935efaaa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -3,7 +3,6 @@ pkgname=gst-plugins-good1
version=1.16.0
revision=1
wrksrc="${pkgname/1/}-${version}"
-lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
-Dgtk3=$(vopt_if gtk3 enabled disabled)
@@ -25,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+lib32disabled=yes
build_options="gtk3 qt"
build_options_default="gtk3 qt"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gst-plugins-good1: add qt option
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
2019-06-14 18:38 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-14 18:38 ` voidlinux-github
@ 2019-06-15 13:35 ` voidlinux-github
2019-06-15 13:35 ` voidlinux-github
2019-06-15 20:55 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-15 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by hadrianw against master on the void-packages repository
https://github.com/hadrianw/void-packages gst-plugins-good1
https://github.com/void-linux/void-packages/pull/12457
gst-plugins-good1: add qt option
With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
A patch file from https://github.com/void-linux/void-packages/pull/12457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-plugins-good1-12457.patch --]
[-- Type: application/text/x-diff, Size: 4379 bytes --]
From b4aa955b2d797a12c176f9c84e9d9ee8de9c988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:12:57 +0200
Subject: [PATCH 1/3] gst-plugins-good1: explicit enable and disable of gtk3 in
configure
Do not depend on auto handling of gtk3 option.
---
srcpkgs/gst-plugins-good1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f4d640ef740..94672591750 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -5,7 +5,8 @@ revision=1
wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
# XXX: libdv, dv1394 and shout2 modules.
hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
makedepends="
From da8546d9cdd51d09d8185a85a332b12367e7a5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:26:19 +0200
Subject: [PATCH 2/3] gst-plugins-good1: add qt option
If disabled disable also examples as they require qt.
---
srcpkgs/gst-plugins-good1/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 94672591750..63718a740d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -6,17 +6,18 @@ wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)
+ $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt '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) qt5-devel
- qt5-declarative-devel qt5-x11extras-devel qt5-wayland-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')"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -25,5 +26,5 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 qt"
+build_options_default="gtk3 qt"
From 3bb07f7ad96e44d23fef4523c14b3eb6cd0a8e5d Mon Sep 17 00:00:00 2001
From: Hadrian W?grzynowski <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:38:05 +0200
Subject: [PATCH 3/3] gst-plugins-good1: fix xlint issues
Also bump revision.
---
srcpkgs/gst-plugins-good1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 63718a740d1..2bdad1d5fef 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,9 +1,8 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.16.0
-revision=1
+revision=2
wrksrc="${pkgname/1/}-${version}"
-lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
-Dgtk3=$(vopt_if gtk3 enabled disabled)
@@ -25,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+lib32disabled=yes
build_options="gtk3 qt"
build_options_default="gtk3 qt"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gst-plugins-good1: add qt option
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
` (2 preceding siblings ...)
2019-06-15 13:35 ` voidlinux-github
@ 2019-06-15 13:35 ` voidlinux-github
2019-06-15 20:55 ` [PR PATCH] [Merged]: " voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-15 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
There is an updated pull request by hadrianw against master on the void-packages repository
https://github.com/hadrianw/void-packages gst-plugins-good1
https://github.com/void-linux/void-packages/pull/12457
gst-plugins-good1: add qt option
With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
A patch file from https://github.com/void-linux/void-packages/pull/12457.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gst-plugins-good1-12457.patch --]
[-- Type: application/text/x-diff, Size: 4379 bytes --]
From b4aa955b2d797a12c176f9c84e9d9ee8de9c988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:12:57 +0200
Subject: [PATCH 1/3] gst-plugins-good1: explicit enable and disable of gtk3 in
configure
Do not depend on auto handling of gtk3 option.
---
srcpkgs/gst-plugins-good1/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f4d640ef740..94672591750 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -5,7 +5,8 @@ revision=1
wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
-configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled"
+configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)"
# XXX: libdv, dv1394 and shout2 modules.
hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
makedepends="
From da8546d9cdd51d09d8185a85a332b12367e7a5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?= <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 19:26:19 +0200
Subject: [PATCH 2/3] gst-plugins-good1: add qt option
If disabled disable also examples as they require qt.
---
srcpkgs/gst-plugins-good1/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 94672591750..63718a740d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -6,17 +6,18 @@ wrksrc="${pkgname/1/}-${version}"
lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
- -Dgtk3=$(vopt_if gtk3 enabled disabled)"
+ -Dgtk3=$(vopt_if gtk3 enabled disabled)
+ $(vopt_if qt '-Dqt5=enabled' '-Dqt5=disabled -Dexamples=disabled')"
# XXX: libdv, dv1394 and shout2 modules.
-hostmakedepends="pkg-config intltool glib-devel qt5-qmake orc qt5-host-tools"
+hostmakedepends="pkg-config intltool glib-devel orc $(vopt_if qt '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) qt5-devel
- qt5-declarative-devel qt5-x11extras-devel qt5-wayland-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')"
depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -25,5 +26,5 @@ homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
-build_options="gtk3"
-build_options_default="gtk3"
+build_options="gtk3 qt"
+build_options_default="gtk3 qt"
From 3bb07f7ad96e44d23fef4523c14b3eb6cd0a8e5d Mon Sep 17 00:00:00 2001
From: Hadrian W?grzynowski <hadrian@hawski.com>
Date: Fri, 14 Jun 2019 20:38:05 +0200
Subject: [PATCH 3/3] gst-plugins-good1: fix xlint issues
Also bump revision.
---
srcpkgs/gst-plugins-good1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 63718a740d1..2bdad1d5fef 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,9 +1,8 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.16.0
-revision=1
+revision=2
wrksrc="${pkgname/1/}-${version}"
-lib32disabled=yes
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled
-Dgtk3=$(vopt_if gtk3 enabled disabled)
@@ -25,6 +24,7 @@ license="LGPL-2.1-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
checksum=654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd
+lib32disabled=yes
build_options="gtk3 qt"
build_options_default="gtk3 qt"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: gst-plugins-good1: add qt option
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
` (3 preceding siblings ...)
2019-06-15 13:35 ` voidlinux-github
@ 2019-06-15 20:55 ` voidlinux-github
4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-06-15 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 436 bytes --]
There's a merged pull request on the void-packages repository
gst-plugins-good1: add qt option
https://github.com/void-linux/void-packages/pull/12457
Description: With qt disabled examples also have to be disabled. Are they needed or could we just skip them all together regardless of qt option?
Also added explicit enable/disable for gtk3 for completeness. Should I just make another pull request for it? They kinda work together.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-06-15 20:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-14 17:38 [PR PATCH] gst-plugins-good1: add qt option voidlinux-github
2019-06-14 18:38 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-14 18:38 ` voidlinux-github
2019-06-15 13:35 ` voidlinux-github
2019-06-15 13:35 ` voidlinux-github
2019-06-15 20:55 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).