commit:     ca5358d650f11d045615aa19edbed5f5781a4480
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 20:22:35 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 20:22:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5358d6

media-libs/libsdl2: Patch in missing Wayland header dependencies

Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=3977
Closes: https://github.com/gentoo/gentoo/pull/9904
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/libsdl2-2.0.8-wayland-headers.patch       | 21 +++++++++++++++++++++
 media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild          |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch 
b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch
new file mode 100644
index 00000000000..95dd1730481
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.8-wayland-headers.patch
@@ -0,0 +1,21 @@
+diff -Naur a/configure.in b/configure.in
+--- a/configure.in     2018-03-01 16:34:41.000000000 +0000
++++ b/configure.in     2018-09-21 21:02:34.823834390 +0100
+@@ -1411,7 +1411,8 @@
+ 
+             WAYLAND_PROTOCOLS_UNSTABLE="relative-pointer-unstable-v1 
pointer-constraints-unstable-v1 xdg-shell-unstable-v6"
+ 
+-            SOURCES="$SOURCES $srcdir/src/video/wayland/*.c"
++            WAYLAND_SOURCES="$srcdir/src/video/wayland/*.c"
++            SOURCES="$SOURCES $WAYLAND_SOURCES"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $WAYLAND_CFLAGS -I\$(gen)"
+             AC_ARG_ENABLE(wayland-shared,
+ AC_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support 
[[default=maybe]]]),
+@@ -4003,6 +4004,7 @@
+ $WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS
+ $WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS
+ $WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE
++`echo ; for s in $WAYLAND_SOURCES ; do echo -n "\$s:" ; for p in 
$WAYLAND_PROTOCOLS_UNSTABLE ; do echo -n " \\$(gen)/\$p-client-protocol.h" ; 
done ; echo ; done ; echo`
+ "
+ fi
+ 

diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild 
b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
index 59e84df973a..adab5ba5df2 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
@@ -75,6 +75,8 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.0.6-static-libs.patch
        # https://bugzilla.libsdl.org/show_bug.cgi?id=4144
        "${FILESDIR}"/${P}-rework-variables.patch
+       # https://bugzilla.libsdl.org/show_bug.cgi?id=3977
+       "${FILESDIR}"/${P}-wayland-headers.patch
 )
 
 S="${WORKDIR}/${MY_P}"

Reply via email to