* [gentoo-commits] proj/musl:master commit in: dev-libs/weston/, dev-libs/weston/files/
@ 2016-11-09 4:22 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-11-09 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 9dacace1698884a65a9cd45bc8b59af1b76f7fcd
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 01:20:27 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 01:21:50 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9dacace1
dev-libs/weston: Add Latest
1.11.0 in both weston and wayland added a lot of musl incompatibilities for no
reason -- the patch removes use of error.h, which musl doesn't have.
dev-libs/weston/Manifest | 5 +
dev-libs/weston/files/1.11.0-musl.patch | 265 ++++++++++++++++++++++++++++++++
dev-libs/weston/files/README.gentoo | 9 ++
dev-libs/weston/metadata.xml | 26 ++++
dev-libs/weston/weston-1.11.0.ebuild | 158 +++++++++++++++++++
5 files changed, 463 insertions(+)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
new file mode 100644
index 0000000..08a2abf
--- /dev/null
+++ b/dev-libs/weston/Manifest
@@ -0,0 +1,5 @@
+AUX 1.11.0-musl.patch 6945 SHA256 c328fffeeb5e5c8ad1b5198c62ba0da415fb0c0ac003070d83c11cde5057b5dc SHA512 6c798b7dad8f81c1cd550b9aa30e11729881dff09141cd811d90e2ad06da7f756542d8844b1a2a2948b247935cd4261d46aa9b991aaaeada226c418512734b2f WHIRLPOOL 719cf3a43ee54c4ab2fd3f3500560a3c10bb974d897cd07c501afe85ee37ab1235ffc5583bbfd3015ecfbe7d9745e6350f9ef9cf78913346bb9f8e4659a0108c
+AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
+DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
+EBUILD weston-1.11.0.ebuild 3671 SHA256 1961ced3c29cdae326f21323f8404ca56ac4880c791bfc35bb781a239bd21a13 SHA512 88de8968e3ca286cbea8df932225619cb000cbfadf591174b8f687fe67831b8e17ca2c4a1c9a0b3d200ebd6b18fdb08789115a914e1df284ce534a4139c24be0 WHIRLPOOL a7a68946e418bbfe6e32a65512e5b5a9fcaecb6ea1b5abe0072767f736b3c77f6be33f4ea681612e081681ba636041fafb694d6ae95939571dd2f72eccfea624
+MISC metadata.xml 1346 SHA256 2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094 WHIRLPOOL 70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
diff --git a/dev-libs/weston/files/1.11.0-musl.patch b/dev-libs/weston/files/1.11.0-musl.patch
new file mode 100644
index 0000000..b568b47
--- /dev/null
+++ b/dev-libs/weston/files/1.11.0-musl.patch
@@ -0,0 +1,265 @@
+diff -Naur weston-1.11.0.orig/shared/xalloc.h weston-1.11.0/shared/xalloc.h
+--- weston-1.11.0.orig/shared/xalloc.h 2016-06-21 10:44:19.589264446 -0700
++++ weston-1.11.0/shared/xalloc.h 2016-06-21 10:44:32.790394210 -0700
+@@ -30,6 +30,7 @@
+ extern "C" {
+ #endif
+
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+diff -Naur weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
+--- weston-1.11.0.orig/src/weston-launch.c 2016-06-21 10:44:19.613264682 -0700
++++ weston-1.11.0/src/weston-launch.c 2016-06-21 10:54:33.890366803 -0700
+@@ -33,7 +33,7 @@
+ #include <poll.h>
+ #include <errno.h>
+
+-#include <error.h>
++#include <err.h>
+ #include <getopt.h>
+
+ #include <sys/types.h>
+@@ -225,11 +225,15 @@
+ static int
+ setup_launcher_socket(struct weston_launch *wl)
+ {
+- if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0)
+- error(1, errno, "socketpair failed");
++ if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) {
++ err(errno, "socketpair failed");
++ exit(1);
++ }
+
+- if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0)
+- error(1, errno, "fcntl failed");
++ if (fcntl(wl->sock[0], F_SETFD, FD_CLOEXEC) < 0) {
++ err(errno, "fcntl failed");
++ exit(1);
++ }
+
+ return 0;
+ }
+@@ -464,7 +468,7 @@
+ int pid, status, ret;
+
+ if (read(wl->signalfd, &sig, sizeof sig) != sizeof sig) {
+- error(0, errno, "reading signalfd failed");
++ err(errno, "reading signalfd failed");
+ return -1;
+ }
+
+@@ -530,49 +534,69 @@
+ int tty0 = open("/dev/tty0", O_WRONLY | O_CLOEXEC);
+ char filename[16];
+
+- if (tty0 < 0)
+- error(1, errno, "could not open tty0");
++ if (tty0 < 0) {
++ err(errno, "could not open tty0");
++ exit(1);
++ }
+
+- if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1)
+- error(1, errno, "failed to find non-opened console");
++ if (ioctl(tty0, VT_OPENQRY, &wl->ttynr) < 0 || wl->ttynr == -1) {
++ err(errno, "failed to find non-opened console");
++ exit(1);
++ }
+
+ snprintf(filename, sizeof filename, "/dev/tty%d", wl->ttynr);
+ wl->tty = open(filename, O_RDWR | O_NOCTTY);
+ close(tty0);
+ }
+
+- if (wl->tty < 0)
+- error(1, errno, "failed to open tty");
++ if (wl->tty < 0) {
++ err(errno, "failed to open tty");
++ exit(1);
++ }
+
+ if (fstat(wl->tty, &buf) == -1 ||
+- major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0)
+- error(1, 0, "weston-launch must be run from a virtual terminal");
++ major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) {
++ err(0, "weston-launch must be run from a virtual terminal");
++ exit(1);
++ }
+
+ if (tty) {
+- if (fstat(wl->tty, &buf) < 0)
+- error(1, errno, "stat %s failed", tty);
++ if (fstat(wl->tty, &buf) < 0) {
++ err(errno, "stat %s failed", tty);
++ exit(1);
++ }
+
+- if (major(buf.st_rdev) != TTY_MAJOR)
+- error(1, 0, "invalid tty device: %s", tty);
++ if (major(buf.st_rdev) != TTY_MAJOR) {
++ err(0, "invalid tty device: %s", tty);
++ exit(1);
++ }
+
+ wl->ttynr = minor(buf.st_rdev);
+ }
+
+- if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode))
+- error(1, errno, "failed to get current keyboard mode: %m\n");
++ if (ioctl(wl->tty, KDGKBMODE, &wl->kb_mode)) {
++ err(errno, "failed to get current keyboard mode: %m\n");
++ exit(1);
++ }
+
+ if (ioctl(wl->tty, KDSKBMUTE, 1) &&
+- ioctl(wl->tty, KDSKBMODE, K_OFF))
+- error(1, errno, "failed to set K_OFF keyboard mode: %m\n");
++ ioctl(wl->tty, KDSKBMODE, K_OFF)) {
++ err(errno, "failed to set K_OFF keyboard mode: %m\n");
++ exit(1);
++ }
+
+- if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS))
+- error(1, errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
++ if (ioctl(wl->tty, KDSETMODE, KD_GRAPHICS)) {
++ err(errno, "failed to set KD_GRAPHICS mode on tty: %m\n");
++ exit(1);
++ }
+
+ mode.mode = VT_PROCESS;
+ mode.relsig = SIGUSR1;
+ mode.acqsig = SIGUSR2;
+- if (ioctl(wl->tty, VT_SETMODE, &mode) < 0)
+- error(1, errno, "failed to take control of vt handling\n");
++ if (ioctl(wl->tty, VT_SETMODE, &mode) < 0) {
++ err(errno, "failed to take control of vt handling\n");
++ exit(1);
++ }
+
+ return 0;
+ }
+@@ -585,10 +609,14 @@
+ int i;
+
+ if (wl->tty != STDIN_FILENO) {
+- if (setsid() < 0)
+- error(1, errno, "setsid failed");
+- if (ioctl(wl->tty, TIOCSCTTY, 0) < 0)
+- error(1, errno, "TIOCSCTTY failed - tty is in use");
++ if (setsid() < 0) {
++ err(errno, "setsid failed");
++ exit(1);
++ }
++ if (ioctl(wl->tty, TIOCSCTTY, 0) < 0) {
++ err(errno, "TIOCSCTTY failed - tty is in use");
++ exit(1);
++ }
+ }
+
+ term = getenv("TERM");
+@@ -604,7 +632,7 @@
+ if (env) {
+ for (i = 0; env[i]; ++i) {
+ if (putenv(env[i]) != 0)
+- error(0, 0, "putenv %s failed", env[i]);
++ err(0, "putenv %s failed", env[i]);
+ }
+ free(env);
+ }
+@@ -617,8 +645,10 @@
+ #ifdef HAVE_INITGROUPS
+ initgroups(wl->pw->pw_name, wl->pw->pw_gid) < 0 ||
+ #endif
+- setuid(wl->pw->pw_uid) < 0)
+- error(1, errno, "dropping privileges failed");
++ setuid(wl->pw->pw_uid) < 0) {
++ err(errno, "dropping privileges failed");
++ exit(1);
++ }
+ }
+
+ static void
+@@ -658,7 +688,8 @@
+ child_argv[5 + i] = NULL;
+
+ execv(child_argv[0], child_argv);
+- error(1, errno, "exec failed");
++ err(errno, "exec failed");
++ exit(1);
+ }
+
+ static void
+@@ -691,8 +722,10 @@
+ switch (c) {
+ case 'u':
+ wl.new_user = optarg;
+- if (getuid() != 0)
+- error(1, 0, "Permission denied. -u allowed for root only");
++ if (getuid() != 0) {
++ err(0, "Permission denied. -u allowed for root only");
++ exit(1);
++ }
+ break;
+ case 't':
+ tty = optarg;
+@@ -706,24 +739,30 @@
+ }
+ }
+
+- if ((argc - optind) > (MAX_ARGV_SIZE - 6))
+- error(1, E2BIG, "Too many arguments to pass to weston");
++ if ((argc - optind) > (MAX_ARGV_SIZE - 6)) {
++ err(E2BIG, "Too many arguments to pass to weston");
++ exit(1);
++ }
+
+ if (wl.new_user)
+ wl.pw = getpwnam(wl.new_user);
+ else
+ wl.pw = getpwuid(getuid());
+- if (wl.pw == NULL)
+- error(1, errno, "failed to get username");
++ if (wl.pw == NULL) {
++ err(errno, "failed to get username");
++ exit(1);
++ }
+
+- if (!weston_launch_allowed(&wl))
+- error(1, 0, "Permission denied. You should either:\n"
++ if (!weston_launch_allowed(&wl)) {
++ err(0, "Permission denied. You should either:\n"
+ #ifdef HAVE_SYSTEMD_LOGIN
+ " - run from an active and local (systemd) session.\n"
+ #else
+ " - enable systemd session support for weston-launch.\n"
+ #endif
+ " - or add yourself to the 'weston-launch' group.");
++ exit(1);
++ }
+
+ if (setup_tty(&wl, tty) < 0)
+ exit(EXIT_FAILURE);
+@@ -738,8 +777,10 @@
+ exit(EXIT_FAILURE);
+
+ wl.child = fork();
+- if (wl.child == -1)
+- error(EXIT_FAILURE, errno, "fork failed");
++ if (wl.child == -1) {
++ err(errno, "fork failed");
++ exit(EXIT_FAILURE);
++ }
+
+ if (wl.child == 0)
+ launch_compositor(&wl, argc - optind, argv + optind);
+@@ -759,7 +800,7 @@
+
+ n = poll(fds, 2, -1);
+ if (n < 0)
+- error(0, errno, "poll failed");
++ err(errno, "poll failed");
+ if (fds[0].revents & POLLIN)
+ handle_socket_msg(&wl);
+ if (fds[1].revents)
diff --git a/dev-libs/weston/files/README.gentoo b/dev-libs/weston/files/README.gentoo
new file mode 100644
index 0000000..ed8c5c3
--- /dev/null
+++ b/dev-libs/weston/files/README.gentoo
@@ -0,0 +1,9 @@
+For running Weston you need to have $XDG_RUNTIME_DIR in your environment,
+directory must exist and have correct permissions. If you are not using systemd,
+it will not be created automatically, you can create it using your shell,
+add these lines to ~/.bash_profile:
+
+# wayland
+export XDG_RUNTIME_DIR=/tmp/.runtime-${USER}
+mkdir -p "${XDG_RUNTIME_DIR}"
+chmod 0700 "${XDG_RUNTIME_DIR}"
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
new file mode 100644
index 0000000..54c4041
--- /dev/null
+++ b/dev-libs/weston/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<use>
+ <flag name="colord">Allow setting color managment</flag>
+ <flag name="drm">Enable drm compositor support</flag>
+ <flag name="editor">Install wayland-editor example application</flag>
+ <flag name="fbdev">Enable fbdev compositor support</flag>
+ <flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
+ <flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
+ <flag name="ivi">Enable the IVI shell</flag>
+ <flag name="launch">Install weston-launch utility</flag>
+ <flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
+ <flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
+ <flag name="rpi">Raspberry Pi GPU support</flag>
+ <flag name="screen-sharing">Enable screen-sharing through RDP</flag>
+ <flag name="unwind">Enable libunwind usage for backtraces</flag>
+ <flag name="wayland-compositor">Enable Wayland compositor support</flag>
+ <flag name="webp">Add support for the WebP image format</flag>
+ <flag name="xwayland">Enable ability support native X11 applications</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
new file mode 100644
index 0000000..8af796a
--- /dev/null
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+VIRTUALX_REQUIRED="test"
+RESTRICT="test"
+
+inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+ SRC_URI="${SRC_PATCHES}"
+ KEYWORDS="amd64 arm x86"
+else
+ SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+ KEYWORDS="amd64 arm x86 ~arm-linux"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE_VIDEO_CARDS="video_cards_intel video_cards_v4l"
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland ${IUSE_VIDEO_CARDS}"
+
+REQUIRED_USE="
+ drm? ( gles2 )
+ screen-sharing? ( rdp )
+ systemd? ( dbus )
+ test? ( X )
+ wayland-compositor? ( gles2 )
+"
+
+RDEPEND="
+ >=dev-libs/libinput-0.8.0
+ >=dev-libs/wayland-1.10.0
+ >=dev-libs/wayland-protocols-1.2
+ lcms? ( media-libs/lcms:2 )
+ media-libs/libpng:0=
+ webp? ( media-libs/libwebp:0= )
+ jpeg? ( virtual/jpeg:0= )
+ >=x11-libs/cairo-1.11.3
+ >=x11-libs/libdrm-2.4.30
+ x11-libs/libxkbcommon
+ x11-libs/pixman
+ x11-misc/xkeyboard-config
+ fbdev? (
+ >=sys-libs/mtdev-1.1.0
+ >=virtual/udev-136
+ )
+ colord? ( >=x11-misc/colord-0.1.27 )
+ dbus? ( sys-apps/dbus )
+ drm? (
+ media-libs/mesa[gbm]
+ >=sys-libs/mtdev-1.1.0
+ >=virtual/udev-136
+ )
+ editor? ( x11-libs/pango )
+ gles2? (
+ media-libs/mesa[gles2,wayland]
+ )
+ rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+ rpi? (
+ >=sys-libs/mtdev-1.1.0
+ >=virtual/udev-136
+ )
+ systemd? (
+ sys-auth/pambase[systemd]
+ sys-apps/systemd[pam]
+ )
+ launch? ( sys-auth/pambase )
+ unwind? ( sys-libs/libunwind )
+ X? (
+ x11-libs/libxcb
+ x11-libs/libX11
+ )
+ xwayland? (
+ x11-base/xorg-server[wayland]
+ x11-libs/cairo[xcb]
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PV}-musl.patch" )
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ eautoreconf
+ fi
+ epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+ local myconf
+ if use examples || use test; then
+ myconf="--enable-simple-clients"
+ else
+ myconf="--disable-simple-clients"
+ fi
+
+ myconf+=" --with-cairo=image --disable-simple-egl-clients"
+
+ econf \
+ $(use_enable examples demo-clients-install) \
+ $(use_enable fbdev fbdev-compositor) \
+ $(use_enable dbus) \
+ $(use_enable drm drm-compositor) \
+ $(use_enable headless headless-compositor) \
+ $(use_enable ivi ivi-shell) \
+ $(use_enable lcms) \
+ $(use_enable rdp rdp-compositor) \
+ $(use_enable rpi rpi-compositor) \
+ $(use_enable wayland-compositor) \
+ $(use_enable X x11-compositor) \
+ $(use_enable launch weston-launch) \
+ $(use_enable colord) \
+ $(use_enable gles2 egl) \
+ $(use_enable unwind libunwind) \
+ $(use_enable resize-optimization) \
+ $(use_enable screen-sharing) \
+ $(use_enable suid setuid-install) \
+ $(use_enable systemd systemd-login) \
+ $(use_enable systemd systemd-notify) \
+ $(use_enable xwayland) \
+ $(use_enable xwayland xwayland-test) \
+ $(use_enable video_cards_intel simple-dmabuf-intel-client) \
+ $(use_enable video_cards_v4l simple-dmabuf-v4l-client) \
+ $(use_with jpeg) \
+ $(use_with webp) \
+ ${myconf}
+}
+
+src_test() {
+ export XDG_RUNTIME_DIR="${T}/runtime-dir"
+ mkdir "${XDG_RUNTIME_DIR}" || die
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+ cd "${BUILD_DIR}" || die
+ Xemake check
+}
+
+src_install() {
+ default
+
+ readme.gentoo_create_doc
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-libs/weston/, dev-libs/weston/files/
@ 2017-03-09 17:50 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-03-09 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 4869f037a9eec5178abc4c6c0dcece3ac636526e
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar 9 17:49:52 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar 9 17:49:52 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4869f037
dev-libs/weston: version bump to 1.12.0
dev-libs/weston/Manifest | 5 ++++-
dev-libs/weston/files/1.12.0-musl.patch | 11 +++++++++++
dev-libs/weston/weston-1.11.0.ebuild | 5 ++++-
.../{weston-1.11.0.ebuild => weston-1.12.0.ebuild} | 23 ++++++++++------------
4 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 4c33fa3..c9c3590 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,8 @@
AUX 1.11.0-musl.patch 1127 SHA256 51e3abf15fbeaf908febecfd5ede898760c2ae5325db60a2b11c4bca3b56503d SHA512 29866a9b22ddc7050467738b98b956df3906299a547edd74d2a861ba3367ca159d3747ffa3df5e9fbdba4e17966f47f33b56b7697418cf9f7f1f2bea62dd9f2f WHIRLPOOL 0eed5a00eb4495b3c3667d0019b99adf60fa9f54d2cc3436628e696729e9195dd4b1545112161edd0bd4f069734c687ae3da23d79fb07c79b3ba84fca1d23779
+AUX 1.12.0-musl.patch 411 SHA256 a0a4a126b74c6858e0587ba82bd0321578bf2b90f1f3accf95850800739b72fd SHA512 3c43e95037cd004fafc4c0ec443e54275fafb3a41784e782429228bfd7f79d5c59c95df1cff83c47d608b92d765fdb8ccd532ce025e51e2b8bb77f1855a66eba WHIRLPOOL d5f6d78e2f666bc989832b9c96e0348d52f3d72bafb142916bf8b929f81969633e292eec441c24de87cc4f2b441568489cd44f0c7234186a73ba0d290ccccb51
AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
-EBUILD weston-1.11.0.ebuild 3549 SHA256 b77d4422dd25616e2ff0a4f3ab71a8f6625e5e2b21c9d87afb41697932de2594 SHA512 69d14b889daff658079e0a187cac5ba3059d583a4ea572bb725ec8df0386e45f7e6fffeb8d6b80579260828e838821ec6ef1e872383325ba20b73f739dd83817 WHIRLPOOL 01a31df9ed78a148508e48f6a7727e7c5b72199616c72dec529197409a6075f04a8d87dc6afccd0f969da7e7e93f83cd8a598f78c8de96d0d8d024cec4a3ab8b
+DIST weston-1.12.0.tar.xz 1260892 SHA256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 SHA512 80cf7c01951cc72b32284a5a6960c2ae7a8dfffffb155cb0f94cd3585b0afa3f06bb8e2b87467d18ab95f0fd673ad9319a6e14ee5f3cec1d3b72c7c0146c927e WHIRLPOOL a809994ea312c01548280e1e5b5915fa3f0fae32ae152a0e64edd0b86db4995a97705d4ab5af5b09cfce32633ae9cdaa6f5db2afad3e0f3c5faab583d1109725
+EBUILD weston-1.11.0.ebuild 3590 SHA256 816befe0fa487c926b12961370561faa8e35c12f86019755dd32a89c171e57cf SHA512 4f7c00597d7ba2ece0d5499ab67bd4ef12544c57b102bb25769c137cfceeb40e2f7866fc641ca5c3af5ec02e462370a541550bfde983d8429829590694e44727 WHIRLPOOL 347c85f1505b96dd7e7f6c6f4d5b97b4e847cd487bfd5929c0e4addaf56479b8cbbb0a3aa0a9e22c7643a8ad66849e8015d585786f75f5607aebe5ef66e0e093
+EBUILD weston-1.12.0.ebuild 3451 SHA256 ff4902087fd80f4ab2736a571fd91010ba28371ff931139e4938dbc7b84c67ee SHA512 437ca12ca3101be75708a65bd43f1bc266fc1049844577b64a560b07dd6906259a8358e63c2020f71e0cbbb4ac6c7fb426a5f607af63448a16378ab63f3cc108 WHIRLPOOL 63bad157b35216bf18efdb17b9d58a136cc5dfa1da33d3f46ec3c6ae25546b450696a7dfe02c5cfcaaeaf6d670ddc30340a6c90a94971a92a6d671996a00e62a
MISC metadata.xml 1346 SHA256 2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094 WHIRLPOOL 70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
diff --git a/dev-libs/weston/files/1.12.0-musl.patch b/dev-libs/weston/files/1.12.0-musl.patch
new file mode 100644
index 0000000..f5bbbc9
--- /dev/null
+++ b/dev-libs/weston/files/1.12.0-musl.patch
@@ -0,0 +1,11 @@
+diff -Naur weston-1.12.0.orig/shared/string-helpers.h weston-1.12.0/shared/string-helpers.h
+--- weston-1.12.0.orig/shared/string-helpers.h 2017-03-09 09:42:17.167310112 -0800
++++ weston-1.12.0/shared/string-helpers.h 2017-03-09 09:43:04.018026289 -0800
+@@ -27,6 +27,7 @@
+ #define WESTON_STRING_HELPERS_H
+
+ #include <stdbool.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <assert.h>
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
index 19a648d..2401e76 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -65,7 +65,10 @@ RDEPEND="
gles2? (
media-libs/mesa[gles2,wayland]
)
- rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+ rdp? (
+ >=net-misc/freerdp-1.1.0_beta1_p20130710
+ <net-misc/freerdp-2.0.0_pre20161219
+ )
rpi? (
>=sys-libs/mtdev-1.1.0
>=virtual/udev-136
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.12.0.ebuild
similarity index 88%
copy from dev-libs/weston/weston-1.11.0.ebuild
copy to dev-libs/weston/weston-1.12.0.ebuild
index 19a648d..61e4e30 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.12.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
@@ -18,16 +18,16 @@ HOMEPAGE="https://wayland.freedesktop.org/"
if [[ $PV = 9999* ]]; then
SRC_URI="${SRC_PATCHES}"
- KEYWORDS="amd64 arm x86"
+ KEYWORDS=""
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="amd64 arm x86 ~arm-linux"
+ KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
fi
LICENSE="MIT CC-BY-SA-3.0"
SLOT="0"
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
REQUIRED_USE="
drm? ( gles2 )
@@ -39,7 +39,7 @@ REQUIRED_USE="
RDEPEND="
>=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.10.0
+ >=dev-libs/wayland-1.12.0
>=dev-libs/wayland-protocols-1.2
lcms? ( media-libs/lcms:2 )
media-libs/libpng:0=
@@ -66,10 +66,6 @@ RDEPEND="
media-libs/mesa[gles2,wayland]
)
rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
- rpi? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
systemd? (
sys-auth/pambase[systemd]
sys-apps/systemd[pam]
@@ -91,13 +87,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${PV}-musl.patch" )
+PATCHES=( "${FILESDIR}"/${PV}-musl.patch )
src_prepare() {
+ default
if [[ ${PV} = 9999* ]]; then
eautoreconf
+ else
+ elibtoolize
fi
- epatch "${PATCHES[@]}"
}
src_configure() {
@@ -119,7 +117,6 @@ src_configure() {
$(use_enable ivi ivi-shell) \
$(use_enable lcms) \
$(use_enable rdp rdp-compositor) \
- $(use_enable rpi rpi-compositor) \
$(use_enable wayland-compositor) \
$(use_enable X x11-compositor) \
$(use_enable launch weston-launch) \
@@ -146,7 +143,7 @@ src_test() {
chmod 0700 "${XDG_RUNTIME_DIR}" || die
cd "${BUILD_DIR}" || die
- Xemake check
+ virtx emake check
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-libs/weston/, dev-libs/weston/files/
@ 2017-09-15 5:01 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-09-15 5:01 UTC (permalink / raw
To: gentoo-commits
commit: 5f25335db0535ca9dbd538cc8d32626d00d5ad37
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Sep 15 05:00:38 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Sep 15 05:00:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5f25335d
dev-libs/weston: version bump to 3.0.0
dev-libs/weston/Manifest | 8 +++---
dev-libs/weston/files/1.12.0-musl.patch | 11 --------
dev-libs/weston/files/3.0.0-musl.patch | 11 ++++++++
dev-libs/weston/weston-1.11.0.ebuild | 2 +-
.../{weston-1.12.0.ebuild => weston-3.0.0.ebuild} | 32 +++++++++++-----------
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index c9c3590..bd577f1 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,8 +1,8 @@
AUX 1.11.0-musl.patch 1127 SHA256 51e3abf15fbeaf908febecfd5ede898760c2ae5325db60a2b11c4bca3b56503d SHA512 29866a9b22ddc7050467738b98b956df3906299a547edd74d2a861ba3367ca159d3747ffa3df5e9fbdba4e17966f47f33b56b7697418cf9f7f1f2bea62dd9f2f WHIRLPOOL 0eed5a00eb4495b3c3667d0019b99adf60fa9f54d2cc3436628e696729e9195dd4b1545112161edd0bd4f069734c687ae3da23d79fb07c79b3ba84fca1d23779
-AUX 1.12.0-musl.patch 411 SHA256 a0a4a126b74c6858e0587ba82bd0321578bf2b90f1f3accf95850800739b72fd SHA512 3c43e95037cd004fafc4c0ec443e54275fafb3a41784e782429228bfd7f79d5c59c95df1cff83c47d608b92d765fdb8ccd532ce025e51e2b8bb77f1855a66eba WHIRLPOOL d5f6d78e2f666bc989832b9c96e0348d52f3d72bafb142916bf8b929f81969633e292eec441c24de87cc4f2b441568489cd44f0c7234186a73ba0d290ccccb51
+AUX 3.0.0-musl.patch 363 SHA256 f45cadd9b5fd74b8bdc354f2508b1a732dd8df2280a65eb3fc5a60012dc6a358 SHA512 a8164c274d5e18b1e6f8bd938d2a94a0f6009c33cceeb907535195dd3c2addbd16986624de1aa7468d1ab25b00884b4997a662d0a14504ed49e4b42feec374b0 WHIRLPOOL 07a93ebe1c3e828dec7c0f7310778bf0505291fa51dd0310e24619d34932226be76f6694de0c3925122230853489cb19216f0a89d5e546ea2237279a1fd4facb
AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81
DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
-DIST weston-1.12.0.tar.xz 1260892 SHA256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 SHA512 80cf7c01951cc72b32284a5a6960c2ae7a8dfffffb155cb0f94cd3585b0afa3f06bb8e2b87467d18ab95f0fd673ad9319a6e14ee5f3cec1d3b72c7c0146c927e WHIRLPOOL a809994ea312c01548280e1e5b5915fa3f0fae32ae152a0e64edd0b86db4995a97705d4ab5af5b09cfce32633ae9cdaa6f5db2afad3e0f3c5faab583d1109725
-EBUILD weston-1.11.0.ebuild 3590 SHA256 816befe0fa487c926b12961370561faa8e35c12f86019755dd32a89c171e57cf SHA512 4f7c00597d7ba2ece0d5499ab67bd4ef12544c57b102bb25769c137cfceeb40e2f7866fc641ca5c3af5ec02e462370a541550bfde983d8429829590694e44727 WHIRLPOOL 347c85f1505b96dd7e7f6c6f4d5b97b4e847cd487bfd5929c0e4addaf56479b8cbbb0a3aa0a9e22c7643a8ad66849e8015d585786f75f5607aebe5ef66e0e093
-EBUILD weston-1.12.0.ebuild 3451 SHA256 ff4902087fd80f4ab2736a571fd91010ba28371ff931139e4938dbc7b84c67ee SHA512 437ca12ca3101be75708a65bd43f1bc266fc1049844577b64a560b07dd6906259a8358e63c2020f71e0cbbb4ac6c7fb426a5f607af63448a16378ab63f3cc108 WHIRLPOOL 63bad157b35216bf18efdb17b9d58a136cc5dfa1da33d3f46ec3c6ae25546b450696a7dfe02c5cfcaaeaf6d670ddc30340a6c90a94971a92a6d671996a00e62a
+DIST weston-3.0.0.tar.xz 1300340 SHA256 cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58 WHIRLPOOL 8b46b199f40e51530c17f782a12e0a3a5b65bffebc090db0c9296454b0bdcb053c0dfd6de3d0c5150e2404ea87d49280c11a0475382e2350699ae27deb204383
+EBUILD weston-1.11.0.ebuild 3597 SHA256 47841bcd45a2f677177c1f13ee8d318341f6e7cf5432ce3de5c66d918b58326b SHA512 2dfe8137e23abe4d7fe4142198fecb248c18131077efd53d17cd2ff6bde6ac5a578d84fbd5283f11609c0c42c39f4a8d4dd6239a9f12e1e8e881211f1d491704 WHIRLPOOL ef8b0fa5f405f12322d315e3927e23060efdb083ecc27d852ad34f998761aa3992cfff27eaaaf0173853803e369a5251443be064ce947ec670132d821989b8c9
+EBUILD weston-3.0.0.ebuild 3505 SHA256 ce6693174c048c4eeb6eb76b8010f8bf54e4b8c95b8550c76c5b76fefdadee4c SHA512 592da6f7083da1b62e1aeeb254e013f84dc247b06437f276f882a8bc5239ba61a477f6ad9647f3addec8cc7c4b25e8aba12e03dcdc8a33e1e1f77e6ed828d0ad WHIRLPOOL de3d726c193200f3ee9494396a1353474f7143863a14ea71fc1712df4a10e904ec88115582d7c61a47cb50f3c60eb63b393cc0ca05568155f2d1a5858a8c1d69
MISC metadata.xml 1346 SHA256 2710b274618784eb36f2c67fa8778b95c49ff2eeb3b52757bca963a363f455e4 SHA512 27e5e3fde5db5d9e04138b1abdeb77a09a3a0c726c28b1ba63db4aec44c1be8804cfc171893573ac2b4365dc94c725129843267cb0ab938bc5599aa186f26094 WHIRLPOOL 70f1a3c35da4948698ab39fc95d3b433d50b9170090050a0b8f4f1c2669011f2bd0d0f177414ae4744fcebdf7728174339578666b26d1508c56720cdb530fbfe
diff --git a/dev-libs/weston/files/1.12.0-musl.patch b/dev-libs/weston/files/1.12.0-musl.patch
deleted file mode 100644
index f5bbbc9..0000000
--- a/dev-libs/weston/files/1.12.0-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur weston-1.12.0.orig/shared/string-helpers.h weston-1.12.0/shared/string-helpers.h
---- weston-1.12.0.orig/shared/string-helpers.h 2017-03-09 09:42:17.167310112 -0800
-+++ weston-1.12.0/shared/string-helpers.h 2017-03-09 09:43:04.018026289 -0800
-@@ -27,6 +27,7 @@
- #define WESTON_STRING_HELPERS_H
-
- #include <stdbool.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <errno.h>
- #include <assert.h>
diff --git a/dev-libs/weston/files/3.0.0-musl.patch b/dev-libs/weston/files/3.0.0-musl.patch
new file mode 100644
index 0000000..a7d9f7c
--- /dev/null
+++ b/dev-libs/weston/files/3.0.0-musl.patch
@@ -0,0 +1,11 @@
+diff -Naur weston-3.0.0.orig/shared/timespec-util.h weston-3.0.0/shared/timespec-util.h
+--- weston-3.0.0.orig/shared/timespec-util.h 2017-09-14 21:48:11.637801876 -0700
++++ weston-3.0.0/shared/timespec-util.h 2017-09-14 21:48:47.289800862 -0700
+@@ -28,6 +28,7 @@
+
+ #include <stdint.h>
+ #include <assert.h>
++#include <time.h>
+
+ #define NSEC_PER_SEC 1000000000
+
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
index 2401e76..eb5bd50 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
GIT_ECLASS="git-r3"
EXPERIMENTAL="true"
fi
diff --git a/dev-libs/weston/weston-1.12.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild
similarity index 85%
rename from dev-libs/weston/weston-1.12.0.ebuild
rename to dev-libs/weston/weston-3.0.0.ebuild
index 61e4e30..b840e78 100644
--- a/dev-libs/weston/weston-1.12.0.ebuild
+++ b/dev-libs/weston/weston-3.0.0.ebuild
@@ -4,14 +4,12 @@
EAPI=6
if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
GIT_ECLASS="git-r3"
EXPERIMENTAL="true"
fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
+inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
DESCRIPTION="Wayland reference compositor"
HOMEPAGE="https://wayland.freedesktop.org/"
@@ -33,29 +31,29 @@ REQUIRED_USE="
drm? ( gles2 )
screen-sharing? ( rdp )
systemd? ( dbus )
- test? ( X )
+ test? ( headless xwayland )
wayland-compositor? ( gles2 )
"
RDEPEND="
>=dev-libs/libinput-0.8.0
>=dev-libs/wayland-1.12.0
- >=dev-libs/wayland-protocols-1.2
+ >=dev-libs/wayland-protocols-1.8
lcms? ( media-libs/lcms:2 )
media-libs/libpng:0=
webp? ( media-libs/libwebp:0= )
jpeg? ( virtual/jpeg:0= )
>=x11-libs/cairo-1.11.3
>=x11-libs/libdrm-2.4.30
- x11-libs/libxkbcommon
- x11-libs/pixman
+ >=x11-libs/libxkbcommon-0.5.0
+ >=x11-libs/pixman-0.25.2
x11-misc/xkeyboard-config
fbdev? (
>=sys-libs/mtdev-1.1.0
>=virtual/udev-136
)
colord? ( >=x11-misc/colord-0.1.27 )
- dbus? ( sys-apps/dbus )
+ dbus? ( >=sys-apps/dbus-1.6 )
drm? (
media-libs/mesa[gbm]
>=sys-libs/mtdev-1.1.0
@@ -68,18 +66,18 @@ RDEPEND="
rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
systemd? (
sys-auth/pambase[systemd]
- sys-apps/systemd[pam]
+ >=sys-apps/systemd-209[pam]
)
launch? ( sys-auth/pambase )
unwind? ( sys-libs/libunwind )
X? (
- x11-libs/libxcb
+ >=x11-libs/libxcb-1.9
x11-libs/libX11
)
xwayland? (
x11-base/xorg-server[wayland]
x11-libs/cairo[xcb]
- x11-libs/libxcb
+ >=x11-libs/libxcb-1.9
x11-libs/libXcursor
)
"
@@ -106,8 +104,6 @@ src_configure() {
myconf="--disable-simple-clients"
fi
- myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
econf \
$(use_enable examples demo-clients-install) \
$(use_enable fbdev fbdev-compositor) \
@@ -132,8 +128,12 @@ src_configure() {
$(use_enable xwayland xwayland-test) \
$(use_with jpeg) \
$(use_with webp) \
- --disable-simple-dmabuf-intel-client \
+ --with-cairo=image \
+ --disable-junit-xml \
+ --disable-simple-dmabuf-drm-client \
--disable-simple-dmabuf-v4l-client \
+ --disable-simple-egl-clients \
+ --disable-vaapi-recorder \
${myconf}
}
@@ -143,7 +143,7 @@ src_test() {
chmod 0700 "${XDG_RUNTIME_DIR}" || die
cd "${BUILD_DIR}" || die
- virtx emake check
+ emake check
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-libs/weston/, dev-libs/weston/files/
@ 2019-01-23 19:29 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2019-01-23 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 7f94055adb54e559a3469fd77a408cd9e9cab4b4
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Jan 19 08:55:35 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 19:28:40 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7f94055a
dev-libs/weston: remove old
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
dev-libs/weston/Manifest | 1 -
dev-libs/weston/files/1.11.0-musl.patch | 42 ---------
dev-libs/weston/weston-1.11.0.ebuild | 159 --------------------------------
3 files changed, 202 deletions(-)
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 10c7bcf..1f806da 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,2 +1 @@
-DIST weston-1.11.0.tar.xz 1242244 SHA256 05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5 WHIRLPOOL 5e76484c1413ddc14c426c80845790e6b636bb2d827188563ca9b41f23ca4afd6cf20c8a743c0ff1b6c09d371c3e6988d0e9765333660aeb8723ddf62208b876
DIST weston-3.0.0.tar.xz 1300340 SHA256 cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58 WHIRLPOOL 8b46b199f40e51530c17f782a12e0a3a5b65bffebc090db0c9296454b0bdcb053c0dfd6de3d0c5150e2404ea87d49280c11a0475382e2350699ae27deb204383
diff --git a/dev-libs/weston/files/1.11.0-musl.patch b/dev-libs/weston/files/1.11.0-musl.patch
deleted file mode 100644
index 05123ad..0000000
--- a/dev-libs/weston/files/1.11.0-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur weston-1.11.0.orig/shared/xalloc.h weston-1.11.0/shared/xalloc.h
---- weston-1.11.0.orig/shared/xalloc.h 2017-03-05 16:35:25.816193000 -0800
-+++ weston-1.11.0/shared/xalloc.h 2017-03-05 16:38:16.043363715 -0800
-@@ -30,6 +30,7 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
-
-diff -Naur weston-1.11.0.orig/src/error.h weston-1.11.0/src/error.h
---- weston-1.11.0.orig/src/error.h 1969-12-31 16:00:00.000000000 -0800
-+++ weston-1.11.0/src/error.h 2017-03-05 16:37:51.441046969 -0800
-@@ -0,0 +1,27 @@
-+#ifndef _ERROR_H_
-+#define _ERROR_H_
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static unsigned int error_message_count = 0;
-+
-+static inline void error(int status, int errnum, const char* format, ...)
-+{
-+ va_list ap;
-+ fprintf(stderr, "%s: ", program_invocation_name);
-+ va_start(ap, format);
-+ vfprintf(stderr, format, ap);
-+ va_end(ap);
-+ if (errnum)
-+ fprintf(stderr, ": %s", strerror(errnum));
-+ fprintf(stderr, "\n");
-+ error_message_count++;
-+ if (status)
-+ exit(status);
-+}
-+
-+#endif /* _ERROR_H_ */
diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
deleted file mode 100644
index 3f9fd77..0000000
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
- KEYWORDS="amd64 arm arm64 x86"
-else
- SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="amd64 arm arm64 x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
- drm? ( gles2 )
- screen-sharing? ( rdp )
- systemd? ( dbus )
- test? ( X )
- wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
- >=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.10.0
- >=dev-libs/wayland-protocols-1.2
- lcms? ( media-libs/lcms:2 )
- media-libs/libpng:0=
- webp? ( media-libs/libwebp:0= )
- jpeg? ( virtual/jpeg:0= )
- >=x11-libs/cairo-1.11.3
- >=x11-libs/libdrm-2.4.30
- x11-libs/libxkbcommon
- x11-libs/pixman
- x11-misc/xkeyboard-config
- fbdev? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- colord? ( >=x11-misc/colord-0.1.27 )
- dbus? ( sys-apps/dbus )
- drm? (
- media-libs/mesa[gbm]
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- editor? ( x11-libs/pango )
- gles2? (
- media-libs/mesa[gles2,wayland]
- )
- rdp? (
- >=net-misc/freerdp-1.1.0_beta1_p20130710
- <net-misc/freerdp-2.0.0_pre20161219
- )
- rpi? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- systemd? (
- sys-auth/pambase[systemd]
- sys-apps/systemd[pam]
- )
- launch? ( sys-auth/pambase )
- unwind? ( sys-libs/libunwind )
- X? (
- x11-libs/libxcb
- x11-libs/libX11
- )
- xwayland? (
- x11-base/xorg-server[wayland]
- x11-libs/cairo[xcb]
- x11-libs/libxcb
- x11-libs/libXcursor
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PV}-musl.patch" )
-
-src_prepare() {
- if [[ ${PV} = 9999* ]]; then
- eautoreconf
- fi
- epatch "${PATCHES[@]}"
-}
-
-src_configure() {
- local myconf
- if use examples || use test; then
- myconf="--enable-simple-clients"
- else
- myconf="--disable-simple-clients"
- fi
-
- myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
- econf \
- $(use_enable examples demo-clients-install) \
- $(use_enable fbdev fbdev-compositor) \
- $(use_enable dbus) \
- $(use_enable drm drm-compositor) \
- $(use_enable headless headless-compositor) \
- $(use_enable ivi ivi-shell) \
- $(use_enable lcms) \
- $(use_enable rdp rdp-compositor) \
- $(use_enable rpi rpi-compositor) \
- $(use_enable wayland-compositor) \
- $(use_enable X x11-compositor) \
- $(use_enable launch weston-launch) \
- $(use_enable colord) \
- $(use_enable gles2 egl) \
- $(use_enable unwind libunwind) \
- $(use_enable resize-optimization) \
- $(use_enable screen-sharing) \
- $(use_enable suid setuid-install) \
- $(use_enable systemd systemd-login) \
- $(use_enable systemd systemd-notify) \
- $(use_enable xwayland) \
- $(use_enable xwayland xwayland-test) \
- $(use_with jpeg) \
- $(use_with webp) \
- --disable-simple-dmabuf-intel-client \
- --disable-simple-dmabuf-v4l-client \
- ${myconf}
-}
-
-src_test() {
- export XDG_RUNTIME_DIR="${T}/runtime-dir"
- mkdir "${XDG_RUNTIME_DIR}" || die
- chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
- cd "${BUILD_DIR}" || die
- Xemake check
-}
-
-src_install() {
- default
-
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-23 19:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-09 17:50 [gentoo-commits] proj/musl:master commit in: dev-libs/weston/, dev-libs/weston/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2019-01-23 19:29 Anthony G. Basile
2017-09-15 5:01 Aric Belsito
2016-11-09 4:22 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox