Update wayland and weston to 1.0.3.
I also removed the screenshooter-client-protocol patch as this was fixed upstream.
This commit is contained in:
parent
7d591c23b3
commit
a53a7bc0e4
@ -2,18 +2,17 @@
|
|||||||
, cairo, libxcb, libXcursor, x11, udev, libdrm2_4_39, mtdev
|
, cairo, libxcb, libXcursor, x11, udev, libdrm2_4_39, mtdev
|
||||||
, libjpeg, pam, autoconf, automake, libtool }:
|
, libjpeg, pam, autoconf, automake, libtool }:
|
||||||
|
|
||||||
let version = "1.0.2"; in
|
let version = "1.0.3"; in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "weston-${version}";
|
name = "weston-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||||
sha256 = "1496l8hmpxx7pivdpp14pv0hi30q18dmnaxz471v9jiqsnnrr11k";
|
sha256 = "0ls8w1l8k9fx0hjlw7qzjb98l911agigf5s2dna3xsjlyv9afdii";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./screenshooter-client-protocol_h.patch
|
|
||||||
./makefile.patch
|
./makefile.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
diff --git a/clients/screenshooter-client-protocol.h b/clients/screenshooter-client-protocol.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..8782ca1
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/clients/screenshooter-client-protocol.h
|
|
||||||
@@ -0,0 +1,66 @@
|
|
||||||
+#ifndef SCREENSHOOTER_CLIENT_PROTOCOL_H
|
|
||||||
+#define SCREENSHOOTER_CLIENT_PROTOCOL_H
|
|
||||||
+
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+extern "C" {
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#include <stdint.h>
|
|
||||||
+#include <stddef.h>
|
|
||||||
+#include "wayland-client.h"
|
|
||||||
+
|
|
||||||
+struct wl_client;
|
|
||||||
+struct wl_resource;
|
|
||||||
+
|
|
||||||
+struct screenshooter;
|
|
||||||
+
|
|
||||||
+extern const struct wl_interface screenshooter_interface;
|
|
||||||
+
|
|
||||||
+struct screenshooter_listener {
|
|
||||||
+ /**
|
|
||||||
+ * done - (none)
|
|
||||||
+ */
|
|
||||||
+ void (*done)(void *data,
|
|
||||||
+ struct screenshooter *screenshooter);
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static inline int
|
|
||||||
+screenshooter_add_listener(struct screenshooter *screenshooter,
|
|
||||||
+ const struct screenshooter_listener *listener, void *data)
|
|
||||||
+{
|
|
||||||
+ return wl_proxy_add_listener((struct wl_proxy *) screenshooter,
|
|
||||||
+ (void (**)(void)) listener, data);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#define SCREENSHOOTER_SHOOT 0
|
|
||||||
+
|
|
||||||
+static inline void
|
|
||||||
+screenshooter_set_user_data(struct screenshooter *screenshooter, void *user_data)
|
|
||||||
+{
|
|
||||||
+ wl_proxy_set_user_data((struct wl_proxy *) screenshooter, user_data);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void *
|
|
||||||
+screenshooter_get_user_data(struct screenshooter *screenshooter)
|
|
||||||
+{
|
|
||||||
+ return wl_proxy_get_user_data((struct wl_proxy *) screenshooter);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void
|
|
||||||
+screenshooter_destroy(struct screenshooter *screenshooter)
|
|
||||||
+{
|
|
||||||
+ wl_proxy_destroy((struct wl_proxy *) screenshooter);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void
|
|
||||||
+screenshooter_shoot(struct screenshooter *screenshooter, struct wl_output *output, struct wl_buffer *buffer)
|
|
||||||
+{
|
|
||||||
+ wl_proxy_marshal((struct wl_proxy *) screenshooter,
|
|
||||||
+ SCREENSHOOTER_SHOOT, output, buffer);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+#endif
|
|
@ -1,13 +1,13 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, libffi, expat, doxygen }:
|
{ stdenv, fetchurl, pkgconfig, libffi, expat, doxygen }:
|
||||||
|
|
||||||
let version = "1.0.2"; in
|
let version = "1.0.3"; in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "wayland-${version}";
|
name = "wayland-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
|
||||||
sha256 = "0q2p83s2c7l5n6yzii3f2r6wrl3bd99d0v0fai21pb4jwijmxq71";
|
sha256 = "04sr7bl1f0qk837qpc9zpxirkgvlp3pval3326mbld553ghmxgpn";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig libffi expat doxygen ];
|
buildInputs = [ pkgconfig libffi expat doxygen ];
|
||||||
|
Loading…
Reference in New Issue
Block a user