diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-29 20:48:22 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-29 20:48:22 -0300 |
| commit | 345b493878f83923bbd61f64846bf696dc402db6 (patch) | |
| tree | 7a12be00d54cabe530264cf55622c9cbfe1fb03c /main/xf86-video-sis | |
| parent | ea0b8b79705a75993149ca52dc781a1759102d51 (diff) | |
main/xf86-video-sis: fix build
Diffstat (limited to 'main/xf86-video-sis')
| -rw-r--r-- | main/xf86-video-sis/APKBUILD | 7 | ||||
| -rw-r--r-- | main/xf86-video-sis/fix-old-cpp-macros.patch | 38 |
2 files changed, 43 insertions, 2 deletions
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD index 5378a17ef01..2eb83ce5cdd 100644 --- a/main/xf86-video-sis/APKBUILD +++ b/main/xf86-video-sis/APKBUILD @@ -8,7 +8,9 @@ arch="all" license="MIT" subpackages="$pkgname-doc" makedepends="xorg-server-dev util-macros mesa-dev libxi-dev xorgproto" -source="https://www.x.org/releases/individual/driver/xf86-video-sis-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/driver/xf86-video-sis-$pkgver.tar.bz2 + fix-old-cpp-macros.patch + " build() { export LDFLAGS="$LDFLAGS -Wl,-z,lazy" @@ -28,4 +30,5 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2" +sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2 +d4262ac8c17d04547473df260518247afb09a5bf6ddbe85d7877534f1e99d316d52fb933839f56a4e61b3706b124fa91c6926d432ba542e525f2007af253ff2a fix-old-cpp-macros.patch" diff --git a/main/xf86-video-sis/fix-old-cpp-macros.patch b/main/xf86-video-sis/fix-old-cpp-macros.patch new file mode 100644 index 00000000000..26ec869a730 --- /dev/null +++ b/main/xf86-video-sis/fix-old-cpp-macros.patch @@ -0,0 +1,38 @@ +Upstream: no (Too lazy) +Reason: Fixes build with new GCC by fixing old CPP macros +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 51c9660..5e2eba2 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -4166,7 +4166,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + biossize = 0x8000; + break; + } +-#if XSERVER_LIBPCIACCESS ++#if defined(XSERVER_LIBPCIACCESS) + if(readpci) { + pSiS->PciInfo->rom_size = biossize; + pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS); +diff --git a/src/sis_vga.c b/src/sis_vga.c +index 8b625d2..c40c140 100644 +--- a/src/sis_vga.c ++++ b/src/sis_vga.c +@@ -1715,7 +1715,7 @@ SiSVGAMapMem(ScrnInfoPtr pScrn) + if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000; + + #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +-#if XSERVER_LIBPCIACCESS ++#if defined(XSERVER_LIBPCIACCESS) + (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize, + PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase); + #else +@@ -1737,7 +1737,7 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn) + + if(pSiS->VGAMemBase == NULL) return; + +-#if XSERVER_LIBPCIACCESS ++#if defined(XSERVER_LIBPCIACCESS) + (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize); + #else + xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize); + |