summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch506
-rw-r--r--abs/core/xf86-video-apm/LICENSE92
-rw-r--r--abs/core/xf86-video-apm/PKGBUILD4
-rw-r--r--abs/core/xf86-video-ark/LICENSE48
-rw-r--r--abs/core/xf86-video-ark/PKGBUILD4
-rw-r--r--abs/core/xf86-video-ast/PKGBUILD2
-rw-r--r--abs/core/xf86-video-ati/PKGBUILD4
-rw-r--r--abs/core/xf86-video-ati/__changelog2
-rw-r--r--abs/core/xf86-video-chips/LICENSE89
-rw-r--r--abs/core/xf86-video-chips/PKGBUILD4
-rw-r--r--abs/core/xf86-video-cirrus/PKGBUILD4
-rw-r--r--abs/core/xf86-video-dummy/PKGBUILD4
-rw-r--r--abs/core/xf86-video-fbdev/PKGBUILD4
-rw-r--r--abs/core/xf86-video-geode/PKGBUILD4
-rw-r--r--abs/core/xf86-video-glint/PKGBUILD4
-rw-r--r--abs/core/xf86-video-i128/PKGBUILD4
-rw-r--r--abs/core/xf86-video-i128/__changelog2
-rw-r--r--abs/core/xf86-video-i740/PKGBUILD4
-rw-r--r--abs/core/xf86-video-intel/20_thinkpad_g40_quirk.patch18
-rw-r--r--abs/core/xf86-video-intel/21_quirk_lenovo.patch12
-rw-r--r--abs/core/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch13
-rw-r--r--abs/core/xf86-video-intel/25_quirk_nc6110.patch13
-rw-r--r--abs/core/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch63
-rw-r--r--abs/core/xf86-video-intel/27_disable_fbc_on_965.patch18
-rw-r--r--abs/core/xf86-video-intel/PKGBUILD4
-rw-r--r--abs/core/xf86-video-mach64/PKGBUILD4
-rw-r--r--abs/core/xf86-video-mach64/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-mga/PKGBUILD4
-rw-r--r--abs/core/xf86-video-mga/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-neomagic/PKGBUILD4
-rw-r--r--abs/core/xf86-video-nouveau/PKGBUILD4
-rw-r--r--abs/core/xf86-video-nv/PKGBUILD4
-rw-r--r--abs/core/xf86-video-openchrome/PKGBUILD4
-rw-r--r--abs/core/xf86-video-r128/PKGBUILD4
-rw-r--r--abs/core/xf86-video-r128/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-radeonhd/PKGBUILD26
-rw-r--r--abs/core/xf86-video-rendition/PKGBUILD4
-rw-r--r--abs/core/xf86-video-s3/PKGBUILD4
-rw-r--r--abs/core/xf86-video-s3virge/PKGBUILD4
-rw-r--r--abs/core/xf86-video-savage/PKGBUILD4
-rw-r--r--abs/core/xf86-video-savage/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-siliconmotion/PKGBUILD4
-rw-r--r--abs/core/xf86-video-sis/PKGBUILD4
-rw-r--r--abs/core/xf86-video-sis/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-sisusb/PKGBUILD4
-rw-r--r--abs/core/xf86-video-tdfx/PKGBUILD4
-rw-r--r--abs/core/xf86-video-tdfx/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-trident/PKGBUILD4
-rw-r--r--abs/core/xf86-video-trident/mesa-7.1-link-shared.patch102
-rw-r--r--abs/core/xf86-video-tseng/PKGBUILD4
-rw-r--r--abs/core/xf86-video-unichrome/PKGBUILD4
-rw-r--r--abs/core/xf86-video-unichrome/fix-defines.patch68
-rw-r--r--abs/core/xf86-video-v4l/PKGBUILD4
-rw-r--r--abs/core/xf86-video-vesa/COPYING24
-rw-r--r--abs/core/xf86-video-vesa/PKGBUILD4
-rw-r--r--abs/core/xf86-video-vmware/LICENSE27
-rw-r--r--abs/core/xf86-video-vmware/PKGBUILD6
-rw-r--r--abs/core/xf86-video-vmware/abi2.patch38
-rw-r--r--abs/core/xf86-video-voodoo/PKGBUILD4
-rw-r--r--abs/core/xf86-video-xgi/PKGBUILD2
-rw-r--r--abs/core/xf86-video-xgixp/PKGBUILD2
61 files changed, 72 insertions, 1845 deletions
diff --git a/abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch b/abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch
deleted file mode 100644
index ff8c1c4..0000000
--- a/abs/core/libdrm/libdrm-2.4.21-b803918f3f.patch
+++ /dev/null
@@ -1,506 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index a8e072d..3446390 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -93,6 +93,7 @@ typedef struct _drm_intel_bufmgr_gem {
- /** Array of lists of cached gem objects of power-of-two sizes */
- struct drm_intel_gem_bo_bucket cache_bucket[14 * 4];
- int num_buckets;
-+ time_t time;
-
- uint64_t gtt_size;
- int available_fences;
-@@ -132,6 +133,7 @@ struct _drm_intel_bo_gem {
- */
- uint32_t tiling_mode;
- uint32_t swizzle_mode;
-+ unsigned long stride;
-
- time_t free_time;
-
-@@ -200,8 +202,9 @@ drm_intel_gem_bo_get_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
- uint32_t * swizzle_mode);
-
- static int
--drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
-- uint32_t stride);
-+drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo,
-+ uint32_t tiling_mode,
-+ uint32_t stride);
-
- static void drm_intel_gem_bo_unreference_locked_timed(drm_intel_bo *bo,
- time_t time);
-@@ -251,7 +254,7 @@ drm_intel_gem_bo_tile_size(drm_intel_bufmgr_gem *bufmgr_gem, unsigned long size,
- */
- static unsigned long
- drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
-- unsigned long pitch, uint32_t tiling_mode)
-+ unsigned long pitch, uint32_t *tiling_mode)
- {
- unsigned long tile_width;
- unsigned long i;
-@@ -259,10 +262,10 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
- /* If untiled, then just align it so that we can do rendering
- * to it with the 3D engine.
- */
-- if (tiling_mode == I915_TILING_NONE)
-+ if (*tiling_mode == I915_TILING_NONE)
- return ALIGN(pitch, 64);
-
-- if (tiling_mode == I915_TILING_X)
-+ if (*tiling_mode == I915_TILING_X)
- tile_width = 512;
- else
- tile_width = 128;
-@@ -271,6 +274,14 @@ drm_intel_gem_bo_tile_pitch(drm_intel_bufmgr_gem *bufmgr_gem,
- if (bufmgr_gem->gen >= 4)
- return ROUND_UP_TO(pitch, tile_width);
-
-+ /* The older hardware has a maximum pitch of 8192 with tiled
-+ * surfaces, so fallback to untiled if it's too large.
-+ */
-+ if (pitch > 8192) {
-+ *tiling_mode = I915_TILING_NONE;
-+ return ALIGN(pitch, 64);
-+ }
-+
- /* Pre-965 needs power of two tile width */
- for (i = tile_width; i < pitch; i <<= 1)
- ;
-@@ -549,7 +560,9 @@ static drm_intel_bo *
- drm_intel_gem_bo_alloc_internal(drm_intel_bufmgr *bufmgr,
- const char *name,
- unsigned long size,
-- unsigned long flags)
-+ unsigned long flags,
-+ uint32_t tiling_mode,
-+ unsigned long stride)
- {
- drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bufmgr;
- drm_intel_bo_gem *bo_gem;
-@@ -615,6 +628,13 @@ retry:
- bucket);
- goto retry;
- }
-+
-+ if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
-+ tiling_mode,
-+ stride)) {
-+ drm_intel_gem_bo_free(&bo_gem->bo);
-+ goto retry;
-+ }
- }
- }
- pthread_mutex_unlock(&bufmgr_gem->lock);
-@@ -642,6 +662,17 @@ retry:
- return NULL;
- }
- bo_gem->bo.bufmgr = bufmgr;
-+
-+ bo_gem->tiling_mode = I915_TILING_NONE;
-+ bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
-+ bo_gem->stride = 0;
-+
-+ if (drm_intel_gem_bo_set_tiling_internal(&bo_gem->bo,
-+ tiling_mode,
-+ stride)) {
-+ drm_intel_gem_bo_free(&bo_gem->bo);
-+ return NULL;
-+ }
- }
-
- bo_gem->name = name;
-@@ -650,8 +681,6 @@ retry:
- bo_gem->reloc_tree_fences = 0;
- bo_gem->used_as_reloc_target = 0;
- bo_gem->has_error = 0;
-- bo_gem->tiling_mode = I915_TILING_NONE;
-- bo_gem->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
- bo_gem->reusable = 1;
-
- drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
-@@ -669,7 +698,8 @@ drm_intel_gem_bo_alloc_for_render(drm_intel_bufmgr *bufmgr,
- unsigned int alignment)
- {
- return drm_intel_gem_bo_alloc_internal(bufmgr, name, size,
-- BO_ALLOC_FOR_RENDER);
-+ BO_ALLOC_FOR_RENDER,
-+ I915_TILING_NONE, 0);
- }
-
- static drm_intel_bo *
-@@ -678,7 +708,8 @@ drm_intel_gem_bo_alloc(drm_intel_bufmgr *bufmgr,
- unsigned long size,
- unsigned int alignment)
- {
-- return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0);
-+ return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, 0,
-+ I915_TILING_NONE, 0);
- }
-
- static drm_intel_bo *
-@@ -687,10 +718,8 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name,
- unsigned long *pitch, unsigned long flags)
- {
- drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr;
-- drm_intel_bo *bo;
- unsigned long size, stride;
- uint32_t tiling;
-- int ret;
-
- do {
- unsigned long aligned_y;
-@@ -717,24 +746,17 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name,
- aligned_y = ALIGN(y, 32);
-
- stride = x * cpp;
-- stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, tiling);
-+ stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, tiling_mode);
- size = stride * aligned_y;
- size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode);
- } while (*tiling_mode != tiling);
--
-- bo = drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags);
-- if (!bo)
-- return NULL;
--
-- ret = drm_intel_gem_bo_set_tiling(bo, tiling_mode, stride);
-- if (ret != 0) {
-- drm_intel_gem_bo_unreference(bo);
-- return NULL;
-- }
--
- *pitch = stride;
-
-- return bo;
-+ if (tiling == I915_TILING_NONE)
-+ stride = 0;
-+
-+ return drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags,
-+ tiling, stride);
- }
-
- /**
-@@ -791,6 +813,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
- }
- bo_gem->tiling_mode = get_tiling.tiling_mode;
- bo_gem->swizzle_mode = get_tiling.swizzle_mode;
-+ /* XXX stride is unknown */
- drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
-
- DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
-@@ -829,6 +852,9 @@ drm_intel_gem_cleanup_bo_cache(drm_intel_bufmgr_gem *bufmgr_gem, time_t time)
- {
- int i;
-
-+ if (bufmgr_gem->time == time)
-+ return;
-+
- for (i = 0; i < bufmgr_gem->num_buckets; i++) {
- struct drm_intel_gem_bo_bucket *bucket =
- &bufmgr_gem->cache_bucket[i];
-@@ -846,6 +872,8 @@ drm_intel_gem_cleanup_bo_cache(drm_intel_bufmgr_gem *bufmgr_gem, time_t time)
- drm_intel_gem_bo_free(&bo_gem->bo);
- }
- }
-+
-+ bufmgr_gem->time = time;
- }
-
- static void
-@@ -854,7 +882,6 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time)
- drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
- drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
- struct drm_intel_gem_bo_bucket *bucket;
-- uint32_t tiling_mode;
- int i;
-
- /* Unreference all the target buffers */
-@@ -883,9 +910,7 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time)
-
- bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
- /* Put the buffer into our internal cache for reuse if we can. */
-- tiling_mode = I915_TILING_NONE;
- if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
-- drm_intel_gem_bo_set_tiling(bo, &tiling_mode, 0) == 0 &&
- drm_intel_gem_bo_madvise_internal(bufmgr_gem, bo_gem,
- I915_MADV_DONTNEED)) {
- bo_gem->free_time = time;
-@@ -894,8 +919,6 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time)
- bo_gem->validate_index = -1;
-
- DRMLISTADDTAIL(&bo_gem->head, &bucket->head);
--
-- drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time);
- } else {
- drm_intel_gem_bo_free(bo);
- }
-@@ -925,6 +948,7 @@ static void drm_intel_gem_bo_unreference(drm_intel_bo *bo)
-
- pthread_mutex_lock(&bufmgr_gem->lock);
- drm_intel_gem_bo_unreference_final(bo, time.tv_sec);
-+ drm_intel_gem_cleanup_bo_cache(bufmgr_gem, time.tv_sec);
- pthread_mutex_unlock(&bufmgr_gem->lock);
- }
- }
-@@ -982,12 +1006,9 @@ static int drm_intel_gem_bo_map(drm_intel_bo *bo, int write_enable)
- &set_domain);
- } while (ret == -1 && errno == EINTR);
- if (ret != 0) {
-- ret = -errno;
- fprintf(stderr, "%s:%d: Error setting to CPU domain %d: %s\n",
- __FILE__, __LINE__, bo_gem->gem_handle,
- strerror(errno));
-- pthread_mutex_unlock(&bufmgr_gem->lock);
-- return ret;
- }
-
- pthread_mutex_unlock(&bufmgr_gem->lock);
-@@ -1062,9 +1083,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
- DRM_IOCTL_I915_GEM_SET_DOMAIN,
- &set_domain);
- } while (ret == -1 && errno == EINTR);
--
- if (ret != 0) {
-- ret = -errno;
- fprintf(stderr, "%s:%d: Error setting domain %d: %s\n",
- __FILE__, __LINE__, bo_gem->gem_handle,
- strerror(errno));
-@@ -1072,7 +1091,7 @@ int drm_intel_gem_bo_map_gtt(drm_intel_bo *bo)
-
- pthread_mutex_unlock(&bufmgr_gem->lock);
-
-- return ret;
-+ return 0;
- }
-
- int drm_intel_gem_bo_unmap_gtt(drm_intel_bo *bo)
-@@ -1587,7 +1606,7 @@ drm_intel_gem_bo_mrb_exec2(drm_intel_bo *bo, int used,
-
- if (ret != 0) {
- ret = -errno;
-- if (ret == -ENOMEM) {
-+ if (ret == -ENOSPC) {
- fprintf(stderr,
- "Execbuffer fails to pin. "
- "Estimate: %u. Actual: %u. Available: %u\n",
-@@ -1671,34 +1690,56 @@ drm_intel_gem_bo_unpin(drm_intel_bo *bo)
- }
-
- static int
--drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
-- uint32_t stride)
-+drm_intel_gem_bo_set_tiling_internal(drm_intel_bo *bo,
-+ uint32_t tiling_mode,
-+ uint32_t stride)
- {
- drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
- drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
- struct drm_i915_gem_set_tiling set_tiling;
- int ret;
-
-- if (bo_gem->global_name == 0 && *tiling_mode == bo_gem->tiling_mode)
-+ if (bo_gem->global_name == 0 &&
-+ tiling_mode == bo_gem->tiling_mode &&
-+ stride == bo_gem->stride)
- return 0;
-
- memset(&set_tiling, 0, sizeof(set_tiling));
-- set_tiling.handle = bo_gem->gem_handle;
--
- do {
-- set_tiling.tiling_mode = *tiling_mode;
-+ set_tiling.handle = bo_gem->gem_handle;
-+ set_tiling.tiling_mode = tiling_mode;
- set_tiling.stride = stride;
-
- ret = ioctl(bufmgr_gem->fd,
- DRM_IOCTL_I915_GEM_SET_TILING,
- &set_tiling);
- } while (ret == -1 && errno == EINTR);
-- if (ret == 0) {
-- bo_gem->tiling_mode = set_tiling.tiling_mode;
-- bo_gem->swizzle_mode = set_tiling.swizzle_mode;
-+ if (ret == -1)
-+ return -errno;
-+
-+ bo_gem->tiling_mode = set_tiling.tiling_mode;
-+ bo_gem->swizzle_mode = set_tiling.swizzle_mode;
-+ bo_gem->stride = set_tiling.stride;
-+ return 0;
-+}
-+
-+static int
-+drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode,
-+ uint32_t stride)
-+{
-+ drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
-+ drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
-+ int ret;
-+
-+ /* Linear buffers have no stride. By ensuring that we only ever use
-+ * stride 0 with linear buffers, we simplify our code.
-+ */
-+ if (*tiling_mode == I915_TILING_NONE)
-+ stride = 0;
-+
-+ ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride);
-+ if (ret == 0)
- drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
-- } else
-- ret = -errno;
-
- *tiling_mode = bo_gem->tiling_mode;
- return ret;
-diff --git a/xf86drmMode.c b/xf86drmMode.c
-index f330e6f..ecb1fd5 100644
---- a/xf86drmMode.c
-+++ b/xf86drmMode.c
-@@ -52,6 +52,12 @@
- #define U642VOID(x) ((void *)(unsigned long)(x))
- #define VOID2U64(x) ((uint64_t)(unsigned long)(x))
-
-+static inline DRM_IOCTL(int fd, int cmd, void *arg)
-+{
-+ int ret = drmIoctl(fd, cmd, arg);
-+ return ret < 0 ? -errno : ret;
-+}
-+
- /*
- * Util functions
- */
-@@ -242,7 +248,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
- f.depth = depth;
- f.handle = bo_handle;
-
-- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_ADDFB, &f)))
-+ if ((ret = DRM_IOCTL(fd, DRM_IOCTL_MODE_ADDFB, &f)))
- return ret;
-
- *buf_id = f.fb_id;
-@@ -251,7 +257,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
-
- int drmModeRmFB(int fd, uint32_t bufferId)
- {
-- return drmIoctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
-
-
- }
-@@ -289,7 +295,7 @@ int drmModeDirtyFB(int fd, uint32_t bufferId,
- dirty.clips_ptr = VOID2U64(clips);
- dirty.num_clips = num_clips;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_DIRTYFB, &dirty);
- }
-
-
-@@ -344,7 +350,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
- } else
- crtc.mode_valid = 0;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
- }
-
- /*
-@@ -361,7 +367,7 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width
- arg.height = height;
- arg.handle = bo_handle;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg);
- }
-
- int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
-@@ -373,7 +379,7 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
- arg.x = x;
- arg.y = y;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_CURSOR, &arg);
- }
-
- /*
-@@ -510,7 +516,7 @@ int drmModeAttachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_inf
- memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
- res.connector_id = connector_id;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
- }
-
- int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_info)
-@@ -520,7 +526,7 @@ int drmModeDetachMode(int fd, uint32_t connector_id, drmModeModeInfoPtr mode_inf
- memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
- res.connector_id = connector_id;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
- }
-
-
-@@ -637,16 +643,12 @@ int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property
- uint64_t value)
- {
- struct drm_mode_connector_set_property osp;
-- int ret;
-
- osp.connector_id = connector_id;
- osp.prop_id = property_id;
- osp.value = value;
-
-- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp)))
-- return ret;
--
-- return 0;
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp);
- }
-
- /*
-@@ -715,7 +717,6 @@ int drmCheckModesettingSupported(const char *busid)
- int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
- uint16_t *red, uint16_t *green, uint16_t *blue)
- {
-- int ret;
- struct drm_mode_crtc_lut l;
-
- l.crtc_id = crtc_id;
-@@ -724,16 +725,12 @@ int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
- l.green = VOID2U64(green);
- l.blue = VOID2U64(blue);
-
-- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_GETGAMMA, &l)))
-- return ret;
--
-- return 0;
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_GETGAMMA, &l);
- }
-
- int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
- uint16_t *red, uint16_t *green, uint16_t *blue)
- {
-- int ret;
- struct drm_mode_crtc_lut l;
-
- l.crtc_id = crtc_id;
-@@ -742,10 +739,7 @@ int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
- l.green = VOID2U64(green);
- l.blue = VOID2U64(blue);
-
-- if ((ret = drmIoctl(fd, DRM_IOCTL_MODE_SETGAMMA, &l)))
-- return ret;
--
-- return 0;
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l);
- }
-
- int drmHandleEvent(int fd, drmEventContextPtr evctx)
-@@ -810,5 +804,5 @@ int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id,
- flip.flags = flags;
- flip.reserved = 0;
-
-- return drmIoctl(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip);
-+ return DRM_IOCTL(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip);
- }
diff --git a/abs/core/xf86-video-apm/LICENSE b/abs/core/xf86-video-apm/LICENSE
deleted file mode 100644
index d8b6af7..0000000
--- a/abs/core/xf86-video-apm/LICENSE
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2005 Adam Jackson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
-#
-
-/*
- * Copyright 2007 George Sapountzis
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
diff --git a/abs/core/xf86-video-apm/PKGBUILD b/abs/core/xf86-video-apm/PKGBUILD
index 7e34b80..dc79a62 100644
--- a/abs/core/xf86-video-apm/PKGBUILD
+++ b/abs/core/xf86-video-apm/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-ark/LICENSE b/abs/core/xf86-video-ark/LICENSE
deleted file mode 100644
index aa45556..0000000
--- a/abs/core/xf86-video-ark/LICENSE
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
- *
- * XFree86 4.x driver for ARK Logic chipset
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation and
- * that the name of Ani Joshi not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Ani Joshi makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- *
- * Based on the 3.3.x driver by:
- * Harm Hanemaayer <H.Hanemaayer@inter.nl.net>
- *
- */
-
-# Copyright 2005 Adam Jackson.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/abs/core/xf86-video-ark/PKGBUILD b/abs/core/xf86-video-ark/PKGBUILD
index f511df4..03b715a 100644
--- a/abs/core/xf86-video-ark/PKGBUILD
+++ b/abs/core/xf86-video-ark/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-ast/PKGBUILD b/abs/core/xf86-video-ast/PKGBUILD
index 96dd584..8cfbaa9 100644
--- a/abs/core/xf86-video-ast/PKGBUILD
+++ b/abs/core/xf86-video-ast/PKGBUILD
@@ -9,7 +9,7 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
+makedepends=('xorg-server-devel')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-ati/PKGBUILD b/abs/core/xf86-video-ati/PKGBUILD
index 9ff6237..a708fc3 100644
--- a/abs/core/xf86-video-ati/PKGBUILD
+++ b/abs/core/xf86-video-ati/PKGBUILD
@@ -10,8 +10,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=(libpciaccess libdrm udev pixman ati-dri)
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-ati/__changelog b/abs/core/xf86-video-ati/__changelog
deleted file mode 100644
index 17890ba..0000000
--- a/abs/core/xf86-video-ati/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-change makedepends=('xorg-server-devel' ...) to makedepends=('xorg-server' ...)
-change conflicts=('xorg-server<1.9.0') to conflicts=('xorg-server<1.8.1')
diff --git a/abs/core/xf86-video-chips/LICENSE b/abs/core/xf86-video-chips/LICENSE
deleted file mode 100644
index 312a710..0000000
--- a/abs/core/xf86-video-chips/LICENSE
+++ /dev/null
@@ -1,89 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright 1993 by Jon Block <block@frc.com>
-Modified by Mike Hollick <hollick@graphics.cis.upenn.edu>
-Modified 1994 by Régis Cridlig <cridlig@dmi.ens.fr>
-
-Major Contributors to XFree86 3.2
-Modified 1995/6 by Nozomi Ytow
-Modified 1996 by Egbert Eich <eich@xfree86.org>
-Modified 1996 by David Bateman <dbateman@club-internet.fr>
-Modified 1996 by Xavier Ducoin <xavier@rd.lectra.fr>
-
-Contributors to XFree86 3.2
-Modified 1995/6 by Ken Raeburn <raeburn@raeburn.org>
-Modified 1996 by Shigehiro Nomura <nomura@sm.sony.co.jp>
-Modified 1996 by Marc de Courville <marc@courville.org>
-Modified 1996 by Adam Sulmicki <adam@cfar.umd.edu>
-Modified 1996 by Jens Maurer <jmaurer@cck.uni-kl.de>
-
-Large parts rewritten for XFree86 4.0
-Modified 1998 by David Bateman <dbateman@club-internet.fr>
-Modified 1998 by Egbert Eich <eich@xfree86.org>
-Modified 1998 by Nozomi Ytow
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the authors not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. The authors makes no representations
-about the suitability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Copyright 1997
-Digital Equipment Corporation. All rights reserved.
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions. Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-1) Any source code used, modified or distributed must reproduce and retain
-this copyright notice and list of conditions as they appear in the
-source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-Equipment Corporation. Neither the "Digital Equipment Corporation" name
-nor any trademark or logo of Digital Equipment Corporation may be used
-to endorse or promote products derived from this software without the
-prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-including but not limited to, any implied warranties of merchantability,
-fitness for a particular purpose, or non-infringement are disclaimed. In
-no event shall DIGITAL be liable for any damages whatsoever, and in
-particular, DIGITAL shall not be liable for special, indirect,
-consequential, or incidental damages or damages for lost profits, loss
-of revenue or loss of use, whether such damages arise in contract,
-negligence, tort, under statute, in equity, at law or otherwise, even if
-advised of the possibility of such damage.
-
-Copyright 1994 The XFree86 Project
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-DAVID WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/abs/core/xf86-video-chips/PKGBUILD b/abs/core/xf86-video-chips/PKGBUILD
index 14bcaa0..b0bab50 100644
--- a/abs/core/xf86-video-chips/PKGBUILD
+++ b/abs/core/xf86-video-chips/PKGBUILD
@@ -10,8 +10,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=(glibc)
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-cirrus/PKGBUILD b/abs/core/xf86-video-cirrus/PKGBUILD
index 2c91f50..06d6510 100644
--- a/abs/core/xf86-video-cirrus/PKGBUILD
+++ b/abs/core/xf86-video-cirrus/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-dummy/PKGBUILD b/abs/core/xf86-video-dummy/PKGBUILD
index 74b79b6..06386c7 100644
--- a/abs/core/xf86-video-dummy/PKGBUILD
+++ b/abs/core/xf86-video-dummy/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-fbdev/PKGBUILD b/abs/core/xf86-video-fbdev/PKGBUILD
index 49367c9..2208c59 100644
--- a/abs/core/xf86-video-fbdev/PKGBUILD
+++ b/abs/core/xf86-video-fbdev/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-geode/PKGBUILD b/abs/core/xf86-video-geode/PKGBUILD
index 54ddbe1..6763518 100644
--- a/abs/core/xf86-video-geode/PKGBUILD
+++ b/abs/core/xf86-video-geode/PKGBUILD
@@ -10,8 +10,8 @@ arch=(i686)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
conflicts=('xf86-video-amd')
replaces=('xf86-video-amd')
diff --git a/abs/core/xf86-video-glint/PKGBUILD b/abs/core/xf86-video-glint/PKGBUILD
index c718fcf..f622429 100644
--- a/abs/core/xf86-video-glint/PKGBUILD
+++ b/abs/core/xf86-video-glint/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-i128/PKGBUILD b/abs/core/xf86-video-i128/PKGBUILD
index 18cf3da..4f51b9d 100644
--- a/abs/core/xf86-video-i128/PKGBUILD
+++ b/abs/core/xf86-video-i128/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-i128/__changelog b/abs/core/xf86-video-i128/__changelog
deleted file mode 100644
index d11a62e..0000000
--- a/abs/core/xf86-video-i128/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-change makedepends=('xorg-server-devel') to makedepends=('xorg-server')
-change conflicts=('xorg-server<1.9.0') to conflicts=('xorg-server<1.8.1')
diff --git a/abs/core/xf86-video-i740/PKGBUILD b/abs/core/xf86-video-i740/PKGBUILD
index 24495ef..8e9be2d 100644
--- a/abs/core/xf86-video-i740/PKGBUILD
+++ b/abs/core/xf86-video-i740/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-intel/20_thinkpad_g40_quirk.patch b/abs/core/xf86-video-intel/20_thinkpad_g40_quirk.patch
deleted file mode 100644
index c2c72a7..0000000
--- a/abs/core/xf86-video-intel/20_thinkpad_g40_quirk.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c
---- xserver-xorg-video-intel-2.3.1-patched/src/i830_quirks.c 2008-06-20 00:05:23.000000000 -0700
-+++ xserver-xorg-video-intel-2.3.1-working/src/i830_quirks.c 2008-06-20 00:20:19.000000000 -0700
-@@ -266,9 +266,13 @@ static i830_quirk i830_quirk_list[] = {
- /* HP Compaq 6730s has no TV output */
- { PCI_CHIP_IGD_GM, 0x103c, 0x30e8, quirk_ignore_tv },
-
-+ /* Thinkpad G40 needs pipe A force quirk (See LP: #240457) */
-+ { PCI_CHIP_I855_GM, 0x1014, 0x0543, quirk_pipea_force },
- /* Thinkpad R31 needs pipe A force quirk */
- { PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force },
-- /* Dell Latitude D400 needs pipe A force quirk (LP: #228519) */
-+ /* Dell Latitude C400 needs pipe A force quirk (See LP: #216490) */
-+ { PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force },
-+ /* Dell Latitude D400 needs pipe A force quirk (See LP: #228519) */
- { PCI_CHIP_I855_GM, 0x1028, 0x0139, quirk_pipea_force },
- /* Dell Latitude D500 needs pipe A force quirk */
- { PCI_CHIP_I855_GM, 0x1028, 0x0152, quirk_pipea_force },
diff --git a/abs/core/xf86-video-intel/21_quirk_lenovo.patch b/abs/core/xf86-video-intel/21_quirk_lenovo.patch
deleted file mode 100644
index 8479a40..0000000
--- a/abs/core/xf86-video-intel/21_quirk_lenovo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c
---- xserver-xorg-video-intel-2.3.2-1ubuntu2-patched/src/i830_quirks.c 2008-06-26 20:21:14.000000000 -0700
-+++ xserver-xorg-video-intel-2.3.2-1ubuntu2-working/src/i830_quirks.c 2008-06-26 20:30:23.000000000 -0700
-@@ -242,6 +242,8 @@ static i830_quirk i830_quirk_list[] = {
-
- /* Lenovo Napa TV (use dmi)*/
- { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },
-+ /* Lenovo T60/R60 needs pipe A force quirk (See LP: #243405) */
-+ { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_pipea_force },
- /* Lenovo T61 has no TV output */
- { PCI_CHIP_I965_GM, 0x17aa, 0x20b5, quirk_ignore_tv },
- /* Lenovo 3000 v200 */
diff --git a/abs/core/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch b/abs/core/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch
deleted file mode 100644
index d82923f..0000000
--- a/abs/core/xf86-video-intel/23_quirks_studiohybrid_eeepc_and_w251u.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nurp xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c
---- xserver-xorg-video-intel-2.4.1-patched/src/i830_quirks.c 2008-09-08 20:12:28.000000000 -0700
-+++ xserver-xorg-video-intel-2.4.1-working/src/i830_quirks.c 2008-09-08 21:02:53.000000000 -0700
-@@ -312,6 +317,9 @@ static i830_quirk i830_quirk_list[] = {
- /* Sony vaio VGN-SZ4MN (See LP: #212163) */
- { PCI_CHIP_I830_M, 0x104d, 0x81e6, quirk_pipea_force },
-
-+ /* Quanta Gigabyte W251U (See LP: #244242) */
-+ { PCI_CHIP_I945_GM, 0x152d, 0x0755, quirk_pipea_force },
-+
- /* Ordi Enduro UW31 (See LP: #152416) */
- { PCI_CHIP_I945_GM, 0x1584, 0x9900, quirk_ignore_tv },
-
diff --git a/abs/core/xf86-video-intel/25_quirk_nc6110.patch b/abs/core/xf86-video-intel/25_quirk_nc6110.patch
deleted file mode 100644
index a6db410..0000000
--- a/abs/core/xf86-video-intel/25_quirk_nc6110.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/i830_quirks.c b/src/i830_quirks.c
-index 089e458..09b7c53 100644
---- a/src/i830_quirks.c
-+++ b/src/i830_quirks.c
-@@ -278,6 +278,8 @@ static i830_quirk i830_quirk_list[] = {
- /* Samsung Q45 has no TV output */
- { PCI_CHIP_I965_GM, 0x144d, 0xc510, quirk_ignore_tv },
-
-+ /* HP Compaq nx6110 has no TV output */
-+ { PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv },
- /* HP Compaq 6730s has no TV output */
- { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },
-
diff --git a/abs/core/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch b/abs/core/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch
deleted file mode 100644
index d74b809..0000000
--- a/abs/core/xf86-video-intel/26_i830-use-lfp-data-ptrs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nurp patched/src/bios_reader/bios_reader.c working/src/bios_reader/bios_reader.c
---- patched/src/bios_reader/bios_reader.c 2008-10-16 14:06:07.000000000 -0700
-+++ working/src/bios_reader/bios_reader.c 2008-10-16 14:25:07.000000000 -0700
-@@ -180,6 +180,19 @@ static void dump_lvds_options(void *data
- printf("\tPFIT mode: %d\n", options->pfit_mode);
- }
-
-+static void dump_lvds_ptr_data(void *data, unsigned char *base)
-+{
-+ struct bdb_lvds_lfp_data_ptrs *ptrs = data;
-+
-+ struct lvds_fp_timing *fp_timing =
-+ (struct lvds_fp_timing *)(base + ptrs->ptr[panel_type].fp_timing_offset);
-+
-+ printf("LVDS timing pointer data:\n");
-+
-+ printf("\tpanel type %02i: %dx%d\n", panel_type, fp_timing->x_res,
-+ fp_timing->y_res);
-+}
-+
- static void dump_lvds_data(void *data, unsigned char *base)
- {
- struct bdb_lvds_lfp_data *lvds_data = data;
-@@ -274,6 +287,8 @@ int main(int argc, char **argv)
- dump_general_definitions(find_section(bdb, BDB_GENERAL_DEFINITIONS));
- dump_lvds_options(find_section(bdb, BDB_LVDS_OPTIONS));
- dump_lvds_data(find_section(bdb, BDB_LVDS_LFP_DATA), bdb);
-+ dump_lvds_ptr_data(find_section(bdb, BDB_LVDS_LFP_DATA_PTRS),
-+ (unsigned char *)bdb);
-
- return 0;
- }
-diff -Nurp patched/src/i830_bios.c working/src/i830_bios.c
---- patched/src/i830_bios.c 2008-10-16 14:06:07.000000000 -0700
-+++ working/src/i830_bios.c 2008-10-16 14:27:15.000000000 -0700
-@@ -89,7 +89,8 @@ parse_panel_data(I830Ptr pI830, struct b
- {
- struct bdb_lvds_options *lvds_options;
- struct bdb_lvds_lfp_data *lvds_lfp_data;
-- struct bdb_lvds_lfp_data_entry *entry;
-+ struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
-+ int timing_offset;
- DisplayModePtr fixed_mode;
- unsigned char *timing_ptr;
-
-@@ -104,12 +105,13 @@ parse_panel_data(I830Ptr pI830, struct b
- if (lvds_options->panel_type == 0xff)
- return;
-
-- lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);
-- if (!lvds_lfp_data)
-+ lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
-+ if (!lvds_lfp_data_ptrs)
- return;
-
-- entry = &lvds_lfp_data->data[lvds_options->panel_type];
-- timing_ptr = (unsigned char *)&entry->dvo_timing;
-+ timing_offset =
-+ lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
-+ timing_ptr = (unsigned char *)bdb + timing_offset;
-
- fixed_mode = xnfalloc(sizeof(DisplayModeRec));
- memset(fixed_mode, 0, sizeof(*fixed_mode));
diff --git a/abs/core/xf86-video-intel/27_disable_fbc_on_965.patch b/abs/core/xf86-video-intel/27_disable_fbc_on_965.patch
deleted file mode 100644
index cc881b9..0000000
--- a/abs/core/xf86-video-intel/27_disable_fbc_on_965.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 5b78236..89f19d2 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -950,6 +950,13 @@ static inline int i830_fb_compression_supported(I830Ptr pI830)
- */
- if (!pI830->tiling || (IS_I965G(pI830) && pI830->accel <= ACCEL_XAA))
- return FALSE;
-+ /* We have not gotten FBC to work consistently on 965GM. Our best
-+ * working theory right now is that FBC simply isn't reliable on
-+ * that device. See this bug report for more details:
-+ * https://bugs.freedesktop.org/show_bug.cgi?id=16257
-+ */
-+ if (IS_I965GM(pI830))
-+ return FALSE;
- return TRUE;
- }
-
diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD
index ed1185c..884c139 100644
--- a/abs/core/xf86-video-intel/PKGBUILD
+++ b/abs/core/xf86-video-intel/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes)
-makedepends=('xorg-server' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util')
-conflicts=('xorg-server<1.8.1' 'xf86-video-i810' 'xf86-video-intel-legacy')
+makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util')
+conflicts=('xorg-server<1.9.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-mach64/PKGBUILD b/abs/core/xf86-video-mach64/PKGBUILD
index 1e11d63..88b2c34 100644
--- a/abs/core/xf86-video-mach64/PKGBUILD
+++ b/abs/core/xf86-video-mach64/PKGBUILD
@@ -8,8 +8,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'mach64-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-mach64/mesa-7.1-link-shared.patch b/abs/core/xf86-video-mach64/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-mach64/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-mga/PKGBUILD b/abs/core/xf86-video-mga/PKGBUILD
index 3f22a99..0170f6c 100644
--- a/abs/core/xf86-video-mga/PKGBUILD
+++ b/abs/core/xf86-video-mga/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'mga-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
options=('!libtool' 'force')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-mga/mesa-7.1-link-shared.patch b/abs/core/xf86-video-mga/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-mga/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-neomagic/PKGBUILD b/abs/core/xf86-video-neomagic/PKGBUILD
index 60f0e0a..5d5bd1f 100644
--- a/abs/core/xf86-video-neomagic/PKGBUILD
+++ b/abs/core/xf86-video-neomagic/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-nouveau/PKGBUILD b/abs/core/xf86-video-nouveau/PKGBUILD
index 624e82f..fb4c542 100644
--- a/abs/core/xf86-video-nouveau/PKGBUILD
+++ b/abs/core/xf86-video-nouveau/PKGBUILD
@@ -12,8 +12,8 @@ url="http://nouveau.freedesktop.org/wiki/"
license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
depends=('libdrm' 'udev')
optdepends=('nouveau-dri: highly experimental gallium3d features')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
install=${pkgname}.install
source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
diff --git a/abs/core/xf86-video-nv/PKGBUILD b/abs/core/xf86-video-nv/PKGBUILD
index b81c538..d9f6bfd 100644
--- a/abs/core/xf86-video-nv/PKGBUILD
+++ b/abs/core/xf86-video-nv/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-openchrome/PKGBUILD b/abs/core/xf86-video-openchrome/PKGBUILD
index 67485c3..7d009a9 100644
--- a/abs/core/xf86-video-openchrome/PKGBUILD
+++ b/abs/core/xf86-video-openchrome/PKGBUILD
@@ -10,10 +10,10 @@ arch=(i686 x86_64)
license=('custom')
url="http://www.openchrome.org"
depends=('libdrm' 'libxvmc' 'unichrome-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
replaces=('openchrome' 'xf86-video-via')
options=('!libtool' 'force' '!makeflags')
-conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.8.1')
+conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.9.0')
source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
drm_stdint.patch
svn-r839.patch
diff --git a/abs/core/xf86-video-r128/PKGBUILD b/abs/core/xf86-video-r128/PKGBUILD
index 44facbf..a50e88d 100644
--- a/abs/core/xf86-video-r128/PKGBUILD
+++ b/abs/core/xf86-video-r128/PKGBUILD
@@ -8,8 +8,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'r128-dri')
-makedepends=('xorg-server' 'xf86driproto' 'libdrm' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86driproto' 'libdrm' 'mesa')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-r128/mesa-7.1-link-shared.patch b/abs/core/xf86-video-r128/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-r128/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-radeonhd/PKGBUILD b/abs/core/xf86-video-radeonhd/PKGBUILD
deleted file mode 100644
index 11ca3e5..0000000
--- a/abs/core/xf86-video-radeonhd/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 75904 2010-04-04 19:30:10Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-radeonhd
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="Experimental Radeon HD video driver for r500 and r600 ATI cards"
-arch=(i686 x86_64)
-url="http://wiki.x.org/wiki/radeonhd"
-license=('custom')
-depends=('glibc' 'ati-dri>=7.8' 'libdrm>=2.4.20' 'libpciaccess')
-makedepends=('pkgconfig' 'xorg-server>=1.8.0' 'diffutils')
-conflicts=('xorg-server<1.8.0')
-options=('!libtool')
-groups=('xorg-video-drivers')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7b6641aa9d836f1621b9b220ad6771b8')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-}
diff --git a/abs/core/xf86-video-rendition/PKGBUILD b/abs/core/xf86-video-rendition/PKGBUILD
index a324641..fe6f54a 100644
--- a/abs/core/xf86-video-rendition/PKGBUILD
+++ b/abs/core/xf86-video-rendition/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool' '!strip')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-s3/PKGBUILD b/abs/core/xf86-video-s3/PKGBUILD
index bda4d57..74ce9a2 100644
--- a/abs/core/xf86-video-s3/PKGBUILD
+++ b/abs/core/xf86-video-s3/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-s3virge/PKGBUILD b/abs/core/xf86-video-s3virge/PKGBUILD
index 3cd94aa..c500c2c 100644
--- a/abs/core/xf86-video-s3virge/PKGBUILD
+++ b/abs/core/xf86-video-s3virge/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('pkgconfig' 'xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=(!libtool)
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-savage/PKGBUILD b/abs/core/xf86-video-savage/PKGBUILD
index 4384a66..0450131 100644
--- a/abs/core/xf86-video-savage/PKGBUILD
+++ b/abs/core/xf86-video-savage/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'savage-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
options=(!libtool !makeflags)
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-savage/mesa-7.1-link-shared.patch b/abs/core/xf86-video-savage/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-savage/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-siliconmotion/PKGBUILD b/abs/core/xf86-video-siliconmotion/PKGBUILD
index 61ff48a..63900c6 100644
--- a/abs/core/xf86-video-siliconmotion/PKGBUILD
+++ b/abs/core/xf86-video-siliconmotion/PKGBUILD
@@ -10,8 +10,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-sis/PKGBUILD b/abs/core/xf86-video-sis/PKGBUILD
index ed0176a..ef457ec 100644
--- a/abs/core/xf86-video-sis/PKGBUILD
+++ b/abs/core/xf86-video-sis/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'sis-dri')
-makedepends=('xorg-server' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-sis/mesa-7.1-link-shared.patch b/abs/core/xf86-video-sis/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-sis/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-sisusb/PKGBUILD b/abs/core/xf86-video-sisusb/PKGBUILD
index e7e3d06..3146df0 100644
--- a/abs/core/xf86-video-sisusb/PKGBUILD
+++ b/abs/core/xf86-video-sisusb/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-tdfx/PKGBUILD b/abs/core/xf86-video-tdfx/PKGBUILD
index f8ff4a1..88a96fc 100644
--- a/abs/core/xf86-video-tdfx/PKGBUILD
+++ b/abs/core/xf86-video-tdfx/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc' 'tdfx-dri')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
+conflicts=('xorg-server<1.9.0')
options=(!libtool)
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/abs/core/xf86-video-tdfx/mesa-7.1-link-shared.patch b/abs/core/xf86-video-tdfx/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-tdfx/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-trident/PKGBUILD b/abs/core/xf86-video-trident/PKGBUILD
index 56abac9..80aa2e6 100644
--- a/abs/core/xf86-video-trident/PKGBUILD
+++ b/abs/core/xf86-video-trident/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=(!libtool)
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-trident/mesa-7.1-link-shared.patch b/abs/core/xf86-video-trident/mesa-7.1-link-shared.patch
deleted file mode 100644
index 7fdbf14..0000000
--- a/abs/core/xf86-video-trident/mesa-7.1-link-shared.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
diff --git a/abs/core/xf86-video-tseng/PKGBUILD b/abs/core/xf86-video-tseng/PKGBUILD
index de9ed37..4fbcf23 100644
--- a/abs/core/xf86-video-tseng/PKGBUILD
+++ b/abs/core/xf86-video-tseng/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-unichrome/PKGBUILD b/abs/core/xf86-video-unichrome/PKGBUILD
index 490dc84..b2aa60e 100644
--- a/abs/core/xf86-video-unichrome/PKGBUILD
+++ b/abs/core/xf86-video-unichrome/PKGBUILD
@@ -9,9 +9,9 @@ arch=(i686 x86_64)
url="http://unichrome.sf.net/"
license=('custom')
depends=('glibc' 'unichrome-dri')
-makedepends=('xorg-server' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
+makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.8.1')
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.9.0')
source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2
drm-include.patch
LICENSE)
diff --git a/abs/core/xf86-video-unichrome/fix-defines.patch b/abs/core/xf86-video-unichrome/fix-defines.patch
deleted file mode 100644
index 5b9f040..0000000
--- a/abs/core/xf86-video-unichrome/fix-defines.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Luc Verhaegen <libv@skynet.be>
-Date: Wed, 6 Dec 2006 23:16:01 +0000 (+0100)
-Subject: Fix build issues due to hard uint32_t and Bool #defines.
-X-Git-Url: http://gitweb.freedesktop.org/?p=users/libv/xf86-video-unichrome.git;a=commitdiff;h=13c214345787a3340f230e77b7770b7c2d115c85
-
-Fix build issues due to hard uint32_t and Bool #defines.
-
-Ported from xf86-video_via, which was by Matthias Hopf.
----
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
-
- # Checks for header files.
- AC_HEADER_STDC
-+AC_CHECK_HEADERS([inttypes.h])
-
- if test "$DRI" != no; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
---- a/src/via_dri.h
-+++ b/src/via_dri.h
-@@ -35,7 +35,7 @@
- #define VIA_DRIDDX_VERSION_MINOR 0
- #define VIA_DRIDDX_VERSION_PATCH 0
-
--#ifndef XFree86Server
-+#if !defined(XFree86Server) && !defined(_XTYPEDEF_BOOL)
- typedef int Bool;
- #endif
-
---- a/src/via_drmclient.h
-+++ b/src/via_drmclient.h
-@@ -27,7 +27,13 @@
- #include "drm.h"
- #include "xf86drm.h"
-
--typedef CARD32 uint32_t;
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# ifndef uint32_t
-+# define uint32_t CARD32
-+# endif
-+#endif
-
- #ifdef X_NEED_DRMLOCK
- #define drm_hw_lock_t drmLock
---- a/src/via_video.c
-+++ b/src/via_video.c
-@@ -367,7 +367,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMe
- if (error) {
- xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: DMA copy sheduling failed: %d.\n",
- __FUNCTION__, error);
-- xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08lX\n",
-+ xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08X\n",
- __func__, blit.mem_addr, blit.fb_addr);
- if (new_buf)
- xfree(new_buf);
-@@ -391,7 +391,7 @@ ViaSwovCopyDMA(VIAPtr pVia, struct ViaMe
- if (error) {
- xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: DMA copy sync failed: %d - %d\n",
- __FUNCTION__, error, -EAGAIN);
-- xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08lX\n",
-+ xf86DrvMsg(pVia->scrnIndex, X_ERROR, "%s: Copying %p to %08X\n",
- __func__, blit.mem_addr, blit.fb_addr);
- return FALSE;
- }
diff --git a/abs/core/xf86-video-v4l/PKGBUILD b/abs/core/xf86-video-v4l/PKGBUILD
index 3790841..338e96a 100644
--- a/abs/core/xf86-video-v4l/PKGBUILD
+++ b/abs/core/xf86-video-v4l/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
diff --git a/abs/core/xf86-video-vesa/COPYING b/abs/core/xf86-video-vesa/COPYING
deleted file mode 100644
index 22b4b13..0000000
--- a/abs/core/xf86-video-vesa/COPYING
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.
diff --git a/abs/core/xf86-video-vesa/PKGBUILD b/abs/core/xf86-video-vesa/PKGBUILD
index 84377d9..0b5dbf3 100644
--- a/abs/core/xf86-video-vesa/PKGBUILD
+++ b/abs/core/xf86-video-vesa/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server')
-conflicts=('xorg-server<1.8.1')
+makedepends=('pkgconfig' 'xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
groups=('xorg' 'xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-vmware/LICENSE b/abs/core/xf86-video-vmware/LICENSE
deleted file mode 100644
index 7934272..0000000
--- a/abs/core/xf86-video-vmware/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Copyright (C) 1998-2002 VMware, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
diff --git a/abs/core/xf86-video-vmware/PKGBUILD b/abs/core/xf86-video-vmware/PKGBUILD
index c99cfbe..38b3efe 100644
--- a/abs/core/xf86-video-vmware/PKGBUILD
+++ b/abs/core/xf86-video-vmware/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=xf86-video-vmware
pkgver=11.0.3
-pkgrel=1
+pkgrel=3
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('libdrm')
-makedepends=('pkgconfig' 'xorg-server' 'libdrm' 'libx11' 'libxext')
-conflicts=('xorg-server<1.8.1')
+makedepends=('pkgconfig' 'xorg-server-devel' 'libdrm' 'libx11' 'libxext')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-vmware/abi2.patch b/abs/core/xf86-video-vmware/abi2.patch
deleted file mode 100644
index 29e8dde..0000000
--- a/abs/core/xf86-video-vmware/abi2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
---- xf86-video-vmware-10.16.7/src/vmware.c.jx 2009-08-07 16:31:33.000000000 -0400
-+++ xf86-video-vmware-10.16.7/src/vmware.c 2009-08-07 16:32:10.000000000 -0400
-@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- return FALSE;
- }
-
-- xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
- if (!vgaHWGetHWRec(pScrn)) {
- return FALSE;
- }
-@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
-
- /* Need ramdac for hwcursor */
- if (pVMWARE->hwCursor) {
-@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
- VMWAREFreeRec(pScrn);
- return FALSE;
- }
-- xf86LoaderReqSymLists(ramdacSymbols, NULL);
- }
-
- return TRUE;
-@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
- setupDone = TRUE;
- xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
-
-- LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
-- shadowfbSymbols, NULL);
--
- return (pointer)1;
- }
- if (errmaj) {
diff --git a/abs/core/xf86-video-voodoo/PKGBUILD b/abs/core/xf86-video-voodoo/PKGBUILD
index 702f753..c0520d8 100644
--- a/abs/core/xf86-video-voodoo/PKGBUILD
+++ b/abs/core/xf86-video-voodoo/PKGBUILD
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.8.1')
+makedepends=('xorg-server-devel' 'xf86dgaproto')
+conflicts=('xorg-server<1.9.0')
groups=('xorg-video-drivers')
options=('!libtool')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-xgi/PKGBUILD b/abs/core/xf86-video-xgi/PKGBUILD
index e012f51..a4de300 100644
--- a/abs/core/xf86-video-xgi/PKGBUILD
+++ b/abs/core/xf86-video-xgi/PKGBUILD
@@ -9,7 +9,7 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-xgixp/PKGBUILD b/abs/core/xf86-video-xgixp/PKGBUILD
index c6a30bf..56acbc5 100644
--- a/abs/core/xf86-video-xgixp/PKGBUILD
+++ b/abs/core/xf86-video-xgixp/PKGBUILD
@@ -9,7 +9,7 @@ arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa')
options=('!libtool')
groups=('xorg-video-drivers')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)