[gentoo-commits] proj/x11:master commit in: dev-libs/weston/

["Nikoli" <nikoli@lavabit.com>]

commit:     60585ac753299de9fc296c234992073db53a7ebd
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Jul 16 11:21:13 2013 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Jul 16 11:21:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=60585ac7

dev-libs/weston: fix deps and USE flags, rm .la, cosmetics, add suid and systemd USE, use video group, check kernel config

Package-Manager: portage-2.1.12.2
RepoMan-Options: --force

---
 dev-libs/weston/metadata.xml        |  22 +++--
 dev-libs/weston/weston-1.2.0.ebuild | 134 +++++++++++++++++++++++++++++
 dev-libs/weston/weston-9999.ebuild  | 166 +++++++++++++++++++++++-------------
 3 files changed, 253 insertions(+), 69 deletions(-)

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index d466899..9cc71a2 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -3,20 +3,18 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='clients'>Enable support for clients.</flag>
-	<flag name='colord'>Allow setting color managment.</flag>
-	<flag name='drm'>Enable drm compositor support.</flag>
-	<flag name='egl'>Enable egl acceleration.</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='colord'>Support color management using <pkg>x11-misc/colord</pkg></flag>
+	<flag name='drm'>Enable DRM backend, uses Linux KMS for output and evdev devices for input.</flag>
+	<flag name='egl'>Enable EGL support.</flag>
+	<flag name='fbdev'>Enable fbdev backend.</flag>
+	<flag name='headless'>Enable headless backend and a noop renderer, mainly for testing purposes.</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='simple-clients'>Enable simple-clients?.</flag>
-	<flag name='tablet'>Enable interface for tablets.</flag>
-	<flag name='wayland-compositor'>Enable Wayland compositor support.</flag>
-	<flag name='xwayland'>Enable ability support native X11 applications.</flag>
-	<flag name='x11'>Enable X11 compositor support.</flag>
+	<flag name='tablet'>Enable Tablet shell, a graphical user interface aimed for tablet-like devices, where usually the only input method is a touch screen.</flag>
+	<flag name='unwind'>Use <pkg>sys-libs/libunwind</pkg> for backtraces.</flag>
+	<flag name='wayland-compositor'>Enable Wayland compositor for running Weston on another Wayland server, a different Weston instance, for example.</flag>
+	<flag name='X'>Enable X11 backend, runs on an X server, each Weston output becomes an X window.</flag>
+	<flag name='xwayland'>Enable XWayland, provides backwards compatibility to X applications in a Wayland stack, requires a special X.org server to be installed.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/weston/weston-1.2.0.ebuild b/dev-libs/weston/weston-1.2.0.ebuild
new file mode 100644
index 0000000..520b625
--- /dev/null
+++ b/dev-libs/weston/weston-1.2.0.ebuild
@@ -0,0 +1,134 @@
+# 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}"
+
+inherit autotools-utils linux-info
+[[ ${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 headless fbdev rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor X xwayland"
+
+REQUIRED_USE="
+	drm? ( egl )
+	fbdev? ( drm )
+	rpi? ( !drm !egl )
+	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.10.0
+	>=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? (
+		>=x11-libs/cairo-1.11.3[opengl]
+		media-libs/glu
+	)
+	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_enable resize-optimization)
+		$(use_enable suid setuid-install)
+		$(use_enable tablet tablet-shell)
+		$(use_enable xwayland)
+		$(use_enable xwayland xwayland-test)
+		# required for tests
+		$(use_enable test simple-clients)
+		$(use_enable test simple-egl-clients)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	autotools-utils_src_test
+}

diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 0003bc6..520b625 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -2,81 +2,133 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+# TODO
+# make building and installing clients_programs optional
+# fix systemd automagic
+#	$(use_enable systemd libsystemd-login)
 
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/wayland/${PN}"
 
-inherit autotools toolchain-funcs $GIT_ECLASS
+inherit autotools-utils linux-info
+[[ ${PV} == 9999* ]] && inherit git-2
 
 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
+[[ ${PV} == 9999* ]] || \
+SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
-IUSE="+clients colord debug +drm +egl headless fbdev gles2 rdp +resize-optimization -rpi +simple-clients static-libs +tablet +wayland-compositor +xwayland +x11"
+[[ ${PV} == 9999* ]] || \
+KEYWORDS="~arm ~amd64 ~x86 ~arm-linux"
+IUSE="colord +drm +egl headless fbdev rdp +resize-optimization rpi static-libs +suid systemd tablet test unwind wayland-compositor X xwayland"
 
 REQUIRED_USE="
-	rpi?   ( !drm !egl gles2 )
+	drm? ( egl )
+	fbdev? ( drm )
+	rpi? ( !drm !egl )
+	wayland-compositor? ( egl )
 "
 
 RDEPEND="
 	>=dev-libs/wayland-1.1.90
-	gnome-base/librsvg
-	media-libs/mesa[gles2,wayland]
+	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.10.0
+	>=x11-libs/libdrm-2.4.30
+	x11-libs/libxkbcommon
 	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 )
-	colord? ( x11-misc/colord )
-	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_beta1_p20130710 )
-	x11? ( x11-libs/libxcb
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
+	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? (
+		>=x11-libs/cairo-1.11.3[opengl]
+		media-libs/glu
+	)
+	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
+"
 
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
+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() {
-	econf --disable-setuid-install \
-		  $(use_enable clients) \
-		  $(use_enable colord) \
-		  $(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 resize-optimization) \
-		  $(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 xwayland xwayland-compositor) \
-		  $(use_enable x11 x11-compositor) \
-		  $(use_with gles2 cairo-glesv2)
+	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_enable resize-optimization)
+		$(use_enable suid setuid-install)
+		$(use_enable tablet tablet-shell)
+		$(use_enable xwayland)
+		$(use_enable xwayland xwayland-test)
+		# required for tests
+		$(use_enable test simple-clients)
+		$(use_enable test simple-egl-clients)
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	autotools-utils_src_test
 }