* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-02-06 15:34 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 7+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-02-06 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 59bae303cbf514a656197ec0bb1dfd0db0b66f9a
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 15:34:14 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Feb 6 15:34:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=59bae303
x11-base/wayland: tweak description, license, dependencies, installed binary filenames
---
x11-base/wayland/wayland-9999.ebuild | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index db825fd..6aff1af 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -6,27 +6,27 @@ EAPI=4
inherit xorg-2
-DESCRIPTION="Wayland is compositor standalone display server"
+DESCRIPTION="A nano display server, relying on kernel modesetting"
HOMEPAGE="http://wayland.freedesktop.org/"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}"
-LICENSE="LGPL-2"
+LICENSE="CCPL-Attribution-ShareAlike-3.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="expat"
+IUSE=""
# cairo opengl is automagic
RDEPEND="app-text/poppler[cairo]
+ dev-libs/expat
dev-libs/glib:2
media-libs/mesa[gles,gallium]
>=sys-fs/udev-136
- x11-libs/cairo[opengl]
+ >=x11-libs/cairo-1.10[opengl]
x11-libs/gtk+:2
- >=x11-libs/libdrm-2.4.17
+ >=x11-libs/libdrm-2.4.23
x11-libs/libxcb
x11-libs/libxkbcommon
- virtual/libffi
- expat? ( dev-libs/expat )"
+ virtual/libffi"
DEPEND="${RDEPEND}"
src_prepare() {
@@ -44,6 +44,6 @@ src_install() {
cd "${ED}/usr/bin"
for binary in $(echo *); do
- mv "${binary}" "wayland_${binary}" || die
+ mv "${binary}" "wayland-${binary}" || die
done
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-03-24 3:53 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2011-03-24 3:53 UTC (permalink / raw
To: gentoo-commits
commit: 1ba15b9bf3e27db5662d42562fd6a885eaaef3aa
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 24 03:51:22 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Mar 24 03:51:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1ba15b9b
Correct wayland's git repo address
---
x11-base/wayland/wayland-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index 6aff1af..37ce871 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="A nano display server, relying on kernel modesetting"
HOMEPAGE="http://wayland.freedesktop.org/"
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
LICENSE="CCPL-Attribution-ShareAlike-3.0 MIT"
SLOT="0"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-03-24 3:53 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2011-03-24 3:53 UTC (permalink / raw
To: gentoo-commits
commit: 467e38b9d91991317fbdca7492a8290d422b882e
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 24 03:51:39 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Mar 24 03:51:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=467e38b9
don't depend on mesa[gallium]
wayland works with the 'classic' Intel i965 driver
---
x11-base/wayland/wayland-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index 37ce871..c127a9a 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
RDEPEND="app-text/poppler[cairo]
dev-libs/expat
dev-libs/glib:2
- media-libs/mesa[gles,gallium]
+ media-libs/mesa[gles]
>=sys-fs/udev-136
>=x11-libs/cairo-1.10[opengl]
x11-libs/gtk+:2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-03-26 2:59 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2011-03-26 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 340d292b9f1e102e979c159c94e75b93d66cca82
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 02:59:03 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 02:59:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=340d292b
remove now-unnecessary src_prepare and src_compile
---
x11-base/wayland/wayland-9999.ebuild | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index c127a9a..f156520 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -28,22 +28,3 @@ RDEPEND="app-text/poppler[cairo]
x11-libs/libxkbcommon
virtual/libffi"
DEPEND="${RDEPEND}"
-
-src_prepare() {
- # install the programs too
- # this should be fixed in makefile.am
- sed -i \
- -e "/PROGRAMS/s/noinst_/bin_/" \
- {compositor,clients}"/Makefile.am" || die
-
- xorg-2_src_prepare
-}
-
-src_install() {
- xorg-2_src_install
-
- cd "${ED}/usr/bin"
- for binary in $(echo *); do
- mv "${binary}" "wayland-${binary}" || die
- done
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-03-26 5:49 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2011-03-26 5:49 UTC (permalink / raw
To: gentoo-commits
commit: 896899ea1130912f443f6773a411c77ec7cfbc4e
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 05:49:06 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 05:49:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=896899ea
wayland should depend on mesa[egl,gles]
---
x11-base/wayland/wayland-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index f156520..3522273 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
RDEPEND="app-text/poppler[cairo]
dev-libs/expat
dev-libs/glib:2
- media-libs/mesa[gles]
+ media-libs/mesa[egl,gles]
>=sys-fs/udev-136
>=x11-libs/cairo-1.10[opengl]
x11-libs/gtk+:2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-08-14 2:44 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2011-08-14 2:44 UTC (permalink / raw
To: gentoo-commits
commit: b29ef0d2f1f42b6c553597dfb5ce99910233d10b
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Aug 14 02:43:34 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Aug 14 02:43:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b29ef0d2
x11-base/wayland: trim down dependencies and clean ebuild
Patch based on work of dottomi <AT> gmail.com in bug 365423.
---
x11-base/wayland/wayland-9999.ebuild | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index 3522273..9efcfcf 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -4,27 +4,25 @@
EAPI=4
-inherit xorg-2
+inherit git autotools
-DESCRIPTION="A nano display server, relying on kernel modesetting"
+DESCRIPTION="Wayland protocol libraries"
HOMEPAGE="http://wayland.freedesktop.org/"
EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
LICENSE="CCPL-Attribution-ShareAlike-3.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static-libs"
-# cairo opengl is automagic
-RDEPEND="app-text/poppler[cairo]
- dev-libs/expat
- dev-libs/glib:2
- media-libs/mesa[egl,gles]
- >=sys-fs/udev-136
- >=x11-libs/cairo-1.10[opengl]
- x11-libs/gtk+:2
- >=x11-libs/libdrm-2.4.23
- x11-libs/libxcb
- x11-libs/libxkbcommon
- virtual/libffi"
+RDEPEND="dev-libs/expat
+ dev-libs/libffi"
DEPEND="${RDEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/wayland/
@ 2011-10-31 21:15 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 7+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-10-31 21:15 UTC (permalink / raw
To: gentoo-commits
commit: a3c32017488b7194093fc0857410221ce0bf4a44
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 21:15:13 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Oct 31 21:15:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a3c32017
x11-base/wayland: add configure option to allow cross-compiling, patch from Mandeep Singh Baines in bug #385963.
---
x11-base/wayland/wayland-9999.ebuild | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/x11-base/wayland/wayland-9999.ebuild b/x11-base/wayland/wayland-9999.ebuild
index 9efcfcf..7e72275 100644
--- a/x11-base/wayland/wayland-9999.ebuild
+++ b/x11-base/wayland/wayland-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit git autotools
+inherit git autotools toolchain-funcs
DESCRIPTION="Wayland protocol libraries"
HOMEPAGE="http://wayland.freedesktop.org/"
@@ -24,5 +24,9 @@ src_prepare() {
}
src_configure() {
- econf $(use_enable static-libs static)
+ if tc-is-cross-compiler ; then
+ econf $(use_enable static-libs static) --disable-scanner
+ else
+ econf $(use_enable static-libs static)
+ fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-10-31 21:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-26 2:59 [gentoo-commits] proj/x11:master commit in: x11-base/wayland/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2011-10-31 21:15 Chi-Thanh Christopher Nguyen
2011-08-14 2:44 Matt Turner
2011-03-26 5:49 Matt Turner
2011-03-24 3:53 Matt Turner
2011-03-24 3:53 Matt Turner
2011-02-06 15:34 Chi-Thanh Christopher Nguyen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox