[ptxdist] [PATCH 1/4] xcb-proto: version bump 1.13 -> 1.14.1

[ptxdist] [PATCH 1/4] xcb-proto: version bump 1.13 -> 1.14.1

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/xcb-proto.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make
index ca54478561c9..fa0e0b97c64b 100644
--- a/rules/xcb-proto.make
+++ b/rules/xcb-proto.make
@@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto
 #
 # Paths and names
 #
-XCB_PROTO_VERSION	:= 1.13
-XCB_PROTO_MD5		:= abe9aa4886138150bbc04ae4f29b90e3
+XCB_PROTO_VERSION	:= 1.14.1
+XCB_PROTO_MD5		:= ecd6955dab1a7b9ba9756a11b8bdb48f
 XCB_PROTO		:= xcb-proto-$(XCB_PROTO_VERSION)
-XCB_PROTO_SUFFIX	:= tar.bz2
-XCB_PROTO_URL		:= http://xcb.freedesktop.org/dist/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
+XCB_PROTO_SUFFIX	:= tar.xz
+XCB_PROTO_URL		:= http://xorg.freedesktop.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
 XCB_PROTO_SOURCE	:= $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
 XCB_PROTO_DIR		:= $(BUILDDIR)/$(XCB_PROTO)
 XCB_PROTO_LICENSE	:= MIT
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/4] waffle: version bump 1.5.2 -> 1.6.1

[Lucas Stach]

- version bump
- use ptx/onoff configuration helper

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...se-EGL-CFLAGS-reported-by-pkg-config.patch | 47 -------------------
 patches/waffle-1.5.2/series                   |  1 -
 rules/waffle.make                             | 18 ++++---
 3 files changed, 12 insertions(+), 54 deletions(-)
 delete mode 100644 patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
 delete mode 100644 patches/waffle-1.5.2/series

diff --git a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch b/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
deleted file mode 100644
index 30759ce4e427..000000000000
--- a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 359902f8f043e7a7d782d1df3d5d74c3b2a3bd04 Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Thu, 8 Jun 2017 13:52:02 +0200
-Subject: [PATCH] egl: use EGL CFLAGS reported by pkg-config
-
-Some platforms need -DMESA_EGL_NO_X11_HEADERS set, as indicated by the
-Cflags: field in egl.pc. pkg-config provides this information, pass it
-to the compiler.
-
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
----
- src/waffle/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
-index d76e029..954774c 100644
---- a/src/waffle/CMakeLists.txt
-+++ b/src/waffle/CMakeLists.txt
-@@ -94,6 +94,9 @@ if(waffle_on_mac)
- endif()
- 
- if(waffle_has_egl)
-+    list(APPEND waffle_cflags
-+        ${egl_CFLAGS}
-+        )
-     list(APPEND waffle_sources
-         egl/wegl_config.c
-         egl/wegl_context.c
-@@ -227,6 +230,7 @@ target_link_libraries(${waffle_libname} ${waffle_libdeps})
- 
- set_target_properties(${waffle_libname}
-     PROPERTIES
-+    COMPILE_FLAGS ${waffle_cflags}
-     SOVERSION ${waffle_soversion}
-     VERSION ${waffle_soversion}.${waffle_minor_version}.${waffle_patch_version}
-     )
-@@ -266,6 +270,7 @@ target_link_libraries(waffle_static ${waffle_libdeps})
- 
- set_target_properties(waffle_static
-     PROPERTIES
-+    COMPILE_FLAGS ${waffle_cflags}
-     OUTPUT_NAME "waffle-static-${waffle_major_version}"
-     )
- 
--- 
-2.11.0
-
diff --git a/patches/waffle-1.5.2/series b/patches/waffle-1.5.2/series
deleted file mode 100644
index 6b680e422f5a..000000000000
--- a/patches/waffle-1.5.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
diff --git a/rules/waffle.make b/rules/waffle.make
index f2c72420793f..7a384476ecc7 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
 #
 # Paths and names
 #
-WAFFLE_VERSION	:= 1.5.2
-WAFFLE_MD5	:= c669c91bf2f7e13a5d781c3dbb30fd8c
+WAFFLE_VERSION	:= 1.6.1
+WAFFLE_MD5	:= c91529e579483f44fb330052872b9c73
 WAFFLE		:= waffle-$(WAFFLE_VERSION)
 WAFFLE_SUFFIX	:= tar.xz
 WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
@@ -32,10 +32,16 @@ WAFFLE_LICENSE_FILES := \
 WAFFLE_CONF_TOOL	:= cmake
 WAFFLE_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
-	-Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
-	-Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
-	-Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
-	-Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
+	-Dwaffle_build_examples=OFF \
+	-Dwaffle_build_htmldocs=OFF \
+	-Dwaffle_build_manpages=OFF \
+	-Dwaffle_build_tests=OFF \
+	-Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
+	-Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
+	-Dwaffle_has_nacl=OFF \
+	-Dwaffle_has_surfaceless_egl=OFF \
+	-Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
+	-Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
 
 
 # ----------------------------------------------------------------------------
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/4] piglit: drop freeglut dependency

[Lucas Stach]

We always build piglit with libwaffle support, so the freeglut based
winsys in never built. Drop the dependency.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/piglit.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/piglit.in b/rules/piglit.in
index d4577200d458..889765ee55af 100644
--- a/rules/piglit.in
+++ b/rules/piglit.in
@@ -17,7 +17,6 @@ menuconfig PIGLIT
 	select WAFFLE
 	select WAYLAND if PIGLIT_WAYLAND
 	select LIBXKBCOMMON if PIGLIT_WAYLAND
-	select FREEGLUT if PIGLIT_TESTS_OPENGL
 	select MESALIB_GLX if PIGLIT_TESTS_OPENGL
 	select MESALIB_OPENGL if PIGLIT_TESTS_OPENGL
 	select XORG if PIGLIT_TESTS_OPENGL
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/4] piglit: switch to ninja build

[Lucas Stach]

Seems to work fine here and is quite a bit faster than the
cmake native build.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/piglit.in   | 1 +
 rules/piglit.make | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rules/piglit.in b/rules/piglit.in
index 889765ee55af..c4414d545cc2 100644
--- a/rules/piglit.in
+++ b/rules/piglit.in
@@ -4,6 +4,7 @@ menuconfig PIGLIT
 	tristate
 	prompt "piglit                        "
 	select HOST_CMAKE
+	select HOST_NINJA
 	select HOST_SYSTEM_PYTHON3
 	select HOST_SYSTEM_PYTHON3_MAKO
 	select HOST_SYSTEM_PYTHON3_NUMPY
diff --git a/rules/piglit.make b/rules/piglit.make
index 1f000cd467b0..9be2826493c0 100644
--- a/rules/piglit.make
+++ b/rules/piglit.make
@@ -31,6 +31,7 @@ PIGLIT_BUILD_OOT	:= NO
 PIGLIT_CONF_TOOL	:= cmake
 
 PIGLIT_CONF_OPT		:= $(CROSS_CMAKE_USR) \
+	-G Ninja \
 	-DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \
 	-DPIGLIT_USE_WAFFLE=1 \
 	-DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] xcb-proto: version bump 1.13 -> 1.14.1

[Michael Olbrich]

Thanks, applied as 7978b087de8b7f07f8e7a5fd5a05c9e2a17180b8.

Michael

[sent from post-receive hook]

On Fri, 27 Nov 2020 09:39:08 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20201116120627.17891-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make
> index ca54478561c9..fa0e0b97c64b 100644
> --- a/rules/xcb-proto.make
> +++ b/rules/xcb-proto.make
> @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto
>  #
>  # Paths and names
>  #
> -XCB_PROTO_VERSION	:= 1.13
> -XCB_PROTO_MD5		:= abe9aa4886138150bbc04ae4f29b90e3
> +XCB_PROTO_VERSION	:= 1.14.1
> +XCB_PROTO_MD5		:= ecd6955dab1a7b9ba9756a11b8bdb48f
>  XCB_PROTO		:= xcb-proto-$(XCB_PROTO_VERSION)
> -XCB_PROTO_SUFFIX	:= tar.bz2
> -XCB_PROTO_URL		:= http://xcb.freedesktop.org/dist/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
> +XCB_PROTO_SUFFIX	:= tar.xz
> +XCB_PROTO_URL		:= http://xorg.freedesktop.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
>  XCB_PROTO_SOURCE	:= $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
>  XCB_PROTO_DIR		:= $(BUILDDIR)/$(XCB_PROTO)
>  XCB_PROTO_LICENSE	:= MIT

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] waffle: version bump 1.5.2 -> 1.6.1

[Michael Olbrich]

Thanks, applied as 1312352dbe18d42b95910c95b4a00b815cda2f3f.

Michael

[sent from post-receive hook]

On Fri, 27 Nov 2020 09:39:09 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> - version bump
> - use ptx/onoff configuration helper
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20201116120627.17891-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch b/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> deleted file mode 100644
> index 30759ce4e427..000000000000
> --- a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -From 359902f8f043e7a7d782d1df3d5d74c3b2a3bd04 Mon Sep 17 00:00:00 2001
> -From: Philipp Zabel <p.zabel@pengutronix.de>
> -Date: Thu, 8 Jun 2017 13:52:02 +0200
> -Subject: [PATCH] egl: use EGL CFLAGS reported by pkg-config
> -
> -Some platforms need -DMESA_EGL_NO_X11_HEADERS set, as indicated by the
> -Cflags: field in egl.pc. pkg-config provides this information, pass it
> -to the compiler.
> -
> -Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ----
> - src/waffle/CMakeLists.txt | 5 +++++
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
> -index d76e029..954774c 100644
> ---- a/src/waffle/CMakeLists.txt
> -+++ b/src/waffle/CMakeLists.txt
> -@@ -94,6 +94,9 @@ if(waffle_on_mac)
> - endif()
> - 
> - if(waffle_has_egl)
> -+    list(APPEND waffle_cflags
> -+        ${egl_CFLAGS}
> -+        )
> -     list(APPEND waffle_sources
> -         egl/wegl_config.c
> -         egl/wegl_context.c
> -@@ -227,6 +230,7 @@ target_link_libraries(${waffle_libname} ${waffle_libdeps})
> - 
> - set_target_properties(${waffle_libname}
> -     PROPERTIES
> -+    COMPILE_FLAGS ${waffle_cflags}
> -     SOVERSION ${waffle_soversion}
> -     VERSION ${waffle_soversion}.${waffle_minor_version}.${waffle_patch_version}
> -     )
> -@@ -266,6 +270,7 @@ target_link_libraries(waffle_static ${waffle_libdeps})
> - 
> - set_target_properties(waffle_static
> -     PROPERTIES
> -+    COMPILE_FLAGS ${waffle_cflags}
> -     OUTPUT_NAME "waffle-static-${waffle_major_version}"
> -     )
> - 
> --- 
> -2.11.0
> -
> diff --git a/patches/waffle-1.5.2/series b/patches/waffle-1.5.2/series
> deleted file mode 100644
> index 6b680e422f5a..000000000000
> --- a/patches/waffle-1.5.2/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> diff --git a/rules/waffle.make b/rules/waffle.make
> index f2c72420793f..7a384476ecc7 100644
> --- a/rules/waffle.make
> +++ b/rules/waffle.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
>  #
>  # Paths and names
>  #
> -WAFFLE_VERSION	:= 1.5.2
> -WAFFLE_MD5	:= c669c91bf2f7e13a5d781c3dbb30fd8c
> +WAFFLE_VERSION	:= 1.6.1
> +WAFFLE_MD5	:= c91529e579483f44fb330052872b9c73
>  WAFFLE		:= waffle-$(WAFFLE_VERSION)
>  WAFFLE_SUFFIX	:= tar.xz
>  WAFFLE_URL	:= http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
> @@ -32,10 +32,16 @@ WAFFLE_LICENSE_FILES := \
>  WAFFLE_CONF_TOOL	:= cmake
>  WAFFLE_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
> -	-Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
> -	-Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
> -	-Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
> -	-Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
> +	-Dwaffle_build_examples=OFF \
> +	-Dwaffle_build_htmldocs=OFF \
> +	-Dwaffle_build_manpages=OFF \
> +	-Dwaffle_build_tests=OFF \
> +	-Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
> +	-Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
> +	-Dwaffle_has_nacl=OFF \
> +	-Dwaffle_has_surfaceless_egl=OFF \
> +	-Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
> +	-Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
>  
>  
>  # ----------------------------------------------------------------------------

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] piglit: drop freeglut dependency

[Michael Olbrich]

Thanks, applied as 3f15da24a862abad14cdfd03a93847e42a7b23ac.

Michael

[sent from post-receive hook]

On Fri, 27 Nov 2020 09:39:11 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> We always build piglit with libwaffle support, so the freeglut based
> winsys in never built. Drop the dependency.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20201116120627.17891-3-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/piglit.in b/rules/piglit.in
> index d4577200d458..889765ee55af 100644
> --- a/rules/piglit.in
> +++ b/rules/piglit.in
> @@ -17,7 +17,6 @@ menuconfig PIGLIT
>  	select WAFFLE
>  	select WAYLAND if PIGLIT_WAYLAND
>  	select LIBXKBCOMMON if PIGLIT_WAYLAND
> -	select FREEGLUT if PIGLIT_TESTS_OPENGL
>  	select MESALIB_GLX if PIGLIT_TESTS_OPENGL
>  	select MESALIB_OPENGL if PIGLIT_TESTS_OPENGL
>  	select XORG if PIGLIT_TESTS_OPENGL

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] piglit: switch to ninja build

[Michael Olbrich]

Thanks, applied as 655a0a4b3f4e144bc55cac29244108cb0d08766f.

Michael

[sent from post-receive hook]

On Fri, 27 Nov 2020 09:39:12 +0100, Lucas Stach <l.stach@pengutronix.de> wrote:
> Seems to work fine here and is quite a bit faster than the
> cmake native build.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20201116120627.17891-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/piglit.in b/rules/piglit.in
> index 889765ee55af..c4414d545cc2 100644
> --- a/rules/piglit.in
> +++ b/rules/piglit.in
> @@ -4,6 +4,7 @@ menuconfig PIGLIT
>  	tristate
>  	prompt "piglit                        "
>  	select HOST_CMAKE
> +	select HOST_NINJA
>  	select HOST_SYSTEM_PYTHON3
>  	select HOST_SYSTEM_PYTHON3_MAKO
>  	select HOST_SYSTEM_PYTHON3_NUMPY
> diff --git a/rules/piglit.make b/rules/piglit.make
> index 1f000cd467b0..9be2826493c0 100644
> --- a/rules/piglit.make
> +++ b/rules/piglit.make
> @@ -31,6 +31,7 @@ PIGLIT_BUILD_OOT	:= NO
>  PIGLIT_CONF_TOOL	:= cmake
>  
>  PIGLIT_CONF_OPT		:= $(CROSS_CMAKE_USR) \
> +	-G Ninja \
>  	-DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \
>  	-DPIGLIT_USE_WAFFLE=1 \
>  	-DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de