[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: d14fb606ded53cefb2e2eb1daf2c40c790da7533
Author: Matt Turner gentoo org>
AuthorDate: Tue Sep 17 02:46:17 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Sep 17 02:48:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14fb606
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 -
media-libs/waffle/waffle-1.8.0.ebuild | 97 ---
2 files changed, 98 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index ea45eb97315c..c72d31a531ca 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1 @@
-DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B
cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521
SHA512
432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4
DIST waffle-v1.8.1.tar.bz2 309259 BLAKE2B
bfc4cd9043df854e34ab0ee0edd7d231fbc2253e41de8eb3bb702428a2b22569a407dc595a4c13a1a5e7cac2686dfe8b4ec26397e3dbed1a433de31fd3616b4f
SHA512
c0e47047776de9cc20791974dec0944c769d766e5fe4f4e66a25a0d5900f3a756d95b4df434ff2e595079659d79d95398f6f411e4b8cc969cace7b2c3532b79f
diff --git a/media-libs/waffle/waffle-1.8.0.ebuild
b/media-libs/waffle/waffle-1.8.0.ebuild
deleted file mode 100644
index 6902993d4b1b..
--- a/media-libs/waffle/waffle-1.8.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
-
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
- S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib virtualx ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc test wayland X"
-RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under
sandbox
-
-RDEPEND="
- >=media-libs/mesa-23[${MULTILIB_USEDEP}]
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- dev-util/wayland-scanner
-"
-# test? (
-# wayland? ( dev-libs/weston[headless] )
-# )
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- -Dgbm=enabled
- -Dsurfaceless_egl=enabled
-
- $(meson_use test build-tests)
- $(meson_native_true build-manpages)
- -Dbuild-htmldocs=false
- -Dbuild-examples=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- if use wayland; then
- export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d
xdg-runtime-XX)"
-
- weston --backend=headless-backend.so --socket=wayland-6
--idle-time=0 &
- compositor=$!
- export WAYLAND_DISPLAY=wayland-6
- fi
-
- export MESA_SHADER_CACHE_DISABLE=true
- virtx meson_src_test
-
- if use wayland; then
- kill ${compositor}
- fi
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- rm -r \
- "${ED}"/usr/share/doc/${P} \
- "${ED}"/usr/share/doc/waffle1/release-notes || die
- mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
- if ! use doc; then
- rm -rf \
- "${ED}"/usr/share/man/man{3,7} || die
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 650d7e9f603f5c1bdaf908bcc90d19ef7758ddf2
Author: Matt Turner gentoo org>
AuthorDate: Sat Sep 7 23:14:03 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Sep 7 23:14:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650d7e9f
media-libs/waffle: Stabilize 1.8.1 x86, #938853
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild
b/media-libs/waffle/waffle-1.8.1.ebuild
index dfddeea09eb7..a7faf62ce171 100644
--- a/media-libs/waffle/waffle-1.8.1.ebuild
+++ b/media-libs/waffle/waffle-1.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: f6622e814cdbe0285de319635dc9ede34b170a9b
Author: Matt Turner gentoo org>
AuthorDate: Sat Sep 7 23:14:15 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Sep 7 23:14:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6622e81
media-libs/waffle: Stabilize 1.8.1 amd64, #938853
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild
b/media-libs/waffle/waffle-1.8.1.ebuild
index a7faf62ce171..046bb04eaf51 100644
--- a/media-libs/waffle/waffle-1.8.1.ebuild
+++ b/media-libs/waffle/waffle-1.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 9d793dbc34a6d3b7de0de40177111ccbf8e39c77
Author: Sam James gentoo org>
AuthorDate: Sun Sep 1 02:17:02 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 1 02:17:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d793dbc
media-libs/waffle: Stabilize 1.8.1 arm, #938853
Signed-off-by: Sam James gentoo.org>
media-libs/waffle/waffle-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild
b/media-libs/waffle/waffle-1.8.1.ebuild
index c90b20ae53d1..dfddeea09eb7 100644
--- a/media-libs/waffle/waffle-1.8.1.ebuild
+++ b/media-libs/waffle/waffle-1.8.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: a438d4de9cd7f97cd1e77dc1afcd6dfe6c21398b
Author: Matt Turner gentoo org>
AuthorDate: Tue Jul 30 22:16:08 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jul 30 22:16:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a438d4de
media-libs/waffle: Version bump to 1.8.1
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.8.1.ebuild | 97 +++
2 files changed, 98 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 8c9814e7bc0d..ea45eb97315c 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B
cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521
SHA512
432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4
+DIST waffle-v1.8.1.tar.bz2 309259 BLAKE2B
bfc4cd9043df854e34ab0ee0edd7d231fbc2253e41de8eb3bb702428a2b22569a407dc595a4c13a1a5e7cac2686dfe8b4ec26397e3dbed1a433de31fd3616b4f
SHA512
c0e47047776de9cc20791974dec0944c769d766e5fe4f4e66a25a0d5900f3a756d95b4df434ff2e595079659d79d95398f6f411e4b8cc969cace7b2c3532b79f
diff --git a/media-libs/waffle/waffle-1.8.1.ebuild
b/media-libs/waffle/waffle-1.8.1.ebuild
new file mode 100644
index ..c90b20ae53d1
--- /dev/null
+++ b/media-libs/waffle/waffle-1.8.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib virtualx ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc test wayland X"
+RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under
sandbox
+
+RDEPEND="
+ >=media-libs/mesa-23[${MULTILIB_USEDEP}]
+ >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
+"
+# test? (
+# wayland? ( dev-libs/weston[headless] )
+# )
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ -Dgbm=enabled
+ -Dsurfaceless_egl=enabled
+
+ $(meson_use test build-tests)
+ $(meson_native_true build-manpages)
+ -Dbuild-htmldocs=false
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ if use wayland; then
+ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d
xdg-runtime-XX)"
+
+ weston --backend=headless-backend.so --socket=wayland-6
--idle-time=0 &
+ compositor=$!
+ export WAYLAND_DISPLAY=wayland-6
+ fi
+
+ export MESA_SHADER_CACHE_DISABLE=true
+ virtx meson_src_test
+
+ if use wayland; then
+ kill ${compositor}
+ fi
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 1b2b69a03b55cd0ed387166dec2ec45a9c1d039d
Author: Matt Turner gentoo org>
AuthorDate: Sat Nov 25 17:11:14 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Nov 25 17:31:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2b69a0
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 2 -
media-libs/waffle/metadata.xml| 2 -
media-libs/waffle/waffle-1.7.2.ebuild | 74 ---
media-libs/waffle/waffle-1.7.3.ebuild | 74 ---
4 files changed, 152 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 2e01a0982270..8c9814e7bc0d 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,3 +1 @@
-DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
-DIST waffle-v1.7.3.tar.bz2 305863 BLAKE2B
efbffd252d085140f587a02e626a3eda75fd5ba3f445a03b6ae03bd74667c797f4590e63330f303dc45394353d57c9ada7973a1552ec68f0de83352719f7975e
SHA512
922507b9f7b8996de0d705f0b705feeb567101d5826a0971f9267b9d58c595b2541d85c0810e43ccdaacbf4ccae0686274ce411d837e7179892ef5ab5d705b0f
DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B
cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521
SHA512
432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4
diff --git a/media-libs/waffle/metadata.xml b/media-libs/waffle/metadata.xml
index 7d510e7a6781..9d90a7ffbca5 100644
--- a/media-libs/waffle/metadata.xml
+++ b/media-libs/waffle/metadata.xml
@@ -6,8 +6,6 @@
X11
-Enable EGL support
-Enable support for the Generic Buffer Manager (gbm)
Enable Wayland support
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
deleted file mode 100644
index 05018931d784..
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
-
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
- S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- dev-util/wayland-scanner
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
- $(meson_native_true build-manpages)
- -Dbuild-tests=false
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- rm -r \
- "${ED}"/usr/share/doc/${P} \
- "${ED}"/usr/share/doc/waffle1/release-notes || die
- mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
- if ! use doc; then
- rm -rf \
- "${ED}"/usr/share/man/man{3,7} || die
- fi
-}
diff --git a/media-libs/waffle/waffle-1.7.3.ebuild
b/media-libs/waffle/waffle-1.7.3.ebuild
deleted file mode 100644
index 70895cc711f7..
--- a/media-libs/waffle/waffle-1.7.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-e
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 22dca8ae56fbcf8e99bcb14d49ae0315c171ece5
Author: Sam James gentoo org>
AuthorDate: Sat Nov 4 09:06:08 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 4 09:06:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22dca8ae
media-libs/waffle: Stabilize 1.8.0 amd64, #916768
Signed-off-by: Sam James gentoo.org>
media-libs/waffle/waffle-1.8.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.8.0.ebuild
b/media-libs/waffle/waffle-1.8.0.ebuild
index e9b2c6defec7..1076c7f0ebf0 100644
--- a/media-libs/waffle/waffle-1.8.0.ebuild
+++ b/media-libs/waffle/waffle-1.8.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 13db5b26ddc6388ca7ab4d5ad3681375788327c5
Author: Sam James gentoo org>
AuthorDate: Fri Nov 3 23:56:48 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 3 23:56:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13db5b26
media-libs/waffle: Stabilize 1.8.0 arm, #916768
Signed-off-by: Sam James gentoo.org>
media-libs/waffle/waffle-1.8.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.8.0.ebuild
b/media-libs/waffle/waffle-1.8.0.ebuild
index 23baef47c53e..e9b2c6defec7 100644
--- a/media-libs/waffle/waffle-1.8.0.ebuild
+++ b/media-libs/waffle/waffle-1.8.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib virtualx ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 7f6e555a9b02a759746782ace9dce46cceab23e2
Author: Matt Turner gentoo org>
AuthorDate: Mon Sep 25 15:06:06 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Sep 25 15:48:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6e555a
media-libs/waffle: Version bump to 1.7.3
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.7.3.ebuild | 74 +++
2 files changed, 75 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index a424d489a4da..aab8096d3677 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
+DIST waffle-v1.7.3.tar.bz2 305863 BLAKE2B
efbffd252d085140f587a02e626a3eda75fd5ba3f445a03b6ae03bd74667c797f4590e63330f303dc45394353d57c9ada7973a1552ec68f0de83352719f7975e
SHA512
922507b9f7b8996de0d705f0b705feeb567101d5826a0971f9267b9d58c595b2541d85c0810e43ccdaacbf4ccae0686274ce411d837e7179892ef5ab5d705b0f
diff --git a/media-libs/waffle/waffle-1.7.3.ebuild
b/media-libs/waffle/waffle-1.7.3.ebuild
new file mode 100644
index ..70895cc711f7
--- /dev/null
+++ b/media-libs/waffle/waffle-1.7.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ $(meson_native_true build-manpages)
+ -Dbuild-tests=false
+ )
+ meson_src_configure
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 5473d9621bc0ebef81881a22385e0d8aa4c75695
Author: Matt Turner gentoo org>
AuthorDate: Mon Sep 25 15:44:29 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Sep 25 15:48:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5473d962
media-libs/waffle: Drop unneeded USE flags
And make an attempt at wiring up tests. Unfortunately the gbm tests
can't work under sandbox, and I've seen some sporadic failures from the
other gl_basic tests as well, so I'll leave this restricted.
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 39
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 70895cc711f7..23baef47c53e 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -11,23 +11,23 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson-multilib multilib ${GIT_ECLASS}
+inherit meson-multilib multilib virtualx ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
+IUSE="doc test wayland X"
+RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under
sandbox
RDEPEND="
- >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-23[${MULTILIB_USEDEP}]
+ >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
)
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
@@ -38,6 +38,9 @@ BDEPEND="
dev-libs/libxslt
dev-util/wayland-scanner
"
+# test? (
+# wayland? ( dev-libs/weston[headless] )
+# )
MULTILIB_CHOST_TOOLS=(
/usr/bin/wflinfo$(get_exeext)
@@ -48,14 +51,34 @@ multilib_src_configure() {
$(meson_feature X glx)
$(meson_feature wayland)
$(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
+ -Dgbm=enabled
+ -Dsurfaceless_egl=enabled
+
+ $(meson_use test build-tests)
$(meson_native_true build-manpages)
- -Dbuild-tests=false
+ -Dbuild-htmldocs=false
+ -Dbuild-examples=false
)
meson_src_configure
}
+multilib_src_test() {
+ if use wayland; then
+ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d
xdg-runtime-XX)"
+
+ weston --backend=headless-backend.so --socket=wayland-6
--idle-time=0 &
+ compositor=$!
+ export WAYLAND_DISPLAY=wayland-6
+ fi
+
+ export MESA_SHADER_CACHE_DISABLE=true
+ virtx meson_src_test
+
+ if use wayland; then
+ kill ${compositor}
+ fi
+}
+
multilib_src_install() {
meson_src_install
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 20f571411e0fb4a4711339a6b634c1a7ed99caa1
Author: Matt Turner gentoo org>
AuthorDate: Mon Sep 25 15:44:53 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Sep 25 15:48:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20f57141
media-libs/waffle: Version bump to 1.8.0
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.8.0.ebuild | 97 +++
2 files changed, 98 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index aab8096d3677..2e01a0982270 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1,3 @@
DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
DIST waffle-v1.7.3.tar.bz2 305863 BLAKE2B
efbffd252d085140f587a02e626a3eda75fd5ba3f445a03b6ae03bd74667c797f4590e63330f303dc45394353d57c9ada7973a1552ec68f0de83352719f7975e
SHA512
922507b9f7b8996de0d705f0b705feeb567101d5826a0971f9267b9d58c595b2541d85c0810e43ccdaacbf4ccae0686274ce411d837e7179892ef5ab5d705b0f
+DIST waffle-v1.8.0.tar.bz2 310657 BLAKE2B
cfc5f6fb32ae379457d9e1a9806504f8e2d22a2e320afab81db04a8e459cc2e127ea546e27a01a36cbb76a3095ca1d87bf96d40286f78f8ef7e1c270a6170521
SHA512
432786f1e255638a866af5c95d4ec0421ce9ffa661696482f9b40f9dbad9198f93caca484a0739a34d37d7a7070efb007771fcc6ea7acb70152c34892466e1e4
diff --git a/media-libs/waffle/waffle-1.8.0.ebuild
b/media-libs/waffle/waffle-1.8.0.ebuild
new file mode 100644
index ..23baef47c53e
--- /dev/null
+++ b/media-libs/waffle/waffle-1.8.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib virtualx ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc test wayland X"
+RESTRICT="!test? ( test ) test" # gl_basic tests don't work when run under
sandbox
+
+RDEPEND="
+ >=media-libs/mesa-23[${MULTILIB_USEDEP}]
+ >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
+"
+# test? (
+# wayland? ( dev-libs/weston[headless] )
+# )
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ -Dgbm=enabled
+ -Dsurfaceless_egl=enabled
+
+ $(meson_use test build-tests)
+ $(meson_native_true build-manpages)
+ -Dbuild-htmldocs=false
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ if use wayland; then
+ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d
xdg-runtime-XX)"
+
+ weston --backend=headless-backend.so --socket=wayland-6
--idle-time=0 &
+ compositor=$!
+ export WAYLAND_DISPLAY=wayland-6
+ fi
+
+ export MESA_SHADER_CACHE_DISABLE=true
+ virtx meson_src_test
+
+ if use wayland; then
+ kill ${compositor}
+ fi
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: b91abcb66ded2ef226820c29cace5a589e55f1f9
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Jun 15 19:24:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 15 21:41:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91abcb6
media-libs/waffle: remove AD website
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Sam James gentoo.org>
media-libs/waffle/waffle-1.7.2.ebuild | 2 +-
media-libs/waffle/waffle-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
index d43cfc4f5302..05018931d784 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -14,7 +14,7 @@ fi
inherit meson-multilib multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 9dd3bad563e3..70895cc711f7 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -14,7 +14,7 @@ fi
inherit meson-multilib multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+HOMEPAGE="https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 7034abe1f2dfe1a1524c3c8183e504618286eb3c
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 9 03:58:25 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 9 04:05:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7034abe1
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest | 1 -
media-libs/waffle/waffle-1.7.0-r2.ebuild | 64
2 files changed, 65 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 8d239f55d202..a424d489a4da 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1 @@
-DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild
b/media-libs/waffle/waffle-1.7.0-r2.ebuild
deleted file mode 100644
index 013a7e9b36be..
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
-
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
- S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3 )
-"
-BDEPEND="
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
- $(meson_native_true build-manpages)
- -Dbuild-tests=false
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-
- ! use doc && rm -rf \
- "${D}"/usr/share/doc/waffle1 \
- "${D}"/usr/share/man/man{3,7}
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 430bf6cbfee4371b496201fec99f1cd1c4998ee1
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 10:45:12 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 10:45:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430bf6cb
media-libs/waffle: Stabilize 1.7.2 amd64, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/waffle/waffle-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
index b1de4e37b135..d43cfc4f5302 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 66fce59229d234dca54ec630d63e490e07436410
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 09:56:28 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 09:56:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fce592
media-libs/waffle: Stabilize 1.7.2 x86, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/waffle/waffle-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
index 113e0d431471..b1de4e37b135 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 15fce2c4c7b9c228ca5e5a1f8934ad64eff3771a
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 09:01:03 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 09:01:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fce2c4
media-libs/waffle: Stabilize 1.7.2 arm, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/waffle/waffle-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
index 9dd3bad563e3..113e0d431471 100644
--- a/media-libs/waffle/waffle-1.7.2.ebuild
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: db162ce3d987199d9c56ce87d4e1480cdd727519
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 13 19:46:11 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 13 20:07:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db162ce3
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 -
media-libs/waffle/waffle-1.7.1.ebuild | 74 ---
2 files changed, 75 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index f40b17c78f85..8d239f55d202 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,3 +1,2 @@
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-DIST waffle-v1.7.1.tar.bz2 305830 BLAKE2B
8be098fa957f3d9cc84a72920e58fcee9ca4ab0b23a6d93b6cc7dfea17501448ff44a41c42f4c06ff81ef26c0041258b8709bcaf8abb4a593e8b3ac21e2085cd
SHA512
e2ce6092c3088d0c4e85581700096954ab4f644e758b8639d2e9fa91771d2d964cd028361d346c9ae9c4ef185e6fc4c59acdee4480ee6ea6436f0d4bd61581a5
DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
diff --git a/media-libs/waffle/waffle-1.7.1.ebuild
b/media-libs/waffle/waffle-1.7.1.ebuild
deleted file mode 100644
index 9dd3bad563e3..
--- a/media-libs/waffle/waffle-1.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
-
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
- S="${WORKDIR}"/${PN}-v${PV}
-fi
-inherit meson-multilib multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc +egl +gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3 )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- dev-util/wayland-scanner
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/wflinfo$(get_exeext)
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
- $(meson_native_true build-manpages)
- -Dbuild-tests=false
- )
- meson_src_configure
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- rm -r \
- "${ED}"/usr/share/doc/${P} \
- "${ED}"/usr/share/doc/waffle1/release-notes || die
- mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
- if ! use doc; then
- rm -rf \
- "${ED}"/usr/share/man/man{3,7} || die
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 5906a7e5b67fa13a611ef50e5a8e6bdbb88f1827
Author: Matt Turner gentoo org>
AuthorDate: Sun Mar 5 19:14:16 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Mar 5 19:16:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5906a7e5
media-libs/waffle: Version bump to 1.7.2
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.7.2.ebuild | 74 +++
2 files changed, 75 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 6a01e0c524cc..f40b17c78f85 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1,3 @@
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
DIST waffle-v1.7.1.tar.bz2 305830 BLAKE2B
8be098fa957f3d9cc84a72920e58fcee9ca4ab0b23a6d93b6cc7dfea17501448ff44a41c42f4c06ff81ef26c0041258b8709bcaf8abb4a593e8b3ac21e2085cd
SHA512
e2ce6092c3088d0c4e85581700096954ab4f644e758b8639d2e9fa91771d2d964cd028361d346c9ae9c4ef185e6fc4c59acdee4480ee6ea6436f0d4bd61581a5
+DIST waffle-v1.7.2.tar.bz2 305728 BLAKE2B
d78e54857d5fd4a20526d23a9a2edc5abacceaf4a2a6fd21b3432e4b68ef8084c93748592232b7698bd0587db83a5396cf92258f8cbfec2dbc1f6335d89e5bf6
SHA512
015bd82ae592d639403136e91681912827ad81b42400b7dd5353076d6af53ceec8d3cba7e9b076e99676c37a75a9e5f6440c22e14d89c978901b1e3f3d95052f
diff --git a/media-libs/waffle/waffle-1.7.2.ebuild
b/media-libs/waffle/waffle-1.7.2.ebuild
new file mode 100644
index ..9dd3bad563e3
--- /dev/null
+++ b/media-libs/waffle/waffle-1.7.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson-multilib multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ $(meson_native_true build-manpages)
+ -Dbuild-tests=false
+ )
+ meson_src_configure
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: fb46cc4d59f36642a9a6e6b2dd2cbb0788e57241
Author: Matt Turner gentoo org>
AuthorDate: Fri Mar 3 16:37:37 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Mar 3 16:40:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb46cc4d
media-libs/waffle: Fix documentation installation path
Closes: https://bugs.gentoo.org/852887
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.7.1.ebuild | 15 ---
media-libs/waffle/waffle-.ebuild | 15 ---
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/media-libs/waffle/waffle-1.7.1.ebuild
b/media-libs/waffle/waffle-1.7.1.ebuild
index 968c882955b5..9dd3bad563e3 100644
--- a/media-libs/waffle/waffle-1.7.1.ebuild
+++ b/media-libs/waffle/waffle-1.7.1.ebuild
@@ -58,8 +58,17 @@ multilib_src_configure() {
multilib_src_install() {
meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
- ! use doc && rm -rf \
- "${D}"/usr/share/doc/waffle1 \
- "${D}"/usr/share/man/man{3,7}
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
}
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 968c882955b5..9dd3bad563e3 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -58,8 +58,17 @@ multilib_src_configure() {
multilib_src_install() {
meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
- ! use doc && rm -rf \
- "${D}"/usr/share/doc/waffle1 \
- "${D}"/usr/share/man/man{3,7}
+ rm -r \
+ "${ED}"/usr/share/doc/${P} \
+ "${ED}"/usr/share/doc/waffle1/release-notes || die
+ mv "${ED}"/usr/share/doc/{waffle1,${P}} || die
+ if ! use doc; then
+ rm -rf \
+ "${ED}"/usr/share/man/man{3,7} || die
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 8df8f7e6b9cf845ef5fa904dc4373f4c89ef142c
Author: Matt Turner gentoo org>
AuthorDate: Thu Mar 2 15:18:52 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Mar 2 15:20:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df8f7e6
media-libs/waffle: Version bump to 1.7.1
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/{waffle-.ebuild => waffle-1.7.1.ebuild} | 5 +++--
media-libs/waffle/waffle-.ebuild | 5 +++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index fccd4b6aa37e..6a01e0c524cc 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
+DIST waffle-v1.7.1.tar.bz2 305830 BLAKE2B
8be098fa957f3d9cc84a72920e58fcee9ca4ab0b23a6d93b6cc7dfea17501448ff44a41c42f4c06ff81ef26c0041258b8709bcaf8abb4a593e8b3ac21e2085cd
SHA512
e2ce6092c3088d0c4e85581700096954ab4f644e758b8639d2e9fa91771d2d964cd028361d346c9ae9c4ef185e6fc4c59acdee4480ee6ea6436f0d4bd61581a5
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-1.7.1.ebuild
similarity index 96%
copy from media-libs/waffle/waffle-.ebuild
copy to media-libs/waffle/waffle-1.7.1.ebuild
index a4611e934598..968c882955b5 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,8 +34,9 @@ DEPEND="${RDEPEND}
X? ( >=x11-base/xcb-proto-1.8-r3 )
"
BDEPEND="
- dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
"
MULTILIB_CHOST_TOOLS=(
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index a4611e934598..968c882955b5 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,8 +34,9 @@ DEPEND="${RDEPEND}
X? ( >=x11-base/xcb-proto-1.8-r3 )
"
BDEPEND="
- dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ dev-util/wayland-scanner
"
MULTILIB_CHOST_TOOLS=(
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: e9f9159663dbfa5c005b96d0f87c08154330432c
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Aug 15 18:03:10 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Aug 15 18:03:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f91596
media-libs/waffle: Stabilize 1.7.0-r2 arm, #861023
Signed-off-by: Arthur Zamarin gentoo.org>
media-libs/waffle/waffle-1.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild
b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index c480c84fbf0b..013a7e9b36be 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: e61a870678b113375855c06aaafb46d7372cc1c4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 26 15:22:54 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 26 15:24:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61a8706
media-libs/waffle: x86 stable wrt bug #861023
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild
b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index de258d653958..c480c84fbf0b 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 505bd68254ef822ace43130520f3abf5b741a308
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 26 15:14:09 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 26 15:14:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505bd682
media-libs/waffle: amd64 stable wrt bug #861023
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.7.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild
b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index a4611e934598..de258d653958 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson-multilib multilib ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: c89aaeaced1931a85f814b36135b5408832c1b44
Author: Matt Turner gentoo org>
AuthorDate: Fri Jun 17 18:08:27 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Jun 17 18:16:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89aaeac
media-libs/waffle: Revbump for xcb-proto multilib removal
Signed-off-by: Matt Turner gentoo.org>
.../waffle/{waffle-.ebuild => waffle-1.7.0-r2.ebuild} | 10 +-
media-libs/waffle/waffle-.ebuild | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-1.7.0-r2.ebuild
similarity index 88%
copy from media-libs/waffle/waffle-.ebuild
copy to media-libs/waffle/waffle-1.7.0-r2.ebuild
index 7b4d01d42f65..a4611e934598 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson-multilib ${GIT_ECLASS}
+inherit meson-multilib multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -31,7 +31,7 @@ RDEPEND="
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
"
BDEPEND="
dev-libs/libxslt
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 7b4d01d42f65..a4611e934598 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson-multilib ${GIT_ECLASS}
+inherit meson-multilib multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -31,7 +31,7 @@ RDEPEND="
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
- X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
+ X? ( >=x11-base/xcb-proto-1.8-r3 )
"
BDEPEND="
dev-libs/libxslt
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 77ea1e044c86761a04b4cdd5f6e3b023d925412a
Author: Matt Turner gentoo org>
AuthorDate: Thu Jul 22 05:38:12 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 31 00:19:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ea1e04
media-libs/waffle: Set USE-defaults for mesa[egl,gbm]
Signed-off-by: Matt Turner gentoo.org>
Signed-off-by: Sam James gentoo.org>
media-libs/waffle/{waffle-1.7.0.ebuild => waffle-1.7.0-r1.ebuild} | 2 +-
media-libs/waffle/waffle-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild
b/media-libs/waffle/waffle-1.7.0-r1.ebuild
similarity index 96%
rename from media-libs/waffle/waffle-1.7.0.ebuild
rename to media-libs/waffle/waffle-1.7.0-r1.ebuild
index b58cfad30b9..7b4d01d42f6 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="doc +egl +gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index b58cfad30b9..7b4d01d42f6 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -22,7 +22,7 @@ IUSE="doc +egl +gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 00e21d92f986a86d3868fe7ff066c68b15176a72
Author: Matt Turner gentoo org>
AuthorDate: Fri May 28 01:21:46 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Jun 4 01:14:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e21d92
media-libs/waffle: Switch to meson-multilib
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.7.0.ebuild | 8 ++--
media-libs/waffle/waffle-.ebuild | 8 ++--
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild
b/media-libs/waffle/waffle-1.7.0.ebuild
index 1a2174a6add..b58cfad30b9 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -49,16 +49,12 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo
false)
+ $(meson_native_true build-manpages)
-Dbuild-tests=false
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_install() {
meson_src_install
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 1a2174a6add..b58cfad30b9 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
@@ -49,16 +49,12 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo
false)
+ $(meson_native_true build-manpages)
-Dbuild-tests=false
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_install() {
meson_src_install
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: fd2d0b360f907df15845719e5f48c33e152d7e9c
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Mon Mar 29 15:53:01 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 15 00:42:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2d0b36
media-libs/waffle: Put X11 packages behind existing USE=X
And since mesa is a dependency, virtual/opengl is removed.
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/20182
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.7.0.ebuild | 9 +
media-libs/waffle/waffle-.ebuild | 9 +
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild
b/media-libs/waffle/waffle-1.7.0.ebuild
index a3d7588a87d..1a2174a6add 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from
portage
RDEPEND="
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
"
BDEPEND="
dev-libs/libxslt
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index a3d7588a87d..1a2174a6add 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from
portage
RDEPEND="
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] )
"
BDEPEND="
dev-libs/libxslt
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/, media-libs/waffle/files/
commit: 0dd0dbedfd0b5366161075e56e5a32f67991288f
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 30 22:00:58 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 30 22:01:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd0dbed
media-libs/waffle: Drop old versions
Bug: https://bugs.gentoo.org/768021
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest | 2 -
...ate-cmake-config-and-version-files-if-mes.patch | 87 --
media-libs/waffle/waffle-1.6.1-r1.ebuild | 68 -
media-libs/waffle/waffle-1.6.2.ebuild | 71 --
4 files changed, 228 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 648aa7b92f7..fccd4b6aa37 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,3 +1 @@
-DIST waffle-1.6.1.tar.xz 227152 BLAKE2B
360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52
SHA512
1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
-DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B
62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf
SHA512
2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
diff --git
a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
deleted file mode 100644
index ef31275de08..000
---
a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
-From: Dylan Baker
-Date: Fri, 7 Jun 2019 15:36:09 -0700
-Subject: [PATCH] meson: Generate cmake config and version files if meson is
- new enough
-
-Meson 0.50.0 added a module similar to the pkg-config module for
-generating cmake config files. Since the CMake build system provides
-these the meson build system should as well.
-
-v2: - Bump version to 0.50 instead of incorrect 0.49
-v3: - remove TODO comment that this fixes
-- Add a definition of set_and_check for meson-generated Config
- files.
-
-Reviewed-by: Eric Engestrom
- cmake/Modules/WaffleConfig.cmake.in | 10 ++
- meson.build | 2 --
- src/waffle/meson.build | 20
- 3 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/WaffleConfig.cmake.in
b/cmake/Modules/WaffleConfig.cmake.in
-index b60b470..4e19755 100644
a/cmake/Modules/WaffleConfig.cmake.in
-+++ b/cmake/Modules/WaffleConfig.cmake.in
-@@ -7,6 +7,16 @@
-
- @PACKAGE_INIT@
-
-+# This should only be used for meson
-+if (NOT DEFINED set_and_check)
-+macro(set_and_check _var _file)
-+set(${_var} "${_file}")
-+if(NOT EXISTS "${_file}")
-+message(FATAL_ERROR "File or directory ${_file} referenced by
variable ${_var} does not exist !")
-+endif()
-+endmacro()
-+endif()
-+
- set_and_check(Waffle_INCLUDE_DIRS
"@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
- set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- set(Waffle_LIBRARIES "@waffle_libname@")
-diff --git a/meson.build b/meson.build
-index 29fda22..22b7f59 100644
a/meson.build
-+++ b/meson.build
-@@ -231,5 +231,3 @@ endif
- if get_option('build-examples')
- subdir('examples')
- endif
--
--# TODO: CMake config file
-diff --git a/src/waffle/meson.build b/src/waffle/meson.build
-index 322df40..cd68ddf 100644
a/src/waffle/meson.build
-+++ b/src/waffle/meson.build
-@@ -211,6 +211,26 @@ pkg.generate(
- description : 'A library for selecting an OpenGL API and windows system at
runtime.',
- )
-
-+if meson.version().version_compare('>= 0.50')
-+ cmake = import('cmake')
-+ cmake.write_basic_package_version_file(
-+name : 'Waffle',
-+version : meson.project_version(),
-+compatibility : 'SameMajorVersion',
-+ )
-+
-+ cmake_conf = configuration_data()
-+ cmake_conf.set('waffle_libname', waffle_name)
-+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR',
join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
-+ cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR',
join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
-+
-+ cmake.configure_package_config_file(
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 04682749b9f16322e9ce61e918db5114bd0ff494
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 8 22:21:09 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 8 22:26:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04682749
media-libs/waffle: Version bump to 1.7.0
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/{waffle-.ebuild => waffle-1.7.0.ebuild} | 2 +-
media-libs/waffle/waffle-.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index c5a09e0f9ba..648aa7b92f7 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1,3 @@
DIST waffle-1.6.1.tar.xz 227152 BLAKE2B
360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52
SHA512
1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B
62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf
SHA512
2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
+DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B
8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5
SHA512
ee7b8419e309387fa6d610174ba5a97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-1.7.0.ebuild
similarity index 97%
copy from media-libs/waffle/waffle-.ebuild
copy to media-libs/waffle/waffle-1.7.0.ebuild
index 43899a8515c..a3d7588a87d 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 43899a8515c..a3d7588a87d 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: a02851558f8b75890482b5c95841c8f5f59113c0
Author: Matt Turner gentoo org>
AuthorDate: Sat Jan 30 17:37:52 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Jan 30 17:46:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0285155
media-libs/waffle: Version bump to 1.6.2
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.6.2.ebuild | 71 +++
2 files changed, 72 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 894e938a881..c5a09e0f9ba 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-1.6.1.tar.xz 227152 BLAKE2B
360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52
SHA512
1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
+DIST waffle-v1.6.2.tar.bz2 259740 BLAKE2B
62708dcda7800d2728ea708f88af5e9c3ff5bbeeef653d064c457ebf86620f67d8dfcd934425810ffb66a452814337e3ed13b6f3e8a4d420363a0b66ceeaf2cf
SHA512
2b1e153277366731cb5cb3790c6ae1b884efa8e5e0d5a9499a218f1a902370a066e3253f9922297314943aa751596f70a33faff10c2e480ccc1ceace93ccecbf
diff --git a/media-libs/waffle/waffle-1.6.2.ebuild
b/media-libs/waffle/waffle-1.6.2.ebuild
new file mode 100644
index 000..a1d9e8bbbf2
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
+"
+
+PATCHES=(
+
"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo
false)
+ -Dbuild-tests=false
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ ! use doc && rm -rf \
+ "${D}"/usr/share/doc/waffle1 \
+ "${D}"/usr/share/man/man{3,7}
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 9efd48cbc7ee283de208269aa714254db681a2bf
Author: Matt Turner gentoo org>
AuthorDate: Sat Jan 30 17:38:37 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Jan 30 17:46:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efd48cb
media-libs/waffle: Use tags instead of gitlab releases
And improve documentation generation.
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 1786f943ad9..43899a8515c 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -7,8 +7,9 @@ if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
GIT_ECLASS="git-r3"
else
-
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2";
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+ S="${WORKDIR}"/${PN}-v${PV}
fi
inherit meson multilib-minimal ${GIT_ECLASS}
@@ -47,7 +48,7 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- -Dbuild-manpages=true
+ -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo
false)
-Dbuild-tests=false
)
meson_src_configure
@@ -60,5 +61,7 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
- ! use doc && rm -rf "${D}"/usr/share/doc/waffle1
+ ! use doc && rm -rf \
+ "${D}"/usr/share/doc/waffle1 \
+ "${D}"/usr/share/man/man{3,7}
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 4624a40cb41081b77ba706edfef1e8a70eeba16b
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 17 05:40:16 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Jun 17 05:46:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4624a40c
media-libs/waffle: Drop old versions
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest | 1 -
media-libs/waffle/waffle-1.6.0-r1.ebuild | 77
2 files changed, 78 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 514148b1a6d..894e938a881 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1 @@
-DIST waffle-1.6.0.tar.xz 224400 BLAKE2B
458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3
SHA512
c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
DIST waffle-1.6.1.tar.xz 227152 BLAKE2B
360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52
SHA512
1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
deleted file mode 100644
index 50f1ac32ba4..000
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
- SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
- doc? (
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
- )
-"
-
-PATCHES=(
-
"${FILESDIR}"/${P}-meson-Generate-cmake-config-and-version-files-if-mes.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/wflinfo$(get_exeext)
-)
-
-src_unpack() {
- default
- [[ $PV = * ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
- $(meson_use doc build-manpages)
- -Dbuild-tests=false
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- meson_src_test
-}
-
-multilib_src_install() {
- meson_src_install
-
- rm -rf "${D}"/usr/share/doc/waffle1
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 64a085c3ce01c0424e7d957250c6dea427c427a1
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jun 15 15:15:28 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jun 15 15:15:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a085c3
media-libs/waffle: x86 stable wrt bug #727768
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild
b/media-libs/waffle/waffle-1.6.1-r1.ebuild
index 1df3c546033..6bd3d6db745 100644
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: f9a888c16506181767b186b0b8a54fe75c08234f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jun 15 15:03:21 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jun 15 15:03:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a888c1
media-libs/waffle: arm stable wrt bug #727768
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild
b/media-libs/waffle/waffle-1.6.1-r1.ebuild
index 13cfbbf9eb1..1df3c546033 100644
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: fa7db0a98fb47e0b2cc8461c928731690453787b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Jun 15 14:59:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Jun 15 14:59:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7db0a9
media-libs/waffle: amd64 stable wrt bug #727768
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.1-r1.ebuild
b/media-libs/waffle/waffle-1.6.1-r1.ebuild
index bb76a7df510..13cfbbf9eb1 100644
--- a/media-libs/waffle/waffle-1.6.1-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: f5c8b9272648d6eaecd6353972022836212d7cfb
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 8 03:39:22 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Apr 8 03:40:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c8b927
media-libs/waffle: Reapply patch to Generate WaffleConfig.cmake file
I mistakenly thought this was included in the 1.6.1 release.
Closes: https://bugs.gentoo.org/716130
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/{waffle-1.6.1.ebuild => waffle-1.6.1-r1.ebuild} | 4
1 file changed, 4 insertions(+)
diff --git a/media-libs/waffle/waffle-1.6.1.ebuild
b/media-libs/waffle/waffle-1.6.1-r1.ebuild
similarity index 94%
rename from media-libs/waffle/waffle-1.6.1.ebuild
rename to media-libs/waffle/waffle-1.6.1-r1.ebuild
index 1786f943ad9..bb76a7df510 100644
--- a/media-libs/waffle/waffle-1.6.1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1-r1.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
app-text/docbook-xml-dtd:4.2
"
+PATCHES=(
+
"${FILESDIR}"/${PN}-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
MULTILIB_CHOST_TOOLS=(
/usr/bin/wflinfo$(get_exeext)
)
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: ee8138beadc04ac93d0dc7ce4ee5063a30b2dd44
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 6 20:00:47 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 6 20:14:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8138be
media-libs/waffle: Add ~arm64 keywords
Fixes: 55ee45dc0ab7 (media-libs/waffle: added ~arm64 keyword)
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.6.1.ebuild | 2 +-
media-libs/waffle/waffle-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.6.1.ebuild
b/media-libs/waffle/waffle-1.6.1.ebuild
index b508b016a13..1786f943ad9 100644
--- a/media-libs/waffle/waffle-1.6.1.ebuild
+++ b/media-libs/waffle/waffle-1.6.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index b508b016a13..1786f943ad9 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 266d203d051c217d125e68e148e0283702c7156b
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 20:10:06 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 20:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266d203d
media-libs/waffle: Version bump to 1.6.1
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.6.1.ebuild | 64 +++
2 files changed, 65 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 0b0146e39dc..514148b1a6d 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-1.6.0.tar.xz 224400 BLAKE2B
458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3
SHA512
c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
+DIST waffle-1.6.1.tar.xz 227152 BLAKE2B
360782636809fa3716589e5c3f2d365ce2a916f3da4dde7ec271ce7e142f94160388f9ae12f1ef0ea79890f45eba9d6ef536e12861ee44cbd88282e3c4f01f52
SHA512
1d5839d517d1067efea163ffd76c05f32f30c3ef0f42dfa1b3a9830d4377829cce368d28889ec5a3be639a5e81db2fb4833d98eafc5ffa5e27578ff11977258f
diff --git a/media-libs/waffle/waffle-1.6.1.ebuild
b/media-libs/waffle/waffle-1.6.1.ebuild
new file mode 100644
index 000..b508b016a13
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc +egl +gbm wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ -Dbuild-manpages=true
+ -Dbuild-tests=false
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ ! use doc && rm -rf "${D}"/usr/share/doc/waffle1
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 8b0fd31eb83227c1eaaf9524eef9906454ea7f7a
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 20:35:15 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 20:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0fd31e
media-libs/waffle: Remove unnecessary functions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 9 -
1 file changed, 9 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 6080dd579e2..b508b016a13 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -40,11 +40,6 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/wflinfo$(get_exeext)
)
-src_unpack() {
- default
- [[ $PV = * ]] && git-r3_src_unpack
-}
-
multilib_src_configure() {
local emesonargs=(
$(meson_feature X glx)
@@ -62,10 +57,6 @@ multilib_src_compile() {
meson_src_compile
}
-multilib_src_test() {
- meson_src_test
-}
-
multilib_src_install() {
meson_src_install
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 65610136a0d399107014dc084c1e24f7e5bf4ef2 Author: Matt Turner gentoo org> AuthorDate: Tue Mar 31 20:31:06 2020 + Commit: Matt Turner gentoo org> CommitDate: Tue Mar 31 20:44:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65610136 media-libs/waffle: Enable egl and gbm by default Signed-off-by: Matt Turner gentoo.org> media-libs/waffle/waffle-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/waffle/waffle-.ebuild b/media-libs/waffle/waffle-.ebuild index 7c8183c35ea..4b2918009cf 100644 --- a/media-libs/waffle/waffle-.ebuild +++ b/media-libs/waffle/waffle-.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"; LICENSE="BSD-2" SLOT="0" -IUSE="doc egl gbm wayland X" +IUSE="doc +egl +gbm wayland X" RESTRICT="test" # gl_basic tests don't work when run from portage RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 89d3f095a715acb04ec227287feb8dd2a3b77563
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 20:31:30 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 20:44:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d3f095
media-libs/waffle: Bump wayland dependency
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 4b2918009cf..4ae9a9bbcf9 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: cffa307c1b846186f14e4fb3d64950b1ef7ad4b6
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 20:30:51 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 20:44:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffa307c
media-libs/waffle: Update SRC_URI
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index cf4f722c608..7c8183c35ea 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
GIT_ECLASS="git-r3"
else
- SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
+
SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz";
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 38e14beda0e6522c6907259a60633447d26bf6c5
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 20:32:05 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 20:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e14bed
media-libs/waffle: Use IUSE=doc to control only dev docs
So wflinfo(1) is always installed. Also move dependencies to BDEPEND.
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 4ae9a9bbcf9..6080dd579e2 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -30,10 +30,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
- doc? (
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
- )
+"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
"
MULTILIB_CHOST_TOOLS=(
@@ -52,7 +52,7 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- $(meson_use doc build-manpages)
+ -Dbuild-manpages=true
-Dbuild-tests=false
)
meson_src_configure
@@ -69,5 +69,5 @@ multilib_src_test() {
multilib_src_install() {
meson_src_install
- rm -rf "${D}"/usr/share/doc/waffle1
+ ! use doc && rm -rf "${D}"/usr/share/doc/waffle1
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: b4827a4cc9c17bef9c018b865aee917486a68196
Author: Matt Turner gentoo org>
AuthorDate: Wed Mar 11 18:34:52 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Mar 11 18:41:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4827a4c
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.6.0.ebuild | 69 ---
1 file changed, 69 deletions(-)
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
deleted file mode 100644
index c1eb3cfd333..000
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
- GIT_ECLASS="git-r3"
-else
- SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-fi
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm test wayland X"
-RESTRICT="test" # gl_basic tests don't work when run from portage
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
- doc? (
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
- )
-"
-
-src_unpack() {
- default
- [[ $PV = * ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_feature X glx)
- $(meson_feature wayland)
- $(meson_feature X x11_egl)
- $(meson_feature gbm)
- $(meson_feature egl surfaceless_egl)
- $(meson_use test build-tests)
- $(meson_use doc build-manpages)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- meson_src_test
-}
-
-multilib_src_install() {
- meson_src_install
-
- rm -rf "${D}"/usr/share/doc/waffle1
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 55ee45dc0ab71c6ece9e0d3117087b03681a487f
Author: Roy Bamford gentoo org>
AuthorDate: Sun Mar 8 10:59:58 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Mar 8 13:21:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ee45dc
media-libs/waffle: added ~arm64 keyword
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Roy Bamford gentoo.org>
Signed-off-by: Mart Raudsepp gentoo.org>
media-libs/waffle/waffle-1.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index 68be1d58a25..50f1ac32ba4 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 6f8ba9729865be02ebebf2daf813c6d3cfc06d5f
Author: Matt Turner gentoo org>
AuthorDate: Sun Mar 8 00:21:34 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Mar 8 00:23:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8ba972
media-libs/waffle: Never build tests, since RESTRICT=test
Closes: https://bugs.gentoo.org/711836
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.6.0-r1.ebuild | 4 ++--
media-libs/waffle/waffle-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index 6e98a39c761..68be1d58a25 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/
https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
-IUSE="doc egl gbm test wayland X"
+IUSE="doc egl gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
@@ -56,8 +56,8 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- $(meson_use test build-tests)
$(meson_use doc build-manpages)
+ -Dbuild-tests=false
)
meson_src_configure
}
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 7a801198f4d..cf4f722c608 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.waffle-gl.org/
https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
-IUSE="doc egl gbm test wayland X"
+IUSE="doc egl gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
@@ -52,8 +52,8 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- $(meson_use test build-tests)
$(meson_use doc build-manpages)
+ -Dbuild-tests=false
)
meson_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 88c1c2db9a2e1733ca246839f6b51fc9b2897102
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 5 11:51:42 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 5 11:51:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c1c2db
media-libs/waffle: arm stable wrt bug #711560
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index bd9b5d70653..6e98a39c761 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: f0a0df7389cd44feebcdc6cdadbd4f60ed2f962f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 5 11:39:50 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 5 11:39:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a0df73
media-libs/waffle: amd64 stable wrt bug #711560
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index 9c501c7f7f7..bd9b5d70653 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: d3a0df5da77c4573a78d28ed6cd153730a060ba5
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Mar 5 11:36:39 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Mar 5 11:36:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a0df5d
media-libs/waffle: x86 stable wrt bug #711560
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/waffle/waffle-1.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
index 3a6e37303ec..9c501c7f7f7 100644
--- a/media-libs/waffle/waffle-1.6.0-r1.ebuild
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: ae6440b4f79e42bb3d1c438ae2988bdb5721a1ba
Author: Matt Turner gentoo org>
AuthorDate: Fri Feb 7 21:26:58 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Feb 7 21:47:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6440b4
media-libs/waffle: Install wflinfo per ABI
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 56a48b84378..f088ab0aa6d 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
)
"
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
src_unpack() {
default
[[ $PV = * ]] && git-r3_src_unpack
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/files/, media-libs/waffle/
commit: 909c1837f2cdc2bf1d93728b33c7c1285dff96bb
Author: Matt Turner gentoo org>
AuthorDate: Fri Feb 7 21:16:43 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Feb 7 21:47:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909c1837
media-libs/waffle: Generate WaffleConfig.cmake file
Signed-off-by: Matt Turner gentoo.org>
...ate-cmake-config-and-version-files-if-mes.patch | 87 ++
media-libs/waffle/waffle-1.6.0-r1.ebuild | 77 +++
2 files changed, 164 insertions(+)
diff --git
a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
new file mode 100644
index 000..ef31275de08
--- /dev/null
+++
b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
@@ -0,0 +1,87 @@
+From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
+From: Dylan Baker
+Date: Fri, 7 Jun 2019 15:36:09 -0700
+Subject: [PATCH] meson: Generate cmake config and version files if meson is
+ new enough
+
+Meson 0.50.0 added a module similar to the pkg-config module for
+generating cmake config files. Since the CMake build system provides
+these the meson build system should as well.
+
+v2: - Bump version to 0.50 instead of incorrect 0.49
+v3: - remove TODO comment that this fixes
+- Add a definition of set_and_check for meson-generated Config
+ files.
+
+Reviewed-by: Eric Engestrom
+---
+ cmake/Modules/WaffleConfig.cmake.in | 10 ++
+ meson.build | 2 --
+ src/waffle/meson.build | 20
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/WaffleConfig.cmake.in
b/cmake/Modules/WaffleConfig.cmake.in
+index b60b470..4e19755 100644
+--- a/cmake/Modules/WaffleConfig.cmake.in
b/cmake/Modules/WaffleConfig.cmake.in
+@@ -7,6 +7,16 @@
+
+ @PACKAGE_INIT@
+
++# This should only be used for meson
++if (NOT DEFINED set_and_check)
++macro(set_and_check _var _file)
++set(${_var} "${_file}")
++if(NOT EXISTS "${_file}")
++message(FATAL_ERROR "File or directory ${_file} referenced by
variable ${_var} does not exist !")
++endif()
++endmacro()
++endif()
++
+ set_and_check(Waffle_INCLUDE_DIRS
"@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
+ set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(Waffle_LIBRARIES "@waffle_libname@")
+diff --git a/meson.build b/meson.build
+index 29fda22..22b7f59 100644
+--- a/meson.build
b/meson.build
+@@ -231,5 +231,3 @@ endif
+ if get_option('build-examples')
+ subdir('examples')
+ endif
+-
+-# TODO: CMake config file
+diff --git a/src/waffle/meson.build b/src/waffle/meson.build
+index 322df40..cd68ddf 100644
+--- a/src/waffle/meson.build
b/src/waffle/meson.build
+@@ -211,6 +211,26 @@ pkg.generate(
+ description : 'A library for selecting an OpenGL API and windows system at
runtime.',
+ )
+
++if meson.version().version_compare('>= 0.50')
++ cmake = import('cmake')
++ cmake.write_basic_package_version_file(
++name : 'Waffle',
++version : meson.project_version(),
++compatibility : 'SameMajorVersion',
++ )
++
++ cmake_conf = configuration_data()
++ cmake_conf.set('waffle_libname', waffle_name)
++ cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR',
join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
++ cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR',
join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
++
++ cmake.configure_package_config_file(
++name : 'Waffle',
++input : '../../cmake/Modules/WaffleConfig.cmake.in',
++configuration : cmake_conf,
++ )
++endif
++
+ if get_option('build-tests')
+ if get_option('default_library') == 'shared'
+ # The unit tests need to poke at internals of the library, but with a
+--
+2.24.1
+
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild
b/media-libs/waffle/waffle-1.6.0-r1.ebuild
new file mode 100644
index 000..2f9c6de8b55
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+ SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: ea888fe6fb922790d8d34a7c1b9c0949a704ba2b
Author: Matt Turner gentoo org>
AuthorDate: Sat Sep 28 18:09:54 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Sep 28 18:27:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea888fe6
media-libs/waffle: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 -
media-libs/waffle/waffle-1.5.2.ebuild | 54 ---
2 files changed, 55 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 32f21dcd336..0b0146e39dc 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1 @@
-DIST waffle-1.5.2.tar.xz 179284 BLAKE2B
40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56
SHA512
04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
DIST waffle-1.6.0.tar.xz 224400 BLAKE2B
458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3
SHA512
c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
deleted file mode 100644
index 2be51a34280..000
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
- GIT_ECLASS="git-r3"
-else
-
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-fi
-inherit cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm test wayland"
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
- doc? (
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
- )
-"
-
-src_configure() {
- local mycmakeargs=(
- -Dwaffle_has_glx=ON
- -Dwaffle_build_examples=OFF
- -Dwaffle_build_manpages=$(usex doc )
- -Dwaffle_has_x11_egl=$(usex egl)
- -Dwaffle_has_gbm=$(usex gbm)
- -Dwaffle_build_tests=$(usex test)
- -Dwaffle_has_wayland=$(usex wayland)
- )
-
- cmake-multilib_src_configure
-}
-
-src_test() {
- emake -C "${CMAKE_BUILD_DIR}" check
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: b50cb75c31e96e2a8a0116736510c8cf79a9d98d
Author: Matt Turner gentoo org>
AuthorDate: Sat Sep 28 18:10:34 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Sep 28 18:27:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50cb75c
media-libs/waffle: Fix unquoted variable
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-1.6.0.ebuild | 2 +-
media-libs/waffle/waffle-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
index ccfc41d0c8c..c1eb3cfd333 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -65,5 +65,5 @@ multilib_src_test() {
multilib_src_install() {
meson_src_install
- rm -rf ${D}/usr/share/doc/waffle1
+ rm -rf "${D}"/usr/share/doc/waffle1
}
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index a7c32a6cf59..56a48b84378 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -65,5 +65,5 @@ multilib_src_test() {
multilib_src_install() {
meson_src_install
- rm -rf ${D}/usr/share/doc/waffle1
+ rm -rf "${D}"/usr/share/doc/waffle1
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 1a0c57e2d7506cb2429a68f86297ff78c611156f
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jul 28 13:04:37 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jul 28 13:05:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0c57e2
media-libs/waffle: arm stable wrt bug #689510
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada gentoo.org>
media-libs/waffle/waffle-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
index 281ad9364c4..ccfc41d0c8c 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 82cb21d8fc20c12b1f4700e58ea5cc1dc16c748b
Author: Mikle Kolyada gentoo org>
AuthorDate: Wed Jul 17 10:16:44 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Wed Jul 17 10:16:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82cb21d8
media-libs/waffle: amd64 stable wrt bug #689510
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-libs/waffle/waffle-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
index 1f4f6057005..281ad9364c4 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 324ecdd39e0bfabc528d08759a41f13f0552065e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jul 10 10:29:30 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jul 10 10:29:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324ecdd3
media-libs/waffle: x86 stable wrt bug #689510
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"
media-libs/waffle/waffle-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
index a7c32a6cf59..1f4f6057005 100644
--- a/media-libs/waffle/waffle-1.6.0.ebuild
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
GIT_ECLASS="git-r3"
else
SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
fi
inherit meson multilib-minimal ${GIT_ECLASS}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 427719116646a2b0fd4cb6ee119e7e318a62356b
Author: Matt Turner gentoo org>
AuthorDate: Sat Jun 8 00:00:23 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Jun 8 00:11:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42771911
media-libs/waffle: Version bump to 1.6.0
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.6.0.ebuild | 69 +++
2 files changed, 70 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index f0b8ca6b3fc..32f21dcd336 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-1.5.2.tar.xz 179284 BLAKE2B
40befb3e4463605e303b404677268d4758f6a43f5d83bee5e74222e2e2bf949f51444c0df68291ef0edc76be313363eca3e59e642b0356451c10703e66d96e56
SHA512
04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
+DIST waffle-1.6.0.tar.xz 224400 BLAKE2B
458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3
SHA512
c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
diff --git a/media-libs/waffle/waffle-1.6.0.ebuild
b/media-libs/waffle/waffle-1.6.0.ebuild
new file mode 100644
index 000..a7c32a6cf59
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
+ GIT_ECLASS="git-r3"
+else
+ SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ doc? (
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
+ )
+"
+
+src_unpack() {
+ default
+ [[ $PV = * ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ $(meson_use test build-tests)
+ $(meson_use doc build-manpages)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ rm -rf ${D}/usr/share/doc/waffle1
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 88d5d2eb5661ea765b3a4f3a1e209d8cb4ed0b98
Author: Matt Turner gentoo org>
AuthorDate: Fri Jun 7 23:55:33 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Jun 8 00:11:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d5d2eb
media-libs/waffle: Convert to Meson
Signed-off-by: Matt Turner gentoo.org>
media-libs/waffle/waffle-.ebuild | 53 +++-
1 file changed, 34 insertions(+), 19 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index dc2a6060887..a7c32a6cf59 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} = ** ]]; then
- EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}";
GIT_ECLASS="git-r3"
else
-
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
+ SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz";
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
-inherit cmake-multilib ${GIT_ECLASS}
+inherit meson multilib-minimal ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle";
LICENSE="BSD-2"
SLOT="0"
-IUSE="doc egl gbm test wayland"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
@@ -35,20 +36,34 @@ DEPEND="${RDEPEND}
)
"
-src_configure() {
- local mycmakeargs=(
- -Dwaffle_has_glx=ON
- -Dwaffle_build_examples=OFF
- -Dwaffle_build_manpages=$(usex doc )
- -Dwaffle_has_x11_egl=$(usex egl)
- -Dwaffle_has_gbm=$(usex gbm)
- -Dwaffle_build_tests=$(usex test)
- -Dwaffle_has_wayland=$(usex wayland)
+src_unpack() {
+ default
+ [[ $PV = * ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ $(meson_use test build-tests)
+ $(meson_use doc build-manpages)
)
+ meson_src_configure
+}
- cmake-multilib_src_configure
+multilib_src_compile() {
+ meson_src_compile
}
-src_test() {
- emake -C "${CMAKE_BUILD_DIR}" check
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ rm -rf ${D}/usr/share/doc/waffle1
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 8dac6041d8685f7bba21e9f5815b3659d66c8547
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 15 22:23:21 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 15 22:39:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dac6041
media-libs/waffle: Bump 1.5.2 to EAPI-6
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/waffle/waffle-1.5.2.ebuild | 47 ++-
1 file changed, 19 insertions(+), 28 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index ec71eacc2bf..2be51a34280 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,25 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
-
-if [[ ${PV} = * ]]; then
- GIT_ECLASS="git-2"
-fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
-
-if [[ $PV = * ]]; then
- KEYWORDS="~ppc ~ppc64"
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
+ GIT_ECLASS="git-r3"
else
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
fi
+inherit cmake-multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
LICENSE="BSD-2"
SLOT="0"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
RDEPEND="
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
DEPEND="${RDEPEND}
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
- )"
-
-src_unpack() {
- default
- [[ $PV = * ]] && git-2_src_unpack
-}
+ )
+"
src_configure() {
local mycmakeargs=(
-Dwaffle_has_glx=ON
-Dwaffle_build_examples=OFF
- $(cmake-utils_use doc waffle_build_manpages)
- $(cmake-utils_use egl waffle_has_x11_egl)
- $(cmake-utils_use gbm waffle_has_gbm)
- $(cmake-utils_use test waffle_build_tests)
- $(cmake-utils_use wayland waffle_has_wayland)
+ -Dwaffle_build_manpages=$(usex doc )
+ -Dwaffle_has_x11_egl=$(usex egl)
+ -Dwaffle_has_gbm=$(usex gbm)
+ -Dwaffle_build_tests=$(usex test)
+ -Dwaffle_has_wayland=$(usex wayland)
)
cmake-multilib_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: c75350d290e3c1c35036e7896f894bd5d4d7b7f5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 15 22:20:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 15 22:39:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75350d2
media-libs/waffle: Bump live to EAPI-6, switch to git-r3
Sort deps, drop implicit inherit, consolidate /non- conditionals.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-libs/waffle/waffle-.ebuild | 49 +++-
1 file changed, 20 insertions(+), 29 deletions(-)
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 23384f2ecad..dc2a6060887 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
-
-if [[ ${PV} = * ]]; then
- GIT_ECLASS="git-2"
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
+ GIT_ECLASS="git-r3"
+else
+
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
+inherit cmake-multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
-if [[ $PV = * ]]; then
- KEYWORDS=""
-else
-
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
LICENSE="BSD-2"
SLOT="0"
IUSE="doc egl gbm test wayland"
@@ -28,31 +22,28 @@ IUSE="doc egl gbm test wayland"
RDEPEND="
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
DEPEND="${RDEPEND}
>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
- )"
-
-src_unpack() {
- default
- [[ $PV = * ]] && git-2_src_unpack
-}
+ )
+"
src_configure() {
local mycmakeargs=(
-Dwaffle_has_glx=ON
-Dwaffle_build_examples=OFF
- $(cmake-utils_use doc waffle_build_manpages)
- $(cmake-utils_use egl waffle_has_x11_egl)
- $(cmake-utils_use gbm waffle_has_gbm)
- $(cmake-utils_use test waffle_build_tests)
- $(cmake-utils_use wayland waffle_has_wayland)
+ -Dwaffle_build_manpages=$(usex doc )
+ -Dwaffle_has_x11_egl=$(usex egl)
+ -Dwaffle_has_gbm=$(usex gbm)
+ -Dwaffle_build_tests=$(usex test)
+ -Dwaffle_has_wayland=$(usex wayland)
)
cmake-multilib_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 699133bcb84c6ef569a3c3b58079c41f44044497
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Mar 25 20:12:06 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Mar 25 20:12:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699133bc
media-libs/waffle: keyworded 1.5.2 for ppc, bug #651152
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
media-libs/waffle/waffle-1.5.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index c5ae78b0035..140bb05b121 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -15,10 +15,10 @@ DESCRIPTION="Library that allows selection of GL API and of
window system at run
HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
- KEYWORDS="~ppc64"
+ KEYWORDS="~ppc ~ppc64"
else
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm ~ppc64 x86"
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
fi
LICENSE="BSD-2"
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: d4261c7c4df52e5fa8b7f4ee341d7e5e456d9d87
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Mar 23 00:01:17 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Mar 23 00:01:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4261c7c
media-libs/waffle: keyworded 1.5.2 for ppc64, bug #651152
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"
media-libs/waffle/waffle-1.5.2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index 12158551047..c5ae78b0035 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,10 +15,10 @@ DESCRIPTION="Library that allows selection of GL API and of
window system at run
HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
- KEYWORDS=""
+ KEYWORDS="~ppc64"
else
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 arm x86"
+ KEYWORDS="amd64 arm ~ppc64 x86"
fi
LICENSE="BSD-2"
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: f78f536b31345f10e343015d169714eb4986565f
Author: David Hicks hicks id au>
AuthorDate: Sat Jul 29 16:39:14 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jul 30 09:38:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78f536b
media-libs/waffle: use HTTPS for GitHub
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-libs/waffle/waffle-1.5.2.ebuild | 6 +++---
media-libs/waffle/waffle-.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index c5874d1761b..12158551047 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-EGIT_REPO_URI="git://github.com/waffle-gl/waffle.git"
+EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
if [[ ${PV} = * ]]; then
GIT_ECLASS="git-2"
@@ -17,7 +17,7 @@ HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
KEYWORDS=""
else
-
SRC_URI="https://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
+
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
KEYWORDS="amd64 arm x86"
fi
diff --git a/media-libs/waffle/waffle-.ebuild
b/media-libs/waffle/waffle-.ebuild
index 783ceab25e0..8d8286cd45c 100644
--- a/media-libs/waffle/waffle-.ebuild
+++ b/media-libs/waffle/waffle-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-EGIT_REPO_URI="git://github.com/waffle-gl/waffle.git"
+EGIT_REPO_URI="https://github.com/waffle-gl/${PN}.git";
if [[ ${PV} = * ]]; then
GIT_ECLASS="git-2"
@@ -17,7 +17,7 @@ HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
KEYWORDS=""
else
-
SRC_URI="https://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
+
SRC_URI="https://people.freedesktop.org/~chadversary/${PN}/files/release/${P}/${P}.tar.xz";
KEYWORDS="~amd64 ~arm ~x86"
fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 9a4834619e169295348580b436e1b59f32e1c852
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 26 22:32:02 2016 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 26 22:33:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a483461
media-libs/waffle: Drop old version 1.5.1.
media-libs/waffle/Manifest| 1 -
media-libs/waffle/waffle-1.5.1.ebuild | 64 ---
2 files changed, 65 deletions(-)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index a361032..8ffe3e4 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,2 +1 @@
-DIST waffle-1.5.1.tar.xz 178136 SHA256
cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa SHA512
0bcd9b76a9806f9b23f27870936f9aed7fe9a21a2c253c8f16b4303129bf7f95dc8f02207b89533b7addcfcdc12b6b05ce9c51a6f1f237d4cf9ac1d81916f831
WHIRLPOOL
3803bd21296ea1e0da3bb39eeb174ad713e005c444b24d792c61e85b28eb06fd863a1412800ad80dec2ff66b6af4b049b8fe9e8a6d82221771de3ad89a51f522
DIST waffle-1.5.2.tar.xz 179284 SHA256
d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c SHA512
04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
WHIRLPOOL
1d7626a717fa5100b83391dcff79bf92885ffcca0945a1e1b0a3a797d5c6dc5536a681e40f1c61c3275c1694b3f4a5292d0eabb1a64ec75383a1de6c5d5c18e9
diff --git a/media-libs/waffle/waffle-1.5.1.ebuild
b/media-libs/waffle/waffle-1.5.1.ebuild
deleted file mode 100644
index 1382ae4..
--- a/media-libs/waffle/waffle-1.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://github.com/waffle-gl/waffle.git"
-
-if [[ ${PV} = * ]]; then
- GIT_ECLASS="git-2"
-fi
-
-inherit cmake-utils cmake-multilib ${GIT_ECLASS}
-
-DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
-HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
-
-if [[ $PV = * ]]; then
- KEYWORDS=""
-else
-
SRC_URI="https://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc egl gbm test wayland"
-
-RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
- gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
- doc? (
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.2
- )"
-
-src_unpack() {
- default
- [[ $PV = * ]] && git-2_src_unpack
-}
-
-src_configure() {
- local mycmakeargs=(
- -Dwaffle_has_glx=ON
- -Dwaffle_build_examples=OFF
- $(cmake-utils_use doc waffle_build_manpages)
- $(cmake-utils_use egl waffle_has_x11_egl)
- $(cmake-utils_use gbm waffle_has_gbm)
- $(cmake-utils_use test waffle_build_tests)
- $(cmake-utils_use wayland waffle_has_wayland)
- )
-
- cmake-multilib_src_configure
-}
-
-src_test() {
- emake -C "${CMAKE_BUILD_DIR}" check
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 0b845c96911fc95ebab545c5075bbe1de64c719c
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 26 22:32:44 2016 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 26 22:33:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b845c96
media-libs/waffle: Drop mistaken keyword.
media-libs/waffle/waffle-1.5.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index 63715ee..ab2a61e 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ DESCRIPTION="Library that allows selection of GL API and of
window system at run
HOMEPAGE="https://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
- KEYWORDS="arm"
+ KEYWORDS=""
else
SRC_URI="https://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
KEYWORDS="amd64 arm x86"
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: 2f55cf3807efb887f1609bd4b8aa320e7b8e17a7
Author: Markus Meier gentoo org>
AuthorDate: Sat Dec 19 21:15:25 2015 +
Commit: Markus Meier gentoo org>
CommitDate: Sat Dec 19 21:15:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f55cf38
media-libs/waffle: arm stable, bug #559062
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"
media-libs/waffle/waffle-1.5.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
index d3d75ea..935a733 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -16,10 +16,10 @@ DESCRIPTION="Library that allows selection of GL API and of
window system at run
HOMEPAGE="http://people.freedesktop.org/~chadversary/waffle/";
if [[ $PV = * ]]; then
- KEYWORDS=""
+ KEYWORDS="arm"
else
SRC_URI="http://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
fi
LICENSE="BSD-2"
[gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/
commit: d8a40757b028653a108aca0ea2cf6fba39d5d8be
Author: Matt Turner gentoo org>
AuthorDate: Tue Aug 25 22:04:53 2015 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Aug 25 22:05:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a40757
media-libs/waffle: Version bump to 1.5.2.
Package-Manager: portage-2.2.20.1
media-libs/waffle/Manifest| 1 +
media-libs/waffle/waffle-1.5.2.ebuild | 64 +++
2 files changed, 65 insertions(+)
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index b68028b..a361032 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1 +1,2 @@
DIST waffle-1.5.1.tar.xz 178136 SHA256
cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa SHA512
0bcd9b76a9806f9b23f27870936f9aed7fe9a21a2c253c8f16b4303129bf7f95dc8f02207b89533b7addcfcdc12b6b05ce9c51a6f1f237d4cf9ac1d81916f831
WHIRLPOOL
3803bd21296ea1e0da3bb39eeb174ad713e005c444b24d792c61e85b28eb06fd863a1412800ad80dec2ff66b6af4b049b8fe9e8a6d82221771de3ad89a51f522
+DIST waffle-1.5.2.tar.xz 179284 SHA256
d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c SHA512
04f90f70421c88418d1d98175b552de9e036ea36b6c870a6c968c7fcc2d4cb2fa4ce08b0adcdd50f4853a7503558eae7a05ef75b292cf85d3c9796e7b342ca62
WHIRLPOOL
1d7626a717fa5100b83391dcff79bf92885ffcca0945a1e1b0a3a797d5c6dc5536a681e40f1c61c3275c1694b3f4a5292d0eabb1a64ec75383a1de6c5d5c18e9
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild
b/media-libs/waffle/waffle-1.5.2.ebuild
new file mode 100644
index 000..4265a5e
--- /dev/null
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/waffle-gl/waffle.git"
+
+if [[ ${PV} = * ]]; then
+ GIT_ECLASS="git-2"
+fi
+
+inherit cmake-utils cmake-multilib ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at
runtime"
+HOMEPAGE="http://people.freedesktop.org/~chadversary/waffle/";
+
+if [[ $PV = * ]]; then
+ KEYWORDS=""
+else
+
SRC_URI="http://people.freedesktop.org/~chadversary/waffle/files/release/${P}/${P}.tar.xz";
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland"
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ doc? (
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
+ )"
+
+src_unpack() {
+ default
+ [[ $PV = * ]] && git-2_src_unpack
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Dwaffle_has_glx=ON
+ -Dwaffle_build_examples=OFF
+ $(cmake-utils_use doc waffle_build_manpages)
+ $(cmake-utils_use egl waffle_has_x11_egl)
+ $(cmake-utils_use gbm waffle_has_gbm)
+ $(cmake-utils_use test waffle_build_tests)
+ $(cmake-utils_use wayland waffle_has_wayland)
+ )
+
+ cmake-multilib_src_configure
+}
+
+src_test() {
+ emake -C "${CMAKE_BUILD_DIR}" check
+}
