diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 14:49:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-10 15:29:04 +0000 |
| commit | 497895f56024e66e933d5f170792cf8b625587bd (patch) | |
| tree | a219464553ae0963d2f959239eb8b420f1d32b48 /main/xf86-video-ati | |
| parent | e48ac87cb8d1d10dd5be27c079d350f9bbe8c3df (diff) | |
| download | aports-497895f56024e66e933d5f170792cf8b625587bd.tar.bz2 aports-497895f56024e66e933d5f170792cf8b625587bd.tar.xz | |
main/xf86-video-ati: rebuild against xorg-server-1.18
Diffstat (limited to 'main/xf86-video-ati')
| -rw-r--r-- | main/xf86-video-ati/APKBUILD | 14 | ||||
| -rw-r--r-- | main/xf86-video-ati/xorg-1.18.patch | 39 |
2 files changed, 47 insertions, 6 deletions
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD index 78b3b0f615..1f8192a0fd 100644 --- a/main/xf86-video-ati/APKBUILD +++ b/main/xf86-video-ati/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xf86-video-ati pkgver=7.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="ATI video driver" url="http://xorg.freedesktop.org/" arch="all" @@ -14,6 +14,7 @@ makedepends="xorg-server-dev libxi-dev fontsproto randrproto " source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 + xorg-1.18.patch " prepare() { @@ -34,8 +35,6 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --enable-dri \ - --enable-kms \ --disable-glamor \ || return 1 make || return 1 @@ -46,6 +45,9 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="29654190e37310b87e44a14c229967ee xf86-video-ati-7.5.0.tar.bz2" -sha256sums="ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 xf86-video-ati-7.5.0.tar.bz2" -sha512sums="51ea3934285c579314614e336cee0d5c079a466cdc94f2c8649d9499515af3dfb37a7ac87ed69c6dbf6befa5bfca27f8305bbc028ff722e2f87143da5f101f7c xf86-video-ati-7.5.0.tar.bz2" +md5sums="29654190e37310b87e44a14c229967ee xf86-video-ati-7.5.0.tar.bz2 +c779b4f1c682efce75691fa50a921327 xorg-1.18.patch" +sha256sums="ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 xf86-video-ati-7.5.0.tar.bz2 +748493fb4cf33effd0da4a838566f73d14dec40f530a109c614fed06997580ef xorg-1.18.patch" +sha512sums="51ea3934285c579314614e336cee0d5c079a466cdc94f2c8649d9499515af3dfb37a7ac87ed69c6dbf6befa5bfca27f8305bbc028ff722e2f87143da5f101f7c xf86-video-ati-7.5.0.tar.bz2 +a79d605810e938cb1be093b230ef09bfe0dc40c956a7df4afa92f70b050eba584bd18cea24723a001dcf0ce7bef6017200e84509acc02fa53723c1b1801fbdd4 xorg-1.18.patch" diff --git a/main/xf86-video-ati/xorg-1.18.patch b/main/xf86-video-ati/xorg-1.18.patch new file mode 100644 index 0000000000..bf88642e6e --- /dev/null +++ b/main/xf86-video-ati/xorg-1.18.patch @@ -0,0 +1,39 @@ +From b6d871bf299c7d0f106c07ee4d8bd3b2337f53cc Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@gmail.com> +Date: Thu, 9 Jul 2015 19:25:36 +1000 +Subject: radeon: adopt for new X server dirty tracking APIs. + +Signed-off-by: Dave Airlie <airlied@redhat.com> + +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index ec8f51c..2dad0e6 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -287,7 +287,11 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + + PixmapRegionInit(&pixregion, dirty->slave_dst); + DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++#ifdef HAS_DIRTYTRACKING_ROTATION ++ PixmapSyncDirtyHelper(dirty); ++#else + PixmapSyncDirtyHelper(dirty, &pixregion); ++#endif + + radeon_cs_flush_indirect(pScrn); + DamageRegionProcessPending(&dirty->slave_dst->drawable); +-- +cgit v0.10.2 + +--- ./src/drmmode_display.c.orig ++++ ./src/drmmode_display.c +@@ -794,7 +794,9 @@ + screen->height = screenpix->drawable.height = max_height; + } + drmmode_crtc->scanout_pixmap_x = this_x; +-#ifdef HAS_DIRTYTRACKING2 ++#ifdef HAS_DIRTYTRACKING_ROTATION ++ PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0); ++#elif defined(HAS_DIRTYTRACKING2) + PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0); + #else + PixmapStartDirtyTracking(ppix, screenpix, 0, 0); |