Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/cdfs/PKGBUILD
	community-testing/open-vm-tools-modules/PKGBUILD
	community-testing/open-vm-tools/PKGBUILD
	community-testing/virtualbox/PKGBUILD
	extra/gnome-device-manager/PKGBUILD
	extra/iptraf/PKGBUILD
	extra/lirc-utils/PKGBUILD
	extra/squeeze/PKGBUILD
	extra/texi2html/PKGBUILD
	extra/thunar-vfs/PKGBUILD
	gnome-unstable/accountsservice/PKGBUILD
	gnome-unstable/anjuta/PKGBUILD
	gnome-unstable/at-spi/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/atkmm/PKGBUILD
	gnome-unstable/avahi/PKGBUILD
	gnome-unstable/brasero/PKGBUILD
	gnome-unstable/cairomm/PKGBUILD
	gnome-unstable/cheese/PKGBUILD
	gnome-unstable/clutter-gst/PKGBUILD
	gnome-unstable/clutter-gtk/PKGBUILD
	gnome-unstable/clutter-gtk2/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/devhelp/PKGBUILD
	gnome-unstable/ekiga/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/eog-plugins/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/epiphany-extensions/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/evince/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution-exchange/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/farsight2/PKGBUILD
	gnome-unstable/file-roller/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gcalctool/PKGBUILD
	gnome-unstable/gconf-editor/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdk-pixbuf2/PKGBUILD
	gnome-unstable/gdl/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gedit/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glade/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/glibmm/PKGBUILD
	gnome-unstable/gnome-applets/PKGBUILD
	gnome-unstable/gnome-bluetooth/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-disk-utility/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-media/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-nettool/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-pilot/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-system-monitor/PKGBUILD
	gnome-unstable/gnome-terminal/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-user-share/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gthumb/PKGBUILD
	gnome-unstable/gtk-vnc/PKGBUILD
	gnome-unstable/gtk2/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/gtksourceview3/PKGBUILD
	gnome-unstable/gucharmap/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/lcms2/PKGBUILD
	gnome-unstable/libcanberra/PKGBUILD
	gnome-unstable/libchamplain/PKGBUILD
	gnome-unstable/libdmapsharing/PKGBUILD
	gnome-unstable/libgda/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libgnome-media-profiles/PKGBUILD
	gnome-unstable/libgnomekbd/PKGBUILD
	gnome-unstable/libgpod/PKGBUILD
	gnome-unstable/libgweather/PKGBUILD
	gnome-unstable/libimobiledevice/PKGBUILD
	gnome-unstable/libnice/PKGBUILD
	gnome-unstable/libnotify/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/librsvg/PKGBUILD
	gnome-unstable/libsocialweb/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libunique/PKGBUILD
	gnome-unstable/libunique3/PKGBUILD
	gnome-unstable/libwebkit/PKGBUILD
	gnome-unstable/libwnck/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/libxklavier/PKGBUILD
	gnome-unstable/metacity/PKGBUILD
	gnome-unstable/mousetweaks/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/nautilus-open-terminal/PKGBUILD
	gnome-unstable/nautilus-sendto/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/networkmanager-openvpn/PKGBUILD
	gnome-unstable/networkmanager-pptp/PKGBUILD
	gnome-unstable/networkmanager-vpnc/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	gnome-unstable/notification-daemon/PKGBUILD
	gnome-unstable/opal/PKGBUILD
	gnome-unstable/pangomm/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	gnome-unstable/polkit-gnome/PKGBUILD
	gnome-unstable/polkit/PKGBUILD
	gnome-unstable/ptlib/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygtk/PKGBUILD
	gnome-unstable/rest/PKGBUILD
	gnome-unstable/rhythmbox/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sound-juicer/PKGBUILD
	gnome-unstable/telepathy-gabble/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	gnome-unstable/telepathy-logger/PKGBUILD
	gnome-unstable/telepathy-mission-control/PKGBUILD
	gnome-unstable/tomboy/PKGBUILD
	gnome-unstable/totem-plparser/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vinagre/PKGBUILD
	gnome-unstable/vino/PKGBUILD
	gnome-unstable/vte/PKGBUILD
	gnome-unstable/yelp/PKGBUILD
	gnome-unstable/zenity/PKGBUILD
	libre-testing/kernel26-libre/PKGBUILD
	multilib-testing/lib32-libdrm/PKGBUILD
	staging/kdeaccessibility/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase/PKGBUILD
	staging/kdebindings/PKGBUILD
	staging/kdeedu/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics/PKGBUILD
	staging/kdelibs/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdeplasma-applets-networkmanagement/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/strigi/PKGBUILD
	testing/aufs2-util/PKGBUILD
	testing/crda/PKGBUILD
	testing/dhcpcd/PKGBUILD
	testing/dmraid/PKGBUILD
	testing/eventlog/PKGBUILD
	testing/fakeroot/PKGBUILD
	testing/gnutls/PKGBUILD
	testing/libdrm/PKGBUILD
	testing/libgcrypt/PKGBUILD
	testing/libgpg-error/PKGBUILD
	testing/libpipeline/PKGBUILD
	testing/libx11/PKGBUILD
	testing/lilo/PKGBUILD
	testing/lirc/PKGBUILD
	testing/madwifi/PKGBUILD
	testing/man-db/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/ncurses/PKGBUILD
	testing/python2/PKGBUILD
	testing/rsync/PKGBUILD
	testing/sqlite3/PKGBUILD
	testing/sudo/PKGBUILD
	testing/syslog-ng/PKGBUILD
	testing/tzdata/PKGBUILD
	testing/xf86-input-acecad/PKGBUILD
	testing/xf86-input-aiptek/PKGBUILD
	testing/xf86-input-evdev/PKGBUILD
	testing/xf86-input-joystick/PKGBUILD
	testing/xf86-input-keyboard/PKGBUILD
	testing/xf86-input-mouse/PKGBUILD
	testing/xf86-input-synaptics/PKGBUILD
	testing/xf86-input-void/PKGBUILD
	testing/xf86-input-wacom/PKGBUILD
	testing/xf86-video-apm/PKGBUILD
	testing/xf86-video-ark/PKGBUILD
	testing/xf86-video-ast/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-chips/PKGBUILD
	testing/xf86-video-cirrus/PKGBUILD
	testing/xf86-video-dummy/PKGBUILD
	testing/xf86-video-fbdev/PKGBUILD
	testing/xf86-video-glint/PKGBUILD
	testing/xf86-video-i128/PKGBUILD
	testing/xf86-video-i740/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-mach64/PKGBUILD
	testing/xf86-video-mga/PKGBUILD
	testing/xf86-video-neomagic/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nv/PKGBUILD
	testing/xf86-video-openchrome/PKGBUILD
	testing/xf86-video-r128/PKGBUILD
	testing/xf86-video-rendition/PKGBUILD
	testing/xf86-video-s3/PKGBUILD
	testing/xf86-video-s3virge/PKGBUILD
	testing/xf86-video-savage/PKGBUILD
	testing/xf86-video-siliconmotion/PKGBUILD
	testing/xf86-video-sis/PKGBUILD
	testing/xf86-video-sisusb/PKGBUILD
	testing/xf86-video-tdfx/PKGBUILD
	testing/xf86-video-trident/PKGBUILD
	testing/xf86-video-tseng/PKGBUILD
	testing/xf86-video-unichrome/PKGBUILD
	testing/xf86-video-v4l/PKGBUILD
	testing/xf86-video-vesa/PKGBUILD
	testing/xf86-video-voodoo/PKGBUILD
	testing/xf86-video-xgi/PKGBUILD
	testing/xf86-video-xgixp/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xz/PKGBUILD

1 files changed, 0 insertions, 144 deletions

diff --git a/extra/libdrm/intel-git-fixes.patch b/extra/libdrm/intel-git-fixes.patch
deleted file mode 100644
index d1f427c10..000000000
--- a/extra/libdrm/intel-git-fixes.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-commit 6717b7579f84d05e45e7846d2b6e767760461709
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Wed Jan 12 10:57:46 2011 +0000
-
-    intel: Fallback to old exec if no mrb_exec is available
-    
-    Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com>
-    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33016
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
-index b7c5c09..2546222 100644
---- a/intel/intel_bufmgr.c
-+++ b/intel/intel_bufmgr.c
-@@ -143,6 +143,10 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
- 					cliprects, num_cliprects, DR4,
- 					rings);
- 
-+	if (ring_flag == 0)
-+		return bo->bufmgr->bo_exec(bo, used,
-+					   cliprects, num_cliprects, DR4);
-+
- 	return -ENODEV;
- }
- 
-commit 53581b6210c024044e0065527d1506e6f5657ef5
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Mon Feb 14 09:27:05 2011 +0000
-
-    intel: Set the public handle after opening by name
-    
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 72c8731..092b56a 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -816,6 +816,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
- 	atomic_set(&bo_gem->refcount, 1);
- 	bo_gem->validate_index = -1;
- 	bo_gem->gem_handle = open_arg.handle;
-+	bo_gem->bo.handle = open_arg.handle;
- 	bo_gem->global_name = handle;
- 	bo_gem->reusable = 0;
- 
-commit 36d4939343d8789d9066f7245fa2d4fe69119dd8
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Mon Feb 14 09:39:06 2011 +0000
-
-    intel: Remember named bo
-    
-    ... and if asked to open a bo by the same global name, return a fresh
-    reference to the previously allocated buffer.
-    
-    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 092b56a..3cdffce 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
- 	int num_buckets;
- 	time_t time;
- 
-+	drmMMListHead named;
-+
- 	uint64_t gtt_size;
- 	int available_fences;
- 	int pci_device;
-@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
- 	 * Kenel-assigned global name for this object
- 	 */
- 	unsigned int global_name;
-+	drmMMListHead name_list;
- 
- 	/**
- 	 * Index of the buffer within the validation list while preparing a
-@@ -690,6 +693,8 @@ retry:
- 		    drm_intel_gem_bo_free(&bo_gem->bo);
- 		    return NULL;
- 		}
-+
-+		DRMINITLISTHEAD(&bo_gem->name_list);
- 	}
- 
- 	bo_gem->name = name;
-@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
- 	int ret;
- 	struct drm_gem_open open_arg;
- 	struct drm_i915_gem_get_tiling get_tiling;
-+	drmMMListHead *list;
-+
-+	/* At the moment most applications only have a few named bo.
-+	 * For instance, in a DRI client only the render buffers passed
-+	 * between X and the client are named. And since X returns the
-+	 * alternating names for the front/back buffer a linear search
-+	 * provides a sufficiently fast match.
-+	 */
-+	for (list = bufmgr_gem->named.next;
-+	     list != &bufmgr_gem->named;
-+	     list = list->next) {
-+		bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
-+		if (bo_gem->global_name == handle) {
-+			drm_intel_gem_bo_reference(&bo_gem->bo);
-+			return &bo_gem->bo;
-+		}
-+	}
- 
- 	bo_gem = calloc(1, sizeof(*bo_gem));
- 	if (!bo_gem)
-@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
- 	/* XXX stride is unknown */
- 	drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
- 
-+	DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
- 	DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
- 
- 	return &bo_gem->bo;
-@@ -925,6 +948,8 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo, time_t time)
- 		bo_gem->relocs = NULL;
- 	}
- 
-+	DRMLISTDEL(&bo_gem->name_list);
-+
- 	bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
- 	/* Put the buffer into our internal cache for reuse if we can. */
- 	if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
-@@ -1771,6 +1796,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
- 			return -errno;
- 		bo_gem->global_name = flink.name;
- 		bo_gem->reusable = 0;
-+
-+		DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
- 	}
- 
- 	*name = bo_gem->global_name;
-@@ -2217,6 +2244,7 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
- 	    drm_intel_gem_get_pipe_from_crtc_id;
- 	bufmgr_gem->bufmgr.bo_references = drm_intel_gem_bo_references;
- 
-+	DRMINITLISTHEAD(&bufmgr_gem->named);
- 	init_cache_buckets(bufmgr_gem);
- 
- 	return &bufmgr_gem->bufmgr;