From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 327C21381F3 for ; Mon, 29 Jul 2013 14:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0BE8E09EF; Mon, 29 Jul 2013 14:49:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D180E09EF for ; Mon, 29 Jul 2013 14:49:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4010C33EA90 for ; Mon, 29 Jul 2013 14:49:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BB89FE468F for ; Mon, 29 Jul 2013 14:49:10 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1375109256.a5d5b2661666194f5b084d39eb916af7ce8fce33.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: dev-libs/weston/ X-VCS-Repository: proj/x11 X-VCS-Files: dev-libs/weston/weston-0.95.0.ebuild dev-libs/weston/weston-1.1.1.ebuild dev-libs/weston/weston-1.2.0.ebuild dev-libs/weston/weston-9999.ebuild X-VCS-Directories: dev-libs/weston/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: a5d5b2661666194f5b084d39eb916af7ce8fce33 X-VCS-Branch: master Date: Mon, 29 Jul 2013 14:49:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8db7f087-565a-4728-97bc-824b03aaf416 X-Archives-Hash: 2eed2b7638e91122824c10804f05d80c commit: a5d5b2661666194f5b084d39eb916af7ce8fce33 Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Mon Jul 29 14:47:36 2013 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Mon Jul 29 14:47:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a5d5b266 dev-libs/weston: sync with ebuild from portage for bug #477054. Drop non-live ebuilds. --- dev-libs/weston/weston-0.95.0.ebuild | 55 ----------- dev-libs/weston/weston-1.1.1.ebuild | 78 --------------- dev-libs/weston/weston-1.2.0.ebuild | 178 ----------------------------------- dev-libs/weston/weston-9999.ebuild | 128 +++++++++++-------------- 4 files changed, 57 insertions(+), 382 deletions(-) diff --git a/dev-libs/weston/weston-0.95.0.ebuild b/dev-libs/weston/weston-0.95.0.ebuild deleted file mode 100644 index 8908303..0000000 --- a/dev-libs/weston/weston-0.95.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-2" - EXPERIMENTAL="true" -fi - -inherit autotools toolchain-funcs $GIT_ECLASS - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="http://wayland.freedesktop.org/" - -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+clients +drm +simple-clients static-libs +tablet +wayland-compositor +x11" - -RDEPEND="dev-libs/wayland - gnome-base/librsvg - media-libs/mesa[egl,gles2,wayland] - x11-libs/pixman - x11? ( x11-libs/libxcb x11-libs/libX11 ) - drm? ( >=virtual/udev-136 >=x11-libs/libdrm-2.4.23 media-libs/mesa[gbm] ) - clients? ( >=x11-libs/cairo-1.10.0 x11-libs/gdk-pixbuf dev-libs/glib:2 - x11-libs/libxkbcommon media-libs/libpng app-text/poppler )" -DEPEND="${RDEPEND}" - -src_prepare() { - if [[ ${PV} = 9999* ]]; then - eautoreconf - fi -} - -src_configure() { - econf --disable-setuid-install \ - $(use_enable static-libs static) \ - $(use_enable drm drm-compositor) \ - $(use_enable wayland-compositor) \ - $(use_enable x11 x11-compositor) \ - $(use_enable tablet tablet-shell) \ - $(use_enable clients) \ - $(use_enable simple-clients) -} diff --git a/dev-libs/weston/weston-1.1.1.ebuild b/dev-libs/weston/weston-1.1.1.ebuild deleted file mode 100644 index b876784..0000000 --- a/dev-libs/weston/weston-1.1.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" - GIT_ECLASS="git-2" - EXPERIMENTAL="true" -fi - -inherit autotools toolchain-funcs $GIT_ECLASS - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="http://wayland.freedesktop.org/" - -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" - KEYWORDS="" -else - SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~arm ~amd64 ~x86 ~arm-linux" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" -IUSE="+clients debug +drm +egl headless fbdev gles2 rdp -rpi +simple-clients static-libs +tablet +wayland-compositor +x11" - -REQUIRED_USE=" - rpi? ( !drm !egl gles2 ) -" - -RDEPEND=" - >=dev-libs/wayland-1.1.0 - gnome-base/librsvg - media-libs/mesa[gles2,wayland] - x11-libs/pixman - clients? ( >=x11-libs/cairo-1.10.0 - x11-libs/gdk-pixbuf - dev-libs/glib:2 - x11-libs/libxkbcommon - media-libs/libpng - app-text/poppler ) - debug? ( sys-libs/libunwind ) - drm? ( >=virtual/udev-136 - >=x11-libs/libdrm-2.4.30 - media-libs/mesa[gbm] ) - egl? ( media-libs/mesa[egl] ) - gles2? ( x11-libs/cairo[gles2] ) - rdp? ( >=net-misc/freerdp-1.1.0_beta1 ) - x11? ( x11-libs/libxcb - x11-libs/libX11 )" -DEPEND="${RDEPEND}" - -src_prepare() { - if [[ ${PV} = 9999* ]]; then - eautoreconf - fi -} - -src_configure() { - econf --disable-setuid-install \ - $(use_enable clients) \ - $(use_enable debug libunwind) \ - $(use_enable drm drm-compositor) \ - $(use_enable egl) \ - $(use_enable fbdev fbdev-compositor) \ - $(use_enable headless headless-compositor) \ - $(use_enable rdp rdp-compositor) \ - $(use_enable rpi rpi-compositor) \ - $(use_enable simple-clients) \ - $(use_enable static-libs static) \ - $(use_enable tablet tablet-shell) \ - $(use_enable wayland-compositor) \ - $(use_enable x11 x11-compositor) \ - $(use_with gles2 cairo-glesv2) -} diff --git a/dev-libs/weston/weston-1.2.0.ebuild b/dev-libs/weston/weston-1.2.0.ebuild deleted file mode 100644 index 2dffadf..0000000 --- a/dev-libs/weston/weston-1.2.0.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# TODO -# make building and installing clients_programs optional -# fix systemd automagic -# $(use_enable systemd libsystemd-login) - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" -VIRTUALX_REQUIRED="test" - -inherit autotools-utils linux-info virtualx -[[ ${PV} == 9999* ]] && inherit git-2 - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="http://wayland.freedesktop.org/" -[[ ${PV} == 9999* ]] || \ -SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" -[[ ${PV} == 9999* ]] || \ -KEYWORDS="~arm ~amd64 ~x86 ~arm-linux" -IUSE="colord +drm +egl examples fbdev gles2 headless +opengl pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland" - -REQUIRED_USE=" - drm? ( egl ) - egl? ( || ( gles2 opengl ) ) - fbdev? ( drm ) - gles2? ( !opengl ) - pango? ( examples ) - pdf? ( examples ) - rpi? ( !drm !egl ) - test? ( X ) - wayland-compositor? ( egl ) -" - -RDEPEND=" - >=dev-libs/wayland-1.1.90 - media-libs/mesa[egl?,gles2,wayland] - media-libs/lcms:2 - media-libs/libpng:= - media-libs/libwebp - virtual/jpeg - sys-libs/pam - >=x11-libs/cairo-1.11.3[gles2?,opengl?] - >=x11-libs/libdrm-2.4.30 - x11-libs/libxkbcommon - x11-libs/pixman - fbdev? ( - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - colord? ( >=x11-misc/colord-0.1.27 ) - drm? ( - media-libs/mesa[gbm] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - egl? ( - media-libs/glu - ) - examples? ( - pango? ( x11-libs/pango ) - pdf? ( - app-text/poppler:=[cairo] - dev-libs/glib:2 - ) - ) - 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] - ) - unwind? ( sys-libs/libunwind ) - X? ( - x11-libs/libxcb - x11-libs/libX11 - ) - xwayland? ( - x11-libs/cairo[xcb] - x11-libs/libxcb - x11-libs/libXcursor - ) -" -DEPEND="${RDEPEND} - gnome-base/librsvg - virtual/pkgconfig -" - -pkg_pretend() { - if use kernel_linux && use drm; then - CONFIG_CHECK="~DRM ~INPUT_EVDEV" - fi - check_extra_config -} - -src_prepare() { - # Gentoo uses "video" group for this purpose - sed -e '/getgrnam/s/"weston-launch"/"video"/' -i src/weston-launch.c || die - - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - # backends - $(use_enable fbdev fbdev-compositor) - $(use_enable drm drm-compositor) - $(use_enable headless headless-compositor) - $(use_enable rdp rdp-compositor) - $(use_enable rpi rpi-compositor) - $(use_enable wayland-compositor) - $(use_enable X x11-compositor) - # optional deps - $(use_enable colord) - $(use_enable egl) - $(use_enable unwind libunwind) - # misc - $(use_with gles2 cairo-glesv2) - $(use_enable resize-optimization) - $(use_enable suid setuid-install) - $(use_enable tablet tablet-shell) - $(use_enable xwayland) - $(use_enable xwayland xwayland-test) - ) - if use examples || use gles2 || use test; then - myeconfargs+=( - --enable-simple-clients - $(use_enable egl simple-egl-clients) - ) - else - myeconfargs+=( - --disable-simple-clients - --disable-simple-egl-clients - ) - fi - autotools-utils_src_configure -} - -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() { - autotools-utils_src_install - - dodoc "${FILESDIR}"/README.gentoo - - cd "${BUILD_DIR}" || die - use opengl && newbin clients/gears weston-gears - if use examples; then - use egl && newbin clients/simple-egl weston-simple-egl - use pango && newbin clients/editor weston-editor - use pdf && newbin clients/view weston-view - local i - for i in calibrator clickdot cliptest dnd eventdemo flower fullscreen image resizor simple-shm simple-touch smoke transformed; do - newbin "clients/${i}" "weston-${i}" - done - fi -} - -pkg_postinst() { - elog "You may need to edit ~/.bash_profile, read /usr/share/doc/${PF}/README.gentoo*" -} diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 2dffadf..2dceef4 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -2,52 +2,53 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -# TODO -# make building and installing clients_programs optional -# fix systemd automagic -# $(use_enable systemd libsystemd-login) - EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}" + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi VIRTUALX_REQUIRED="test" -inherit autotools-utils linux-info virtualx -[[ ${PV} == 9999* ]] && inherit git-2 +inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS DESCRIPTION="Wayland reference compositor" HOMEPAGE="http://wayland.freedesktop.org/" -[[ ${PV} == 9999* ]] || \ -SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" + +if [[ $PV = 9999* ]]; then + SRC_URI="${SRC_PATCHES}" + KEYWORDS="" +else + SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz" + KEYWORDS="~arm ~amd64 ~x86 ~arm-linux" +fi LICENSE="MIT CC-BY-SA-3.0" SLOT="0" -[[ ${PV} == 9999* ]] || \ -KEYWORDS="~arm ~amd64 ~x86 ~arm-linux" -IUSE="colord +drm +egl examples fbdev gles2 headless +opengl pango pdf rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor +X xwayland" +IUSE="colord +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind view wayland-compositor +X xwayland" REQUIRED_USE=" drm? ( egl ) + editor? ( examples ) egl? ( || ( gles2 opengl ) ) fbdev? ( drm ) gles2? ( !opengl ) - pango? ( examples ) - pdf? ( examples ) - rpi? ( !drm !egl ) + rpi? ( gles2 ) test? ( X ) + view? ( examples ) wayland-compositor? ( egl ) " RDEPEND=" >=dev-libs/wayland-1.1.90 - media-libs/mesa[egl?,gles2,wayland] + media-libs/mesa[egl?,wayland] media-libs/lcms:2 media-libs/libpng:= media-libs/libwebp virtual/jpeg sys-libs/pam - >=x11-libs/cairo-1.11.3[gles2?,opengl?] + >=x11-libs/cairo-1.11.3[gles2(-)?,opengl?] >=x11-libs/libdrm-2.4.30 x11-libs/libxkbcommon x11-libs/pixman @@ -63,10 +64,11 @@ RDEPEND=" ) egl? ( media-libs/glu + media-libs/mesa[gles2] ) examples? ( - pango? ( x11-libs/pango ) - pdf? ( + editor? ( x11-libs/pango ) + view? ( app-text/poppler:=[cairo] dev-libs/glib:2 ) @@ -96,54 +98,40 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -pkg_pretend() { - if use kernel_linux && use drm; then - CONFIG_CHECK="~DRM ~INPUT_EVDEV" - fi - check_extra_config -} src_prepare() { - # Gentoo uses "video" group for this purpose - sed -e '/getgrnam/s/"weston-launch"/"video"/' -i src/weston-launch.c || die - - autotools-utils_src_prepare + if [[ ${PV} = 9999* ]]; then + eautoreconf + fi } src_configure() { - local myeconfargs=( - # backends - $(use_enable fbdev fbdev-compositor) - $(use_enable drm drm-compositor) - $(use_enable headless headless-compositor) - $(use_enable rdp rdp-compositor) - $(use_enable rpi rpi-compositor) - $(use_enable wayland-compositor) - $(use_enable X x11-compositor) - # optional deps - $(use_enable colord) - $(use_enable egl) - $(use_enable unwind libunwind) - # misc - $(use_with gles2 cairo-glesv2) - $(use_enable resize-optimization) - $(use_enable suid setuid-install) - $(use_enable tablet tablet-shell) - $(use_enable xwayland) - $(use_enable xwayland xwayland-test) - ) + local myconf if use examples || use gles2 || use test; then - myeconfargs+=( - --enable-simple-clients - $(use_enable egl simple-egl-clients) - ) + myconf="--enable-simple-clients + $(use_enable egl simple-egl-clients)" else - myeconfargs+=( - --disable-simple-clients - --disable-simple-egl-clients - ) + myconf="--disable-simple-clients + --disable-simple-egl-clients" fi - autotools-utils_src_configure + econf \ + $(use_enable fbdev fbdev-compositor) \ + $(use_enable drm drm-compositor) \ + $(use_enable headless headless-compositor) \ + $(use_enable rdp rdp-compositor) \ + $(use_enable rpi rpi-compositor) \ + $(use_enable wayland-compositor) \ + $(use_enable X x11-compositor) \ + $(use_enable colord) \ + $(use_enable egl) \ + $(use_enable unwind libunwind) \ + $(use_with gles2 cairo-glesv2) \ + $(use_enable resize-optimization) \ + $(use_enable suid setuid-install) \ + $(use_enable tablet tablet-shell) \ + $(use_enable xwayland) \ + $(use_enable xwayland xwayland-test) \ + ${myconf} } src_test() { @@ -156,23 +144,21 @@ src_test() { } src_install() { - autotools-utils_src_install + default - dodoc "${FILESDIR}"/README.gentoo + readme.gentoo_src_install cd "${BUILD_DIR}" || die - use opengl && newbin clients/gears weston-gears + if use opengl && use egl; then + newbin clients/gears weston-gears + fi if use examples; then use egl && newbin clients/simple-egl weston-simple-egl - use pango && newbin clients/editor weston-editor - use pdf && newbin clients/view weston-view + use editor && newbin clients/editor weston-editor + use view && newbin clients/view weston-view local i for i in calibrator clickdot cliptest dnd eventdemo flower fullscreen image resizor simple-shm simple-touch smoke transformed; do newbin "clients/${i}" "weston-${i}" done fi } - -pkg_postinst() { - elog "You may need to edit ~/.bash_profile, read /usr/share/doc/${PF}/README.gentoo*" -}