From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
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 <p.zabel@pengutronix.de>) id 1i4kYG-00037b-1F
 for ptxdist@pengutronix.de; Mon, 02 Sep 2019 13:31:16 +0200
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon,  2 Sep 2019 13:31:15 +0200
Message-Id: <20190902113115.32765-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH v2] weston: version bump 6.0.1 -> 7.0.0
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=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" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/weston.in   |  6 ++++++
 rules/weston.make | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 42dcb9eeadbe..d2ef2119b432 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -110,6 +110,12 @@ config WESTON_IVISHELL_EXAMPLE
 	  application, a few demo clients and the weston.ini configuration for
 	  the IVI-Shell.
 
+config WESTON_PIPEWIRE
+	bool
+	prompt "pipewire plugin"
+	# needs pipewire
+	depends on BROKEN
+
 config WESTON_REMOTING
 	bool
 	prompt "remoting plugin"
diff --git a/rules/weston.make b/rules/weston.make
index 1dd13bfb32d3..4c38fd2d1aa1 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION	:= 6.0.1
-LIBWESTON_MAJOR := 6
-WESTON_MD5	:= e7b10710ef1eac82258f97bfd41fe534
+WESTON_VERSION	:= 7.0.0
+LIBWESTON_MAJOR := 7
+WESTON_MD5	:= cbfda483bc2501d0831af3f33c707850
 WESTON		:= weston-$(WESTON_VERSION)
 WESTON_SUFFIX	:= tar.xz
 WESTON_URL	:= http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -53,9 +53,11 @@ WESTON_CONF_OPT		:= \
 	-Dcolor-management-lcms=false \
 	-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
 	-Ddesktop-shell-client-default=weston-desktop-shell \
+	-Ddoc=false \
 	-Dimage-jpeg=true \
 	-Dimage-webp=false \
 	-Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
+	-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
 	-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
 	-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
 	-Dresize-pool=true \
@@ -154,6 +156,9 @@ ifdef PTXCONF_WESTON_GL
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/wayland-backend)
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/gl-renderer)
 endif
+ifdef PTXCONF_WESTON_PIPEWIRE
+	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/pipewire-plugin)
+endif
 ifdef PTXCONF_WESTON_REMOTING
 	@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR)/remoting-plugin)
 endif
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de