Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1526 from ertugerata/master

Browse Source 
geode remove
This commit is contained in:
Ertuğrul Erata
2016-04-02 16:09:57 +03:00
parent c0d0a81664 5fdd2b8ab9
commit c8fec22fef
10 changed files with 40 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
need_build
-7
View File
@@ -3,29 +3,22 @@
* working on http://ciftlik.pisilinux.org/2.0-Beta/pisi-index.xml.xz
* Packages missing in http://ciftlik.pisilinux.org/2.0-Beta/pisi-index.xml.xz
desktop/gnome2/librsvg
desktop/kde/application/okular
editor/emacs/emacs-php-mode
hardware/gkrellm
hardware/powermanagement/suspend
kernel/drivers/module-fglrx
multimedia/converter/pythonmagick
multimedia/editor/blender
multimedia/graphics/hugin
multimedia/graphics/librecad
multimedia/sound/lash
multimedia/sound/sayonara
multimedia/sound/speech-dispatcher
multimedia/sound/timidity-shompatches
multimedia/video/libdvbpsi
multimedia/video/libquicktime
network/mail/thunderbird
network/web/chromium-browser
office/libreoffice/libreoffice
programming/language/java/eclipse-ecj
programming/language/java/rhino
programming/misc/vigra
system/boot/efibootmgr
util/crypt/skey
x11/driver/xorg-input-aiptek
x11/driver/xorg-video-geode
pisi-index.xml
+38 -91
View File
@@ -7211,6 +7211,10 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Dependency>jack-audio-connection-kit-devel</Dependency>
<Dependency>dmapi-devel</Dependency>
<Dependency>texi2html</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">makefile.patch</Patch>
@@ -7221,12 +7225,16 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Package>
<Name>lash</Name>
<RuntimeDependencies>
<Dependency>alsa-lib</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>jack-audio-connection-kit</Dependency>
<Dependency>dbus</Dependency>
<Dependency>glib2</Dependency>
<Dependency>dmapi</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>readline</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>libutil-linux</Dependency>
<Dependency>jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -7256,7 +7264,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2014-05-26</Date>
<Date>2016-04-01</Date>
<Version>0.6.0_rc2</Version>
<Comment>First release</Comment>
<Name>Kamil Atlı</Name>
@@ -8524,7 +8532,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Summary xml:lang="tr">MPEG TS/DVB PSI taslaklarını üretmek ve çözümlemek için kullanılan bir kitaplık</Summary>
<Description xml:lang="en">libdvbpsi is a simple library designed for decoding and generation of MPEG TS and DVB PSI tables.</Description>
<Description xml:lang="tr">libdvbpsi, MPEG TS ve DVB PSI tablolarının ürteimi ve çözümlenmesi için tasarlanmış basit bir kitaplıktır.</Description>
<Archive type="tarbz2" sha1sum="ea1d7cb2dd9b380bbfabb879d1c77590a600ae40">http://download.videolan.org/pub/libdvbpsi/1.1.2/libdvbpsi-1.1.2.tar.bz2</Archive>
<Archive type="tarbz2" sha1sum="00e68c5e1261f16cf2aae3c15e3e6da326329508">http://download.videolan.org/pub/libdvbpsi/1.3.0/libdvbpsi-1.3.0.tar.bz2</Archive>
<SourceURI>multimedia/video/libdvbpsi/pspec.xml</SourceURI>
</Source>
<Package>
@@ -8548,8 +8556,8 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2014-05-31</Date>
<Version>1.1.2</Version>
<Date>2016-04-02</Date>
<Version>1.3.0</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
@@ -42790,7 +42798,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Summary xml:lang="tr">UEFI Firmware Yükleme Yöneticisi Değişkenlerini düzenlemek için araç</Summary>
<Description xml:lang="en">a Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager.</Description>
<Description xml:lang="tr">UEFI Firmware Yükleme Yöneticisi Değişkenlerini düzenlemek için araç</Description>
<Archive type="targz" sha1sum="1a4c2792d0f8f4db2b18882803a99132c7a4f3a3">http://source.pisilinux.org/1.0/efibootmgr.tar.gz</Archive>
<Archive type="targz" sha1sum="e4d96361e7d71117027ccf02a63545270e1eac5e">https://github.com/rhinstaller/efibootmgr/archive/efibootmgr-0.12.tar.gz</Archive>
<BuildDependencies>
<Dependency>pciutils-devel</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -42801,6 +42809,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Source>
<Package>
<Name>efibootmgr</Name>
<RuntimeDependencies>
<Dependency>efivar</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="man">/usr/share/man</Path>
@@ -42815,11 +42826,11 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Package>
<History>
<Update release="1">
<Date>2014-09-27</Date>
<Version>0.7.0.16</Version>
<Date>2016-04-01</Date>
<Version>0.12</Version>
<Comment>First release</Comment>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
@@ -50157,52 +50168,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>xorg-video-geode</Name>
<Homepage>http://www.x.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>driver</IsA>
<PartOf>x11.driver</PartOf>
<Summary xml:lang="en">X.Org geode video driver</Summary>
<Summary xml:lang="tr">X.Org geode ekran kartı sürücüsü</Summary>
<Description xml:lang="en">xorg-video-geode contains the X.Org driver for AMD Geode video cards.</Description>
<Description xml:lang="tr">xorg-video-geode, AMD Geode ekran kartları için X.Org sürücüsünü içerir.</Description>
<Archive type="tarbz2" sha1sum="f69f7cdbe5e9594a581349411ffe2dfe944e4e0a">mirrors://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2</Archive>
<BuildDependencies>
<Dependency>xorg-server-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">xf86-video-geode-2.11.16-glibc-2.20.patch</Patch>
<Patch level="1">build-fix-1.17.patch</Patch>
</Patches>
<SourceURI>x11/driver/xorg-video-geode/pspec.xml</SourceURI>
</Source>
<Package>
<Name>xorg-video-geode</Name>
<RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2015-05-10</Date>
<Version>2.11.16</Version>
<Comment>First release</Comment>
<Name>Burak Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>xorg-video-intel</Name>
@@ -70275,7 +70240,11 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<RuntimeDependencies>
<Dependency>plymouth</Dependency>
<Dependency>noto-fonts</Dependency>
<Dependency>grub2</Dependency>
<Dependency>plymouth-core-libs</Dependency>
<Dependency>plymouth-theme-spinner</Dependency>
<Dependency>plymouth-graphics-libs</Dependency>
<Dependency>plymouth-plugin-script</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="all">/</Path>
@@ -70578,6 +70547,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kitemmodels-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">kmplot-isnan.patch</Patch>
</Patches>
<SourceURI>desktop/kde/edu/kmplot/pspec.xml</SourceURI>
</Source>
<Package>
@@ -70610,7 +70582,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Package>
<History>
<Update release="1">
<Date>2016-03-24</Date>
<Date>2016-04-01</Date>
<Version>15.12.3</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
@@ -71057,6 +71029,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>zlib-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">kstars-isnan.patch</Patch>
</Patches>
<SourceURI>desktop/kde/edu/kstars/pspec.xml</SourceURI>
</Source>
<Package>
@@ -71082,6 +71057,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>kwidgetsaddons</Dependency>
<Dependency>wcslib</Dependency>
<Dependency>xplanet</Dependency>
<Dependency>knotifications</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/xdg</Path>
@@ -71093,7 +71069,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Package>
<History>
<Update release="1">
<Date>2016-03-24</Date>
<Date>2016-04-01</Date>
<Version>15.12.3</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
@@ -86426,6 +86402,9 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Dependency>gtk-doc</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">bgo759084.patch</Patch>
</Patches>
<SourceURI>desktop/gnome2/librsvg/pspec.xml</SourceURI>
</Source>
<Package>
@@ -86467,38 +86446,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<Path fileType="data">/usr/lib32/pkgconfig</Path>
</Files>
</Package>
<Package>
<Name>librsvg-32bit</Name>
<Summary xml:lang="en">32-bit shared libraries for librsvg</Summary>
<PartOf>emul32</PartOf>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>atk-32bit</Dependency>
<Dependency>gtk2-32bit</Dependency>
<Dependency>glib2-32bit</Dependency>
<Dependency>cairo-32bit</Dependency>
<Dependency>pango-32bit</Dependency>
<Dependency>libpng-32bit</Dependency>
<Dependency>libxml2-32bit</Dependency>
<Dependency>freetype-32bit</Dependency>
<Dependency>libcroco-32bit</Dependency>
<Dependency>gdk-pixbuf-32bit</Dependency>
<Dependency>fontconfig-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="1">librsvg</Dependency>
<Dependency>glibc-32bit</Dependency>
<Dependency>glib2-32bit</Dependency>
<Dependency>cairo-32bit</Dependency>
<Dependency>pango-32bit</Dependency>
<Dependency>libxml2-32bit</Dependency>
<Dependency>libcroco-32bit</Dependency>
<Dependency>gdk-pixbuf-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-03-23</Date>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
8857f32b8471891de7452c1451db6808b85ccb23
b46166fed3279c90947194cddf99b6b4c6493763
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
b226823ba39b7f9c153e4938ec43a4566bc5e334
35e2a2340f7e8d19fc2fd5024b0b9c081643b2a9
x11/driver/xorg-video-geode/actions.py
-24
View File
@@ -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")
x11/driver/xorg-video-geode/files/build-fix-1.17.patch
-243
View File
@@ -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 <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
#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 <stdio.h>
#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
#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;
}
x11/driver/xorg-video-geode/files/xf86-video-geode-2.11.16-glibc-2.20.patch
-14
View File
@@ -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"
x11/driver/xorg-video-geode/pspec.xml
-47
View File
@@ -1,47 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xorg-video-geode</Name>
<Homepage>http://www.x.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>driver</IsA>
<Summary>X.Org geode video driver</Summary>
<Description>xorg-video-geode contains the X.Org driver for AMD Geode video cards.</Description>
<Archive sha1sum="f69f7cdbe5e9594a581349411ffe2dfe944e4e0a" type="tarbz2">mirrors://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2</Archive>
<BuildDependencies>
<Dependency>xorg-server-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">xf86-video-geode-2.11.16-glibc-2.20.patch</Patch>
<Patch level="1">build-fix-1.17.patch</Patch>
</Patches>
</Source>
<Package>
<Name>xorg-video-geode</Name>
<RuntimeDependencies>
<Dependency>xorg-server</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/xorg</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2015-05-10</Date>
<Version>2.11.16</Version>
<Comment>First release</Comment>
<Name>Burak Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
</History>
</PISI>
x11/driver/xorg-video-geode/translations.xml
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xorg-video-geode</Name>
<Summary xml:lang="tr">X.Org geode ekran kartı sürücüsü</Summary>
<Description xml:lang="tr">xorg-video-geode, AMD Geode ekran kartları için X.Org sürücüsünü içerir.</Description>
</Source>
</PISI>