From 761a5156f05284f8d7da19181c906e458426c1a6 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Tue, 18 May 2021 07:13:22 -0500 Subject: [PATCH] x11-drivers/xf86-video-armsoc EAPI 7 Bug: https://bugs.gentoo.org/786369 --- x11-drivers/xf86-video-armsoc/Manifest | 7 +-- ...ld => xf86-video-armsoc-0.6.0-r101.ebuild} | 6 +- .../xf86-video-armsoc-9999-r100.ebuild | 60 ------------------- ...ild => xf86-video-armsoc-9999-r102.ebuild} | 8 ++- 4 files changed, 11 insertions(+), 70 deletions(-) rename x11-drivers/xf86-video-armsoc/{xf86-video-armsoc-0.6.0-r100.ebuild => xf86-video-armsoc-0.6.0-r101.ebuild} (92%) delete mode 100644 x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r100.ebuild rename x11-drivers/xf86-video-armsoc/{xf86-video-armsoc-9999-r101.ebuild => xf86-video-armsoc-9999-r102.ebuild} (86%) diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest index 8d7a80a..ff89337 100644 --- a/x11-drivers/xf86-video-armsoc/Manifest +++ b/x11-drivers/xf86-video-armsoc/Manifest @@ -3,7 +3,6 @@ AUX 50-ump.rules 42 BLAKE2B 9990c490e2a50dcf8249583b934e65c5f615f8756004233d2ce9 AUX remove-mibstore-header-include.patch 638 BLAKE2B e2b68bd0e175de16502b16874c323eb0a96991261b0b21fd916d176dc436f80fe84a5063d1c6821c2047c48e54a3963a1cfe908914964bc30e951790630b2c3b SHA512 8bad45bb731c1d1cc7d6ccf3b62a40bdbb4683f7097f5c780a665f82559d6716b3b9475b412f5042654625ccdfa4d164b6fa3bd9d26b7bea5dd18b9f483cf664 AUX xf86-video-armsoc-compat-api.patch 1334 BLAKE2B c96e76f40ac0d903e1c5f05007ad8577ef68f6b746985de37276ba1319e75c1406430891017ffc98e886f3edeb3ee9444d1bd7296c25bbf34543cffd2b8c89d4 SHA512 4bfddd7973b76f812722b8b67e78596161feb9ee02773d9f59b823dd6d6080dab386d472672477b7e6855c8055f93440aa7af293ceecb7785be597d51b59121c AUX xf86-video-armsoc-implicit_declaration.patch 349 BLAKE2B ecf5eece6a2c2d7d343bc3bf51efff9cc14dd3da82a487a53767c2fdb9eda98882fccf030ea254bb49f5dd0d6d135e8aac669740d2e023254924cce5fbdffb96 SHA512 25b9ccbcea91ef8fef94a1a4f42ca36e908d2892506e5fa92bb3cf687768e4e8a041b85c0b8e9d973bbb87a8b24b28644b29b51fea811ac8264a38a2656d4e1f -DIST xf86-video-armsoc-0.6.0-r100.tar.gz 50938 BLAKE2B b6a4b78a146d54abb937308ced2ea6164fc0aec7789a632891bf52f7226c5e8fb6da42c49707d8fcc5332e7c26eabbf799aa8678a3a56f462d69820a921fc73f SHA512 c3e59be74c3b4d43f2dcf5102ac0eb3284a5fd15195db235c5abc55c97039629415b99c40a972b5756454c4609a3ac55f49fc237d8587d9940aef7f0636d8284 -EBUILD xf86-video-armsoc-0.6.0-r100.ebuild 1169 BLAKE2B 32161d0f653e8afb7eae5401a543335b25162460204de9c96628caf152ab1a5911650a100bdcc59c6b0bcb5e021d107b038fdc2b1b41c3a0935d70aa44ab5b5f SHA512 e0235740ce8640827d85a66dfeab571960b57e458fdf9ee3b0cf31b1221da0fa4e0831d9c875a0da08381831dbc05bcbedfbddb8241f32570af958bac227f6be -EBUILD xf86-video-armsoc-9999-r100.ebuild 1591 BLAKE2B 626e6a52f91aff446759e4f18b5cd0e675da6ebabe1f9c5e56bf64e22c181b1774d1f885902c3c5aac51a24ccfb57533d62cadf42e3d6aaccdde8375bd9f071d SHA512 58d2cebb84b6ecfb74ab18c93ab003208d0e0b4d7a20011f1825b53ebf6800fc93022efb2eb2108d8d9a0780e6dd661804680d5c09afa739f909b80a7a672afc -EBUILD xf86-video-armsoc-9999-r101.ebuild 1589 BLAKE2B d0ec609508c1ffb77a62c15e8c6aca82b9cef800689a0813f552b966973b94d4d4ccc29be9231c96a28bde1a1fc3ed2f2ea2e347e5fc38ea2679adaea86ba245 SHA512 1997212b95a0a1795ab3396bf8f4e686da8547612b31aaccbe522a84cfd7b8145ed4e734b77ecebbdf45828711594114b0659689b765acaf4b9d14ddc79d995f +DIST xf86-video-armsoc-0.6.0-r101.tar.gz 50938 BLAKE2B b6a4b78a146d54abb937308ced2ea6164fc0aec7789a632891bf52f7226c5e8fb6da42c49707d8fcc5332e7c26eabbf799aa8678a3a56f462d69820a921fc73f SHA512 c3e59be74c3b4d43f2dcf5102ac0eb3284a5fd15195db235c5abc55c97039629415b99c40a972b5756454c4609a3ac55f49fc237d8587d9940aef7f0636d8284 +EBUILD xf86-video-armsoc-0.6.0-r101.ebuild 1158 BLAKE2B 6e23d95dc31ca12eaf17ca2ca60e4ec4d1238c347d0b3cd1f8175cde6163eeac949ccfb15118710c6729eaf01db50fe910a11c650cc5a41b5c5419434a8b7db3 SHA512 232bd646574cc3b4e7f2beda32e89b91dcc900c229a401e62de2610342639e5e0c9969ffc592d45cdbd1867e1497bdd6074b41842b93570e19c45fde7ceb0852 +EBUILD xf86-video-armsoc-9999-r102.ebuild 1721 BLAKE2B f89344e16f04adb6f06f1111ac6d6b063f360e47ff56e3543a926b8d4d6e946172040016e7ee6dc5e7144d5955a2c20e96d36027ad5854c5888870599ce5a89f SHA512 aa2d26f9b30ffecac8c87b2abb273e86ffd8a8749e3908645f605e585bc89599e4c4f29caf937869300edb1feb5b6dfe0d5dfb550977d36af671123ffd50a66d diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r100.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r101.ebuild similarity index 92% rename from x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r100.ebuild rename to x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r101.ebuild index 82c7419..09ae080 100644 --- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r100.ebuild +++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-0.6.0-r101.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 XORG_DRI="always" XORG_EAUTORECONF="yes" XORG_CONFIGURE_OPTIONS="--with-drmmode=exynos --disable-selective-werror" -inherit autotools xorg-2 versionator +inherit autotools xorg-3 MY_PR="1endless9" MY_PV="v${PV}-${MY_PR}" diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r100.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r100.ebuild deleted file mode 100644 index bd92f61..0000000 --- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r100.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -XORG_DRI="always" -XORG_EAUTORECONF="yes" -XORG_CONFIGURE_OPTIONS="--with-drmmode=exynos --disable-selective-werror" - -inherit autotools xorg-2 flag-o-matic git-r3 - #EGIT_REPO_URI="http://anongit.freedesktop.org/git/xorg/driver/xf86-video-armsoc.git" - #EGIT_COMMIT="1.3.1" - - #EGIT_REPO_URI="https://github.com/mdrjr/xf86-video-armsoc.git - # git@github.com:mdrjr/xf86-video-armsoc.git" - ## release branch for github tarballs: r4p0-umplock - ## alternate 5422 branch is more active: 5422_r5p1 - #EGIT_BRANCH="5422_r5p1" - - EGIT_REPO_URI="https://github.com/superna9999/xf86-video-armsoc.git" - #EGIT_BRANCH="sunxi-mali" - EGIT_BRANCH="meson-drm" - - -DESCRIPTION="Open-source X.org graphics driver for ARM graphics" -#HOMEPAGE="https://github.com/mdrjr/xf86-video-armsoc" -HOMEPAGE="https://github.com/superna9999/xf86-video-armsoc" -LICENSE="MIT" -KEYWORDS="~arm ~arm64" - -RDEPEND="virtual/udev - >=x11-base/xorg-server-1.10 - >=x11-libs/pixman-0.32.6 - >=x11-libs/libump-3.0 - >=x11-libs/libdrm-2.4.60[video_cards_exynos]" - -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -# Best way to jam this into the config parameter? -#IUSE="exynos pl111" - -AUTOTOOLS_IN_SOURCE_BUILD="yes" -AUTOTOOLS_AUTORECONF="yes" - -src_prepare() { - sed -i -e "s|ERROR_CFLAGS = -Werror|ERROR_CFLAGS = |" \ - "${S}"/Makefile.am "${S}"/src/Makefile.am \ - || die "could not tweak makefile.am!" - - xorg-2_src_prepare -} - -src_install() { - xorg-2_src_install - - insinto /etc/udev/rules.d - doins "${FILESDIR}"/50-ump.rules -} diff --git a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r101.ebuild b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r102.ebuild similarity index 86% rename from x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r101.ebuild rename to x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r102.ebuild index cbee145..56f085e 100644 --- a/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r101.ebuild +++ b/x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r102.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 XORG_DRI="always" XORG_EAUTORECONF="yes" XORG_CONFIGURE_OPTIONS="--with-drmmode=exynos --disable-selective-werror" -inherit autotools xorg-2 flag-o-matic git-r3 +inherit autotools xorg-3 flag-o-matic git-r3 #EGIT_REPO_URI="http://anongit.freedesktop.org/git/xorg/driver/xf86-video-armsoc.git" #EGIT_COMMIT="1.3.1" @@ -18,6 +18,7 @@ inherit autotools xorg-2 flag-o-matic git-r3 ## alternate 5422 branch is more active: 5422_r5p1 #EGIT_BRANCH="5422_r5p1" + #EGIT_REPO_URI="https://github.com/superna9999/xf86-video-armsoc.git" EGIT_REPO_URI="https://github.com/KenjiBrown/xf86-video-armsoc.git" #EGIT_BRANCH="sunxi-mali" EGIT_BRANCH="meson-drm" @@ -25,6 +26,7 @@ inherit autotools xorg-2 flag-o-matic git-r3 DESCRIPTION="Open-source X.org graphics driver for ARM graphics" #HOMEPAGE="https://github.com/mdrjr/xf86-video-armsoc" +#HOMEPAGE="https://github.com/superna9999/xf86-video-armsoc" HOMEPAGE="https://github.com/KenjiBrown/xf86-video-armsoc" LICENSE="MIT" KEYWORDS="~arm ~arm64"