KBrown/gentoo-overlay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into KBrown-pub

Browse source
This commit is contained in:
Sandino Araico Sanchez 2018-12-12 17:56:48 -06:00
commit c61f3fc406
5 changed files with 78 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x11-drivers/xf86-video-armsoc/Manifest
View file

@ -1,7 +1,8 @@
AUX 0001-Import-patch-from-Marcin.patch 13238 BLAKE2B 4dc360c4132e2f5689ba6f8a47cdf1a7807a7927f7ffc4705b770e42a9c1cf12d91598f2767fe628675cd26631ce08f0cdca7adba139014b7afc2f42cc4010b4 SHA512 86f1396ab74b26ee93a1090ab06be0d2eb012805c2dcbf1a7ecd671dbb0d5be5b1d1bb5d0f3e1c59bd686aaac0e38a49da98c1c9c3dc4ad6bb7ca7a581d6ceb6
AUX 50-ump.rules 42 BLAKE2B 9990c490e2a50dcf8249583b934e65c5f615f8756004233d2ce9c6f61b00928e7788b02f7b9c5d56909cb1dcf96b176f3e3e5fc424475ba76e118d8dd1d5c549 SHA512 40f2200170f7efe0cf15666299eac7cc67ffd394ed58ffa2093f4db2cb62cac9aa4066d2c4a4afc614382f412a1a41f15aa323e868d3b894fa072923430f2ecc
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 1457 BLAKE2B 94b37bf3666a357be3f2abbb6b9f5c73bc6e3dd7378304b23eae811b724d83e5b5533ddee772c274573b3e7bf3994d0a1811c9f98fd8fda5d6cd3437c3dcbb87 SHA512 a4d59576d79bbd2c24984eb230b25a431514ade50adea4266672cf5d42f474df1343bb961326964e75a111ab3268861825ee6828722db0a82dba6653f1fa3bd2
EBUILD xf86-video-armsoc-9999-r100.ebuild 1591 BLAKE2B 626e6a52f91aff446759e4f18b5cd0e675da6ebabe1f9c5e56bf64e22c181b1774d1f885902c3c5aac51a24ccfb57533d62cadf42e3d6aaccdde8375bd9f071d SHA512 58d2cebb84b6ecfb74ab18c93ab003208d0e0b4d7a20011f1825b53ebf6800fc93022efb2eb2108d8d9a0780e6dd661804680d5c09afa739f909b80a7a672afc

32
x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc-compat-api.patch Normal file
View file

@ -0,0 +1,32 @@
diff -puriN xf86-video-armsoc.orig/src/compat-api.h xf86-video-armsoc/src/compat-api.h
--- xf86-video-armsoc.orig/src/compat-api.h 2018-11-16 07:13:46.000000000 -0600
+++ xf86-video-armsoc/src/compat-api.h 2018-12-11 12:32:09.870023252 -0600
@@ -28,6 +28,8 @@
#ifndef COMPAT_API_H
#define COMPAT_API_H
+#include <xorgVersion.h>
+
#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
@@ -77,9 +79,17 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-#define BLOCKHANDLER_ARGS_DECL \
- ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,17,0,0,0)
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,0,0,0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, void* pTimeout, void* pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#else
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, void* pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen

20
x11-drivers/xf86-video-armsoc/xf86-video-armsoc-9999-r100.ebuild
View file

@ -11,15 +11,21 @@ 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/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/mdrjr/xf86-video-armsoc"
HOMEPAGE="https://github.com/superna9999/xf86-video-armsoc"
LICENSE="MIT"
KEYWORDS="~arm ~arm64"
@ -43,8 +49,6 @@ src_prepare() {
"${S}"/Makefile.am "${S}"/src/Makefile.am \
|| die "could not tweak makefile.am!"
epatch "${FILESDIR}"/${PN}-implicit_declaration.patch
xorg-2_src_prepare
}

1
x11-drivers/xf86-video-fbturbo/Manifest Normal file
View file

@ -0,0 +1 @@
EBUILD xf86-video-fbturbo-9999-r100.ebuild 715 BLAKE2B a95211f4d2b1e91558ce4e24084f4abea3a368c941be6b19a62bfe345d22fff1d9228a9776184a0868ee1e544286dbf59b9fb2c283e4198433d3a16de68caf78 SHA512 4c08997285404e06c09b9fcfa4a2a9c8f6e47a45af6a3d4facdbed6c07060fa613ced097955e597c6ed1be8b034e302d3f27794cec6045575d3b83bf8576710f

31
x11-drivers/xf86-video-fbturbo/xf86-video-fbturbo-9999-r100.ebuild Normal file
View file

@ -0,0 +1,31 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
XORG_DRI=always
#EGIT_REPO_URI="https://github.com/ssvb/xf86-video-fbturbo.git"
#EGIT_REPO_URI="https://github.com/schaal/xf86-video-fbturbo.git"
EGIT_REPO_URI="https://github.com/KenjiBrown/xf86-video-fbturbo.git"
EGIT_BRANCH="aarch64-gentoo"
inherit autotools-utils xorg-2 git-2
DESCRIPTION="FBTurbo ARM video driver (based on sunxifb)"
KEYWORDS="~arm ~arm64"
RDEPEND=">=x11-base/xorg-server-1.3
gles2? (
( >=x11-libs/libdrm-2.4.36[video_cards_exynos] )
( x11-libs/libump )
)"
DEPEND="${RDEPEND}"
IUSE="gles2"
AUTOTOOLS_IN_SOURCE_BUILD="yes"
AUTOTOOLS_AUTORECONF="yes"