From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1kedH9-00071U-O7 for ptxdist@pengutronix.de; Mon, 16 Nov 2020 13:06:27 +0100 From: Lucas Stach Date: Mon, 16 Nov 2020 13:06:25 +0100 Message-Id: <20201116120627.17891-2-l.stach@pengutronix.de> In-Reply-To: <20201116120627.17891-1-l.stach@pengutronix.de> References: <20201116120627.17891-1-l.stach@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/4] waffle: version bump 1.5.2 -> 1.6.1 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de - version bump - use ptx/onoff configuration helper Signed-off-by: Lucas Stach --- ...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 -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 ---- - 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