changeset 1307:43561db97cbf

graphics/wayland: upgrade to 1.19.92
author David Demelier <markand@malikania.fr>
date Thu, 18 Nov 2021 19:55:43 +0100
parents f6d252a2a67c
children 7c81bdc2541b
files graphics/wayland/wayland.sh graphics/wayland/wayland.sha1
diffstat 2 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/graphics/wayland/wayland.sh	Fri Nov 12 10:22:57 2021 +0100
+++ b/graphics/wayland/wayland.sh	Thu Nov 18 19:55:43 2021 +0100
@@ -16,12 +16,12 @@
 #
 
 PKGNAME=wayland
-PKGVERSION=1.16.93
+PKGVERSION=1.19.92
 PKGREVISION=1
 PKGLICENSE="MIT"
 PKGSUMMARY="displayer server protocol"
 PKGDOWNLOAD="https://wayland.freedesktop.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
-PKGDEPENDS="expat"
+PKGDEPENDS="expat meson:build"
 PKGOPTIONS="DTD DOCS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
@@ -35,37 +35,38 @@
 
 if [ "$DTD" = "yes" ]; then
 	PKGDEPENDS="libxml2 $PKGDEPENDS"
-	with_dtd="--enable-dtd-validation"
+	with_dtd="-Ddtd_validation=true"
 else
-	with_dtd="--disable-dtd-validation"
+	with_dtd="-Ddtd_validation=false"
 fi
 
 if [ "$DOCS" = "yes" ]; then
 	PKGDEPENDS="graphviz:build doxygen:build xmlto:build $PKGDEPENDS"
-	with_docs="--enable-documentation"
+	with_docs="-Ddocumentation=true"
 else
-	with_docs="--disable-documentation"
+	with_docs="-Ddocumentation=false"
 fi
 
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
+	meson . build \
+		--prefix / \
+		--buildtype release \
+		--default-library shared \
 		$with_dtd \
 		$with_docs
-	make
-	make install DESTDIR=$DESTDIR
-	find $DESTDIR -type f -name "*.la" -delete
+	ninja -C build
+	DESTDIR=$DESTDIR ninja -C build install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/graphics/wayland/wayland.sha1	Fri Nov 12 10:22:57 2021 +0100
+++ b/graphics/wayland/wayland.sha1	Thu Nov 18 19:55:43 2021 +0100
@@ -1,1 +1,1 @@
-7951873d5d58228e8d6511fe8223990c79d45f80  wayland-1.16.93.tar.xz
+c0ec93b42c2c5e745695c1457d6cf91e55c7633a  wayland-1.19.92.tar.xz