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 04156138334 for ; Thu, 9 Aug 2018 02:00:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D774E08F5; Thu, 9 Aug 2018 02:00:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 98C63E08F5 for ; Thu, 9 Aug 2018 02:00:16 +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 417FE340139 for ; Wed, 8 Aug 2018 19:25:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2580238E for ; Wed, 8 Aug 2018 19:25:48 +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: <1533756290.7d2a1c345f249f7ba6f8f786e3f81662bb0c481c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-amdgpu/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild X-VCS-Directories: x11-drivers/xf86-video-amdgpu/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7d2a1c345f249f7ba6f8f786e3f81662bb0c481c X-VCS-Branch: master Date: Wed, 8 Aug 2018 19:25:48 +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-Archives-Salt: a9236196-35a6-4142-94d2-37da153bf24d X-Archives-Hash: f5dbcc8b67e4c265d7088bc8f9fe99dc commit: 7d2a1c345f249f7ba6f8f786e3f81662bb0c481c Author: Matt Turner gentoo org> AuthorDate: Wed Aug 8 19:11:36 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Aug 8 19:24:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2a1c34 Revert "x11-drivers/xf86-video-amdgpu: port to EAPI 7" In the port to EAPI=7, we stopped inheriting xorg-2 since that eclass is not EAPI 7 ready. Unfortunately it was providing some critical functionality: [[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes" ... xorg-2_flags_setup() { ... [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy In order to revert this commit, we must revert some commits that fix problems introduced by it as well. In total: This reverts commit 568eca2a556b1f5ba09d5486374cec7346ab1fce. Revert "x11-drivers/xf86-video-amdgpu: add --disable-selective-werror" This reverts commit 66c24d866e939044601f58d1521e00224ca8bf4b. Revert "x11-drivers/xf86-video-amdgpu: fix xorg-server:= dependency" This reverts commit e900d1be730882c962354203277ebb1ba499c0d3. Closes: https://bugs.gentoo.org/661502 .../xf86-video-amdgpu-18.0.1-r1.ebuild | 52 ---------------------- .../xf86-video-amdgpu-9999.ebuild | 51 +++++---------------- 2 files changed, 11 insertions(+), 92 deletions(-) diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild deleted file mode 100644 index 1045c31be89..00000000000 --- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" -HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git" - inherit autotools git-r3 - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="mirror://xorg/driver/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - >=x11-libs/libdrm-2.4.78[video_cards_amdgpu] - x11-libs/libpciaccess - x11-base/xorg-server:=[glamor(-),-minimal] -" -DEPEND=" - ${LIVE_DEPEND} - ${RDEPEND} -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - --enable-glamor - ) - - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild index 1045c31be89..90a06199708 100644 --- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild +++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild @@ -1,52 +1,23 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=5 +XORG_DRI="always" +inherit xorg-2 -DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" -HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git" - inherit autotools git-r3 - LIVE_DEPEND=">=x11-misc/util-macros-1.18" +if [[ ${PV} == 9999* ]]; then + SRC_URI="" else - SRC_URI="mirror://xorg/driver/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" fi -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - >=x11-libs/libdrm-2.4.78[video_cards_amdgpu] - x11-libs/libpciaccess - x11-base/xorg-server:=[glamor(-),-minimal] -" -DEPEND=" - ${LIVE_DEPEND} - ${RDEPEND} -" +DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} +RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu] + x11-base/xorg-server[glamor(-)]" +DEPEND="${RDEPEND}" src_configure() { - local econfargs=( - --disable-selective-werror - --enable-glamor - ) - - econf "${econfargs[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die + XORG_CONFIGURE_OPTIONS="--enable-glamor" + xorg-2_src_configure }