From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- gui-libs/wlroots/Manifest | 3 ++- .../files/wlroots-0.8.1-eglmesaextfix.patch | 25 ++++++++++++++++++++++ gui-libs/wlroots/wlroots-0.8.1-r1.ebuild | 3 +++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch (limited to 'gui-libs/wlroots') diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest index aa1bf0ff702d..e9bdc6e50608 100644 --- a/gui-libs/wlroots/Manifest +++ b/gui-libs/wlroots/Manifest @@ -1,6 +1,7 @@ +AUX wlroots-0.8.1-eglmesaextfix.patch 655 BLAKE2B 94a8e4271037360ee13ebd86852b542426b2a7e7a7bc2df30b74ab57e246b757e7a9ef71f82dc73d7a9c2a352116e13eeddb957c0ca931aad8eb1c9baf729c48 SHA512 2bffe4e80e01902640ec7e585f277a008d3b35568d61a79398659e32fa1aa69b5f9784c3eb931c0851cf1c76f42435887618a14aba0515542ed0b03ebf0eaa42 DIST wlroots-0.6.0.tar.gz 497934 BLAKE2B a0b631831752e533f83ed62e402ef69b0994df050fd643cf2ef89556face4a822b3936bc758b70ab160eedda8ced16c0992dc209600914095784bba97bd26ee2 SHA512 c205d4303a381e11ef2f4db2faac1ddf9ad85c675824aae9cfe62d9f8bd313f1568d4810db1d006416783b50c8364198648a46d1ba453a0d8f659d6920618286 DIST wlroots-0.8.1.tar.gz 451814 BLAKE2B 85f221ba9068839f326e09df616f6182f518b9a129730dda794103305e3c0786d609a7cc6cb60a90c9d51cb77e3dbbc5993901271dcf1bd656c7744260561b06 SHA512 da41513de48e00303b31fde620463389103215011c6cc49b9a2420a1529889722aa54f26a211179c528709edb6b90ba2efdae5e4bcef18147d9516f3a94e365a EBUILD wlroots-0.6.0.ebuild 1882 BLAKE2B 1ecbd11added412bb951a2fcb2a3810e67788b2590ea5e7262bf8e86dd9fd7e34d5ee3845c8d7e0dba00d2750917b84d84645ced7e54c85162762221c34c7178 SHA512 03a62c755d4bf57a79be14fbce917245e658a09d57c71c5e8294dce579b189bc9ab64c9a87e06efe27214db281c9191a16d74ed6e545218a2fb81a23f1a8f619 -EBUILD wlroots-0.8.1-r1.ebuild 1884 BLAKE2B 700c130f84f1b46033a94be0f4322443cac7d5ed6b787a5dc8e124b615190701589e1509fc48a79839bdc8edb74e2502ae431b6f5c19e306be9afb84f3e72d3f SHA512 0e8437ccde986819667cafb5ebf303b1cd9abe7cba61631732be247d56e88f1c468cfb3463ef80a634980b0efff628efffc2302cf4027ed1d9b5e1ddd36144d1 +EBUILD wlroots-0.8.1-r1.ebuild 1982 BLAKE2B b4492dd909a04631bb66dd36b0b46cdc6d397e40778dd1606cbdce41b68d4d4fbbee4db41c2c10b5c5b2875bab2f85c871ea0056c97d16b33f1f69a75410fb51 SHA512 b81d1a2d0b4f5d30d0f795765a596166d8c5de1b70bd88fa15f6f1aacde695761acfb197eec20fc98652a40a482e3eb7e4ee20679933806af391d5c22dd947d6 EBUILD wlroots-9999.ebuild 1836 BLAKE2B f18c1cba6f5a79b8824fa62280360efbd4c89c67f0b4ae1a83fc3aa5fd2a9dc5e5e12855c8e6a542b66b682405dd98c479d7043b2e687f7bf8b37305c7d6c6f3 SHA512 291b7060c3f782d26176fc38af7286c902283b3b20c64a50726368549f048e26b1b6666e442dc445f7a54a6f266f2e525cfd42a1e0615d52e4010108f217da81 MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99 diff --git a/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch new file mode 100644 index 000000000000..614d0c7a2cd4 --- /dev/null +++ b/gui-libs/wlroots/files/wlroots-0.8.1-eglmesaextfix.patch @@ -0,0 +1,25 @@ +From d113e48a2a32542fe6e12f1759f07888364609bf Mon Sep 17 00:00:00 2001 +From: Ferdinand Bachmann +Date: Sat, 19 Oct 2019 13:33:22 +0200 +Subject: [PATCH] Add missing include required by mesa and libglvnd change + +eglext.h no longer inludes eglmesaext.h, include it within wlroots +explicitly. + +Fixes #1862 +--- + glgen.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/glgen.sh b/glgen.sh +index 7324fdf6b..31af28120 100755 +--- a/glgen.sh ++++ b/glgen.sh +@@ -75,6 +75,7 @@ cat > "$OUTDIR/$BASE.h" << EOF + + #include + #include ++#include + #include + #include + diff --git a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild index 50a4262598f9..51f138afcfd2 100644 --- a/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild +++ b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild @@ -68,6 +68,9 @@ src_configure() { emesonargs+=("-Dlogind=disabled") fi + # Patch is currently in upstream master + eapply "${FILESDIR}/wlroots-0.8.1-eglmesaextfix.patch" + meson_src_configure } -- cgit v1.2.3