From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79ADD1382C5 for ; Tue, 16 Feb 2021 02:23:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9257E0884; Tue, 16 Feb 2021 02:23:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92C8BE0884 for ; Tue, 16 Feb 2021 02:23:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F23A3411EF for ; Tue, 16 Feb 2021 02:23:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8C924C4 for ; Tue, 16 Feb 2021 02:23:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1613442005.acf64d44f89f2e8a4cd77f069be558fc1a04e589.mattst88@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/ X-VCS-Repository: proj/x11 X-VCS-Files: app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild app-benchmarks/glmark2/glmark2-2014.03.ebuild X-VCS-Directories: app-benchmarks/glmark2/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: acf64d44f89f2e8a4cd77f069be558fc1a04e589 X-VCS-Branch: master Date: Tue, 16 Feb 2021 02:23:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a98a4b91-897b-4ea9-aaef-3d8aeb8c9024 X-Archives-Hash: d4f763150e9f97bb4428618f4e5bf78c commit: acf64d44f89f2e8a4cd77f069be558fc1a04e589 Author: Matt Turner gentoo org> AuthorDate: Tue Feb 16 02:19:47 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Feb 16 02:20:05 2021 +0000 URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=acf64d44 app-benchmarks/glmark2: Drop old versions Signed-off-by: Matt Turner gentoo.org> app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild | 64 ---------------------- app-benchmarks/glmark2/glmark2-2014.03.ebuild | 64 ---------------------- 2 files changed, 128 deletions(-) diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild deleted file mode 100644 index ce4a9ced..00000000 --- a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -inherit waf-utils python-single-r1 - -REV=${PV#*_p} - -DESCRIPTION="Opengl test suite" -HOMEPAGE="https://launchpad.net/glmark2" -SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV} -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="drm +gles2 opengl wayland X" - -RDEPEND="media-libs/libpng - media-libs/mesa[gles2?] - X? ( x11-libs/libX11 ) - wayland? ( >=dev-libs/wayland-1.2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( opengl gles2 ) - || ( drm wayland X )" - -S="${WORKDIR}/~${PN}-dev/${PN}/trunk/" - -src_prepare() { - rm -rf "${S}/src/libpng" - sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >= libpng:1.6 -} - -src_configure() { - : ${WAF_BINARY:="${S}/waf"} - - local myconf - - if use X; then - use opengl && myconf+="x11-gl" - use gles2 && myconf+=",x11-glesv2" - fi - - if use drm; then - use opengl && myconf+=",drm-gl" - use gles2 && myconf+=",drm-glesv2" - fi - - if use wayland; then - use opengl && myconf+=",wayland-gl" - use gles2 && myconf+=",wayland-glesv2" - - fi - myconf=${myconf#,} - - # it does not know --libdir specification, dandy huh - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ - --prefix=/usr \ - --with-flavors ${myconf} \ - configure || die "configure failed" -} diff --git a/app-benchmarks/glmark2/glmark2-2014.03.ebuild b/app-benchmarks/glmark2/glmark2-2014.03.ebuild deleted file mode 100644 index 19c7b21c..00000000 --- a/app-benchmarks/glmark2/glmark2-2014.03.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit waf-utils python-single-r1 - -REV=${PV#*_p} - -DESCRIPTION="Opengl test suite" -HOMEPAGE="https://launchpad.net/glmark2" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="drm gles2 +opengl wayland X" - -RDEPEND="media-libs/libpng - media-libs/mesa[gles2?] - X? ( x11-libs/libX11 ) - wayland? ( >=dev-libs/wayland-1.2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( opengl gles2 ) - || ( drm wayland X )" - -src_prepare() { - rm -rf "${S}/src/libpng" - sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >= libpng:1.6 - sed -i "/req_funcs/ s/,..sqrt.*\]/\]/" "${S}/wscript" # sqrt patch - sed -i "s/-Werror//" "${S}/wscript" -} - -src_configure() { - : ${WAF_BINARY:="${S}/waf"} - - local myconf - - if use X; then - use opengl && myconf+="x11-gl" - use gles2 && myconf+=",x11-glesv2" - fi - - if use drm; then - use opengl && myconf+=",drm-gl" - use gles2 && myconf+=",drm-glesv2" - fi - - if use wayland; then - use opengl && myconf+=",wayland-gl" - use gles2 && myconf+=",wayland-glesv2" - - fi - myconf=${myconf#,} - - # it does not know --libdir specification, dandy huh - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ - --prefix=/usr \ - --with-flavors ${myconf} \ - configure || die "configure failed" -}