diff options
| author |   Nicholas Fish <gentoo@seaofdirac.net> | 2017-10-07 15:18:58 +0200 |
|---|---|---|
| committer | Nicholas Fish <gentoo@seaofdirac.net> | 2017-10-07 15:18:58 +0200 |
| commit | ba9b3ddd05b3989707d621baf13011efe79079cf (patch) | |
| tree | a30fbe75eef2e7dc84aa0e3b5ed13b9ee65a5df0 | |
| parent | Remove Nvidia drivers (diff) | |
| download | ennui-ba9b3ddd05b3989707d621baf13011efe79079cf.tar.gz ennui-ba9b3ddd05b3989707d621baf13011efe79079cf.tar.bz2 ennui-ba9b3ddd05b3989707d621baf13011efe79079cf.zip | |
weston: update git ebuild
| -rw-r--r-- | dev-libs/weston/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/weston/weston-9999.ebuild | 30 |
2 files changed, 15 insertions, 17 deletions
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index bb8c3f1..b41fbd6 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -2,5 +2,5 @@ AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478 AUX weston-1.11-make-error-portable.patch 1732 SHA256 1b5bbbc8ba161d0b8cd70d4ef98bcf5e6e81a9fa8b0a06e421728bf606ba7775 SHA512 b781558017b2a1f7a3b07e80da7e7fbaf6a3478d49a2a83bb1c4dc15929e6fb9aac79fe466a7af09c02997331ca7ca4f54230bbf1aa81eace9c8493803c03689 WHIRLPOOL ddc6a80129e809e5947655eff6d88f674dccc6f73c420966075399884c36045550e7a85dfb8545aabbe0d643b9a3da59f4eec6dac48f6236d695d206e7613931 AUX weston-1.11-stdinth.patch 264 SHA256 cf917f59e5883fe1390389bb22675e6181915ea9f80ae4f866188056ca167b4c SHA512 b145ea120b052e5113586ed2d7a7e377c7b6ad3c4670cbe8f4f9d54f20e54bf2e3aa9aa1f016a5c163674e99f5194a50e8f7e7017cbef169954656023f2f4cb5 WHIRLPOOL 49eef4720f5649e72ac016e1f28fba0006ddbb256f2abc2838a11e34c84e6737f5c318f28004d9d1db20bc5aeaa0cbc6290746e1b50c90baee5293464a511790 AUX weston-timeh.patch 269 SHA256 a67fe651e75c7864dbff95d6d098c0b093753cd10bc241e4e25f5eac8f88e9a7 SHA512 8e818db5753b93e75178ced7923cfee1431c5c79f7dd0579d85f959ffb88c3d07541ec4f495cadfc5ba9a708f757d895bf79a80ea0775fe8a8b8d0d270d5276b WHIRLPOOL 3387b5e2dd3253a93f8f0b474f1a4870e3a2ccb1abace74162aa8885da59a63cd13f7eb0116375218fb8d5e79dbb9bbecd421cb9e3ff9e78501d1da855268d04 -EBUILD weston-9999.ebuild 3591 SHA256 7e53652fa6e652d25d5c37e420be1bac13a844c9875ef5e8814e0a992669c8e9 SHA512 ba464484dd1d0ad6f74e2fafadaf5898e077b82762888833b171f4bbbe2de68bd99b5162e0deedde545f94a36e5bc30bfc0cbd43ce563fa1dff4fdabcb6b4314 WHIRLPOOL 76dffc706edd3de61d5c1ed46ac5ea6ff12fca53345f0c29c3a5db5193a28bf7e5cc34c554aee0c6425d8c675b47fe0e4d9ae5399cc460edab68c279bf98fe32 +EBUILD weston-9999.ebuild 3591 SHA256 a2a18a69f5c267fa87f4ef33cd17c677e591fa73fa86da7e4831300e9c30dba4 SHA512 e72415ab16c85ba9eb7eaea43fdffecec30a70cc40c9e2feae2690b62de461905326d13e5e5a3486f5eccbafa10d4e587d734b70f919497eb1c6093e7f3a0b03 WHIRLPOOL 9cfa9682c9bcdc200f67903bca79234a45c233897e95ea742fb9bbeef6bc67d8689ecb25011d1e76c7999a666fc7d656e3a106961277d67477778978485a9fe9 MISC metadata.xml 1257 SHA256 30a5608ab189260222d32fa240fd3791b3e17a471e29e7a2e4a04466b21dfb29 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3 WHIRLPOOL e53b1747e2e014af1e179c8fa6b8f77aa1dd2db43aec27e433561faa5c93700e57247c4bc06c74baa75f454672410dbf3b0e7d0375b9e7c620d6990ed5e42055 diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index e796a9f..6b18e71 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.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/${PN}.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 ) " @@ -111,8 +109,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) \ @@ -137,8 +133,10 @@ src_configure() { $(use_enable xwayland xwayland-test) \ $(use_with jpeg) \ $(use_with webp) \ - --disable-simple-dmabuf-intel-client \ + --with-cairo=image \ + --disable-simple-dmabuf-drm-client \ --disable-simple-dmabuf-v4l-client \ + --disable-simple-egl-clients \ ${myconf} } @@ -148,7 +146,7 @@ src_test() { chmod 0700 "${XDG_RUNTIME_DIR}" || die cd "${BUILD_DIR}" || die - virtx emake check + emake check } src_install() { |