diff mbox

[v1] qt5base: remove libudev dependency from kms

Message ID 1471720194-22686-1-git-send-email-ps.report@gmx.net
State Accepted
Headers show

Commit Message

Peter Seiderer Aug. 20, 2016, 7:09 p.m. UTC
Use upstream patch [1]

Fixes [2]:

  KMS auto-detection... ()
  Project ERROR: libudev development package not found
  KMS disabled.
   KMS support cannot be enabled due to functionality tests!
   Turn on verbose messaging (-v) to ./configure to see the final report.
   If you believe this message is in error you may use the continue
   switch (-continue) to ./configure to continue.

[1] https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
[2] http://autobuild.buildroot.net/results/063/063859ad460552dd7c101115500b7845045a134f

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 ...07-Remove-libudev-dependency-from-kms.pro.patch | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch

Comments

Thomas Petazzoni Aug. 20, 2016, 8:36 p.m. UTC | #1
Hello,

On Sat, 20 Aug 2016 21:09:54 +0200, Peter Seiderer wrote:
> Use upstream patch [1]
> 
> Fixes [2]:
> 
>   KMS auto-detection... ()
>   Project ERROR: libudev development package not found
>   KMS disabled.
>    KMS support cannot be enabled due to functionality tests!
>    Turn on verbose messaging (-v) to ./configure to see the final report.
>    If you believe this message is in error you may use the continue
>    switch (-continue) to ./configure to continue.
> 
> [1] https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
> [2] http://autobuild.buildroot.net/results/063/063859ad460552dd7c101115500b7845045a134f
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  ...07-Remove-libudev-dependency-from-kms.pro.patch | 33 ++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch

Applied to master, thanks.

Thomas
Yann E. MORIN Aug. 20, 2016, 11:15 p.m. UTC | #2
Peter, All,

On 2016-08-20 21:09 +0200, Peter Seiderer spake thusly:
> Use upstream patch [1]

I'd say be carefull when backporting patches from upstream, especially
since upstream has changed the license after the Qt-5.6 release.

Backporting a patch in this case would risk propagating the new license.

However, this is acceptable in this case, because this only touches the
.pro file, which is part of the buildsystem.

Regards,
Yann E. MORIN.

> Fixes [2]:
> 
>   KMS auto-detection... ()
>   Project ERROR: libudev development package not found
>   KMS disabled.
>    KMS support cannot be enabled due to functionality tests!
>    Turn on verbose messaging (-v) to ./configure to see the final report.
>    If you believe this message is in error you may use the continue
>    switch (-continue) to ./configure to continue.
> 
> [1] https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
> [2] http://autobuild.buildroot.net/results/063/063859ad460552dd7c101115500b7845045a134f
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  ...07-Remove-libudev-dependency-from-kms.pro.patch | 33 ++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> 
> diff --git a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> new file mode 100644
> index 0000000..7ecbcd0
> --- /dev/null
> +++ b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> @@ -0,0 +1,33 @@
> +From 0f1b4bb65abe0e36e9e4b9813e45192223509de8 Mon Sep 17 00:00:00 2001
> +From: Ralf Nolden <nolden@kde.org>
> +Date: Tue, 17 May 2016 12:57:17 +0200
> +Subject: [PATCH] Remove libudev dependency from kms.pro
> +
> +To compile the kms qpa plugin, only libdrm is needed.
> +Remove the libudev dependency for the compile check to enable
> +building of the qpa plugin on platforms where libudev is not present
> +such as BSD systems (but where KMS works)
> +
> +Change-Id: Icd0be70a8949578a6158d523428706890a9674eb
> +Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
> +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
> +
> +Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
> +Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> +---
> + config.tests/qpa/kms/kms.pro | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
> +index 1fb7367..5147bc8 100644
> +--- a/config.tests/qpa/kms/kms.pro
> ++++ b/config.tests/qpa/kms/kms.pro
> +@@ -1,4 +1,4 @@
> + SOURCES = kms.cpp
> + CONFIG += link_pkgconfig
> +-PKGCONFIG += libdrm libudev
> ++PKGCONFIG += libdrm
> + CONFIG -= qt
> +-- 
> +2.8.1
> +
> -- 
> 2.8.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Seiderer Sept. 6, 2016, 5:58 p.m. UTC | #3
Hello Yann,

On Sun, 21 Aug 2016 01:15:25 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Peter, All,
> 
> On 2016-08-20 21:09 +0200, Peter Seiderer spake thusly:
> > Use upstream patch [1]
> 
> I'd say be carefull when backporting patches from upstream, especially
> since upstream has changed the license after the Qt-5.6 release.
> 
> Backporting a patch in this case would risk propagating the new license.
> 

Thanks for license change hint, will double check in future...

Hope it is no problem here because the same patch (despite my original
source link from 5.7 branch) is although available from the 5.6
branch ([3])...

Regards,
Peter

[3] https://code.qt.io/cgit/qt/qtbase.git/commit/config.tests/qpa/kms/kms.pro?h=5.6&id=72492735b7b7770808fcc9fe067e8f03fab827fc


> However, this is acceptable in this case, because this only touches the
> .pro file, which is part of the buildsystem.
> 
> Regards,
> Yann E. MORIN.
> 
> > Fixes [2]:
> > 
> >   KMS auto-detection... ()
> >   Project ERROR: libudev development package not found
> >   KMS disabled.
> >    KMS support cannot be enabled due to functionality tests!
> >    Turn on verbose messaging (-v) to ./configure to see the final report.
> >    If you believe this message is in error you may use the continue
> >    switch (-continue) to ./configure to continue.
> > 
> > [1] https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
> > [2] http://autobuild.buildroot.net/results/063/063859ad460552dd7c101115500b7845045a134f
> > 
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> >  ...07-Remove-libudev-dependency-from-kms.pro.patch | 33 ++++++++++++++++++++++
> >  1 file changed, 33 insertions(+)
> >  create mode 100644 package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> > 
> > diff --git a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> > new file mode 100644
> > index 0000000..7ecbcd0
> > --- /dev/null
> > +++ b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
> > @@ -0,0 +1,33 @@
> > +From 0f1b4bb65abe0e36e9e4b9813e45192223509de8 Mon Sep 17 00:00:00 2001
> > +From: Ralf Nolden <nolden@kde.org>
> > +Date: Tue, 17 May 2016 12:57:17 +0200
> > +Subject: [PATCH] Remove libudev dependency from kms.pro
> > +
> > +To compile the kms qpa plugin, only libdrm is needed.
> > +Remove the libudev dependency for the compile check to enable
> > +building of the qpa plugin on platforms where libudev is not present
> > +such as BSD systems (but where KMS works)
> > +
> > +Change-Id: Icd0be70a8949578a6158d523428706890a9674eb
> > +Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
> > +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
> > +
> > +Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
> > +Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > +---
> > + config.tests/qpa/kms/kms.pro | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
> > +index 1fb7367..5147bc8 100644
> > +--- a/config.tests/qpa/kms/kms.pro
> > ++++ b/config.tests/qpa/kms/kms.pro
> > +@@ -1,4 +1,4 @@
> > + SOURCES = kms.cpp
> > + CONFIG += link_pkgconfig
> > +-PKGCONFIG += libdrm libudev
> > ++PKGCONFIG += libdrm
> > + CONFIG -= qt
> > +-- 
> > +2.8.1
> > +
> > -- 
> > 2.8.1
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
diff mbox

Patch

diff --git a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
new file mode 100644
index 0000000..7ecbcd0
--- /dev/null
+++ b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch
@@ -0,0 +1,33 @@ 
+From 0f1b4bb65abe0e36e9e4b9813e45192223509de8 Mon Sep 17 00:00:00 2001
+From: Ralf Nolden <nolden@kde.org>
+Date: Tue, 17 May 2016 12:57:17 +0200
+Subject: [PATCH] Remove libudev dependency from kms.pro
+
+To compile the kms qpa plugin, only libdrm is needed.
+Remove the libudev dependency for the compile check to enable
+building of the qpa plugin on platforms where libudev is not present
+such as BSD systems (but where KMS works)
+
+Change-Id: Icd0be70a8949578a6158d523428706890a9674eb
+Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+
+Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ config.tests/qpa/kms/kms.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
+index 1fb7367..5147bc8 100644
+--- a/config.tests/qpa/kms/kms.pro
++++ b/config.tests/qpa/kms/kms.pro
+@@ -1,4 +1,4 @@
+ SOURCES = kms.cpp
+ CONFIG += link_pkgconfig
+-PKGCONFIG += libdrm libudev
++PKGCONFIG += libdrm
+ CONFIG -= qt
+-- 
+2.8.1
+