* [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum
@ 2016-06-30 12:41 Alexander Stein
2016-06-30 12:41 ` [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support Alexander Stein
2016-06-30 15:42 ` [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Michael Olbrich
0 siblings, 2 replies; 5+ messages in thread
From: Alexander Stein @ 2016-06-30 12:41 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Stein
The main URL does not provide the source tarball. But on mirrors the MD5
has changed.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
rules/xkeyboard-config.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make
index dd6b75b..587f503 100644
--- a/rules/xkeyboard-config.make
+++ b/rules/xkeyboard-config.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config
# Paths and names
#
XKEYBOARD_CONFIG_VERSION := 2.0
-XKEYBOARD_CONFIG_MD5 := bb8a98ee61cdc4bd835fdfd2b5cee3e6
+XKEYBOARD_CONFIG_MD5 := 06a8c600d086988cc98ea186d39d552e
XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION)
XKEYBOARD_CONFIG_SUFFIX := tar.bz2
XKEYBOARD_CONFIG_URL := http://xlibs.freedesktop.org/xkbdesc/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX)
--
2.7.3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support
2016-06-30 12:41 [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Alexander Stein
@ 2016-06-30 12:41 ` Alexander Stein
2016-07-04 6:28 ` Alexander Stein
2016-06-30 15:42 ` [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Stein @ 2016-06-30 12:41 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Stein
Apparently pkg-config is not used for qt configuration, so we need to
provide MESA_EGL_NO_X11_HEADERS in case mesa is built without X11 headers,
e.g. wayland only. Otherwise the following error orccurs:
make[7]: Entering directory '/build/build-target/qt-everywhere-opensource
-src-5.6.1-1-build/qtbase/src/plugins/platforms/eglfs'
compiling /build/build-target/qt-everywhere-opensource-src-5.6.1-1/qtbase/
src/plugins/platforms/eglfs/qeglfsmain.cpp
In file included from /build/sysroot-target/usr/include/EGL/egl.h:39:0,
from /build/build-target/qt-everywhere-opensource-src
-5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsintegration.h:41,
from /build/build-target/qt-everywhere-opensource-src
-5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsmain.cpp:35:
/build/sysroot-target/usr/include/EGL/eglplatform.h:119:22:
fatal error: X11/Xlib.h: No such file or directory
compilation terminated.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
---
rules/qt5.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/qt5.make b/rules/qt5.make
index b802443..3a91cbb 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -222,6 +222,10 @@ QT5_CONF_OPT += \
--$(call ptx/endis, PTXCONF_QT5_XRENDER)-xrender \
--$(call ptx/endis, PTXCONF_QT5_XV)-xvideo \
+ifndef PTXCONF_XORG_LIB_X11
+QT5_CONF_OPT += -DMESA_EGL_NO_X11_HEADERS
+endif
+
ifdef PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL
QT5_CONF_OPT += -mysql_config $(SYSROOT)/usr/bin/mysql_config
endif
--
2.7.3
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support
2016-06-30 12:41 ` [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support Alexander Stein
@ 2016-07-04 6:28 ` Alexander Stein
2016-07-04 6:40 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Alexander Stein @ 2016-07-04 6:28 UTC (permalink / raw)
To: ptxdist
On Thursday 30 June 2016 14:41:26, Alexander Stein wrote:
> Apparently pkg-config is not used for qt configuration, so we need to
> provide MESA_EGL_NO_X11_HEADERS in case mesa is built without X11 headers,
> e.g. wayland only. Otherwise the following error orccurs:
> make[7]: Entering directory '/build/build-target/qt-everywhere-opensource
> -src-5.6.1-1-build/qtbase/src/plugins/platforms/eglfs'
> compiling /build/build-target/qt-everywhere-opensource-src-5.6.1-1/qtbase/
> src/plugins/platforms/eglfs/qeglfsmain.cpp
> In file included from /build/sysroot-target/usr/include/EGL/egl.h:39:0,
> from /build/build-target/qt-everywhere-opensource-src
> -5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsintegration.h:41,
> from /build/build-target/qt-everywhere-opensource-src
> -5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsmain.cpp:35:
> /build/sysroot-target/usr/include/EGL/eglplatform.h:119:22:
> fatal error: X11/Xlib.h: No such file or directory
> compilation terminated.
I guess with commit 981c7ca69cc8ac105cab551fd710435f1a262a5f ("qt5: don't
forget the patches") this patch is no longer necessary.
Best regards,
Alexander
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support
2016-07-04 6:28 ` Alexander Stein
@ 2016-07-04 6:40 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2016-07-04 6:40 UTC (permalink / raw)
To: ptxdist
On Mon, Jul 04, 2016 at 08:28:22AM +0200, Alexander Stein wrote:
> On Thursday 30 June 2016 14:41:26, Alexander Stein wrote:
> > Apparently pkg-config is not used for qt configuration, so we need to
> > provide MESA_EGL_NO_X11_HEADERS in case mesa is built without X11 headers,
> > e.g. wayland only. Otherwise the following error orccurs:
> > make[7]: Entering directory '/build/build-target/qt-everywhere-opensource
> > -src-5.6.1-1-build/qtbase/src/plugins/platforms/eglfs'
> > compiling /build/build-target/qt-everywhere-opensource-src-5.6.1-1/qtbase/
> > src/plugins/platforms/eglfs/qeglfsmain.cpp
> > In file included from /build/sysroot-target/usr/include/EGL/egl.h:39:0,
> > from /build/build-target/qt-everywhere-opensource-src
> > -5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsintegration.h:41,
> > from /build/build-target/qt-everywhere-opensource-src
> > -5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsmain.cpp:35:
> > /build/sysroot-target/usr/include/EGL/eglplatform.h:119:22:
> > fatal error: X11/Xlib.h: No such file or directory
> > compilation terminated.
>
> I guess with commit 981c7ca69cc8ac105cab551fd710435f1a262a5f ("qt5: don't
> forget the patches") this patch is no longer necessary.
Thanks for the heads up. I had wondered why I didn't see this.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum
2016-06-30 12:41 [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Alexander Stein
2016-06-30 12:41 ` [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support Alexander Stein
@ 2016-06-30 15:42 ` Michael Olbrich
1 sibling, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2016-06-30 15:42 UTC (permalink / raw)
To: ptxdist
On Thu, Jun 30, 2016 at 02:41:25PM +0200, Alexander Stein wrote:
> The main URL does not provide the source tarball. But on mirrors the MD5
> has changed.
<PKG>_MD5 can be a list of md5sums. This is for cases like this where
different sources produce tarballs that are basically the same but have
different md5sums. So please keep the old one and add the new one.
Can you update the URL as well?
That should be $(call ptx/mirror, XORG, individual/...), I think.
Michael
> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> ---
> rules/xkeyboard-config.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make
> index dd6b75b..587f503 100644
> --- a/rules/xkeyboard-config.make
> +++ b/rules/xkeyboard-config.make
> @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config
> # Paths and names
> #
> XKEYBOARD_CONFIG_VERSION := 2.0
> -XKEYBOARD_CONFIG_MD5 := bb8a98ee61cdc4bd835fdfd2b5cee3e6
> +XKEYBOARD_CONFIG_MD5 := 06a8c600d086988cc98ea186d39d552e
> XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION)
> XKEYBOARD_CONFIG_SUFFIX := tar.bz2
> XKEYBOARD_CONFIG_URL := http://xlibs.freedesktop.org/xkbdesc/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX)
> --
> 2.7.3
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-04 6:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-30 12:41 [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Alexander Stein
2016-06-30 12:41 ` [ptxdist] [PATCH 2/2] qt5: Pass required compiler flags if mesa is built without X11 support Alexander Stein
2016-07-04 6:28 ` Alexander Stein
2016-07-04 6:40 ` Michael Olbrich
2016-06-30 15:42 ` [ptxdist] [PATCH 1/2] xkeyboard-config: Update md5sum Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox