diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 08:43:38 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 08:43:44 +0000 |
commit | 5810adb2eb3b79de9a368693844c6c779373ca76 (patch) | |
tree | e0f7702bf5aeca15205bfe8b6c09f0c8a1eb442e | |
parent | 936819bfa331b7a313a5e84aca09f8a7ba4a58fd (diff) | |
download | alpine_aports-5810adb2eb3b79de9a368693844c6c779373ca76.tar.bz2 alpine_aports-5810adb2eb3b79de9a368693844c6c779373ca76.tar.xz alpine_aports-5810adb2eb3b79de9a368693844c6c779373ca76.zip |
main/xf86-video-geode: upgrade to 2.11.15
-rw-r--r-- | main/xf86-video-geode/APKBUILD | 25 | ||||
-rw-r--r-- | main/xf86-video-geode/mibstore.patch | 46 |
2 files changed, 10 insertions, 61 deletions
diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD index f9314aea6b..04ad5f5b51 100644 --- a/main/xf86-video-geode/APKBUILD +++ b/main/xf86-video-geode/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xf86-video-geode | 2 | pkgname=xf86-video-geode |
3 | pkgver=2.11.14 | 3 | pkgver=2.11.15 |
4 | pkgrel=2 | 4 | pkgrel=0 |
5 | pkgdesc="AMD Geode GX and LX video driver" | 5 | pkgdesc="AMD Geode GX and LX video driver" |
6 | url="http://xorg.freedesktop.org/" | 6 | url="http://xorg.freedesktop.org/" |
7 | arch="x86" | 7 | arch="x86" |
@@ -11,16 +11,14 @@ depends= | |||
11 | makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto | 11 | makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto |
12 | videoproto renderproto xf86dgaproto" | 12 | videoproto renderproto xf86dgaproto" |
13 | 13 | ||
14 | patches="mibstore.patch" | 14 | source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" |
15 | source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 | ||
16 | $patches" | ||
17 | 15 | ||
18 | prepare() { | 16 | prepare() { |
19 | cd "$srcdir"/$pkgname-$pkgver | 17 | cd "$srcdir"/$pkgname-$pkgver |
20 | update_config_sub || return 1 | 18 | for i in $source; do |
21 | for i in $patches; do | 19 | case $i in |
22 | msg $i | 20 | *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; |
23 | patch -p1 -i "$srcdir"/$i || return 1 | 21 | esac |
24 | done | 22 | done |
25 | } | 23 | } |
26 | 24 | ||
@@ -41,9 +39,6 @@ package() { | |||
41 | rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 | 39 | rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1 |
42 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING | 40 | install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING |
43 | } | 41 | } |
44 | md5sums="c9a4e1c5438240e5bdce332f92df9163 xf86-video-geode-2.11.14.tar.bz2 | 42 | md5sums="7dafd19e274c771539b6d4d459423ccf xf86-video-geode-2.11.15.tar.bz2" |
45 | 241b9d715ad8e22e8d556b5cf6d4dd07 mibstore.patch" | 43 | sha256sums="00db3bd697b32286eb0e42f5dbd7fcc8d7255dd11c299b1ee16a06a244868ff0 xf86-video-geode-2.11.15.tar.bz2" |
46 | sha256sums="4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc xf86-video-geode-2.11.14.tar.bz2 | 44 | sha512sums="a6e69a57a02122501e0a6677d95d1bc95e0cce509f2b9ae2ce6e422d67b5dc1e9fae6be01cb745eaec0f51ba73447db943119748959c72879274d266adaa87e7 xf86-video-geode-2.11.15.tar.bz2" |
47 | f5958126b5361b856607fb0c575086f18f148bfff97ae11ed83638fcecb0c69d mibstore.patch" | ||
48 | sha512sums="d974bb0b00d09c0c3454ccf5363838acc8c3baa62daf8664f1bf310177c23997924db9adcf57323c355f7add43a0560fb54f3ede97e4ed11082d0c793312559b xf86-video-geode-2.11.14.tar.bz2 | ||
49 | b2757d5647c79e94f5c77604941fb059ffe570b84d04b1d76fd53b7200deade837d6c805196e1a306d7bc2ae512d868b7f87ccfbdce164b11c0fd68af2c071a0 mibstore.patch" | ||
diff --git a/main/xf86-video-geode/mibstore.patch b/main/xf86-video-geode/mibstore.patch deleted file mode 100644 index b34ba9c76a..0000000000 --- a/main/xf86-video-geode/mibstore.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001 | ||
2 | From: Adam Jackson <ajax@redhat.com> | ||
3 | Date: Thu, 10 Jan 2013 03:16:26 +0000 | ||
4 | Subject: Remove mibstore.h | ||
5 | |||
6 | Signed-off-by: Adam Jackson <ajax@redhat.com> | ||
7 | --- | ||
8 | diff --git a/src/geode_driver.c b/src/geode_driver.c | ||
9 | index b27bfd5..9cd0af9 100644 | ||
10 | --- a/src/geode_driver.c | ||
11 | +++ b/src/geode_driver.c | ||
12 | @@ -59,8 +59,6 @@ | ||
13 | /* Machine independent stuff */ | ||
14 | #include "mipointer.h" | ||
15 | #include "micmap.h" | ||
16 | -/* All drivers implementing backing store need this */ | ||
17 | -#include "mibstore.h" | ||
18 | #include "vgaHW.h" | ||
19 | #include "vbe.h" | ||
20 | |||
21 | diff --git a/src/gx_driver.c b/src/gx_driver.c | ||
22 | index 5268f29..7f44e19 100644 | ||
23 | --- a/src/gx_driver.c | ||
24 | +++ b/src/gx_driver.c | ||
25 | @@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) | ||
26 | if (!pGeode->NoAccel) | ||
27 | GXAccelInit(pScrn); | ||
28 | |||
29 | - miInitializeBackingStore(pScrn); | ||
30 | xf86SetBackingStore(pScrn); | ||
31 | |||
32 | /* Set up the soft cursor */ | ||
33 | diff --git a/src/lx_driver.c b/src/lx_driver.c | ||
34 | index 6d7f37f..146578e 100644 | ||
35 | --- a/src/lx_driver.c | ||
36 | +++ b/src/lx_driver.c | ||
37 | @@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL) | ||
38 | if (!pGeode->NoAccel) | ||
39 | pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE; | ||
40 | |||
41 | - miInitializeBackingStore(pScrn); | ||
42 | xf86SetBackingStore(pScrn); | ||
43 | |||
44 | /* Set up the soft cursor */ | ||
45 | -- | ||
46 | cgit v0.9.0.2-2-gbebe | ||