From 404279195d5fbe89f2536f8bb405be4120e96a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sat, 2 Apr 2016 15:06:52 +0300 Subject: [PATCH] sil https://www.archlinux.org/news/xorg-server-1171-is-now-available --- x11/driver/xorg-video-geode/actions.py | 24 -- .../files/build-fix-1.17.patch | 243 ------------------ .../xf86-video-geode-2.11.16-glibc-2.20.patch | 14 - x11/driver/xorg-video-geode/pspec.xml | 47 ---- x11/driver/xorg-video-geode/translations.xml | 8 - 5 files changed, 336 deletions(-) delete mode 100644 x11/driver/xorg-video-geode/actions.py delete mode 100644 x11/driver/xorg-video-geode/files/build-fix-1.17.patch delete mode 100644 x11/driver/xorg-video-geode/files/xf86-video-geode-2.11.16-glibc-2.20.patch delete mode 100644 x11/driver/xorg-video-geode/pspec.xml delete mode 100644 x11/driver/xorg-video-geode/translations.xml diff --git a/x11/driver/xorg-video-geode/actions.py b/x11/driver/xorg-video-geode/actions.py deleted file mode 100644 index ff46368204..0000000000 --- a/x11/driver/xorg-video-geode/actions.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/copyleft/gpl.txt. - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -def setup(): - shelltools.export("LC_ALL", "C") - #autotools.autoreconf("-vif") - autotools.configure("\ - --disable-static \ - --enable-visibility\ - ") - -def build(): - autotools.make() - -def install(): - autotools.install() - pisitools.dodoc("COPYING", "ChangeLog", "README") diff --git a/x11/driver/xorg-video-geode/files/build-fix-1.17.patch b/x11/driver/xorg-video-geode/files/build-fix-1.17.patch deleted file mode 100644 index 9878c64c0b..0000000000 --- a/x11/driver/xorg-video-geode/files/build-fix-1.17.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff --git a/src/gx_driver.c b/src/gx_driver.c -index 7f44e19..ab57df1 100644 ---- a/src/gx_driver.c -+++ b/src/gx_driver.c -@@ -32,6 +32,9 @@ - #endif - - #include -+#include -+#include -+#include - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -322,7 +325,6 @@ map_pci_mem(ScrnInfoPtr pScrni, int vram, - struct pci_device *dev, int bar, int size) - { - void *ptr; -- void **result = (void **) &ptr; - int map_size = size ? size : dev->regions[bar].size; - - int err = pci_device_map_range(dev, -@@ -330,12 +332,18 @@ map_pci_mem(ScrnInfoPtr pScrni, int vram, - map_size, - PCI_DEV_MAP_FLAG_WRITABLE | - (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0), -- result); -+ &ptr); - - if (err) - return NULL; - return ptr; - } -+ -+static inline int -+unmap_pci_mem(ScrnInfoPtr pScrni, struct pci_device *dev, void *ptr, int size) -+{ -+ return pci_device_unmap_range(dev, ptr, size); -+} - #endif - - extern unsigned long gfx_gx2_scratch_base; -@@ -373,8 +381,19 @@ GXMapMem(ScrnInfoPtr pScrni) - - gfx_gx2_scratch_base = pGeode->FBAvail - 0x4000; - -+#ifndef XSERVER_LIBPCIACCESS - XpressROMPtr = xf86MapVidMem(index, VIDMEM_FRAMEBUFFER, 0xF0000, 0x10000); -- -+#else -+ { -+ int fd = open("/dev/mem", O_RDWR); -+ if (fd < 0) { -+ xf86DrvMsg(index, X_ERROR, "Failed to open /dev/mem: %m\n"); -+ return FALSE; -+ } -+ XpressROMPtr = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0xF0000); -+ close(fd); -+ } -+#endif - pGeode->FBBase = gfx_virt_fbptr; - - if ((!gfx_virt_regptr) || (!gfx_virt_gpptr) || -@@ -395,9 +414,9 @@ GXMapMem(ScrnInfoPtr pScrni) - */ - - static Bool --GXCheckVGA(ScrnInfoPtr pScrni) -+GXCheckVGA(ScrnInfoPtr pScrni, EntityInfoPtr pEnt) - { -- -+#ifndef XSERVER_LIBPCIACCESS - unsigned char *ptr; - const char *vgasig = "IBM VGA Compatible"; - int ret; -@@ -413,6 +432,11 @@ GXCheckVGA(ScrnInfoPtr pScrni) - xf86UnMapVidMem(pScrni->scrnIndex, (pointer) ptr, strlen(vgasig)); - - return ret ? FALSE : TRUE; -+#else -+ pciVideoPtr pci = xf86GetPciInfoForEntity(pEnt->index); -+ -+ return pci_device_is_boot_vga(pci); -+#endif - } - - static Bool -@@ -443,7 +467,7 @@ GXPreInit(ScrnInfoPtr pScrni, int flags) - if (pGeode == NULL) - return FALSE; - -- useVGA = GXCheckVGA(pScrni); -+ useVGA = GXCheckVGA(pScrni, pEnt); - - if (flags & PROBE_DETECT) { - GeodeProbeDDC(pScrni, pEnt->index); -@@ -591,12 +615,18 @@ GXPreInit(ScrnInfoPtr pScrni, int flags) - panelgeo = xf86GetOptValString(GeodeOptions, GX_OPTION_PANEL_GEOMETRY); - - if ((s = xf86GetOptValString(GeodeOptions, GX_OPTION_ACCEL_METHOD))) { -+#if defined(XF86XAA) && defined(XF86EXA) - if (!xf86NameCmp(s, "XAA")) - pGeode->useEXA = FALSE; - else if (xf86NameCmp(s, "EXA")) - xf86DrvMsg(pScrni->scrnIndex, X_ERROR, - "Unknown accleration method %s. Defaulting to XAA.\n", - s); -+#elif defined(XF86EXA) -+ pGeode->useEXA = TRUE; -+#else -+ pGeode->useEXA = FALSE; -+#endif - } - - xf86DrvMsg(pScrni->scrnIndex, X_INFO, -@@ -752,11 +782,21 @@ GXUnmapMem(ScrnInfoPtr pScrni) - GeodeRec *pGeode = GEODEPTR(pScrni); - - /* unmap all the memory map's */ -- -+#ifndef XSERVER_LIBPCIACCESS - xf86UnMapVidMem(pScrni->scrnIndex, gfx_virt_regptr, GX_CPU_REG_SIZE); - xf86UnMapVidMem(pScrni->scrnIndex, gfx_virt_gpptr, GX_GP_REG_SIZE); - xf86UnMapVidMem(pScrni->scrnIndex, gfx_virt_vidptr, GX_VID_REG_SIZE); - xf86UnMapVidMem(pScrni->scrnIndex, gfx_virt_fbptr, pGeode->FBAvail); -+#else -+ pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index); -+ -+ unmap_pci_mem(pScrni, pci, gfx_virt_regptr, GX_CPU_REG_SIZE); -+ unmap_pci_mem(pScrni, pci, gfx_virt_gpptr, GX_GP_REG_SIZE); -+ unmap_pci_mem(pScrni, pci, gfx_virt_vidptr, GX_VID_REG_SIZE); -+ unmap_pci_mem(pScrni, pci, gfx_virt_fbptr, pGeode->FBAvail); -+ -+ munmap(XpressROMPtr, 0x10000); -+#endif - return TRUE; - } - -diff --git a/src/lx_driver.c b/src/lx_driver.c -index 146578e..c68f715 100644 ---- a/src/lx_driver.c -+++ b/src/lx_driver.c -@@ -33,6 +33,9 @@ - - #include - #include -+#include -+#include -+#include - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -155,7 +158,6 @@ map_pci_mem(ScrnInfoPtr pScrni, int vram, - struct pci_device *dev, int bar, int size) - { - void *ptr; -- void **result = (void **) &ptr; - int map_size = size ? size : dev->regions[bar].size; - - int err = pci_device_map_range(dev, -@@ -163,7 +165,7 @@ map_pci_mem(ScrnInfoPtr pScrni, int vram, - map_size, - PCI_DEV_MAP_FLAG_WRITABLE | - (vram ? PCI_DEV_MAP_FLAG_WRITE_COMBINE : 0), -- result); -+ &ptr); - - if (err) - return NULL; -@@ -235,7 +237,19 @@ LXMapMem(ScrnInfoPtr pScrni) - pGeode->FBAvail); - gp_set_command_buffer_base(cmd_bfr_phys, 0, pGeode->CmdBfrSize); - -+#ifndef XSERVER_LIBPCIACCESS - XpressROMPtr = xf86MapVidMem(index, VIDMEM_FRAMEBUFFER, 0xF0000, 0x10000); -+#else -+ { -+ int fd = open("/dev/mem", O_RDWR); -+ if (fd < 0) { -+ xf86DrvMsg(index, X_ERROR, "Failed to open /dev/mem: %m\n"); -+ return FALSE; -+ } -+ XpressROMPtr = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0xF0000); -+ close(fd); -+ } -+#endif - - pGeode->FBBase = cim_fb_ptr; - -@@ -253,9 +267,9 @@ LXMapMem(ScrnInfoPtr pScrni) - */ - - static Bool --LXCheckVGA(ScrnInfoPtr pScrni) -+LXCheckVGA(ScrnInfoPtr pScrni, EntityInfoPtr pEnt) - { -- -+#ifndef XSERVER_LIBPCIACCESS - unsigned char *ptr; - const char *vgasig = "IBM VGA Compatible"; - int ret; -@@ -271,6 +285,11 @@ LXCheckVGA(ScrnInfoPtr pScrni) - xf86UnMapVidMem(pScrni->scrnIndex, (pointer) ptr, strlen(vgasig)); - - return ret ? FALSE : TRUE; -+#else -+ pciVideoPtr pci = xf86GetPciInfoForEntity(pEnt->index); -+ -+ return pci_device_is_boot_vga(pci); -+#endif - } - - static Bool -@@ -310,7 +329,7 @@ LXPreInit(ScrnInfoPtr pScrni, int flags) - if (pGeode == NULL) - return FALSE; - -- pGeode->useVGA = LXCheckVGA(pScrni); -+ pGeode->useVGA = LXCheckVGA(pScrni, pEnt); - pGeode->VGAActive = FALSE; - pGeode->pEnt = pEnt; - -@@ -611,6 +630,8 @@ LXUnmapMem(ScrnInfoPtr pScrni) - xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vg_ptr, LX_VG_REG_SIZE); - xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vid_ptr, LX_VID_REG_SIZE); - xf86UnMapVidMem(pScrni->scrnIndex, (pointer) cim_vip_ptr, LX_VIP_REG_SIZE); -+ -+ xf86UnMapVidMem(pScrni->scrnIndex, XpressROMPtr, 0x10000); - #else - GeodeRec *pGeode = GEODEPTR(pScrni); - pciVideoPtr pci = xf86GetPciInfoForEntity(pGeode->pEnt->index); -@@ -620,9 +641,9 @@ LXUnmapMem(ScrnInfoPtr pScrni) - unmap_pci_mem(pScrni, pci, cim_vid_ptr, LX_VID_REG_SIZE); - unmap_pci_mem(pScrni, pci, cim_vip_ptr, LX_VIP_REG_SIZE); - unmap_pci_mem(pScrni, pci, cim_fb_ptr, pGeode->FBAvail + CIM_CMD_BFR_SZ); --#endif - -- xf86UnMapVidMem(pScrni->scrnIndex, XpressROMPtr, 0x10000); -+ munmap(XpressROMPtr, 0x10000); -+#endif - - return TRUE; - } diff --git a/x11/driver/xorg-video-geode/files/xf86-video-geode-2.11.16-glibc-2.20.patch b/x11/driver/xorg-video-geode/files/xf86-video-geode-2.11.16-glibc-2.20.patch deleted file mode 100644 index b5ea6a121a..0000000000 --- a/x11/driver/xorg-video-geode/files/xf86-video-geode-2.11.16-glibc-2.20.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xf86-video-geode-2.11.16/src/lx_memory.c.orig 2014-10-16 21:48:40.794858194 -0400 -+++ xf86-video-geode-2.11.16/src/lx_memory.c 2014-10-16 21:49:10.025007547 -0400 -@@ -23,6 +23,10 @@ - * software without specific prior written permission. - */ - -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "xf86.h" - #include "geode.h" - #include "cim/cim_regs.h" - diff --git a/x11/driver/xorg-video-geode/pspec.xml b/x11/driver/xorg-video-geode/pspec.xml deleted file mode 100644 index 02840bea78..0000000000 --- a/x11/driver/xorg-video-geode/pspec.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - xorg-video-geode - http://www.x.org - - PisiLinux Community - admins@pisilinux.org - - MIT - driver - X.Org geode video driver - xorg-video-geode contains the X.Org driver for AMD Geode video cards. - mirrors://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2 - - xorg-server-devel - util-macros - - - xf86-video-geode-2.11.16-glibc-2.20.patch - build-fix-1.17.patch - - - - - xorg-video-geode - - xorg-server - - - /usr/lib/xorg - /usr/share/doc - - - - - - 2015-05-10 - 2.11.16 - First release - Burak Ertürk - burakerturk@pisilinux.org - - - diff --git a/x11/driver/xorg-video-geode/translations.xml b/x11/driver/xorg-video-geode/translations.xml deleted file mode 100644 index 048c5ff2c2..0000000000 --- a/x11/driver/xorg-video-geode/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - xorg-video-geode - X.Org geode ekran kartı sürücüsü - xorg-video-geode, AMD Geode ekran kartları için X.Org sürücüsünü içerir. - -