diff --git a/alarm/xf86-video-fbturbo-git/0001-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch b/alarm/xf86-video-fbturbo-git/0001-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch deleted file mode 100644 index f3da538a2..000000000 --- a/alarm/xf86-video-fbturbo-git/0001-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 5152fea67554f9fe8a6fcd194f88e31a47ec1381 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 21 May 2014 09:49:56 -0400 -Subject: [PATCH 1/2] Use own thunk functions instead of fbdevHW*Weak - -I plan to remove the Weak functions from a future server. - -Signed-off-by: Adam Jackson ---- - src/fbdev.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 71 insertions(+), 15 deletions(-) - -diff --git a/src/fbdev.c b/src/fbdev.c -index 2bbee6e..23ec855 100644 ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -269,6 +269,35 @@ FBDevIdentify(int flags) - xf86PrintChipsets(FBDEV_NAME, "driver for framebuffer", FBDevChipsets); - } - -+static Bool -+fbdevSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode) -+{ -+ return fbdevHWSwitchMode(pScrn, mode); -+} -+ -+static void -+fbdevAdjustFrame(ScrnInfoPtr pScrn, int x, int y) -+{ -+ fbdevHWAdjustFrame(pScrn, x, y); -+} -+ -+static Bool -+fbdevEnterVT(ScrnInfoPtr pScrn) -+{ -+ return fbdevHWEnterVT(pScrn); -+} -+ -+static void -+fbdevLeaveVT(ScrnInfoPtr pScrn) -+{ -+ fbdevHWLeaveVT(pScrn); -+} -+ -+static ModeStatus -+fbdevValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags) -+{ -+ return fbdevHWValidMode(pScrn, mode, verbose, flags); -+} - - #ifdef XSERVER_LIBPCIACCESS - static Bool FBDevPciProbe(DriverPtr drv, int entity_num, -@@ -294,11 +323,11 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num, - pScrn->Probe = FBDevProbe; - pScrn->PreInit = FBDevPreInit; - pScrn->ScreenInit = FBDevScreenInit; -- pScrn->SwitchMode = fbdevHWSwitchModeWeak(); -- pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); -- pScrn->EnterVT = fbdevHWEnterVTWeak(); -- pScrn->LeaveVT = fbdevHWLeaveVTWeak(); -- pScrn->ValidMode = fbdevHWValidModeWeak(); -+ pScrn->SwitchMode = fbdevSwitchMode; -+ pScrn->AdjustFrame = fbdevAdjustFrame; -+ pScrn->EnterVT = fbdevEnterVT; -+ pScrn->LeaveVT = fbdevLeaveVT; -+ pScrn->ValidMode = fbdevValidMode; - - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "claimed PCI slot %d@%d:%d:%d\n", -@@ -411,11 +440,11 @@ FBDevProbe(DriverPtr drv, int flags) - pScrn->Probe = FBDevProbe; - pScrn->PreInit = FBDevPreInit; - pScrn->ScreenInit = FBDevScreenInit; -- pScrn->SwitchMode = fbdevHWSwitchModeWeak(); -- pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); -- pScrn->EnterVT = fbdevHWEnterVTWeak(); -- pScrn->LeaveVT = fbdevHWLeaveVTWeak(); -- pScrn->ValidMode = fbdevHWValidModeWeak(); -+ pScrn->SwitchMode = fbdevSwitchMode; -+ pScrn->AdjustFrame = fbdevAdjustFrame; -+ pScrn->EnterVT = fbdevEnterVT; -+ pScrn->LeaveVT = fbdevLeaveVT; -+ pScrn->ValidMode = fbdevValidMode; - - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "using %s\n", dev ? dev : "default device"); -@@ -656,6 +685,17 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) - return TRUE; - } - -+static void -+fbdevUpdateRotatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) -+{ -+ shadowUpdateRotatePacked(pScreen, pBuf); -+} -+ -+static void -+fbdevUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) -+{ -+ shadowUpdatePacked(pScreen, pBuf); -+} - - static Bool - FBDevCreateScreenResources(ScreenPtr pScreen) -@@ -675,7 +715,7 @@ FBDevCreateScreenResources(ScreenPtr pScreen) - pPixmap = pScreen->GetScreenPixmap(pScreen); - - if (!shadowAdd(pScreen, pPixmap, fPtr->rotate ? -- shadowUpdateRotatePackedWeak() : shadowUpdatePackedWeak(), -+ fbdevUpdateRotatePacked : fbdevUpdatePacked, - FBDevWindowLinear, fPtr->rotate, NULL)) { - return FALSE; - } -@@ -699,6 +739,23 @@ FBDevShadowInit(ScreenPtr pScreen) - return TRUE; - } - -+static void -+fbdevLoadPalette(ScrnInfoPtr pScrn, int num, int *i, LOCO *col, VisualPtr pVis) -+{ -+ fbdevHWLoadPalette(pScrn, num, i, col, pVis); -+} -+ -+static void -+fbdevDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) -+{ -+ fbdevHWDPMSSet(pScrn, mode, flags); -+} -+ -+static Bool -+fbdevSaveScreen(ScreenPtr pScreen, int mode) -+{ -+ return fbdevHWSaveScreen(pScreen, mode); -+} - - static Bool - FBDevScreenInit(SCREEN_INIT_ARGS_DECL) -@@ -1025,13 +1082,12 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) - return FALSE; - } - flags = CMAP_PALETTED_TRUECOLOR; -- if(!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(), -- NULL, flags)) -+ if(!xf86HandleColormaps(pScreen, 256, 8, fbdevLoadPalette, NULL, flags)) - return FALSE; - -- xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0); -+ xf86DPMSInit(pScreen, fbdevDPMSSet, 0); - -- pScreen->SaveScreen = fbdevHWSaveScreenWeak(); -+ pScreen->SaveScreen = fbdevSaveScreen; - - /* Wrap the current CloseScreen function */ - fPtr->CloseScreen = pScreen->CloseScreen; --- -2.16.2 - diff --git a/alarm/xf86-video-fbturbo-git/0002-GCC-8-fix.patch b/alarm/xf86-video-fbturbo-git/0002-GCC-8-fix.patch deleted file mode 100644 index c7e01ad77..000000000 --- a/alarm/xf86-video-fbturbo-git/0002-GCC-8-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b0110d28c675dfc68ae8567c0b1712b187c7e61a Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 17 May 2018 12:53:53 -0600 -Subject: [PATCH 2/2] GCC 8 fix - ---- - src/fbdev.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/fbdev.c b/src/fbdev.c -index 23ec855..76ca968 100644 ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -1093,7 +1093,7 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) - fPtr->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = FBDevCloseScreen; - --#if XV -+#ifdef XV - fPtr->SunxiVideo_private = NULL; - if (xf86ReturnOptValBool(fPtr->Options, OPTION_XV_OVERLAY, TRUE) && - fPtr->sunxi_disp_private) { -@@ -1183,7 +1183,7 @@ FBDevCloseScreen(CLOSE_SCREEN_ARGS_DECL) - fPtr->SunxiDispHardwareCursor_private = NULL; - } - --#if XV -+#ifdef XV - if (fPtr->SunxiVideo_private) { - SunxiVideo_Close(pScreen); - free(fPtr->SunxiVideo_private); --- -2.16.2 - diff --git a/alarm/xf86-video-fbturbo-git/PKGBUILD b/alarm/xf86-video-fbturbo-git/PKGBUILD deleted file mode 100644 index fcb66cf52..000000000 --- a/alarm/xf86-video-fbturbo-git/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: smotocel69 -# Contribuitor: Georges Discry - -pkgname=xf86-video-fbturbo-git -_gitname=xf86-video-fbturbo -pkgver=199.f9a6ed7 -pkgrel=4 -pkgdesc="X.org MALI video driver" -arch=('armv7h') -url="https://github.com/ssvb/xf86-video-fbturbo" -license=('MIT') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=24.0' 'git') -conflicts=('xorg-server<1.20' 'X-ABI-VIDEODRV_VERSION<24' 'X-ABI-VIDEODRV_VERSION>=25') -options=('!libtool') -provides=('xf86-video-fbturbo') -source=('git+https://github.com/ssvb/xf86-video-fbturbo' - '0001-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch' - '0002-GCC-8-fix.patch') -md5sums=('SKIP' - 'c6bf86bda174e0d37c75294518909b76' - '36ff3a90c4c17bbfb982d53bfd411936') - -pkgver() { - cd "${SRCDEST}/${_gitname}" - echo $(git rev-list --count master).$(git rev-parse --short master) -} - -prepare() { - cd "${srcdir}/${_gitname}" - patch -p1 -i ../0001-Use-own-thunk-functions-instead-of-fbdevHW-Weak.patch - patch -p1 -i ../0002-GCC-8-fix.patch -} - -build() { - cd "${srcdir}/${_gitname}" - - # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf - # With them, module fail to load with undefined symbol. - # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 - export CFLAGS=${CFLAGS/-fno-plt} - export CXXFLAGS=${CXXFLAGS/-fno-plt} - export LDFLAGS=${LDFLAGS/,-z,now} - - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${_gitname}" - mkdir -p "${pkgdir}/etc/X11/xorg.conf.d/" - cp "xorg.conf" "${pkgdir}/etc/X11/xorg.conf.d/99-fbturbo.conf" - make DESTDIR="${pkgdir}/" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -}