reinit the tree, so we can have metadata

6 files changed, 289 insertions, 0 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
new file mode 100644
index 000000000000..988deadb982f
--- /dev/null
+++ b/x11-apps/mesa-progs/Manifest
@@ -0,0 +1,9 @@
+AUX mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 1182 SHA256 607d50474746e71102ce008cb20baac09dc913dd4b07245de35998851cd786ff SHA512 0c2c5bf3b938215ab433e698c253b35a535562ebf8f8be0dc903b4e916224b298d0381e19bae462c75733a078b929173f3074230e1953d5135b7e0721cb5117e WHIRLPOOL 06bc061aff830a261786e65f2c9c68e794244d6b3918204862effb8d44c9480cbafde9afe03b62580c7f09de969259234d4723bebfdb27c313fea109fab53a13
+DIST mesa-demos-8.2.0.tar.bz2 10071635 SHA256 e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de WHIRLPOOL faa4dfb6ee32d81a4569f883d587ea96e76da1c97df26effaff1fc2827b359de40bb61a5b87f46e13993bada2d37ca333cfb1f2023f953829c4d6fb886553899
+DIST mesa-demos-8.3.0.tar.bz2 10044647 SHA256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f WHIRLPOOL 90eaece4019da0d7ee95dc587650d8ec889aaafbbbbf59808ddbe85cf626a05a2af62ce55a3184895aac8de6a4032e58d99aae3a4f38f07ec9c71c0f22f88dfc
+EBUILD mesa-progs-8.2.0.ebuild 1783 SHA256 ed6d0b3a9ed779a99c32673d4b3338b2f193b1a5159a29238c4d905421f640be SHA512 925ee6661e7dfbc02b901a6b3ae43099b6e78066ad2de269bef931be76c9ef728a5a9a0e7de00d681cbacc904694c831b297d17de8dea0a32717a206b176238e WHIRLPOOL 053d5f2a33af3f93752b072b2064ad37cef6b2e2fbaf72ca27c4550ab88a436a0be63076aff6f4256ab4b72346404086e1e63fbec8ab959fc02465e242d896a9
+EBUILD mesa-progs-8.3.0.ebuild 1762 SHA256 996d5e21dce9d3256a561fce615eb28fe9490e344c9a3f896fb8941b48e85863 SHA512 d66ef4b3b89275b12721bd0b0f2eefe400b22c8820ad155c0fed19828a48441ee6feb6f6ed26a9b2ce16735d8e4ba5e0d0590bc478ae2a63917cdafa65e76126 WHIRLPOOL c1a4e37cae80b6cff015da61f416d31dba73975e8aeaeed8311a17138bef4ab89336217f1327cdb4d19bd84ad88a0b20e58de69510031cdca762c849599fee3d
+EBUILD mesa-progs-9999.ebuild 1726 SHA256 95d5c355ce84cce13410099fc2cf26cd1165d0c18f6b9a2c33c96fe3c08231ec SHA512 97e37c0f755302606ba7ebe3532df29bfcbd9eb46733d6b59e7fc3f86e134633b581b0ad058a3fdb6507213f47a5db1f0ebaf50222464562dcf4efc0bce86632 WHIRLPOOL 4ac1303c53779db814ce012e623b41d02202e43d58b039176f5dad158b44cb95d4f06561c43401137fe4e8ccc25ac1be042959ec813a0f9350f5ad92c7e91d39
+MISC ChangeLog 5760 SHA256 210a34c21f672b6e78c08e4f27d0a9e4a5c9edb9091d8575b007df49a40980cd SHA512 68a9f7ff5174c5725f03c0628eb40f380bf7c53d9de76cc21705882fbcc9b595aa4932e06a7d79934c57a4deffb041a18a7d98d6bb72f3578814d7512a2bb64c WHIRLPOOL df39141860f8f3c9df3cb3ae6e644123142b9da796001b9400e6cec1918f7b8609c7b0aa169467cffaefae06b5c047424bfc27c6ccd91b8bee695acf00af67b3
+MISC ChangeLog-2015 14735 SHA256 aed7618ec0d20e6e417f1ca888d340c1c0ac60f7e8679ce1ead92fcfbe467d35 SHA512 16b38165d950e84099e3f5aeecf4acce338b3cc4aa0378d0a42ce2bdc29dc2446df779b78ba86279326c3f5d9761db4911a14fc08f04b85b2ac65e81f3ca1e86 WHIRLPOOL 2275d022288aeae78c75154227db0905b7a01e11cfd9acc642f1096dc5068eab780b73f53449a2b3caa8d246e7eee5196bb4ebc651bc2e5928fcaa7fd59b2b58
+MISC metadata.xml 475 SHA256 3cf259da0559db33e97412909769f94cf6eb6cce356878efa4830e22890c7d47 SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675 WHIRLPOOL 76ff4e504e7d4481f960ac938e15c698bf777de105cd650386b201f01554af61926ec8760e834aaaab5035113119e275c0af0a4926b8067f7fea3278e7689a99
diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
new file mode 100644
index 000000000000..f0389cb8d9c7
--- /dev/null
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
@@ -0,0 +1,33 @@
+diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
+index 2ee6f15..9921746 100644
+--- a/src/egl/eglut/eglut.c
++++ b/src/egl/eglut/eglut.c
+@@ -76,8 +76,7 @@ _eglutNow(void)
+ static void
+ _eglutDestroyWindow(struct eglut_window *win)
+ {
+-   if (_eglut->surface_type != EGL_PBUFFER_BIT &&
+-       _eglut->surface_type != EGL_SCREEN_BIT_MESA)
++   if (_eglut->surface_type != EGL_PBUFFER_BIT)
+       eglDestroySurface(_eglut->dpy, win->surface);
+ 
+    _eglutNativeFiniWindow(win);
+@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h)
+             win->config, win->native.u.pixmap, NULL);
+       break;
+    case EGL_PBUFFER_BIT:
+-   case EGL_SCREEN_BIT_MESA:
+       win->surface = win->native.u.surface;
+       break;
+    default:
+@@ -289,9 +287,7 @@ eglutDestroyWindow(int win)
+    if (window->index != win)
+       return;
+ 
+-   /* XXX it causes some bug in st/egl KMS backend */
+-   if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA)
+-      eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
++   eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ 
+    _eglutDestroyWindow(_eglut->current);
+ }
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
new file mode 100644
index 000000000000..1e807c1632f6
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-EGL_SCREEN_BIT_MESA.patch
+)
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
new file mode 100644
index 000000000000..d999d44c52e5
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
new file mode 100644
index 000000000000..3765af34344b
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
new file mode 100644
index 000000000000..733cce5b7dfb
--- /dev/null
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -0,0 +1,15 @@
+<?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="egl">Build EGL utilities</flag>
+        <flag name="gles2">Build OpenGL ES 2 utilities</flag>
+    </use>
+    <upstream>
+        <remote-id type="sourceforge">mesa3d</remote-id>
+    </upstream>
+</pkgmetadata>