Merge branch 'master' of https://github.com/archlinuxarm/PKGBUILDs

alarm/nvidia-trimslice/PKGBUILD

@@ -6,22 +6,35 @@
 buildarch=4
 
 pkgname=('nvidia-trimslice')
-pkgver=15.1.0
+pkgver=16.1.0
 pkgrel=1
 arch=(armv7h)
 license=('GPL')
 url="http://archlinuxarm.org"
-source=('http://archlinuxarm.org/builder/src/ventana_nv-tegra_base_R15-Beta.1.0_armhf.tar.xz'
+source=('http://developer.download.nvidia.com/devzone/devcenter/tools/files/l4t/r16_Release_v1.0/ventana_release_armhf/ventana_Tegra-Linux-R16.1.0_armhf.tbz2'
+        'http://developer.download.nvidia.com/devzone/devcenter/tools/files/l4t/r16_Release_v1.0/ventana_release_armhf/ventana_Tegra-Linux-codecs-R16.1.0_armhf.tbz2'
+        'http://developer.download.nvidia.com/devzone/devcenter/tools/files/l4t/r16/ventana_Tegra-Linux-tegra_drv_abi13-R16.1.0_armhf.tbz2'
         'xorg.conf')
-md5sums=('b81218af9f6b7f05047bf27fccfc19a5'
-         '0b9ab7162a59d80a2f7487561ee088d1')
+md5sums=('7cf9f75fff8ddc41910fbe7676864fcf'
+         '6214f62fcd97db044a3e84152591deb6'
+         'b333cd1c5c998ce2e3b3098e81b3cba3'
+         '55e50a6894b95795732bdbc942e3e016')
+
 options=('!distcc' '!ccache')
 
 package() {
   pkgdesc="Nvidia drivers for the TrimSlice"
   
   cd ${srcdir}
-  cp -a usr lib ${pkgdir}/
+  tar xf restricted_codecs.tbz2
+  tar xf tegra_drv_abi_13.tbz2
+  tar xf Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2
+  mv lib/firmware usr/firmware
+  mv usr/lib/libjpeg.so usr/lib/nvlibjpeg.so
+  cd usr/lib/xorg/modules/drivers/
+  ln -s tegra_drv.abi13.so tegra_drv.so
+  cd ../../../../../
+  cp -a usr ${pkgdir}/
   mkdir -p ${pkgdir}/etc/X11/
   cp xorg.conf ${pkgdir}/etc/X11/
 }

alarm/nvidia-trimslice/xorg.conf

@@ -1,21 +1,36 @@
-# This is the minimal configuration necessary to use the Tegra driver.
-# Please refer to the xorg.conf man page for more configuration
-# options provided by the X server, including display-related options
-# provided by RandR 1.2 and higher.
+Section "Monitor"
 
-# Disable extensions not useful on Tegra.
-Section "Module"
-    Disable     "dri"
-    Disable     "dri2"
-    Disable     "glx"
-    SubSectionSub  "extmod"
-        Option  "omit xfree86-dga"
-    EndSubSection
+     Identifier	"HDMI"
+#    ModeLine "1280x720"  74.48   1280 1336 1472 1664  720  721  724  746   -HSync +Vsync
+#    ModeLine "720x480"   26.72   720  736  808  896   480  481  484  497   -HSync +Vsync
+#    ModeLine "640x480"   23.86   640  656  720  800   480  481  484  497   -HSync +Vsync
+#    ModeLine "720x576"   32.67   720  744  816  912   576  577  580  597   -HSync +Vsync
+#    ModeLine "1920x1080" 172.80  1920 2040 2248 2576  1080 1081 1084 1118  -HSync +Vsync
+
+EndSection
+
+Section "Monitor"
+    Identifier	"TFTLCD"
+#    HorizSync       28.0 - 100.0
+#    VertRefresh     43.0 - 72.0
+#    ModeLine "800x600"   38.22   800  832  912  1024  600  601  604  622   -HSync +Vsync
+#    ModeLine "1280x960"  102.10  1280 1360 1496 1712  960  961  964  994   -HSync +Vsync
+#    ModeLine "1280x1024" 108.88  1280 1360 1496 1712  1024 1025 1028 1060  -HSync +Vsync
+#    ModeLine "1680x1050" 147.14  1680 1784 1968 2256  1050 1051 1054 1087  -HSync +Vsync
 EndSection
 
 Section "Device"
-    Identifier  "Tegra"
-    Driver      "tegra"
+
+    Identifier	"Tegra HDMI"
+    Driver	"tegra"
+
+# VirtualDesktop indicates which virtual desktops should be used by X.
+# X will use the specified virtual desktop *and* the next one.  In
+# order for an external app to share a display with the X server, it
+# needs to use the same virtual desktop.  Valid values are integers 0
+# (default) or 1.
+
+#    Option      "VirtualDesktop" "1"
 
 # OverlayDepth is a 32-bit integer which is used to control overlay
 # stacking order.  The overlay with the lowest depth is in front of
@@ -24,10 +39,81 @@ Section "Device"
 
 #    Option      "OverlayDepth" "255"
 
+# OverlayCombineMode determines how the X overlay is combined with the
+# overlay behind it during scanout.  Available modes are: Opaque
+# (default), SourceAlphaBlend, and PremultSourceAlphaBlend.  This
+# value has meaning only when an external process has created a
+# display which is behind the X server.
+
+#    Option      "OverlayCombineMode" "PremultSourceAlphaBlend"
+
 # ARGBHWCursor controls whether the X driver uses an overlay to
 # display 32-bit "true-color" cursors, or whether such cursors are
-# emulated in software.  Valid values are "true" to enable hardware
-# cursors, and "false" (default) to disable them.
+# emulated in software.  Valid values are "true" (default) to enable
+# hardware cursors, and "false" to disable them.
+
+    Option      "ARGBHWCursor" "false"
 
-#    Option      "ARGBHWCursor"
 EndSection
+
+Section "Device"
+
+    Identifier	"Tegra Internal"
+    Driver	"tegra"
+
+    Option      "ARGBHWCursor" "false"
+
+EndSection
+
+Section "Screen"
+
+    Identifier	"Screen HDMI"
+    Device	"Tegra HDMI"
+    Monitor	"HDMI"
+
+    DefaultDepth 24
+
+    SubSectionSub "Display"
+        Depth		24
+        ViewPort	0 0	
+	Virtual 	3600 1080
+    EndSubsection
+
+EndSection
+
+Section "Screen"
+
+    Identifier	"Screen Internal"
+    Device	"Tegra Internal"
+    Monitor	"TFTLCD"
+
+    DefaultDepth 24
+
+    SubSectionSub "Display"
+        Depth		24
+        ViewPort	0 0	
+    EndSubsection
+
+EndSection
+
+Section "ServerLayout"
+
+    Identifier	"HDMI"
+    Screen	"Screen HDMI"
+
+EndSection
+
+#Section "ServerLayout"
+
+#    Identifier	"Internal"
+#    Screen	"Screen Internal"
+
+#EndSection
+
+#Section "ServerLayout"
+
+#    Identifier	"DualView"
+#    Screen	"Screen Internal"
+#    Screen	"Screen HDMI" RightOf "Screen Internal"
+ 
+#EndSection

alarm/raspberrypi-firmware/PKGBUILD

@@ -1,7 +1,7 @@
 buildarch=18
 
 pkgname=raspberrypi-firmware
-pkgver=20120926
+pkgver=20121017
 pkgrel=1
 pkgdesc="Firmware files for Raspberry Pi"
 arch=('any')

alarm/wiringpi/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Mike Brown <mbrown@archlinuxarm.org>
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
 
-buildarch=2
+buildarch=18
 
 _pkgname='wiringPi'
 pkgname=wiringpi

alarm/xf86-video-dove/PKGBUILD

@@ -6,18 +6,20 @@ buildarch=4
 
 pkgname="xf86-video-dove"
 pkgver=0.3.4
-pkgrel=5
+pkgrel=7
 arch=('armv7h')
 url="http://www.solid-run.com/mw/index.php/CuBox_Drivers#GPU_Drivers"
 license=('GPL2')
 depends=('marvell-libgfx')
-makedepends=('pkgconfig' 'xorg-server-devel')
+makedepends=('pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 options=('!libtool' '!strip')
 source=("http://archlinuxarm.org/builder/src/xf86-video-dove-0.3.4.tar.gz"
-        "xorg.conf")
+        "xorg.conf"
+        "dovefb-port-to-compat-api-for-new-server.patch")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/dovefb-port-to-compat-api-for-new-server.patch"
   CFLAGS="${CFLAGS} -I/usr/include/HAL -g -DMRVL_SUPPORT_RANDR=1 -DMRVL_SUPPORT_EXA=1 -DDUMP_RAW_VIDEO=0 -DMRVL_USE_OFFSCREEN_HEAP=0 -DMRVL_EXA_MODE=2 -DMRVL_EXA_ENABLE_UP_DOWNLOAD=2 -DMRVL_EXA_FORCE_HW_LOAD=0 -DMRVL_EXA_ALLOC_PIXMAP_FROM_SYSTEM=0 -DMRVL_EXA_PERF_PROFILING=0 -DMRVL_EXA_TRACE_FALLBACK=0 -DMRVL_EXA_XBGR_SUPPORT=1 -DMRVL_XV_SUPPORT_RGB_FORMAT=1 -DMRVL_XV_TEX_VIDEO=1 -DMRVL_XV_OVERLAY_VIDEO=1 -DMRVL_XV_DEFERRED_STALL_GPU=1 -DMRVL_XV_USE_FAKE_FENCE_STALL=1 -DMRVL_RANDR_EDID_MODES=1  -DMRVL_CRTC_SUPPORT_ROTATION=1 -DMRVL_PLATFORM_INFO=1"
 
   autoreconf -i
@@ -37,5 +39,6 @@ package() {
 }
 
 md5sums=('b48a969dfab79a66c1817463380fa89c'
-         '03294f82a3df0ccdf63f62ea1e4d027a')
+         '03294f82a3df0ccdf63f62ea1e4d027a'
+         '0cf362fde4ca25572f8f264fb424e082')
 

alarm/xf86-video-dove/dovefb-port-to-compat-api-for-new-server.patch

@@ -0,0 +1,475 @@
+diff -rupN xf86-video-dove-0.3.4.orig/src/compat-api.h xf86-video-dove-0.3.4/src/compat-api.h
+--- xf86-video-dove-0.3.4.orig/src/compat-api.h	1970-01-01 01:00:00.000000000 +0100
++++ xf86-video-dove-0.3.4/src/compat-api.h	2012-10-16 22:21:27.589861729 +0200
+@@ -0,0 +1,99 @@
++/*
++ * Copyright 2012 Red Hat, 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 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.
++ *
++ * Author: Dave Airlie <airlied@redhat.com>
++ */
++
++/* this file provides API compat between server post 1.13 and pre it,
++   it should be reused inside as many drivers as possible */
++#ifndef COMPAT_API_H
++#define COMPAT_API_H
++
++#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
++#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
++#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
++#endif
++
++#ifndef XF86_HAS_SCRN_CONV
++#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
++#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
++#endif
++
++#ifndef XF86_SCRN_INTERFACE
++
++#define SCRN_ARG_TYPE int
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
++
++#define SCREEN_ARG_TYPE int
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
++
++#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
++
++#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
++
++#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
++
++#define FREE_SCREEN_ARGS_DECL int arg, int flags
++
++#define VT_FUNC_ARGS_DECL int arg, int flags
++#define VT_FUNC_ARGS pScrn->scrnIndex, 0
++
++#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
++#else
++#define SCRN_ARG_TYPE ScrnInfoPtr
++#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
++
++#define SCREEN_ARG_TYPE ScreenPtr
++#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
++
++#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
++
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
++#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++
++#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
++#define CLOSE_SCREEN_ARGS pScreen
++
++#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
++#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
++
++#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
++#define SWITCH_MODE_ARGS(arg, m) arg, m
++
++#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
++
++#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
++#define VT_FUNC_ARGS pScrn
++
++#define XF86_SCRN_ARG(x) (x)
++
++#endif
++
++#endif
+diff -rupN xf86-video-dove-0.3.4.orig/src/dovefb.c xf86-video-dove-0.3.4/src/dovefb.c
+--- xf86-video-dove-0.3.4.orig/src/dovefb.c	2011-03-07 18:52:09.000000000 +0100
++++ xf86-video-dove-0.3.4/src/dovefb.c	2012-10-16 22:21:49.705464928 +0200
+@@ -78,9 +78,8 @@ static Bool	FBDevPciProbe(DriverPtr drv,
+      struct pci_device *dev, intptr_t match_data);
+ #endif
+ static Bool	FBDevPreInit(ScrnInfoPtr pScrn, int flags);
+-static Bool	FBDevScreenInit(int Index, ScreenPtr pScreen, int argc,
+-				char **argv);
+-static Bool	FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen);
++static Bool	FBDevScreenInit(SCREEN_INIT_ARGS_DECL);
++static Bool	FBDevCloseScreen(CLOSE_SCREEN_ARGS_DECL);
+ static void *	FBDevWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, int mode,
+ 				  CARD32 *size, void *closure);
+ static void	FBDevPointerMoved(int index, int x, int y);
+@@ -329,9 +328,9 @@ mrvl_scn_validMode(int scrnIndex, Displa
+ }
+ 
+ Bool
+-mrvl_scn_switchMode(int scrnIndex, DisplayModePtr mode, int flags)
++mrvl_scn_switchMode(SWITCH_MODE_ARGS_DECL)
+ {
+-    ScrnInfoPtr    pScrn       = xf86Screens[scrnIndex];
++    SCRN_INFO_PTR(arg);
+     Bool  ret;
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Preparing to switch single mode\n");
+@@ -346,9 +345,9 @@ mrvl_scn_switchMode(int scrnIndex, Displ
+ extern int mrvl_crtc_set_pos(xf86CrtcPtr crtc, int x, int y);
+ 
+ void
+-mrvl_scn_adjustFrame(int scrnIndex, int x, int y, int flags)
++mrvl_scn_adjustFrame(ADJUST_FRAME_ARGS_DECL)
+ {
+-    ScrnInfoPtr    pScrn      = xf86Screens[scrnIndex];
++    SCRN_INFO_PTR(arg);
+     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
+     xf86OutputPtr  output = config->output[config->compat_output];
+     xf86CrtcPtr	crtc = output->crtc;
+@@ -485,9 +484,9 @@ static Bool mrvlRestoreServerScreen(Scrn
+ }
+ 
+ Bool
+-mrvl_scn_entervt(int scrnIndex, int flags)
++mrvl_scn_entervt(VT_FUNC_ARGS_DECL)
+ {
+-    ScrnInfoPtr    pScrn = xf86Screens[scrnIndex];
++    SCRN_INFO_PTR(arg);
+     MRVLGetPrivateByScrn(pScrn);
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Preparing to enter VT\n");
+@@ -512,10 +511,10 @@ mrvl_scn_entervt(int scrnIndex, int flag
+ 
+ // 
+ void
+-mrvl_scn_leavevt(int scrnIndex, int flags)
++mrvl_scn_leavevt(VT_FUNC_ARGS_DECL)
+ {
++    SCRN_INFO_PTR(arg);
+     int i;
+-    ScrnInfoPtr    pScrn = xf86Screens[scrnIndex];
+     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+     MRVLGetPrivateByScrn(pScrn);
+ 
+@@ -1252,9 +1251,9 @@ FBDevShadowInit(ScreenPtr pScreen)
+ 
+ 
+ static Bool
+-FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ {
+-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ 	FBDevPtr    fPtr = FBDEVPTR(pScrn);
+ 	VisualPtr   visual;
+ 	int         init_picture = 0;
+@@ -1281,7 +1280,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ #endif
+ 
+ 	if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) {
+-	        xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
++	        xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory"
+ 			   " failed\n");
+ 		return FALSE;
+ 	}
+@@ -1292,17 +1291,17 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	fbdevHWSave(pScrn);
+ 
+ 	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) {
+-		xf86DrvMsg(scrnIndex,X_ERROR,"mode initialization failed\n");
++		xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mode initialization failed\n");
+ 		return FALSE;
+ 	}
+ 	fbdevHWSaveScreen(pScreen, SCREEN_SAVER_ON);
+-	fbdevHWAdjustFrame(scrnIndex,0,0,0);
++	fbdevHWAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
+ 
+ 	/* mi layer */
+ 	miClearVisualTypes();
+ 	if (pScrn->bitsPerPixel > 8) {
+ 		if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
+-			xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
++			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
+ 				   " for %d bits per pixel [1]\n",
+ 				   pScrn->bitsPerPixel);
+ 			return FALSE;
+@@ -1311,14 +1310,14 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 		if (!miSetVisualTypes(pScrn->depth,
+ 				      miGetDefaultVisualMask(pScrn->depth),
+ 				      pScrn->rgbBits, pScrn->defaultVisual)) {
+-			xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
++			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
+ 				   " for %d bits per pixel [2]\n",
+ 				   pScrn->bitsPerPixel);
+ 			return FALSE;
+ 		}
+ 	}
+ 	if (!miSetPixmapDepths()) {
+-	  xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n");
++	  xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n");
+ 	  return FALSE;
+ 	}
+ 
+@@ -1334,7 +1333,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 				      (pScrn->bitsPerPixel / 8);
+ 
+ 		if (pScrn->displayWidth != pScrn->virtualX) {
+-			xf86DrvMsg(scrnIndex, X_INFO,
++			xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 				   "Pitch updated to %d after ModeInit\n",
+ 				   pScrn->displayWidth);
+ 		}
+@@ -1367,14 +1366,14 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	case FBDEVHW_PLANES:
+ 		if (fPtr->rotate)
+ 		{
+-		  xf86DrvMsg(scrnIndex, X_ERROR,
++		  xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 			     "internal error: rotate not supported for afb\n");
+ 		  ret = FALSE;
+ 		  break;
+ 		}
+ 		if (fPtr->shadowFB)
+ 		{
+-		  xf86DrvMsg(scrnIndex, X_ERROR,
++		  xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 			     "internal error: shadow framebuffer not supported"
+ 			     " for afb\n");
+ 		  ret = FALSE;
+@@ -1399,7 +1398,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 			init_picture = 1;
+ 			break;
+ 	 	default:
+-			xf86DrvMsg(scrnIndex, X_ERROR,
++			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 				   "internal error: invalid number of bits per"
+ 				   " pixel (%d) encountered in"
+ 				   " FBDevScreenInit()\n", pScrn->bitsPerPixel);
+@@ -1410,7 +1409,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	case FBDEVHW_INTERLEAVED_PLANES:
+ 		/* This should never happen ...
+ 		* we should check for this much much earlier ... */
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: interleaved planes are not yet "
+ 			   "supported by the fbdev driver\n");
+ 		ret = FALSE;
+@@ -1418,20 +1417,20 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	case FBDEVHW_TEXT:
+ 		/* This should never happen ...
+ 		* we should check for this much much earlier ... */
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: text mode is not supported by the "
+ 			   "fbdev driver\n");
+ 		ret = FALSE;
+ 		break;
+ 	case FBDEVHW_VGA_PLANES:
+ 		/* Not supported yet */
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: EGA/VGA Planes are not yet "
+ 			   "supported by the fbdev driver\n");
+ 		ret = FALSE;
+ 		break;
+ 	default:
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: unrecognised hardware type (%d) "
+ 			   "encountered in FBDevScreenInit()\n", type);
+ 		ret = FALSE;
+@@ -1490,7 +1489,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+     pScrn->vtSema = TRUE;
+ 
+ 	if (fPtr->shadowFB && !FBDevShadowInit(pScreen)) {
+-	    xf86DrvMsg(scrnIndex, X_ERROR,
++	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		       "shadow framebuffer initialization failed\n");
+ 	    return FALSE;
+ 	}
+@@ -1498,12 +1497,12 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	if (!fPtr->rotate)
+ 	  FBDevDGAInit(pScrn, pScreen);
+ 	else {
+-	  xf86DrvMsg(scrnIndex, X_INFO, "display rotated; disabling DGA\n");
+-	  xf86DrvMsg(scrnIndex, X_INFO, "using driver rotation; disabling "
++	  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "display rotated; disabling DGA\n");
++	  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using driver rotation; disabling "
+ 			                "XRandR\n");
+ 	  xf86DisableRandR();
+ 	  if (pScrn->bitsPerPixel == 24)
+-	    xf86DrvMsg(scrnIndex, X_WARNING, "rotation might be broken at 24 "
++	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "rotation might be broken at 24 "
+                                              "bits per pixel\n");
+ 	}
+ 
+@@ -1521,7 +1520,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ #ifdef USE_AFB
+ 	case FBDEVHW_PLANES:
+ 		if (!afbCreateDefColormap(pScreen)) {
+-			xf86DrvMsg(scrnIndex, X_ERROR,
++			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                                    "internal error: afbCreateDefColormap "
+ 				   "failed in FBDevScreenInit()\n");
+ 			return FALSE;
+@@ -1530,29 +1529,29 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ #endif
+ 	case FBDEVHW_PACKED_PIXELS:
+ 		if (!miCreateDefColormap(pScreen)) {
+-			xf86DrvMsg(scrnIndex, X_ERROR,
++			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                                    "internal error: miCreateDefColormap failed "
+ 				   "in FBDevScreenInit()\n");
+ 			return FALSE;
+ 		}
+ 		break;
+ 	case FBDEVHW_INTERLEAVED_PLANES:
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: interleaved planes are not yet "
+ 			   "supported by the fbdev driver\n");
+ 		return FALSE;
+ 	case FBDEVHW_TEXT:
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: text mode is not supported by "
+ 			   "the fbdev driver\n");
+ 		return FALSE;
+ 	case FBDEVHW_VGA_PLANES:
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: EGA/VGA planes are not yet "
+ 			   "supported by the fbdev driver\n");
+ 		return FALSE;
+ 	default:
+-		xf86DrvMsg(scrnIndex, X_ERROR,
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		           "internal error: unrecognised fbdev hardware type "
+ 			   "(%d) encountered in FBDevScreenInit()\n", type);
+ 		return FALSE;
+@@ -1574,7 +1573,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ #if MRVL_SUPPORT_EXA		
+     if (fPtr->UseExa)
+     {
+-        xf86DrvMsg(scrnIndex, X_INFO,
++        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		           "Start to initialize vivnate hal module\n");
+         fPtr->UseGPU = TRUE;
+     }
+@@ -1588,11 +1587,11 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+ 	    // Set up hal layer for Exa and Xv.
+         if( ! mrvlExaInitHal(pScreen) )
+         {       
+-            xf86DrvMsg(scrnIndex, X_ERROR,
++            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		               "Failed to initialize vivnate hal module\n");
+             return FALSE;
+         }
+-        xf86DrvMsg(scrnIndex, X_INFO,
++        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		           "Initialize vivnate hal module successfully\n");
+     }  
+ #endif
+@@ -1647,11 +1646,11 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+     	/* Initialize Xv support. */
+     	DovefbXVInitVideo (pScreen);
+     	
+-    	xf86DrvMsg(scrnIndex, X_INFO, "Xv acceleration is loaded successfully\n");
++    	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv acceleration is loaded successfully\n");
+     }
+     else
+     {
+-        xf86DrvMsg(scrnIndex, X_INFO, "Xv acceleration is disabled\n");
++        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Xv acceleration is disabled\n");
+     }
+ 
+ 	/* Initialize hw cursor. */	
+@@ -1660,7 +1659,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+     			xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Can not initialize h/w cursor\n");
+ 			return FALSE;
+ 		}
+-	  	xf86DrvMsg(scrnIndex, X_INFO, "HW cursor init okay.\n");
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HW cursor init okay.\n");
+ 	}		
+ 	
+ 	/* ----------------------------------------- */
+@@ -1682,18 +1681,18 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+     //pScrn->modes = xf86CVTMode(1024, 768, 60.0, FALSE, FALSE);
+ #endif      
+ 
+-   xf86DrvMsg(scrnIndex, X_INFO, "Leave FBDevScreenInit().\n");
++   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Leave FBDevScreenInit().\n");
+ 
+ 	return TRUE;
+ }
+ 
+ static Bool
+-FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen)
++FBDevCloseScreen(CLOSE_SCREEN_ARGS_DECL)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+     FBDevPtr fPtr = FBDEVPTR(pScrn);
+-	
+-    xf86DrvMsg(scrnIndex, X_INFO, "FBDevCloseScreen.\n");
++
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "FBDevCloseScreen.\n");
+     fbdevHWRestore(pScrn);
+     fbdevHWUnmapVidmem(pScrn);
+     if (fPtr->shadow) {
+@@ -1750,7 +1749,7 @@ FBDevCloseScreen(int scrnIndex, ScreenPt
+     /* Restore resolution for fb console */
+     mrvlRestoreFBScreen(pScrn);
+ 
+-    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
++    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
+ }
+ 
+ 
+@@ -1859,9 +1858,9 @@ FBDevDGASetMode(ScrnInfoPtr pScrn, DGAMo
+ 	frameY0 = pScrn->frameY0;
+     }
+ 
+-    if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0))
++    if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)))
+ 	return FALSE;
+-    (*pScrn->AdjustFrame)(scrnIdx, frameX0, frameY0, 0);
++    (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, frameX0, frameY0));
+ 
+     return TRUE;
+ }
+@@ -1869,7 +1868,7 @@ FBDevDGASetMode(ScrnInfoPtr pScrn, DGAMo
+ static void
+ FBDevDGASetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
+ {
+-    (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
++    (*pScrn->AdjustFrame)(ADJUST_FRAME_ARGS(pScrn, x, y));
+ }
+ 
+ static int
+diff -rupN xf86-video-dove-0.3.4.orig/src/dovefb_driver.h xf86-video-dove-0.3.4/src/dovefb_driver.h
+--- xf86-video-dove-0.3.4.orig/src/dovefb_driver.h	2011-03-07 18:52:09.000000000 +0100
++++ xf86-video-dove-0.3.4/src/dovefb_driver.h	2012-10-16 22:21:27.589861730 +0200
+@@ -40,6 +40,8 @@
+ 
+ #include <linux/fb.h>
+ 
++#include "compat-api.h"
++
+ /* Platform ID*/
+ #define MRVL_DOVE 1
+ #define MRVL_MMP2 2

alarm/xf86-video-fbdev-damage/PKGBUILD

@@ -1,12 +1,12 @@
 pkgname=xf86-video-fbdev-damage
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org framebuffer video driver with DAMAGE support"
 arch=(arm)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
+makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.11.99.903'
            'xf86-video-fbdev')
 groups=('xorg-drivers' 'xorg')

alarm/xf86-video-imx/PKGBUILD

@@ -5,12 +5,12 @@ buildarch=4
 
 pkgname="xf86-video-imx"
 pkgver=11.03.00
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://www.freescale.com"
 license=('GPL2')
 depends=('libz160')
-makedepends=('pkgconfig' 'xorg-server-devel')
+makedepends=('pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 options=('!libtool')
 source=("http://archlinuxarm.org/builder/src/xf86-video-imx-11.03.00.tar.gz")
 md5sums=('fb203bdc6fe760605f5f06bf6d0226f2')

alarm/xf86-video-omapfb/PKGBUILD

@@ -6,11 +6,11 @@ buildarch=4
 
 pkgname="xf86-video-omapfb"
 pkgver=0.1.1.1
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="http://gitweb.pingu.fi/?p=xf86-video-omapfb.git"
 license=('GPL2')
-makedepends=('pkgconfig' 'xorg-server-devel')
+makedepends=('pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 options=('!libtool')
 source=("http://archlinuxarm.org/builder/src/xf86-video-omapfb_0.1.1.1.tar.gz")
 md5sums=('a9bca5424bd76d53b78826f9d5fa4abe')

aur/cherokee/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=cherokee
 pkgver=1.2.101
-pkgrel=4
+pkgrel=5
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -29,13 +29,15 @@ source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.ta
         cherokee.rc
         cherokee.logrotate
         fix-ctk-path-handler-match.patch
-	cherokee-1.2.101-ffmpeg0.11.patch)
+	cherokee-1.2.101-ffmpeg0.11.patch
+  cherokee.service)
 
 sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8'
             '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
             '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
             '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630'
-            '6bcdcb8eaccb5516478a0c36960fbacc3d68f8bc326b9b526c388e0607a65116')
+            '6bcdcb8eaccb5516478a0c36960fbacc3d68f8bc326b9b526c388e0607a65116'
+            '415a2e4cd7d04afe21e502dd0ad76301f85a7087cadbfdab5566bec469679a68')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -89,6 +91,7 @@ package() {
   install -d -o http -g http "$pkgdir/var/log/$pkgname"
   install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
   install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+  install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 
   # Cleanup
   rm -rf "$pkgdir/srv"

aur/cherokee/cherokee.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=Cherokee web server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/cherokee
+
+[Install]
+WantedBy=multi-user.target

aur/couchpotato-git/PKGBUILD

@@ -1,24 +1,24 @@
 # Maintainer: Ben Ruijl <benruyl at gmail>
 
-plugrel=1
-
 pkgname=couchpotato-git
-pkgver=20120412
+pkgver=20120812
 pkgrel=1
 pkgdesc="Automatic Movie Downloading via NZBs & Torrent"
 arch=('i686' 'x86_64')
-url="http://couchpotatoapp.com/"
+url="http://couchpota.to/"
 license=('unknown')
 depends=('python2')
 makedepends=('git')
-provides=('couchpotato')
 install='couchpotato.install'
-source=('couchpotato' 'couchpotato.init')
+backup=('etc/conf.d/couchpotato' 'etc/conf.d/couchpotato_systemd')
+source=('couchpotato' 'couchpotato.init' 'couchpotato.conf' 'couchpotato_systemd.conf' 'couchpotato.service')
 md5sums=('a7db842a8af532847ef41890f6714819'
-         '6f247a743fd17aa38e99f64e6e123978')
+         'a7711d04d2db7de96f067e484c29f709'
+         '2c3c045ae9c5f5bf4bc0972917c19071'
+         'c22c7a797415131baf0fbe092132abda'
+         'bdedef6bcb8d04c534bd094047885fa7')
 
-
-_gitroot="git://github.com/RuudBurger/CouchPotato.git"
+_gitroot="git://github.com/RuudBurger/CouchPotatoServer.git"
 _gitname="couchpotato_src"
 
 build() {
@@ -40,4 +40,7 @@ build() {
 
   install -D -m755 "${srcdir}/couchpotato" "${pkgdir}/usr/bin/couchpotato"
   install -D -m755 "${srcdir}/couchpotato.init" "${pkgdir}/etc/rc.d/couchpotato"
+  install -D -m644 "${srcdir}/couchpotato.conf" "${pkgdir}/etc/conf.d/couchpotato"
+  install -D -m644 "${srcdir}/couchpotato_systemd.conf" "${pkgdir}/etc/conf.d/couchpotato_systemd"
+  install -D -m644 "${srcdir}/couchpotato.service" "${pkgdir}/usr/lib/systemd/system/couchpotato.service"
 }

aur/couchpotato-git/couchpotato.conf

@@ -0,0 +1,25 @@
+# Make sure we don't run as 0077 or similar
+#
+# Useful if running as another user that needs access to files
+umask 0022
+
+# Misc options, these aren't necessary but useful
+#
+# Can be commented out / modified
+CP_OPTS="--daemon --quiet"
+
+#
+# The following below MUST be set
+#
+
+# User to run process as
+CP_USER="couchpotato"
+
+# Config file to use
+CP_CONFIG="/opt/couchpotato/config.ini"
+
+# Port to listen on, only used for shutdown!
+CP_PORT="5050"
+
+# Where CouchPotato stores its info
+CP_DATA="/opt/couchpotato/data"

aur/couchpotato-git/couchpotato.init

@@ -2,39 +2,39 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/couchpotato
+
+PID=`ps -A -F | grep "python2 /opt/couchpotato/CouchPotato.py" | grep -v grep | awk '{print $2}'`
 
 case "$1" in
   start)
     stat_busy "Starting CouchPotato"
-    
-    if [ -f /var/run/daemons/couchpotato ]; then
-	    echo -n "CouchPotato is already running as a daemon! If you are certain it is not running, remove /var/run/daemons/couchpotato."
-	    stat_fail 
+    if [ -z "$CP_USER" ]; then
+      stat_busy "No CP_USER, please edit /etc/conf.d/couchpotato"
+      stat_fail
     else
-	    su - couchpotato -c "python2 /opt/couchpotato/CouchPotato.py &> /dev/null &" -s /bin/sh
-	    if [ $? -gt 0 ]; then
-		    stat_fail
-	    else
-		    add_daemon couchpotato
-		    stat_done
-	    fi
+      [ -z "$PID" ] && su -l -s /bin/sh -c "python2 /opt/couchpotato/CouchPotato.py ${CP_OPTS} --config_file ${CP_CONFIG} --data_dir ${CP_DATA} &> /dev/null &" "$CP_USER"
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+       add_daemon couchpotato
+       stat_done
+      fi
     fi
     ;;
   stop)
     stat_busy "Stopping CouchPotato"
-
-    curl -f http://localhost:5000/config/exit/ &> /dev/null
-
-    if [ $? -gt 0 ]; then
-      	    stat_fail
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -ne 0 ]; then
+      stat_fail
     else
-	    rm_daemon couchpotato
-      	    stat_done
+      rm_daemon couchpotato
+      stat_done
     fi
     ;;
   restart)
     $0 stop
-    sleep 1
+    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
     $0 start
     ;;
   *)

aur/couchpotato-git/couchpotato.install

@@ -3,7 +3,7 @@ post_install() {
   groupadd couchpotato &> /dev/null
   useradd -g couchpotato -d /opt/couchpotato -s /bin/false couchpotato &> /dev/null
   chown -R couchpotato:couchpotato /opt/couchpotato
-  echo "  >> If you change CouchPotato's port in the general configuration page, you will need to edit /etc/rc.d/couchpotato to have it point to the new port number"
+  echo "  >> If you change CouchPotato's port in the general configuration page, you will need to edit /etc/conf.d/couchpotato (or /etc/conf.d/couchpotato_systemd) to have it point to the new port number"
 }
 ## arg 1:  the new package version
 ## arg 2:  the old package version
@@ -12,6 +12,7 @@ post_upgrade() {
 }
 
 ## arg 1:  the old package version
-pre_remove() {
+post_remove() {
   userdel couchpotato &> /dev/null
+  groupdel sabnzbd &> /dev/null || /bin/true
 }

aur/couchpotato-git/couchpotato.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=An automatic NZB and torrent movie downloader
+
+[Service]
+EnvironmentFile=/etc/conf.d/couchpotato_systemd
+ExecStart=/usr/bin/python2 /opt/couchpotato/CouchPotato.py $CP_OPTS
+GuessMainPID=no
+Type=forking
+User=couchpotato
+Group=couchpotato
+
+[Install]
+WantedBy=multi-user.target
+
+

aur/couchpotato-git/couchpotato_systemd.conf

@@ -0,0 +1 @@
+CP_OPTS=--config_file /opt/couchpotato/config.ini --data_dir /opt/couchpotato/data --daemon --quiet

aur/lightdm/PKGBUILD

@@ -1,7 +1,7 @@
 #Mantainer: M0Rf30
 pkgname=lightdm
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/lightdm"
@@ -68,7 +68,7 @@ package() {
   cp ../lightdm.pam $pkgdir/etc/pam.d/lightdm
 }
 
-md5sums=('bea9fc58a1798bcf76808225e0bf4f22'
+md5sums=('622d9087ec773dd0626a250a5868f88c'
          '6699eb35f65ff498d1d05e6782f4f902'
          'b9781cdb3aaae3755f21c7852dcc76bf'
          'e6d573b1913f3aa020cbde3863ee80f0'

aur/mt-daapd/PKGBUILD

@@ -2,20 +2,17 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
-plugrel=1
-
 pkgname=mt-daapd
 pkgver=0.2.4.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A multi-threaded DAAP server compatible with iTunes music sharing"
 url="http://www.mt-daapd.org/"
 license=("LGPL")
 arch=('i686' 'x86_64')
 backup=(etc/mt-daapd/mt-daapd.conf)
-depends=('libid3tag' 'gdbm' 'avahi')
-makedepends=('automake' 'autoconf' 'patch')
+depends=('libid3tag' 'avahi')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
-	mt-daapd fix-libs.patch)
+	mt-daapd fix-libs.patch mt-daapd.service)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -31,8 +28,10 @@ build() {
 
   install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.playlist $pkgdir/etc/mt-daapd/sample.playlist && \
   install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.conf $pkgdir/etc/mt-daapd/mt-daapd.conf && \
-  install -D -m755 $srcdir/mt-daapd $pkgdir/etc/rc.d/mt-daapd
+  install -D -m755 $srcdir/mt-daapd $pkgdir/etc/rc.d/mt-daapd && \
+  install -D -m644 $srcdir/mt-daapd.service $pkgdir/usr/lib/systemd/system/mt-daapd.service
 }
 md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
          '26cf6ff799ef06d262a8648d6890a250'
-         '59896e760486a51170d8b0e7ed5a2506')
+         '59896e760486a51170d8b0e7ed5a2506'
+         'e4fe850008da5206286c3ced6384ac4c')

aur/mt-daapd/mt-daapd.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=mt-daapd - multi-threaded DAAP server
+ConditionPathExists=/etc/mt-daapd/mt-daapd.conf
+Requires=network.target
+Wants=avahi-daemon.service
+After=avahi-daemon.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/mt-daapd
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

aur/netatalk/PKGBUILD

@@ -5,8 +5,8 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=3
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -17,19 +17,19 @@ backup=('etc/afp.conf')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-	'62eb034011bb60b0bfd95072af3693dc')
+source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
 
 build() {
 	cd $pkgname-$pkgver
 	msg2 'Fixing...'
 	sed -i 's/x"linux/x"generic/' macros/netatalk.m4
+	sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
 	autoreconf &>/dev/null
-	echo -e "all:\ninstall:">libevent/Makefile
 	msg2 'Configuring...'
-	CFLAGS="-Wno-unused-result" LIBS=-levent ./configure --prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
-		--disable-bundled-libevent --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-init-style=systemd
+	CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \
+		--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --without-libevent-header --without-libevent-lib
+	sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
 	msg2 'Making...'
 	make >/dev/null
 }
@@ -37,6 +37,4 @@ package() {
 	cd $pkgname-$pkgver
 	msg2 'Building...'
 	make DESTDIR="$pkgdir" install >/dev/null
-	msg2 'Copying initscripts...'
-	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
 }

aur/netatalk/netatalk.changelog

@@ -1,3 +1,21 @@
+2012-10-08 SJ_UnderWater
+
+	* 3.0.1-3 :
+	moved systemd from /etc
+	better rc.d install test
+
+2012-10-05 SJ_UnderWater
+
+	* 3.0.1-2 :
+	removed rc.d references
+
+2012-10-04 SJ_UnderWater
+
+	* 3.0.1-1 :
+	new version
+	moved to systemd
+	moved state to /var/db
+
 2012-07-14 SJ_UnderWater
 
 	* 3.0-3 :

aur/netatalk/netatalk.install

@@ -2,11 +2,11 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
+	else echo '>>> Add "netatalk" to your DAEMONS list';fi
 	echo '>>>';
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
@@ -18,6 +18,3 @@ post_upgrade() {
 	echo '>>> Found *.conf in /opt/netatalk, please';
 	echo '>>> migrate these to /etc/netatalk before restarting';fi
 }
-pre_remove() {
-	rc.d stop netatalk
-}

aur/owncloud/PKGBUILD

@@ -2,7 +2,7 @@
 # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
 
 pkgname=owncloud
-pkgver=4.0.7
+pkgver=4.5.0
 pkgrel=1
 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
@@ -14,7 +14,7 @@ makedepends=()
 source=("http://owncloud.org/releases/$pkgname-$pkgver.tar.bz2" 'owncloud.conf')
 backup=('etc/httpd/conf/extra/owncloud.conf')
 install=owncloud.install
-md5sums=('7fdbe0113621730a6787afdc7ebb529f'
+md5sums=('115dc4ca9615816b3247792409f45ec8'
          '7a08e1fee098615ea24fcdb1f4bd82d9')
 
 package() { 

aur/sabnzbd/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=sabnzbd
 _pkgname=SABnzbd
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="A web-interface based binary newsgrabber with NZB file support"
 url="http://www.sabnzbd.org"
@@ -14,7 +14,7 @@ backup=("etc/conf.d/${pkgname}" "opt/${pkgname}/${pkgname}.ini")
 source=("http://downloads.sourceforge.net/sabnzbdplus/${_pkgname}-${pkgver}-src.tar.gz"
         "${pkgname}" "${pkgname}.confd" "${pkgname}.init" "${pkgname}.desktop"
         "addnzb.sh" "nzb-2.png" "sab2_64.png" "x-nzb.xml" "${pkgname}.service" "${pkgname}_systemd.confd" "${pkgname}.tmp")
-md5sums=('5a528e9ac07cce558c9a775d5d2b91d3'
+md5sums=('6c5e24b4dc9fa3004e4724845afe2cae'
          '48d60a1c626503c7fef1bc5374390513'
          '7d7ae7cca08e90582587773da3b55de8'
          '848c7b117388671f243bd0833ff41f89'
@@ -24,7 +24,7 @@ md5sums=('5a528e9ac07cce558c9a775d5d2b91d3'
          'fdc878dd0f6f25617e627b04409abbbd'
          '11fb2cd1451e3725b08bfc2bd045be54'
          '7c2971c330fc131e75ad55979231edff'
-         'bb1111d3938d76dcc4109d24f1107fe7'
+         '321a56d66a971c833677a54bc3f1060d'
          '1ced962fabe7f5392e32828429b93d04')
 
 package() {

aur/sabnzbd/sabnzbd.install

@@ -21,15 +21,16 @@ pre_upgrade() {
   PID="$(pgrep -f SABnzbd.py)"
   if [ -f /run/daemons/sabnzbd ]; then
     /etc/rc.d/sabnzbd stop # kill the daemon
+  
+    if [ -n "${PID}" ];then
+       kill "${PID}"          # kill the daemon finaly
+    fi
   fi
   
   if [[ -d "/run/sabnzbd/" && "$(ls -A /run/sabnzbd/)" ]]; then
     systemctl stop sabnzbd.service
   fi
   
-  if [ -n "${PID}" ];then
-    kill "${PID}"          # kill the daemon finaly
-  fi
 }
 
 ## arg 1:  the new package version

aur/sabnzbd/sabnzbd_systemd.confd

@@ -9,7 +9,7 @@ SABNZBD_PORT=8080
 
 # Set your default user/group(id), startarguments and your configfile
 SABNZBD_DIR=/opt/sabnzbd
-SABNZBD_ARGS=-f /opt/sabnzbd/sabnzbd.ini -s 127.0.0.1:8080 -d
+SABNZBD_ARGS=-f /opt/sabnzbd/sabnzbd.ini -s ${SABNZBD_IP}:${SABNZBD_PORT} -d
 
 # Put the session keys from Config > General here
 SABNZBD_KEY=

aur/squid/PKGBUILD

@@ -4,7 +4,7 @@
 # Maintainer: Mark Coolen <mark.coolen@gmail.com>
 
 pkgname="squid"
-pkgver="3.2.1"
+pkgver="3.2.2"
 pkgrel="1"
 pkgdesc="A full-featured Web proxy cache server."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ backup=('etc/squid/squid.conf'
         'etc/conf.d/squid')
 install=squid.install
 
-#source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
+#source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
 #source=( "$pkgname-$pkgver"'.tar.bz2'
 source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
         'squid'
@@ -27,7 +27,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
         'squid.service')
 
 #'c4d733a383c0508fd0746d64a2d7278a'
-md5sums=('929f7a3988fe63ec188d2ad920d92d82'
+md5sums=('39d3f9d03cc0ea9e4d55cde02db18093'
          '02f7b5bd793f778e40834fd6457d2199'
          '2383772ef94efddc7b920628bc7ac5b0'
          '270977cdd9b47ef44c0c427ab9034777'

aur/uwsgi/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Vsevolod Balashov <vsevolod@balashov.name>, Kevin Zuber <uKev@knet.eu>
 pkgname=uwsgi
-pkgver=1.2.6
+pkgver=1.3
 pkgrel=1
 pkgdesc="a fast (pure C), self-healing, developer-friendly WSGI server"
 arch=(i686 x86_64)
@@ -10,15 +10,17 @@ license=(GPL2)
 depends=(python2 libxml2)
 conflicts=(python-$pkgname)
 makedepends=(gcc python2)
-backup=(etc/conf.d/uwsgid etc/uwsgi/uwsgi.ini)
+backup=(etc/conf.d/uwsgid etc/uwsgi/emperor.ini)
 source=(http://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz
         uwsgid.sh
-        uwsgi.ini
+        emperor.ini
+        emperor.uwsgi.service
         uwsgid.conf)
-md5sums=('e704bf8e315129a16ea233342580e5d1'
+md5sums=('0e83c1ef1b7b01a16c87884d23030ce2'
          '3dd03dce734b50910b3a5e12da0fc062'
          '495afaafac6da631a859ab72c5983c36'
-         '5db37c7dbfd432623883d125d7127fbf')
+         '85a7401c62dc4834259fc27d9c0703ee'
+         'a3ae324e43ba841aacd917542bd7e878')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -34,5 +36,6 @@ package() {
   mkdir -p $pkgdir/etc/conf.d
   install -Dm644 $srcdir/uwsgid.conf $pkgdir/etc/conf.d/uwsgid
   mkdir -p $pkgdir/etc/uwsgi/apps
-  install -Dm644 $srcdir/uwsgi.ini $pkgdir/etc/uwsgi/uwsgi.ini
+  install -Dm644 $srcdir/emperor.ini $pkgdir/etc/uwsgi/emperor.ini
+  install -Dm644 $srcdir/emperor.uwsgi.service $pkgdir/etc/systemd/system/emperor.uwsgi.service
 }

aur/uwsgi/emperor.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+emperor = /etc/uwsgi/apps
+master = 1

aur/uwsgi/emperor.uwsgi.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=uWSGI Emperor
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini
+Restart=always
+Type=notify
+StandardError=syslog
+NotifyAccess=main
+
+[Install]
+WantedBy=multi-user.target

aur/uwsgi/uwsgid.conf

@@ -1,3 +1,3 @@
-UWSGI_INI=/etc/uwsgi/uwsgi.ini
+UWSGI_INI=/etc/uwsgi/emperor.ini
 UWSGI_PIDFILE=/var/run/uwsgid.pid
 UWSGI_DAEMONIZE=/var/log/uwsgid.log

community/gpsbabel/PKGBUILD

@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=gpsbabel
+pkgver=1.4.4
+pkgrel=1
+pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
+arch=('i686' 'x86_64')
+url="http://www.gpsbabel.org"
+license=('GPL')
+depends=('libusb-compat' 'expat')
+makedepends=('qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'docbook-xsl')
+optdepends=('qt' 'qtwebkit')
+options=('docs')
+source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
+	"gpsbabel.desktop"
+	"htmldoc.tar.xz")
+md5sums=('6c4c8f0cb9fcf9f8302585148878f174'
+         '7bdbd243e29a8831842d31c079f04c45'
+	 'cd91c9117bb8e6294bf807431bd95bcd')
+
+build() {
+  cd $srcdir/gpsbabel-$pkgver
+  ./configure --prefix=/usr
+  make
+#  make doc
+  (cd gui && qmake && make)
+}
+
+package() {
+  cd $srcdir/gpsbabel-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # GUI
+  install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
+  install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
+  install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
+
+  # Header install
+  mkdir -p $pkgdir/usr/include/gpsbabel
+  cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
+     $pkgdir/usr/include/gpsbabel
+
+  # Doc install
+  mkdir -p $pkgdir/usr/share/doc/$pkgname
+  cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname//
+  cp README* $pkgdir/usr/share/doc/$pkgname/
+}

community/gpsbabel/gpsbabel.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=GPSBabel
+Comment=Qt GUI interface for GPSBabel
+GenericName=GPSBabel
+Icon=gpsbabel
+Exec=gpsbabelfe-bin
+Terminal=false
+Categories=Geography;Education;Utility;

community/mplayer-vaapi/PKGBUILD

@@ -8,18 +8,18 @@
 
 pkgname=mplayer-vaapi
 pkgver=35107
-pkgrel=1
+pkgrel=2
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
+         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
          'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
 provides=("mplayer=$pkgver")
 conflicts=('mplayer')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')

community/mythtv/PKGBUILD

@@ -11,14 +11,14 @@
 
 pkgname=mythtv
 pkgver=0.26.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
 license=('GPL')
 depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
-         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa'
+         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
 	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
 	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
 	 'x264')

community/percona-server/PKGBUILD

@@ -4,7 +4,7 @@
 #  - added alarm.patch
 
 pkgname=percona-server
-pkgver=5.5.27_rel28.1
+pkgver=5.5.27_rel29.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
 arch=('i686' 'x86_64')
@@ -40,10 +40,9 @@ build() {
 
 	# CFLAGS/CXXFLAGS as suggested upstream
 	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+	CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti  -fpermissive" \
 
 	cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \
-		-DMANUFACTURER=Arch \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
@@ -110,7 +109,7 @@ package() {
     install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post"
 }
 
-sha256sums=('bf32acb0b56d3bfabf65748bbbcb5cfce33191bd31893040ed7e2aebc3548df4'
+sha256sums=('4ba9e3300d99bfdbf65dd1a00e51da5bddc1582e33a58219b5184075783889ce'
             'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4'
             '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa'
             '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32'

community/python-geotypes/PKGBUILD

@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 78223 2012-10-17 10:25:46Z allan $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor:tardo <tardo@nagi-fanboi.net>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for pkgname rename without pkgrel bump, remove when bumped upstream
+
+pkgbase=python-geotypes
+pkgname=python2-geotypes
+pkgver=0.7.0
+pkgrel=6.1
+pkgdesc="A python library that implements the OpenGIS 'Simple Features Specification for SQL' Geometric Object Model"
+arch=('any')
+url="http://pypi.python.org/pypi/GeoTypes"
+license=('LGPL')
+depends=('python2-psycopg1')
+conflicts=('python-geotypes<=0.7.0-6')
+replaces=('python-geotypes<=0.7.0-6')
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/GeoTypes-${pkgver}.tar.gz")
+md5sums=('241f2a2ec3a90b7d501fccf7879549db')
+
+package_python2-geotypes() {
+  cd "${srcdir}/GeoTypes-${pkgver}"
+
+  python2 setup.py install --root="${pkgdir}" --optimize=1 -O1
+}

community/xbmc/PKGBUILD

@@ -6,37 +6,42 @@
 # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - --disable-vdpau, remove from makedepends
+#  - --disable-vdpau/xvda, remove from makedepends
 #  - specify our C/CXXFLAGS in configure
 #  - patch to remove very wrong XBMC code trying to assert its own ARM CFLAGS, MathUtils.h ARM fix
 #  - commented TexturePacker install, doesn't appear to want to build
 
-buildarch=20
+buildarch=4
 
 _prefix=/usr
 
 pkgname=xbmc
 pkgver=11.0
-pkgrel=6
+pkgrel=9
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libcec' 'udisks' 'upower' 'bluez')
-optdepends=(
-  'libcec: support for Pulse-Eight USB-CEC adapter'
-  'xvba-video: accelerated video playback for amd cards'
-  'pulseaudio: pulseaudio support'
-  'lirc: remote controller support'
-  'udisks: automount external drives'
-  'upower: used to trigger suspend functionality'
-  'unrar: access compressed files without unpacking them'
-)
+depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+	 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
+	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
+	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
+	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libcec'
+	     'udisks' 'upower' 'bluez' 'mesa')
+optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
+	    'pulseaudio: pulseaudio support'
+	    'lirc: remote controller support'
+	    'udisks: automount external drives'
+	    'upower: used to trigger suspend functionality'
+	    'unrar: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service"
         "alarm.patch")
 sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
+            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af'
             '6e4934e8d1bf82890679eca2fa78b3bc5942feedd9c012728a8d04c59be1651d')
 
 build() {
@@ -60,7 +65,7 @@ build() {
     --enable-sdl \
     --enable-vaapi \
     --disable-vdpau \
-    --enable-xvba \
+    --disable-xvba \
     --enable-joystick \
     --enable-xrandr \
     --enable-rsxs \
@@ -112,4 +117,7 @@ package() {
   for licensef in LICENSE.GPL copying.txt; do
     mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
   done
+
+  # systemd stuff
+  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
 }

community/xbmc/xbmc.install

@@ -1,15 +1,16 @@
 post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-  /bin/true
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  groupadd xbmc
+  useradd -G xbmc -d /var/empty xbmc
 }
 
 post_upgrade() {
   post_install $1
-  /bin/true
+  echo "You may want to add xbmc user and group to use xbmc standalone"
 }
 
 post_remove() {
   post_install $1
-  /bin/true
+  echo "You may want to remove xbmc user and group"
 }

community/xbmc/xbmc.service

@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
+Restart = on-failure
+
+[Install]
+WantedBy = multi-user.target

core/gcc/PKGBUILD

@@ -14,10 +14,10 @@
 noautobuild=1
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
-pkgver=4.7.1
-pkgrel=6
-_snapshot=4.7-20120721
-_libstdcppmanver=20120725		# Note: check source directory name when updating this
+pkgver=4.7.2
+pkgrel=1
+#_snapshot=4.7-20120721
+_libstdcppmanver=20120924		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -25,13 +25,13 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl')
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs' '!distcc')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
         ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
         gcc_pure64.patch
         armhf-triplet-trunk.diff)
-md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
-         '79c4381f983b71868c02da3379e1e8a2'
+md5sums=('cc308a0891e778cfda7a151ab8a6e762'
+         '7f3d52515daafffb57c287f427381106'
          'ced48436c1b3c981d721a829f1094de1'
          'bd7330bd41845929f1e0efb3b7d0a060')
 

core/libtool/PKGBUILD

@@ -11,7 +11,7 @@ noautobuild=1
 
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-pkgrel=6
+pkgrel=7
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
@@ -33,7 +33,7 @@ check() {
 }
 
 package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.1')
+  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2')
   groups=('base-devel')
   install=libtool.install
 

core/linux-cubox/PKGBUILD

@@ -7,8 +7,8 @@ pkgbase=linux-cubox
 pkgname=('linux-cubox' 'linux-headers-cubox')
 _kernelname=${pkgname#linux}
 _basekernel=3.5
-pkgver=${_basekernel}.3
-pkgrel=1
+pkgver=${_basekernel}.7
+pkgrel=2
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')

core/linux-cubox/config

@@ -202,7 +202,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
 # CONFIG_KARMA_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
+CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 
 #

core/linux-kirkwood-dt/PKGBUILD

@@ -7,9 +7,9 @@ pkgbase=linux-kirkwood-dt
 pkgname=('linux-kirkwood-dt' 'linux-headers-kirkwood-dt')
 #pkgname=linux-test       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=next.20121011
+_basekernel=next.20121016
 pkgver=${_basekernel}
-pkgrel=1
+pkgrel=0
 cryptover=1.5
 arch=('arm')
 url="http://www.kernel.org/"
@@ -37,7 +37,7 @@ md5sums=('f5d3635da03cb45904bedd69b47133de'
 
 __gitroot="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
 __gitname="linux-next"
-__gitbranch="next-20121011"
+__gitbranch="next-20121016"
 
 build() {
   cd "${srcdir}"
@@ -198,6 +198,46 @@ package_linux-headers-kirkwood-dt() {
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
   make headers_install INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}"
 
+  # copy arch includes for external modules
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm
+  cp -a arch/arm/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood   
+  cp -a arch/arm/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion
+  cp -a arch/arm/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion/
+
+  # copy files necessary for later builds, like nvidia and vmware
+  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel"
+
+  cp arch/arm/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/"
+
+  cp arch/arm/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel/"
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+
+  # add xfs and shmem for aufs building
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"
+  cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h"
+
+  # copy in Kconfig files
+  for i in `find . -name "Kconfig*"`; do
+    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+
   # strip scripts directory
   find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
     case "$(file -bi "${binary}")" in

core/linux-kirkwood-dt/linux-kirkwood-dt.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=3.6.0-1-next-20121011-ARCH+
+KERNEL_VERSION=3.7.0-0-next-20121016-ARCH+
 
 post_install () {
   # updating module dependencies

core/linux-kirkwood/PKGBUILD

@@ -7,7 +7,7 @@ pkgbase=linux-kirkwood
 pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
 #pkgname=linux-test       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=3.5.4
+_basekernel=3.6.2
 pkgver=${_basekernel}
 pkgrel=0
 cryptover=1.5
@@ -19,25 +19,25 @@ options=('!strip')
 source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2"
         'archlinuxarm.patch'
         'support.patch'
-	'aufs3-3.5.patch.xz'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'change-default-console-loglevel.patch'
         'usb-add-reset-resume-quirk-for-several-webcams.patch'
         "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch")
-md5sums=('95d5c7271ad448bc965bdb29339b6923'
-         '468b0f29653a18d9debd17c99086dc4f'
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.6.0-v5/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
+	'aufs3-3.6.patch.xz')
+md5sums=('daf804cac9e158a7ac529fc622b2186b'
+         '53526a46677489b3e962e7c497e6b0d2'
          'f5d3635da03cb45904bedd69b47133de'
-         '227356bd0efdc6b9a6925d46b3701141'
-         '9a4778bd910c788ff72d78066c41dc47'
+         'f10f5e441a14e33b4200d03f7adee961'
          '9506a43fff451fda36d5d7b1f5eaed04'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd00814b57448895e65fbbc800e8a58ba'
          '3a4b8d23c1708283e29477931d63ffb8'
-	 '5c0552440670dd3c41629346766cdb4a'
-	 'da1584d485b4bc604d8208b50a6acf42')
+	 'f8d5472706d94a2707dd53bad5ccd00e'
+	 'b5df48a60787f0abe275fe9df1bbef35'
+	 'c8182bf611ab1f9fb3fbc314b61dd04c')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -52,11 +52,11 @@ build() {
   cp "${srcdir}/mach-types" arch/arm/tools
 
   # Add AUFS3 patches
-  patch -Np1 -i "${srcdir}/aufs3-3.5.patch"
+  patch -Np1 -i "${srcdir}/aufs3-3.6.patch"
 
   # Add BFQ patches
-  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
-  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch"
+  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5-3.6.patch"
+  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5-I-O-sched-for-3.6.patch"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -176,20 +176,18 @@ package_linux-headers-kirkwood() {
     "${pkgdir}/usr/src/linux-${_kernver}/.config"
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+  make headers_install INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}"
 
-  for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media net pcmcia scsi sound trace video xen; do
-    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
-  done
-
-   # copy arch includes for external modules
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
-  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood   
-  cp -a arch/$KARCH/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood/
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion
-  cp -a arch/$KARCH/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion/
+  # Clean up unneeded files
+  find "${pkgdir}" -name "..install.cmd" -delete
 
+  # copy arch includes for external modules
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm
+  cp -a arch/arm/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood   
+  cp -a arch/arm/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/mach-kirkwood/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion
+  cp -a arch/arm/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/arm/plat-orion/
 
   # copy files necessary for later builds, like nvidia and vmware
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
@@ -199,69 +197,16 @@ package_linux-headers-kirkwood() {
   chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
 
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel"
 
-  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  cp arch/arm/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/"
 
-  if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-  fi
-
-  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
-
-  # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-  done
+  cp arch/arm/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/arm/kernel/"
 
   # add docbook makefile
   install -D -m644 Documentation/DocBook/Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 
-  # add dm headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
-
-  # add inotify.h
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
-  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
-
-  # add wireless headers
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
-
-  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/9912
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
-  # and...
-  # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-
-  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  # in reference to:
-  # http://bugs.archlinux.org/task/13146
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-
-  # add dvb headers
-  # in reference to:
-  # http://bugs.archlinux.org/task/20402
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
-  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
-
   # add xfs and shmem for aufs building
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm"

core/linux-kirkwood/archlinuxarm.patch

@@ -1,14 +1,117 @@
+diff -ruN a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
+--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,99 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood.dtsi"
+-
+-/ {
+-	model = "Seagate GoFlex Net";
+-	compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+-
+-	memory {
+-		device_type = "memory";
+-		reg = <0x00000000 0x8000000>;
+-	};
+-
+-	chosen {
+-		bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+-	};
+-
+-	ocp@f1000000 {
+-		serial@12000 {
+-			clock-frequency = <200000000>;
+-			status = "ok";
+-		};
+-
+-		nand@3000000 {
+-			status = "okay";
+-
+-			partition@0 {
+-				label = "u-boot";
+-				reg = <0x0000000 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@100000 {
+-				label = "uImage";
+-				reg = <0x0100000 0x400000>;
+-			};
+-
+-			partition@500000 {
+-				label = "pogoplug";
+-				reg = <0x0500000 0x2000000>;
+-			};
+-
+-			partition@2500000 {
+-				label = "root";
+-				reg = <0x02500000 0xd800000>;
+-			};
+-		};
+-		sata@80000 {
+-			status = "okay";
+-			nr-ports = <2>;
+-		};
+-
+-	};
+-	gpio-leds {
+-		compatible = "gpio-leds";
+-
+-		health {
+-			label = "status:green:health";
+-			gpios = <&gpio1 14 1>;
+-			linux,default-trigger = "default-on";
+-		};
+-		fault {
+-			label = "status:orange:fault";
+-			gpios = <&gpio1 15 1>;
+-		};
+-		left0 {
+-			label = "status:white:left0";
+-			gpios = <&gpio1 10 0>;
+-		};
+-		left1 {
+-			label = "status:white:left1";
+-			gpios = <&gpio1 11 0>;
+-		};
+-		left2 {
+-			label = "status:white:left2";
+-			gpios = <&gpio1 12 0>;
+-		};
+-		left3 {
+-			label = "status:white:left3";
+-			gpios = <&gpio1 13 0>;
+-		};
+-		right0 {
+-			label = "status:white:right0";
+-			gpios = <&gpio1 6 0>;
+-		};
+-		right1 {
+-			label = "status:white:right1";
+-			gpios = <&gpio1 7 0>;
+-		};
+-		right2 {
+-			label = "status:white:right2";
+-			gpios = <&gpio1 8 0>;
+-		};
+-		right3 {
+-			label = "status:white:right3";
+-			gpios = <&gpio1 9 0>;
+-		};
+-	};
+-};
 diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
---- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-08-25 22:32:13.000000000 -0400
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts	2012-10-07 11:41:28.000000000 -0400
 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts	1969-12-31 19:00:00.000000000 -0500
-@@ -1,26 +0,0 @@
+@@ -1,72 +0,0 @@
 -/dts-v1/;
 -
 -/include/ "kirkwood.dtsi"
 -
 -/ {
 -	model = "Iomega Iconnect";
--	compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+-	compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 -
 -	memory {
 -		device_type = "memory";
@@ -22,29 +125,271 @@ diff -ruN a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood
 -	};
 -
 -	ocp@f1000000 {
+-		i2c@11000 {
+-			status = "okay";
+-
+-			lm63: lm63@4c {
+-				compatible = "national,lm63";
+-				reg = <0x4c>;
+-			};
+-		};
 -		serial@12000 {
 -			clock-frequency = <200000000>;
 -			status = "ok";
 -		};
 -	};
--};
-diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
---- a/arch/arm/mach-kirkwood/board-dt.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/board-dt.c	2012-09-06 13:36:28.000000000 -0400
-@@ -62,9 +62,6 @@
- 	if (of_machine_is_compatible("dlink,dns-kirkwood"))
- 		dnskw_init();
- 
--	if (of_machine_is_compatible("iom,iconnect"))
--		iconnect_init();
+-	gpio-leds {
+-		compatible = "gpio-leds";
 -
- 	if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
- 		ib62x0_init();
- 
+-		led-level {
+-			label = "led_level";
+-			gpios = <&gpio1 9 0>;
+-			linux,default-trigger = "default-on";
+-		};
+-		power-blue {
+-			label = "power:blue";
+-			gpios = <&gpio1 10 0>;
+-			linux,default-trigger = "timer";
+-		};
+-		power-red {
+-			label = "power:red";
+-			gpios = <&gpio1 11 0>;
+-		};
+-		usb1 {
+-			label = "usb1:blue";
+-			gpios = <&gpio1 12 0>;
+-		};
+-		usb2 {
+-			label = "usb2:blue";
+-			gpios = <&gpio1 13 0>;
+-		};
+-		usb3 {
+-			label = "usb3:blue";
+-			gpios = <&gpio1 14 0>;
+-		};
+-		usb4 {
+-			label = "usb4:blue";
+-			gpios = <&gpio1 15 0>;
+-		};
+-		otb {
+-			label = "otb:blue";
+-			gpios = <&gpio1 16 0>;
+-		};
+-	};
+-};
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,21 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood-ts219.dtsi"
+-
+-/ {
+-	gpio_keys {
+-		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		button@1 {
+-			label = "USB Copy";
+-			linux,code = <133>;
+-			gpios = <&gpio0 15 1>;
+-		};
+-		button@2 {
+-			label = "Reset";
+-			linux,code = <0x198>;
+-			gpios = <&gpio0 16 1>;
+-		};
+-	};
+-};
+\ No newline at end of file
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts	1969-12-31 19:00:00.000000000 -0500
+@@ -1,21 +0,0 @@
+-/dts-v1/;
+-
+-/include/ "kirkwood-ts219.dtsi"
+-
+-/ {
+-	gpio_keys {
+-		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		button@1 {
+-			label = "USB Copy";
+-			linux,code = <133>;
+-			gpios = <&gpio1 11 1>;
+-		};
+-		button@2 {
+-			label = "Reset";
+-			linux,code = <0x198>;
+-			gpios = <&gpio1 5 1>;
+-		};
+-	};
+-};
+\ No newline at end of file
+diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
+--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	1969-12-31 19:00:00.000000000 -0500
+@@ -1,78 +0,0 @@
+-/include/ "kirkwood.dtsi"
+-
+-/ {
+-	model = "QNAP TS219 family";
+-	compatible = "qnap,ts219", "marvell,kirkwood";
+-
+-	memory {
+-		device_type = "memory";
+-		reg = <0x00000000 0x20000000>;
+-	};
+-
+-	chosen {
+-		bootargs = "console=ttyS0,115200n8";
+-	};
+-
+-	ocp@f1000000 {
+-		i2c@11000 {
+-			status = "okay";
+-			clock-frequency = <400000>;
+-
+-			s35390a: s35390a@30 {
+-				compatible = "s35390a";
+-				reg = <0x30>;
+-			};
+-		};
+-		serial@12000 {
+-			clock-frequency = <200000000>;
+-			status = "okay";
+-		};
+-		serial@12100 {
+-			clock-frequency = <200000000>;
+-			status = "okay";
+-		};
+-		spi@10600 {
+-			status = "okay";
+-
+-			m25p128@0 {
+-				#address-cells = <1>;
+-				#size-cells = <1>;
+-				compatible = "m25p128";
+-				reg = <0>;
+-				spi-max-frequency = <20000000>;
+-				mode = <0>;
+-
+-				partition@0000000 {
+-					reg = <0x00000000 0x00080000>;
+-					label = "U-Boot";
+-				};
+-
+-				partition@00200000 {
+-					reg = <0x00200000 0x00200000>;
+-					label = "Kernel";
+-				};
+-
+-				partition@00400000 {
+-					reg = <0x00400000 0x00900000>;
+-					label = "RootFS1";
+-				};
+-				partition@00d00000 {
+-					reg = <0x00d00000 0x00300000>;
+-					label = "RootFS2";
+-				};
+-				partition@00040000 {
+-					reg = <0x00080000 0x00040000>;
+-					label = "U-Boot Config";
+-				};
+-				partition@000c0000 {
+-					reg = <0x000c0000 0x00140000>;
+-					label = "NAS Config";
+-				};
+-			};
+-		};
+-		sata@80000 {
+-			status = "okay";
+-			nr-ports = <2>;
+-		};
+-	};
+-};
+diff -ruN a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
+--- a/arch/arm/mach-kirkwood/board-goflexnet.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/board-goflexnet.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,71 +0,0 @@
+-/*
+- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
+- *
+- * arch/arm/mach-kirkwood/board-goflexnet.c
+- *
+- * Seagate GoFlext Net Board Init for drivers not converted to
+- * flattened device tree yet.
+- *
+- * This file is licensed under the terms of the GNU General Public
+- * License version 2.  This program is licensed "as is" without any
+- * warranty of any kind, whether express or implied.
+- *
+- * Copied and modified for Seagate GoFlex Net support by
+- * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
+- * GoFlex kernel patches.
+- *
+- */
+-
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/platform_device.h>
+-#include <linux/ata_platform.h>
+-#include <linux/mv643xx_eth.h>
+-#include <linux/of.h>
+-#include <linux/of_address.h>
+-#include <linux/of_fdt.h>
+-#include <linux/of_irq.h>
+-#include <linux/of_platform.h>
+-#include <linux/gpio.h>
+-#include <asm/mach-types.h>
+-#include <asm/mach/arch.h>
+-#include <asm/mach/map.h>
+-#include <mach/kirkwood.h>
+-#include <mach/bridge-regs.h>
+-#include <plat/mvsdio.h>
+-#include "common.h"
+-#include "mpp.h"
+-
+-static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
+-	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
+-};
+-
+-static unsigned int goflexnet_mpp_config[] __initdata = {
+-	MPP29_GPIO,	/* USB Power Enable */
+-	MPP47_GPIO,	/* LED Orange */
+-	MPP46_GPIO,	/* LED Green */
+-	MPP45_GPIO,	/* LED Left Capacity 3 */
+-	MPP44_GPIO,	/* LED Left Capacity 2 */
+-	MPP43_GPIO,	/* LED Left Capacity 1 */
+-	MPP42_GPIO,	/* LED Left Capacity 0 */
+-	MPP41_GPIO,	/* LED Right Capacity 3 */
+-	MPP40_GPIO,	/* LED Right Capacity 2 */
+-	MPP39_GPIO,	/* LED Right Capacity 1 */
+-	MPP38_GPIO,	/* LED Right Capacity 0 */
+-	0
+-};
+-
+-void __init goflexnet_init(void)
+-{
+-	/*
+-	 * Basic setup. Needs to be called early.
+-	 */
+-	kirkwood_mpp_conf(goflexnet_mpp_config);
+-
+-	if (gpio_request(29, "USB Power Enable") != 0 ||
+-	    gpio_direction_output(29, 1) != 0)
+-		pr_err("can't setup GPIO 29 (USB Power Enable)\n");
+-	kirkwood_ehci_init();
+-
+-	kirkwood_ge00_init(&goflexnet_ge00_data);
+-}
 diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
---- a/arch/arm/mach-kirkwood/board-iconnect.c	2012-08-25 22:32:13.000000000 -0400
+--- a/arch/arm/mach-kirkwood/board-iconnect.c	2012-10-07 11:41:28.000000000 -0400
 +++ b/arch/arm/mach-kirkwood/board-iconnect.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,162 +0,0 @@
+@@ -1,106 +0,0 @@
 -/*
 - * arch/arm/mach-kirkwood/board-iconnect.c
 - *
@@ -66,8 +411,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -#include <linux/mtd/partitions.h>
 -#include <linux/mv643xx_eth.h>
 -#include <linux/gpio.h>
--#include <linux/leds.h>
--#include <linux/i2c.h>
 -#include <linux/input.h>
 -#include <linux/gpio_keys.h>
 -#include <asm/mach/arch.h>
@@ -79,50 +422,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	.phy_addr	= MV643XX_ETH_PHY_ADDR(11),
 -};
 -
--static struct gpio_led iconnect_led_pins[] = {
--	{
--		.name		= "led_level",
--		.gpio		= 41,
--		.default_trigger = "default-on",
--	}, {
--		.name		= "power:blue",
--		.gpio		= 42,
--		.default_trigger = "timer",
--	}, {
--		.name		= "power:red",
--		.gpio		= 43,
--	}, {
--		.name		= "usb1:blue",
--		.gpio		= 44,
--	}, {
--		.name		= "usb2:blue",
--		.gpio		= 45,
--	}, {
--		.name		= "usb3:blue",
--		.gpio		= 46,
--	}, {
--		.name		= "usb4:blue",
--		.gpio		= 47,
--	}, {
--		.name		= "otb:blue",
--		.gpio		= 48,
--	},
--};
--
--static struct gpio_led_platform_data iconnect_led_data = {
--	.leds		= iconnect_led_pins,
--	.num_leds	= ARRAY_SIZE(iconnect_led_pins),
--	.gpio_blink_set	= orion_gpio_led_blink_set,
--};
--
--static struct platform_device iconnect_leds = {
--	.name	= "leds-gpio",
--	.id	= -1,
--	.dev	= {
--		.platform_data	= &iconnect_led_data,
--	}
--};
--
 -static unsigned int iconnect_mpp_config[] __initdata = {
 -	MPP12_GPIO,
 -	MPP35_GPIO,
@@ -137,12 +436,6 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	0
 -};
 -
--static struct i2c_board_info __initdata iconnect_board_info[] = {
--	{
--		I2C_BOARD_INFO("lm63", 0x4c),
--	},
--};
--
 -static struct mtd_partition iconnect_nand_parts[] = {
 -	{
 -		.name = "flash",
@@ -189,15 +482,11 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -{
 -	kirkwood_mpp_conf(iconnect_mpp_config);
 -	kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
--	kirkwood_i2c_init();
--	i2c_register_board_info(0, iconnect_board_info,
--		ARRAY_SIZE(iconnect_board_info));
 -
 -	kirkwood_ehci_init();
 -	kirkwood_ge00_init(&iconnect_ge00_data);
 -
 -	platform_device_register(&iconnect_button_device);
--	platform_device_register(&iconnect_leds);
 -}
 -
 -static int __init iconnect_pci_init(void)
@@ -207,10 +496,108 @@ diff -ruN a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/boa
 -	return 0;
 -}
 -subsys_initcall(iconnect_pci_init);
+diff -ruN a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
+--- a/arch/arm/mach-kirkwood/board-ts219.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/board-ts219.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,82 +0,0 @@
+-/*
+- *
+- * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
+- *
+- * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
+- *
+- * Based on the board file ts219-setup.c:
+- *
+- * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>
+- * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version
+- * 2 of the License, or (at your option) any later version.
+- */
+-
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/platform_device.h>
+-#include <linux/mv643xx_eth.h>
+-#include <linux/ata_platform.h>
+-#include <linux/gpio_keys.h>
+-#include <linux/input.h>
+-#include <asm/mach-types.h>
+-#include <asm/mach/arch.h>
+-#include <mach/kirkwood.h>
+-#include "common.h"
+-#include "mpp.h"
+-#include "tsx1x-common.h"
+-
+-static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
+-	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
+-};
+-
+-static unsigned int qnap_ts219_mpp_config[] __initdata = {
+-	MPP0_SPI_SCn,
+-	MPP1_SPI_MOSI,
+-	MPP2_SPI_SCK,
+-	MPP3_SPI_MISO,
+-	MPP4_SATA1_ACTn,
+-	MPP5_SATA0_ACTn,
+-	MPP8_TW0_SDA,
+-	MPP9_TW0_SCK,
+-	MPP10_UART0_TXD,
+-	MPP11_UART0_RXD,
+-	MPP13_UART1_TXD,	/* PIC controller */
+-	MPP14_UART1_RXD,	/* PIC controller */
+-	MPP15_GPIO,		/* USB Copy button (on devices with 88F6281) */
+-	MPP16_GPIO,		/* Reset button (on devices with 88F6281) */
+-	MPP36_GPIO,		/* RAM: 0: 256 MB, 1: 512 MB */
+-	MPP37_GPIO,		/* Reset button (on devices with 88F6282) */
+-	MPP43_GPIO,		/* USB Copy button (on devices with 88F6282) */
+-	MPP44_GPIO,		/* Board ID: 0: TS-11x, 1: TS-21x */
+-	0
+-};
+-
+-void __init qnap_dt_ts219_init(void)
+-{
+-	u32 dev, rev;
+-
+-	kirkwood_mpp_conf(qnap_ts219_mpp_config);
+-
+-	kirkwood_pcie_id(&dev, &rev);
+-	if (dev == MV88F6282_DEV_ID)
+-		qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
+-
+-	kirkwood_ge00_init(&qnap_ts219_ge00_data);
+-	kirkwood_ehci_init();
+-
+-	pm_power_off = qnap_tsx1x_power_off;
+-}
+-
+-/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
+-static int __init ts219_pci_init(void)
+-{
+-	if (machine_is_ts219())
+-		kirkwood_pcie_init(KW_PCIE0);
+-
+-	return 0;
+-}
+-subsys_initcall(ts219_pci_init);
 diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
---- a/arch/arm/mach-kirkwood/common.h	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/common.h	2012-09-06 13:36:28.000000000 -0400
-@@ -65,12 +65,6 @@
+--- a/arch/arm/mach-kirkwood/common.h	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/common.h	2012-10-10 15:03:29.000000000 -0400
+@@ -58,11 +58,6 @@
+ #else
+ static inline void dreamplug_init(void) {};
+ #endif
+-#ifdef CONFIG_MACH_TS219_DT
+-void qnap_dt_ts219_init(void);
+-#else
+-static inline void qnap_dt_ts219_init(void) {};
+-#endif
+ 
+ #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
+ void dnskw_init(void);
+@@ -70,24 +65,12 @@
  static inline void dnskw_init(void) {};
  #endif
  
@@ -223,9 +610,21 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
  #ifdef CONFIG_MACH_IB62X0_DT
  void ib62x0_init(void);
  #else
+ static inline void ib62x0_init(void) {};
+ #endif
+ 
+-#ifdef CONFIG_MACH_GOFLEXNET_DT
+-void goflexnet_init(void);
+-#else
+-static inline void goflexnet_init(void) {};
+-#endif
+-
+ #ifdef CONFIG_MACH_LSXL_DT
+ void lsxl_init(void);
+ #else
 diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
---- a/arch/arm/mach-kirkwood/dockstar-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-09-06 13:36:28.000000000 -0400
+--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -29,6 +29,10 @@
  		.offset = 0,
  		.size = SZ_1M
@@ -271,7 +670,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
  
 diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-09-06 14:14:44.000000000 -0400
++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@@ -399,7 +798,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-09-06 14:14:20.000000000 -0400
++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@@ -579,8 +978,8 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +MACHINE_END
 +
 diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
---- a/arch/arm/mach-kirkwood/guruplug-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-09-06 13:36:28.000000000 -0400
+--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -57,22 +57,24 @@
  
  static struct gpio_led guruplug_led_pins[] = {
@@ -612,7 +1011,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
  	},
 diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
 --- a/arch/arm/mach-kirkwood/iconnect-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-09-06 13:36:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@@ -820,7 +1219,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
 --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2012-09-06 13:36:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@@ -960,8 +1359,8 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
---- a/arch/arm/mach-kirkwood/Kconfig	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Kconfig	2012-09-06 13:42:40.000000000 -0400
+--- a/arch/arm/mach-kirkwood/Kconfig	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/Kconfig	2012-10-10 14:47:05.000000000 -0400
 @@ -58,12 +58,6 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Marvell DreamPlug (Flattened Device Tree).
@@ -975,7 +1374,35 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  config MACH_DLINK_KIRKWOOD_DT
  	bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
  	select ARCH_KIRKWOOD_DT
-@@ -100,6 +94,54 @@
+@@ -80,27 +74,6 @@
+ 	  RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
+ 	  Flattened Device Tree.
+ 
+-config MACH_TS219_DT
+-	bool "Device Tree for QNAP TS-11X, TS-21X NAS"
+-	select ARCH_KIRKWOOD_DT
+-	select ARM_APPENDED_DTB
+-	select ARM_ATAG_DTB_COMPAT
+-	help
+-	  Say 'Y' here if you want your kernel to support the QNAP
+-	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
+-	  TS-219P+ Turbo NAS devices using Fattened Device Tree.
+-	  There are two different Device Tree descriptions, depending
+-	  on if the device is based on an if the board uses the MV6281
+-	  or MV6282. If you have the wrong one, the buttons will not
+-	  work.
+-
+-config MACH_GOFLEXNET_DT
+-	bool "Seagate GoFlex Net (Flattened Device Tree)"
+-	select ARCH_KIRKWOOD_DT
+-	help
+-	  Say 'Y' here if you want your kernel to support the
+-	  Seagate GoFlex Net (Flattened Device Tree).
+-
+ config MACH_LSXL_DT
+ 	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
+ 	select ARCH_KIRKWOOD_DT
+@@ -129,6 +102,54 @@
  	  Say 'Y' here if you want your kernel to support the
  	  Seagate FreeAgent DockStar.
  
@@ -1030,7 +1457,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  config MACH_OPENRD
          bool
  
-@@ -166,6 +208,18 @@
+@@ -195,6 +216,18 @@
  	  Say 'Y' here if you want your kernel to support the
  	  HP t5325 Thin Client.
  
@@ -1050,8 +1477,8 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
  
  endif
 diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
---- a/arch/arm/mach-kirkwood/Makefile	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Makefile	2012-09-06 13:43:49.000000000 -0400
+--- a/arch/arm/mach-kirkwood/Makefile	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/Makefile	2012-10-10 14:47:50.000000000 -0400
 @@ -8,6 +8,14 @@
  obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
  obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
@@ -1067,7 +1494,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
  obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
-@@ -18,10 +26,11 @@
+@@ -18,13 +26,12 @@
  obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
  obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
@@ -1080,30 +1507,26 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 -obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o
  obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o
  obj-$(CONFIG_MACH_IB62X0_DT)		+= board-ib62x0.o
+-obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o
+-obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
+ obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 diff -ruN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
---- a/arch/arm/mach-kirkwood/Makefile.boot	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/Makefile.boot	2012-09-06 13:36:29.000000000 -0400
-@@ -5,5 +5,4 @@
+--- a/arch/arm/mach-kirkwood/Makefile.boot	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/Makefile.boot	2012-10-10 14:48:04.000000000 -0400
+@@ -5,10 +5,6 @@
  dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
  dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
  dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
 -dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
  dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
-diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
---- a/arch/arm/mach-kirkwood/mpp.h	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/mpp.h	2012-09-06 13:36:29.000000000 -0400
-@@ -102,7 +102,7 @@
- #define MPP11_SATA0_ACTn	MPP( 11, 0x5, 0, 0, 0,   1,   1,   1,   1 )
- 
- #define MPP12_GPO		MPP( 12, 0x0, 0, 1, 1,   1,   1,   1,   1 )
--#define MPP12_GPIO		MPP( 12, 0x0, 1, 1, 0,   0,   0,   1,   0 )
-+#define MPP12_GPIO		MPP( 12, 0x0, 1, 1, 1,   1,   1,   1,   1 )
- #define MPP12_SD_CLK		MPP( 12, 0x1, 0, 0, 1,   1,   1,   1,   1 )
- #define MPP12_AU_SPDIF0		MPP( 12, 0xa, 0, 0, 0,   0,   0,   0,   1 )
- #define MPP12_SPI_MOSI		MPP( 12, 0xb, 0, 0, 0,   0,   0,   0,   1 )
+-dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6281.dtb
+-dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6282.dtb
+-dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
+ dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
+ dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
 diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
 --- a/arch/arm/mach-kirkwood/nas6210-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2012-09-06 13:36:29.000000000 -0400
++++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@@ -1293,7 +1716,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
 --- a/arch/arm/mach-kirkwood/nsa310-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2012-09-06 14:12:34.000000000 -0400
++++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,299 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@@ -1596,7 +2019,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
 --- a/arch/arm/mach-kirkwood/nsa320-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2012-09-06 14:13:43.000000000 -0400
++++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,308 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@@ -1908,7 +2331,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
 --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2012-09-06 13:36:29.000000000 -0400
++++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@@ -2027,7 +2450,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
 --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-09-06 13:36:29.000000000 -0400
++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,194 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@@ -2224,8 +2647,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
---- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-09-06 13:36:29.000000000 -0400
+--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -43,7 +43,7 @@
  	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
  };
@@ -2306,7 +2729,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
  
 diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
 --- a/arch/arm/mach-kirkwood/topkick-setup.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2012-09-06 13:36:29.000000000 -0400
++++ b/arch/arm/mach-kirkwood/topkick-setup.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@@ -2474,9 +2897,9 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
---- a/arch/arm/plat-orion/common.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/arch/arm/plat-orion/common.c	2012-09-06 13:36:29.000000000 -0400
-@@ -252,7 +252,9 @@
+--- a/arch/arm/plat-orion/common.c	2012-10-07 11:41:28.000000000 -0400
++++ b/arch/arm/plat-orion/common.c	2012-10-10 13:37:18.000000000 -0400
+@@ -253,7 +253,9 @@
  /*****************************************************************************
   * GE00
   ****************************************************************************/
@@ -2488,9 +2911,9 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
  static struct resource orion_ge00_shared_resources[] = {
  	{
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
---- a/drivers/hwmon/Kconfig	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/hwmon/Kconfig	2012-09-06 14:18:09.000000000 -0400
-@@ -1391,6 +1391,19 @@
+--- a/drivers/hwmon/Kconfig	2012-10-07 11:41:28.000000000 -0400
++++ b/drivers/hwmon/Kconfig	2012-10-10 13:37:18.000000000 -0400
+@@ -1411,6 +1411,19 @@
          help
            Support for the A/D converter on MC13783 and MC13892 PMIC.
  
@@ -2511,9 +2934,9 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
  
  comment "ACPI drivers"
 diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
---- a/drivers/hwmon/Makefile	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/hwmon/Makefile	2012-09-06 14:18:57.000000000 -0400
-@@ -96,6 +96,7 @@
+--- a/drivers/hwmon/Makefile	2012-10-07 11:41:28.000000000 -0400
++++ b/drivers/hwmon/Makefile	2012-10-10 13:37:18.000000000 -0400
+@@ -98,6 +98,7 @@
  obj-$(CONFIG_SENSORS_MAX6642)	+= max6642.o
  obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
  obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@@ -2523,7 +2946,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
  obj-$(CONFIG_SENSORS_PC87360)	+= pc87360.o
 diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 --- a/drivers/hwmon/nsa3xx-hwmon.c	1969-12-31 19:00:00.000000000 -0500
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2012-09-06 14:19:30.000000000 -0400
++++ b/drivers/hwmon/nsa3xx-hwmon.c	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@@ -2777,9 +3200,9 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:nsa3xx-hwmon");
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
---- a/drivers/mmc/core/core.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/core/core.c	2012-09-06 13:36:29.000000000 -0400
-@@ -537,7 +537,7 @@
+--- a/drivers/mmc/core/core.c	2012-10-07 11:41:28.000000000 -0400
++++ b/drivers/mmc/core/core.c	2012-10-10 13:37:18.000000000 -0400
+@@ -546,7 +546,7 @@
  			 */
  			limit_us = 3000000;
  		else
@@ -2789,9 +3212,9 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
  		/*
  		 * SDHC cards always use these fixed values.
 diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
---- a/drivers/mmc/core/sd.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/core/sd.c	2012-09-06 13:36:29.000000000 -0400
-@@ -389,6 +389,15 @@
+--- a/drivers/mmc/core/sd.c	2012-10-07 11:41:28.000000000 -0400
++++ b/drivers/mmc/core/sd.c	2012-10-10 13:37:18.000000000 -0400
+@@ -355,6 +355,15 @@
  		return -ENOMEM;
  	}
  
@@ -2808,8 +3231,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
  	if (err)
  		goto out;
 diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
---- a/drivers/mmc/host/mvsdio.c	2012-08-25 22:32:13.000000000 -0400
-+++ b/drivers/mmc/host/mvsdio.c	2012-09-06 13:36:29.000000000 -0400
+--- a/drivers/mmc/host/mvsdio.c	2012-10-07 11:41:28.000000000 -0400
++++ b/drivers/mmc/host/mvsdio.c	2012-10-10 13:37:18.000000000 -0400
 @@ -22,6 +22,7 @@
  #include <linux/clk.h>
  #include <linux/gpio.h>
@@ -2828,7 +3251,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
  
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
 --- a/include/linux/nsa3xx-hwmon.h	1969-12-31 19:00:00.000000000 -0500
-+++ b/include/linux/nsa3xx-hwmon.h	2012-09-06 14:20:54.000000000 -0400
++++ b/include/linux/nsa3xx-hwmon.h	2012-10-10 13:37:18.000000000 -0400
 @@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h

core/linux-kirkwood/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.5.1-0 Kernel Configuration
+# Linux/arm 3.6.2-0 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -65,6 +65,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_KTIME_SCALAR=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -94,10 +96,7 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
+# CONFIG_MEMCG is not set
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -112,7 +111,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -162,17 +160,19 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
-# CONFIG_JUMP_LABEL is not set
+CONFIG_JUMP_LABEL=y
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 
 #
 # GCOV-based kernel profiling
@@ -267,6 +267,7 @@ CONFIG_FREEZER=y
 # System Type
 #
 CONFIG_MMU=y
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
@@ -289,6 +290,7 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_DOVE is not set
 CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_LPC32XX is not set
@@ -335,9 +337,9 @@ CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
 # CONFIG_ARCH_KIRKWOOD_DT is not set
 # CONFIG_MACH_DREAMPLUG_DT is not set
-# CONFIG_MACH_ICONNECT_DT is not set
 # CONFIG_MACH_DLINK_KIRKWOOD_DT is not set
 # CONFIG_MACH_IB62X0_DT is not set
+# CONFIG_MACH_LSXL_DT is not set
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -467,6 +469,7 @@ CONFIG_ATAGS_PROC=y
 # CPU Power Management
 #
 # CONFIG_CPU_IDLE is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
 # Floating point emulation
@@ -535,6 +538,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_ARPD=y
 CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -614,6 +618,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 # CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -636,7 +641,7 @@ CONFIG_NETFILTER_XT_TARGET_HL=m
 # CONFIG_NETFILTER_XT_TARGET_HMARK is not set
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m 
+CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -981,6 +986,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+# CONFIG_BT_HCIUART_3WIRE is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1004,7 +1010,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=y
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1019,6 +1024,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1055,6 +1061,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_CMA is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@@ -1238,9 +1245,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1282,7 +1286,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1676,6 +1679,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
@@ -1806,7 +1810,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-# CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_SDIO=m
@@ -1835,6 +1838,7 @@ CONFIG_RT2800PCI=m
 # CONFIG_RT2800PCI_RT33XX is not set
 CONFIG_RT2800PCI_RT35XX=y
 # CONFIG_RT2800PCI_RT53XX is not set
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -1870,8 +1874,6 @@ CONFIG_MWIFIEX_SDIO=m
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
@@ -1970,10 +1972,12 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
 CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
@@ -2075,7 +2079,6 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
 
 #
 # I2C Hardware Bus support
@@ -2143,6 +2146,7 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPI_ORION=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
 
@@ -2194,6 +2198,7 @@ CONFIG_GPIO_SYSFS=y
 # PCI GPIO expanders:
 #
 # CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
 
@@ -2236,6 +2241,7 @@ CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
 # CONFIG_W1_SLAVE_DS2780 is not set
 # CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
@@ -2253,6 +2259,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2286,6 +2293,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_LINEAGE is not set
@@ -2426,6 +2434,8 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
@@ -2445,462 +2455,15 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
+# CONFIG_MEDIA_CAMERA_SUPPORT is not set
+# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
+# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
+# CONFIG_MEDIA_RC_SUPPORT is not set
 
 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_RC_CORE=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
-# CONFIG_RC_ATI_REMOTE is not set
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_RC_LOOPBACK=m
-# CONFIG_IR_GPIO_CIR is not set
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-# CONFIG_VIDEO_VIVI is not set
-CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-# CONFIG_USB_GSPCA_JL2005BCD is not set
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-# CONFIG_USB_GSPCA_TOPRO is not set
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_V4L_PCI_DRIVERS=y
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_CX23885 is not set
-# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_FB_IVTV is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_SAA7164 is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-# CONFIG_I2C_SI470X is not set
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_KEENE is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-# CONFIG_RADIO_WL128X is not set
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-# CONFIG_DVB_USB_PCTV452E is not set
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-# CONFIG_DVB_USB_AZ6007 is not set
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-# CONFIG_DVB_USB_MXL111SF is not set
-# CONFIG_DVB_USB_RTL28XXU is not set
-# CONFIG_DVB_USB_AF9035 is not set
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-# CONFIG_DVB_PLUTO2 is not set
-
-#
-# Supported SDMC DM1105 Adapters
-#
-# CONFIG_DVB_DM1105 is not set
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-# CONFIG_DVB_PT1 is not set
-
-#
-# Supported Mantis Adapters
-#
-# CONFIG_MANTIS_CORE is not set
-
-#
-# Supported nGene Adapters
-#
-# CONFIG_DVB_NGENE is not set
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-# CONFIG_DVB_DDBRIDGE is not set
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_CXD2820R=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
 
 #
 # Graphics support
@@ -3042,6 +2605,7 @@ CONFIG_SND_USB_CAIAQ=m
 #
 CONFIG_HID=m
 # CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
 CONFIG_HID_GENERIC=m
 
 #
@@ -3072,6 +2636,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 # CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LENOVO_TPKBD is not set
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
@@ -3366,13 +2931,16 @@ CONFIG_LEDS_NS2=y
 CONFIG_LEDS_NETXBIG=y
 # CONFIG_LEDS_RENESAS_TPU is not set
 # CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM3556 is not set
 # CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -3384,6 +2952,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_TRANSIENT is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -3411,7 +2980,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_DRV_PCF8563=m 
+CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_BQ32K is not set
@@ -3510,6 +3079,7 @@ CONFIG_USB_SERIAL_QUATECH2=m
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_DX_SEP is not set
+# CONFIG_ZSMALLOC is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_CRYSTALHD is not set
 CONFIG_FB_XGI=m
@@ -3533,6 +3103,7 @@ CONFIG_FB_XGI=m
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_CSR_WIFI is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -3561,6 +3132,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
 
 #
 # File systems
@@ -3741,10 +3313,11 @@ CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -3892,6 +3465,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_LKDTM is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -4089,6 +3663,8 @@ CONFIG_BINARY_PRINTF=y
 #
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
 CONFIG_CRC_CCITT=y
@@ -4133,6 +3709,7 @@ CONFIG_HAS_DMA=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set

core/linux-kirkwood/linux-kirkwood.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.5.4-0-ARCH
+KERNEL_VERSION=3.6.2-0-ARCH
 
 post_install () {
   # updating module dependencies

core/linux-raspberrypi/PKGBUILD

@@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
 _kernelname=${pkgname#linux}
 _basekernel=3.2
 pkgver=${_basekernel}.27
-pkgrel=10
+pkgrel=12
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')

core/linux-trimslice/PKGBUILD

@@ -13,32 +13,31 @@ pkgname=('linux-trimslice' 'linux-headers-trimslice')
 _kernelname=${pkgname#linux}
 _basekernel=3.1
 pkgver=${_basekernel}.10
-pkgrel=3
+pkgrel=4
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
 options=('!strip')
-source=("https://gitorious.org/trimslice-kernel/trimslice-kernel/archive-tarball/trimslice-l4t.r15.01"
+source=("https://gitorious.org/trimslice-kernel/trimslice-kernel/archive-tarball/trimslice-l4t.r15.02-rc3"
         http://trimslice.com/download/drivers/firmware/rtl_nic/rtl8168d-1.fw
         http://trimslice.com/download/drivers/firmware/rtl_nic/rtl8168d-2.fw
         'armdma.patch'
         'config'
         'change-default-console-loglevel.patch'
-        'build-oops.diff'
         'aufs3-3.1.patch.xz')
-md5sums=('d4866354e4646240aef16aa0c16857d3'
+md5sums=('fdde612ee03e1d231184317395efd8b6'
          '500d938ce15d1b0aff8d394aefb7a812'
          'b14a1a124c2d58fd346ed25ffbbe2959'
          '6e7667c6c6348bfeca22eaaa05462d62'
          '200a901b589dc4b064f224bc009d80d2'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '754a3ac8597addf265d6d6cc34a587c9'
          'd869f19ed1630ec92c2843d907ecc91b')
 
 build() {
   cd "${srcdir}/trimslice-kernel-trimslice-kernel"
-
+CFLAGS=""
+CXXFLAGS=""
   # clean up git
   make clean mrproper
 
@@ -49,7 +48,7 @@ build() {
 
   # ALARM: add dma_coherent_write_sync calls to USB EHCI driver, AUFS
   patch -Np1 -i "${srcdir}/armdma.patch"
-  patch -Np1 -i "${srcdir}/build-oops.diff"
+  #patch -Np1 -i "${srcdir}/build-oops.diff"
   patch -Np1 -i "${srcdir}/aufs3-3.1.patch"
 
   cat "${srcdir}/config" > ./.config

extra/chromium/PKGBUILD

@@ -15,8 +15,8 @@
 buildarch=4
 
 pkgname=chromium
-pkgver=22.0.1229.79
-pkgrel=2
+pkgver=22.0.1229.94
+pkgrel=1
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('i686' 'x86_64')
 url="http://www.chromium.org/"
@@ -38,9 +38,8 @@ source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgna
         chromium.default
         chromium.sh
         chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
-        chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch
         chromium-ppapi-r0.patch)
-sha256sums=('06cab1c48092def5bd94e9f4aa764f6ff5728ce35bbcdcc12fddbad3a0f0f738'
+sha256sums=('a0af7e681ef43a7a17b32a1f6e1dc16ffa2a5f725f946ddaeea13660eba31caf'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
@@ -54,10 +53,6 @@ build() {
   # Fix build with glibc 2.16
   patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
 
-  # Fix return code when reusing the existing browser
-  # http://code.google.com/p/chromium/issues/detail?id=146842
-  patch -Np2 -i "$srcdir/chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch"
-
   # Fix build without NaCl glibc toolchain (patch from Gentoo)
   patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
 

extra/chromium/chromium-22.0.1229.79-only-use-the-different-return-type-under-test.patch

@@ -1,17 +0,0 @@
---- trunk/src/chrome/browser/chrome_browser_main.cc	2012/09/07 19:44:53	155456
-+++ trunk/src/chrome/browser/chrome_browser_main.cc	2012/09/07 19:45:06	155457
-@@ -1081,7 +1081,13 @@
-         printf("%s\n", base::SysWideToNativeMB(UTF16ToWide(
-             l10n_util::GetStringUTF16(IDS_USED_EXISTING_BROWSER))).c_str());
- #endif
--        return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED;
-+        // Having a differentiated return type for testing allows for tests to
-+        // verify proper handling of some switches. When not testing, stick to
-+        // the standard Unix convention of returning zero when things went as
-+        // expected.
-+        if (parsed_command_line().HasSwitch(switches::kTestType))
-+          return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED;
-+        return content::RESULT_CODE_NORMAL_EXIT;
-
-       case ProcessSingleton::PROFILE_IN_USE:
-         return chrome::RESULT_CODE_PROFILE_IN_USE;

extra/claws-mail/PKGBUILD

@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145084 2011-12-16 15:46:53Z andyrtr $
+# $Id: PKGBUILD 168547 2012-10-13 11:00:14Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -6,7 +6,7 @@
 
 pkgname=claws-mail
 pkgver=3.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -22,12 +22,17 @@ replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d388929fb1c8f04d4bcb2139faaf9e70')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+        gnutls313.diff)
+md5sums=('d388929fb1c8f04d4bcb2139faaf9e70'
+         '21bdc9d324f9424e0071bb73be169977')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
+
+  # fix a bug in gnutls cert check triggered since gnutls 3.1.3 update
+  patch -Np1 -i ${srcdir}/gnutls313.diff
+   
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
   ./configure --prefix=/usr --disable-static \

extra/claws-mail/gnutls313.diff

@@ -0,0 +1,12 @@
+diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
+index efc5c53..8303f3e 100644
+--- a/src/common/ssl_certificate.c
++++ b/src/common/ssl_certificate.c
+@@ -92,6 +92,7 @@
+     size_t size;
+     gnutls_datum tmp;
+     gnutls_x509_crt dest;
++    size = 0;
+     
+     if (gnutls_x509_crt_init(&dest) != 0) {
+     	g_warning("couldn't gnutls_x509_crt_init\n");

extra/firefox/PKGBUILD

@@ -9,7 +9,7 @@ buildarch=4
 highmem=1
 
 pkgname=firefox
-pkgver=15.0.1
+pkgver=16.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -25,10 +25,10 @@ install=firefox.install
 options=(!emptydirs)
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('743ba71fbce7b32023405db02d44143f'
+md5sums=('78e641c67dc4a40cb3f48fce3e782d41'
          '5644c7b42f51013e2023787938fa955e'
-         'bdeb0380c7fae30dd0ead6d2d3bc5873'
-         '594523c536a9be951b52c90dd85aff18'
+         'eb56667bc1919f2ed93e34bdfc21f7d6'
+         '150ac0fb3ac7b2114c8e8851a9e0516c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93')
 

extra/firefox/firefox-install-dir.patch

@@ -1,28 +1,30 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
-+++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
  
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
  
- TOP_DIST	= @TOP_DIST@
  ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)

extra/firefox/firefox.desktop

@@ -72,6 +72,46 @@ GenericName[xh]=Umkhangeli zincwadi we Web
 GenericName[zh_CN]=网页浏览器
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zu]=Umcingi we-Web
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
+Comment[ast]=Restola pela Rede
+Comment[bn]=ইন্টারনেট ব্রাউজ করুন
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[da]=Surf på internettet
+Comment[de]=Im Internet surfen
+Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[es]=Navegue por la web
+Comment[et]=Lehitse veebi
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Naviguer sur le Web
+Comment[gl]=Navegar pola rede
+Comment[he]=גלישה ברחבי האינטרנט
+Comment[hr]=Pretražite web
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[ku]=Li torê bigere
+Comment[lt]=Naršykite internete
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW 
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ro]=Navigați pe Internet
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prehliadanie internetu
+Comment[sl]=Brskajte po spletu
+Comment[sv]=Surfa på webben
+Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
+Comment[uk]=Перегляд сторінок Інтернету
+Comment[vi]=Để duyệt các trang web
+Comment[zh_CN]=浏览互联网
+Comment[zh_TW]=瀏覽網際網路
 Exec=firefox %u
 Icon=firefox
 Terminal=false

extra/gmime/PKGBUILD

@@ -5,10 +5,8 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - v7h needs to be built as -O1, workaround for gcc bug
 
-plugrel=1
-
 pkgname=gmime
-pkgver=2.6.10
+pkgver=2.6.11
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64')
@@ -18,7 +16,7 @@ depends=('glib2' 'gpgme' 'zlib')
 makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0e1132613339d6ba06df483a1f8d8bda6feb4f58f8b102daab2f1390fd6a3b7')
+sha256sums=('ec227549062120af006ed0842baab921e133aa520353ca0fff004390c68af9ab')
 
 build() {
   # get rid of that .wapi errors in fakeroot

extra/imagemagick/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.7.9.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')

extra/initscripts/PKGBUILD

@@ -4,13 +4,12 @@
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=initscripts
-pkgver=2012.09.2
-pkgrel=2
+pkgver=2012.10.1
+pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
 url="http://www.archlinux.org"
 license=('GPL2')
-groups=('base')
 provides=('initscripts-systemd')
 conflicts=('initscripts-systemd')
 replaces=('initscripts-systemd')
@@ -26,7 +25,7 @@ install=initscripts.install
 source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
         'alarm.patch'
         'rc.conf')
-md5sums=('c0a550c17624a6e72dc0edb3da8d664c'
+md5sums=('a4a747e73819b81f2218cf5b9bd53703'
          'e7ec1f2d469258b91bbda84284d37c4c'
          'c618e099f522f861e08a475f8960a6c2')
 

extra/initscripts/initscripts.install

@@ -1,9 +1,4 @@
 post_upgrade() {
-  if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
-    echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
-    echo "==> Original file saved as /etc/inittab.pacsave"
-    sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
-  fi
   if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
     echo "Blacklisting of modules is no longer supported in rc.conf,"
     echo "please add blacklist entries to /etc/modprobe.d/ instead."
@@ -18,9 +13,14 @@ post_upgrade() {
   fi
   if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
     echo "----"
-    echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
-    echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
+    echo "> initscripts now ships a compatibility layer to make systemd use DAEMONS"
+    echo "> from rc.conf; and run rc.local and rc.local.shutdown on boot and"
     echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
     echo "----"
   fi
+  if [ "$(vercmp $2 2012.10.1)" -lt 0 ]; then
+    echo "----"
+    echo "> systemd no longer reads MODULES from rc.conf."
+    echo "----"
+  fi
 }

extra/kdebindings-python/PKGBUILD

@@ -8,31 +8,34 @@ pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        "pykde4-4.4.4-arm-sip.patch")
+        "pykde4-4.4.4-arm-sip.patch"
+        'pyqt495.patch')
 sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '20d37a8b127eebffc4556352168786036969ee78')
+          '20d37a8b127eebffc4556352168786036969ee78'
+          '30def4a0ff94c9f3f173347e0e0bcac195cfe780')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
   cd "${srcdir}/pykde4-${pkgver}"
   patch -Np3 -i "${srcdir}/pykde4-4.4.4-arm-sip.patch"
+  patch -p1 -i "${srcdir}"/pyqt495.patch
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
   make
   cd ..
 

extra/kdebindings-python/pyqt495.patch

@@ -0,0 +1,81 @@
+diff -urN a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
+--- a/sip/kdecore/typedefs.sip	2012-09-27 18:18:24.000000000 -0600
++++ b/sip/kdecore/typedefs.sip	2012-10-18 07:32:15.490502568 -0600
+@@ -951,77 +951,3 @@
+ %End
+ };
+ 
+-%MappedType QVector<int>
+-{
+-%TypeHeaderCode
+-#include <qvector.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i)
+-    {
+-        int t = (sipCpp->at(i));
+-
+-#if PY_MAJOR_VERSION >= 3        
+-        PyObject *tobj = PyLong_FromLong(t);
+-#else
+-        PyObject *tobj = PyInt_FromLong(t);
+-#endif
+-
+-        PyList_SET_ITEM(l, i, tobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+-#if PY_MAJOR_VERSION >= 3
+-            if (!PyNumber_Check(tobj))
+-#else
+-            if (!PyInt_Check(tobj))
+-#endif
+-                return 0;
+-        }
+-        return 1;
+-    }
+-
+-    QVector<int> *qv = new QVector<int>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+- #if PY_MAJOR_VERSION >= 3
+-        int t = PyLong_AsLong (tobj);
+-#else
+-        int t = PyInt_AS_LONG (tobj);
+-#endif
+-
+-        if (*sipIsErr)
+-        {
+-            delete qv;
+-            return 0;
+-        }
+-
+-        qv->append(t);
+-    }
+- 
+-    *sipCppPtr = qv;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};

extra/koffice/20_arm_fix.patch

@@ -1,289 +0,0 @@
-Description: fix build in arm s/double/qreal
-Author: Ana Guerrero <ana@debian.org>
-Last-Update: 2011-02-13
-Applied-Upstream: Calligra master, koffice 2.3 branch
-
---- a/kplato/libs/ui/kptintervaledit.cpp
-+++ b/kplato/libs/ui/kptintervaledit.cpp
-@@ -42,7 +42,7 @@ IntervalEdit::IntervalEdit( CalendarDay
-         setIntervals( intervals );
-         if ( ! intervals.isEmpty() ) {
-             startTime->setTime( intervals.last()->endTime() );
--            double l = ( intervals.last()->endTime().msecsTo( QTime().addMSecs( -1 ) ) + 1 )  / (1000.0*60.0*60.0);
-+            qreal l = ( intervals.last()->endTime().msecsTo( QTime().addMSecs( -1 ) ) + 1 )  / (1000.0*60.0*60.0);
-             length->setValue( qMin( l, (qreal) 8.0 ) );
-         }
-     }
---- a/krita/image/brushengine/kis_paintop.cc
-+++ b/krita/image/brushengine/kis_paintop.cc
-@@ -86,7 +86,7 @@ KisFixedPaintDeviceSP KisPaintOp::cached
-     return d->dab;
- }
- 
--void KisPaintOp::splitCoordinate(double coordinate, qint32 *whole, double *fraction)
-+void KisPaintOp::splitCoordinate(qreal coordinate, qint32 *whole, qreal *fraction)
- {
-     qint32 i = static_cast<qint32>(coordinate);
- 
---- a/krita/image/brushengine/kis_paintop.h
-+++ b/krita/image/brushengine/kis_paintop.h
-@@ -108,7 +108,7 @@ public:
-     /**
-      * Split the coordinate into whole + fraction, where fraction is always >= 0.
-      */
--    static void splitCoordinate(double coordinate, qint32 *whole, double *fraction);
-+    static void splitCoordinate(qreal coordinate, qint32 *whole, qreal *fraction);
- 
-     /**
-      * returns the scale and rotation dynamically computed for the single dab
---- a/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector.cpp
-+++ b/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector.cpp
-@@ -161,12 +161,12 @@ inline int iconSize(qreal width, qreal h
-     qreal xm = width/2.;
-     qreal ym = height/2.;
-     if(xm>=2*ym || ym>=2*xm)
--        return qBound(5., radius, 32.);
-+        return qBound(qreal(5.), radius, qreal(32.));
- 
-     qreal a=-2;
-     qreal b=2.*(xm+ym);
-     qreal c=radius*radius-xm*xm-ym*ym;
--    return qBound(5., ((-b+sqrt(b*b-4*a*c))/(2*a)), 32.);
-+    return qBound(qreal(5.), qreal((-b+sqrt(b*b-4*a*c))/(2*a)), qreal(32.));
- }
- 
- void KisColorSelector::resizeEvent(QResizeEvent* e) {
---- a/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp
-+++ b/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp
-@@ -39,7 +39,7 @@ void KisColorSelectorSimple::setColor(co
-         emit paramChanged(-1, -1, -1, c.hslSaturationF(), c.lightnessF());
-         break;
-     case KisColorSelector::LH:
--        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
-+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
-         m_lastClickPos.setY(1.-c.lightnessF());
-         emit paramChanged(c.hueF(), -1, -1, -1, c.lightnessF());
-         break;
-@@ -49,17 +49,17 @@ void KisColorSelectorSimple::setColor(co
-         emit paramChanged(-1, c.saturationF(), c.valueF(), -1, -1);
-         break;
-     case KisColorSelector::VH:
--        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
-+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
-         m_lastClickPos.setY(c.valueF());
-         emit paramChanged(c.hueF(), -1, c.valueF(), -1, -1);
-         break;
-     case KisColorSelector::hsvSH:
--        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
-+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
-         m_lastClickPos.setY(1-c.saturationF());
-         emit paramChanged(c.hueF(), c.saturationF(), -1, -1, -1);
-         break;
-     case KisColorSelector::hslSH:
--        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
-+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
-         m_lastClickPos.setY(1-c.hslSaturationF());
-         emit paramChanged(c.hueF(), -1, -1, c.hslSaturationF(), -1);
-         break;
-@@ -80,7 +80,7 @@ void KisColorSelectorSimple::setColor(co
-         emit paramChanged(-1, -1, -1, c.hslSaturationF(), -1);
-         break;
-     case KisColorSelector::H:
--        m_lastClickPos.setX(1-qBound(0., c.hueF(), 1.));
-+        m_lastClickPos.setX(1-qBound<qreal>(0., c.hueF(), 1.));
-         emit paramChanged(c.hueF(), -1, -1, -1, -1);
-         break;
-     default:
---- a/krita/plugins/extensions/dockers/colorselectorng/kis_shade_selector_line.cpp
-+++ b/krita/plugins/extensions/dockers/colorselectorng/kis_shade_selector_line.cpp
-@@ -139,9 +139,9 @@ void KisShadeSelectorLine::paintEvent(QP
-         while(hue<0) hue+=1.;
-         while(hue>1) hue-=1.;
- 
--        qreal saturation = qBound(0., m_color.saturationF()+(i*saturationStep)+m_saturationShift, 1.);
-+        qreal saturation = qBound<qreal>(0., m_color.saturationF()+(i*saturationStep)+m_saturationShift, 1.);
- 
--        qreal value = qBound(0., m_color.valueF()+(i*valueStep)+m_valueShift, 1.);
-+        qreal value = qBound<qreal>(0., m_color.valueF()+(i*valueStep)+m_valueShift, 1.);
- 
- 
-         koColor.fromQColor(QColor::fromHsvF(hue, saturation, value));
---- a/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h
-+++ b/krita/plugins/paintops/defaultpaintops/brush/kis_brushop.h
-@@ -51,7 +51,7 @@ public:
-     KisBrushOp(const KisBrushBasedPaintOpSettings *settings, KisPainter * painter, KisImageWSP image);
-     virtual ~KisBrushOp();
- 
--    double paintAt(const KisPaintInformation& info);
-+    qreal paintAt(const KisPaintInformation& info);
-     virtual KisDistanceInformation paintLine(const KisPaintInformation& pi1, const KisPaintInformation& pi2, const KisDistanceInformation& savedDist = KisDistanceInformation());
- 
- private:
---- a/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop.cpp
-+++ b/krita/plugins/paintops/defaultpaintops/smudge/kis_smudgeop.cpp
-@@ -95,7 +95,7 @@ KisSmudgeOp::~KisSmudgeOp()
-  of the current iteration.
- */
-     
--double KisSmudgeOp::paintAt(const KisPaintInformation& info)
-+qreal KisSmudgeOp::paintAt(const KisPaintInformation& info)
- {
-     KisBrushSP brush = m_brush;
-     
-@@ -118,7 +118,7 @@ double KisSmudgeOp::paintAt(const KisPai
-     is where the dab will be positioned and the fractional part determines
-     the sub-pixel positioning. */
-     qint32 x, y;
--    double xFraction, yFraction;
-+    qreal xFraction, yFraction;
- 
-     splitCoordinate(pt.x(), &x, &xFraction);
-     splitCoordinate(pt.y(), &y, &yFraction);
---- a/krita/plugins/paintops/deform/kis_deform_paintop.cpp
-+++ b/krita/plugins/paintops/deform/kis_deform_paintop.cpp
-@@ -94,9 +94,9 @@ qreal KisDeformPaintOp::paintAt(const Ki
-         KisFixedPaintDeviceSP dab = cachedDab(painter()->device()->colorSpace());
- 
-         qint32 x;
--        double subPixelX;
-+        qreal subPixelX;
-         qint32 y;
--        double subPixelY;
-+        qreal subPixelY;
- 
-         QPointF pt = info.pos();
-         if (m_sizeProperties.jitterEnabled){
-@@ -151,7 +151,7 @@ qreal KisDeformPaintOp::paintAt(const Ki
- }
- 
- 
--double KisDeformPaintOp::spacing(double /*pressure*/) const
-+qreal KisDeformPaintOp::spacing(qreal /*pressure*/) const
- {
-     return m_spacing;
- }
---- a/krita/plugins/paintops/hatching/kis_hatching_paintop.cpp
-+++ b/krita/plugins/paintops/hatching/kis_hatching_paintop.cpp
-@@ -67,7 +67,7 @@ KisHatchingPaintOp::~KisHatchingPaintOp(
-     delete m_hatchingBrush;
- }
- 
--double KisHatchingPaintOp::paintAt(const KisPaintInformation& info)
-+qreal KisHatchingPaintOp::paintAt(const KisPaintInformation& info)
- {
-     //------START SIMPLE ERROR CATCHING-------
-     if (!painter()->device()) return 1;
-@@ -104,7 +104,7 @@ double KisHatchingPaintOp::paintAt(const
-     QPointF pt = info.pos() - hotSpot;
- 
-     qint32 x, y;
--    double xFraction, yFraction;
-+    qreal xFraction, yFraction;
- 
-     splitCoordinate(pt.x(), &x, &xFraction);
-     splitCoordinate(pt.y(), &y, &yFraction);
---- a/krita/plugins/paintops/hatching/kis_hatching_paintop.h
-+++ b/krita/plugins/paintops/hatching/kis_hatching_paintop.h
-@@ -50,7 +50,7 @@ public:
-      *  Paint a hatched dab around the mouse cursor according to
-      *  sensor settings and user preferences.
-      */
--    double paintAt(const KisPaintInformation& info);
-+    qreal paintAt(const KisPaintInformation& info);
-     
-     /**
-      *  Returns a number between -90 and 90, and corresponds to the
---- a/krita/plugins/paintops/sketch/kis_sketch_paintop.cpp
-+++ b/krita/plugins/paintops/sketch/kis_sketch_paintop.cpp
-@@ -265,7 +265,7 @@ KisDistanceInformation KisSketchPaintOp:
- 
- 
- 
--double KisSketchPaintOp::paintAt(const KisPaintInformation& info)
-+qreal KisSketchPaintOp::paintAt(const KisPaintInformation& info)
- {
-     return paintLine(info, info).spacing;
- }
---- a/krita/plugins/paintops/sketch/kis_sketch_paintop.h
-+++ b/krita/plugins/paintops/sketch/kis_sketch_paintop.h
-@@ -38,7 +38,7 @@ public:
-     KisSketchPaintOp(const KisSketchPaintOpSettings *settings, KisPainter * painter, KisImageWSP image);
-     virtual ~KisSketchPaintOp();
-     virtual KisDistanceInformation paintLine(const KisPaintInformation& pi1, const KisPaintInformation& pi2, const KisDistanceInformation& savedDist = KisDistanceInformation());
--    double paintAt(const KisPaintInformation& info);
-+    qreal paintAt(const KisPaintInformation& info);
- 
- private:
-     // pixel buffer
---- a/krita/plugins/paintops/spray/spray_brush.cpp
-+++ b/krita/plugins/paintops/spray/spray_brush.cpp
-@@ -74,7 +74,7 @@ qreal SprayBrush::rotationAngle()
-     if ( m_shapeDynamicsProperties->randomRotation ){
- 
-         if ( m_properties->gaussian ) {
--                rotation = linearInterpolation(rotation ,M_PI * 2.0 * qBound(0.0, m_rand->nextGaussian(0.0, 0.50) , 1.0), m_shapeDynamicsProperties->randomRotationWeight );
-+                rotation = linearInterpolation(rotation ,M_PI * 2.0 * qBound<qreal>(0.0, m_rand->nextGaussian(0.0, 0.50) , 1.0), m_shapeDynamicsProperties->randomRotationWeight );
-         } else {
-                 rotation = linearInterpolation(rotation, M_PI * 2.0 * drand48(), m_shapeDynamicsProperties->randomRotationWeight );
-         }
-@@ -322,9 +322,9 @@ void SprayBrush::paint(KisPaintDeviceSP
-             QPointF pt = pos - hotSpot;
- 
-             qint32 ix;
--            double xFraction;
-+            qreal xFraction;
-             qint32 iy;
--            double yFraction;
-+            qreal yFraction;
- 
-             KisPaintOp::splitCoordinate(pt.x(), &ix, &xFraction);
-             KisPaintOp::splitCoordinate(pt.y(), &iy, &yFraction);
---- a/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
-+++ b/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
-@@ -278,7 +278,7 @@ KoPointerEvent KisToolDyna::filterEvent(
- #endif
- 
-     m_pressure =  m_mouse.vel * 100;
--    m_pressure = qBound(0.0,m_pressure, 1.0);
-+    m_pressure = qBound(qreal(0.0),m_pressure, qreal(1.0));
-     
-     m_odelx = delx;
-     m_odely = dely;
---- a/krita/plugins/paintops/waterymixbrush/kis_waterymix_paintop.cpp
-+++ b/krita/plugins/paintops/waterymixbrush/kis_waterymix_paintop.cpp
-@@ -65,7 +65,7 @@ KisWateryMixPaintOp::~KisWateryMixPaintO
- {
- }
- 
--double KisWateryMixPaintOp::paintAt(const KisPaintInformation& info)
-+qreal KisWateryMixPaintOp::paintAt(const KisPaintInformation& info)
- {
-     //------START SIMPLE ERROR CATCHING-------
-     if (!painter()->device()) return 1;
-@@ -91,7 +91,7 @@ double KisWateryMixPaintOp::paintAt(cons
-     QPointF pt = info.pos() - hotSpot;
- 
-     qint32 x, y;
--    double xFraction, yFraction;
-+    qreal xFraction, yFraction;
- 
-     splitCoordinate(pt.x(), &x, &xFraction);
-     splitCoordinate(pt.y(), &y, &yFraction);
-@@ -187,4 +187,4 @@ void KisWateryMixPaintOp::absorb ()
- void KisWateryMixPaintOp::dilute ()
- {
- }
--*/
-\ No newline at end of file
-+*/
---- a/krita/plugins/paintops/waterymixbrush/kis_waterymix_paintop.h
-+++ b/krita/plugins/paintops/waterymixbrush/kis_waterymix_paintop.h
-@@ -53,7 +53,7 @@ public:
-     /**
-      *  Document me
-      */
--    double paintAt(const KisPaintInformation& info);
-+    qreal paintAt(const KisPaintInformation& info);
- 
-     /*
-     /// Absorb the color beneath the brush

extra/koffice/PKGBUILD

@@ -1,313 +0,0 @@
-# $Id: PKGBUILD 142653 2011-11-12 17:18:30Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-# ALARM: Kevin Mihelich <kevin@plugapps.com>
-#  - Added patch to fix building on ARM
-
-plugrel=1
-
-pkgbase=koffice
-pkgname=(
-	'koffice-filters'
-	'koffice-interfaces'
-	'koffice-libs'
-	'koffice-plugins'
-	'koffice-pics'
-	'koffice-servicetypes'
-	'koffice-templates'
-	'koffice-tools'
-	'koffice-karbon'
-	'koffice-karbon-doc'
-#	'koffice-kchart'
-#	'koffice-kchart-doc'
-	'koffice-kexi'
-	'koffice-kexi-doc'
-	'koffice-kformula'
-	'koffice-kformula-doc'
-	'koffice-kounavail'
-	'koffice-kplato'
-#	'koffice-kplato-doc'
-	'koffice-kpresenter'
-	'koffice-kpresenter-doc'
-	'koffice-krita'
-#	'koffice-krita-doc' # no krita-doc anymore upstream
-	'koffice-kspread'
-	'koffice-kspread-doc'
-	'koffice-kword'
-#	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
-	'koffice-handbook'
-	'koffice-thesaurus-doc'
-#	'koffice-kdgantt' # still an empty package
-)
-pkgver=2.3.3
-pkgrel=12
-arch=('i686' 'x86_64')
-url='http://koffice.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
-             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf')
-groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch' '20_arm_fix.patch')
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
-            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa'
-            '3a2debc7ccf6f821cec1cf0e5c2a38bcf9ac08a8673f445f21276f31cafb92b3')
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-	patch -p1 -i "${srcdir}"/gcc46.patch
-    patch -p1 -i "${srcdir}"/qt48fix.patch
-    patch -p1 -i "${srcdir}/20_arm_fix.patch"
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-##### 1st package common files, depends, optdepends of the koffice applications #####
-
-package_koffice-filters(){
-	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info' 'libgsf')
-	optdepends=('libwpd: WordPerfect document importer'
-                   'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-                   'libkdcraw: support for raw images' 'poppler: support for pdf' 
-		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
-		   'koffice-kplato: Kplato filters')
-	install=filters.install
-        cd "${srcdir}/build/filters"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-interfaces(){
-	pkgdesc="Interfaces for the KDE office suite"
-	depends=('koffice-libs')
-	cd "${srcdir}/build/interfaces"
-	make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-libs(){
-	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'lcms' 'koffice-servicetypes')
-        cd "${srcdir}/build/libs"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-plugins(){
-	pkgdesc="Plugins for the KDE office suite"
-	depends=('koffice-libs')
-	replaces=('koffice-kchart')
-	conflicts=('koffice-kchart')
-        cd "${srcdir}/build/plugins"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-pics(){
-	pkgdesc="Icons for the KDE office suite"
-	depends=('desktop-file-utils' 'xdg-utils')
-	install=koffice.install
-        cd "${srcdir}/build/pics"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-servicetypes(){
-	pkgdesc="Servicetypes for the KDE office suite"
-        cd "${srcdir}/build/servicetypes"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-templates(){
-	pkgdesc="Templates for the KDE office suite"
-        cd "${srcdir}/build/templates"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-tools(){
-	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs' 'oxygen-icons')
-        cd "${srcdir}/build/tools"
-        make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_koffice-karbon(){
-	pkgdesc="Vector drawing application for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-karbon-doc(){
-	pkgdesc="Documentation for karbon"
-        cd "${srcdir}/build/doc/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi(){
-        pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('koffice-kspread' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi-doc(){
-        pkgdesc="Documentation for kexi"
-        cd "${srcdir}/build/doc/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula(){
-        pkgdesc="Formula editor for the KDE office suite"
-	depends=('koffice-libs')
-	install=koffice.install
-        cd "${srcdir}/build/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula-doc() {
-	pkgdesc="Documentation for koffice-kformula"
-	cd "${srcdir}/build/doc/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-
-package_koffice-kounavail(){
-	pkgdesc="Kounavail for the KDE office suite"
-	depends=('koffice-libs')
-        cd "${srcdir}/build/kounavail"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kplato(){
-	pkgdesc="Project management application for KDE"
-	depends=('koffice-kword' 'oxygen-icons')
-	install=koffice.install
-        cd "${srcdir}/build/kplato"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-kplato-doc(){
-#	pkgdesc="Documentation for kplato"
-#        cd ${srcdir}/build/doc/kplato
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-kpresenter(){
-	pkgdesc="Presentation tool for KDE"
-	depends=('koffice-libs' 'koffice-templates' 'oxygen-icons')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kpresenter-doc(){
-	pkgdesc="Documentation for kpresenter"
-        cd "${srcdir}/build/doc/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-krita(){
-	pkgdesc="Graphics editor for KDE"
-	depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
-		 'koffice-plugins' 'poppler-qt' 'opengtl')
-        optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
-	install=krita.install
-        cd "${srcdir}/build/krita"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-krita-doc(){
-#	pkgdesc="Documentation for krita"
-#        cd ${srcdir}/build/doc/krita
-#        make DESTDIR="${pkgdir}" install
-#}
-
-
-package_koffice-kspread(){
-	pkgdesc="Spreadsheet application for KDE"
-	depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
-	optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kspread-doc(){
-	pkgdesc="Documentation for kspread"
-	cd "${srcdir}/build/doc/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kword(){
-	pkgdesc="Wordprocessor for KDE"
-	depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
-		'koffice-kounavail' 'koffice-plugins')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}

extra/koffice/filters.install

@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

extra/koffice/gcc46.patch

@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 

extra/koffice/koffice.install

@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

extra/koffice/krita.install

@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

extra/koffice/qt48fix.patch

@@ -1,10 +0,0 @@
---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
-+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
-@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
- 	<< ")";
-     return dbg;
- }

extra/lirc/PKGBUILD

@@ -8,7 +8,7 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=30
+pkgrel=31
 epoch=1
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"

extra/mesa/PKGBUILD

@@ -17,16 +17,17 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.10.99.git20110709
     #pkgver=7.11
   else
-    pkgver=8.0.4
+    pkgver=9.0
 fi
-pkgrel=3.1
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools')
+makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3'
+             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
+options=('!libtool')
 source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch)
+        git_fixes.diff)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
@@ -38,42 +39,18 @@ if [ "${_git}" = "true" ]; then
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
+         '2ebce12196dbb7b69bdf7ef53b8afdee'
+         '60e557ce407be3732711da484ab3db6c')
 
 build() {
     cd ${srcdir}/?esa-*
 
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
     [ "${CARCH}" = "armv7h" ] && CFLAGS=`echo $CFLAGS | sed -e 's/-O2/-O1/'` && CXXFLAGS="$CFLAGS"
 
-if [ "${_git}" = "true" ]; then
-    autoreconf -vfi
-    ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=swrast \
-    --enable-gallium-llvm \
-    --enable-egl \
-    --enable-gallium-egl \
-    --with-egl-platforms=x11,drm \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-    
-    #    --enable-gallium-svga \
-    
-  else
-     autoreconf -vfi
-    ./configure --prefix=/usr \
+    patch -Np1 -i ${srcdir}/git_fixes.diff
+
+    COMMONOPTS="--prefix=/usr \
+    --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-dri-drivers=swrast \
     --with-gallium-drivers=swrast \
@@ -90,155 +67,155 @@ if [ "${_git}" = "true" ]; then
     --enable-gles1 \
     --enable-gles2 \
     --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-fi
+    --enable-xa "
+
+  if [ "${_git}" = "true" ]; then
+    ./autogen.sh \
+      $COMMONOPTS
+  else
+    autoreconf -vfi
+    ./configure \
+      $COMMONOPTS
+  fi
 
   make
 }
 
-package_libgl() {
-  depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-  #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-
-  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
-
-  cd src/mesa/drivers/dri
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_osmesa() {
-  depends=('mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
-}
-
 package_libglapi() {
   depends=('glibc')
   pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
 
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
 }
 
+package_libgl() {
+  depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
+  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
+
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  # libGL & libdricore
+  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+
+  # See FS#26284
+  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+}
+
+package_mesa() {
+  # check also gl.pc
+  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  pkgdesc="Mesa 3-D graphics libraries and include files"
+
+  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS
+  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
+
+  make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_osmesa() {
+  depends=('libglapi' 'gcc-libs')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  pkgdesc="Mesa 3D off-screen rendering library"
+
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
+
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
+}
+
 package_libgbm() {
-  depends=('systemd-tools')
+  depends=('systemd' 'libglapi' 'libdrm')
   pkgdesc="Mesa gbm library"
 
-  cd ${srcdir}/?esa-*
-  install -m755 -d ${pkgdir}/usr/{include,lib/gbm}
-  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
-  bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/"
-  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
+
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
 }
 
 package_libgles() {
-  depends=('libglapi' 'khrplatform-devel')
+  depends=('libglapi' 'libdrm' 'khrplatform-devel')
   pkgdesc="Mesa GLES libraries and headers"
 
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/GLES"
-  install -m755 -d "${pkgdir}/usr/include/GLES2"
-  bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
+
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
 }
 
 package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel')
+  # check also egl.pc
+  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
 
-  cd ${srcdir}/?esa-*   
-  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/"
-  install -m755 -d "${pkgdir}/usr/include/EGL"
-  install -m755 -d "${pkgdir}/usr/share"
-  install -m755 -d "${pkgdir}/usr/share/doc"
+  make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
-  bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
-  bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+  install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
+
+  make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
+
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+
+  # fix file conflicts
+  rm -rf ${pkgdir}/usr/include/KHR
 }
 
 package_khrplatform-devel() {
-  #depends=('')
   pkgdesc="Khronos platform development package"
 
-  cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/include/KHR"
-  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
+  install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
 }
-
-package_mesa() {
-  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  cd ${srcdir}/?esa-*   
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib/libGL.so"*
-  rm -f "${pkgdir}/usr/lib/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib/libgbm.so"*
-  rm -f "${pkgdir}/usr/lib/libGLESv"*
-  rm -f "${pkgdir}/usr/lib/libEGL"*
-  rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f "${pkgdir}/usr/lib/libOSMesa"*
-  rm -rf "${pkgdir}/usr/lib/gbm"
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -f "${pkgdir}/usr/include/GL/glew.h"
-  rm -f "${pkgdir}/usr/include/GL/glxew.h"
-  rm -f "${pkgdir}/usr/include/GL/wglew.h"
-  rm -f "${pkgdir}/usr/include/GL/glut.h"
-  rm -f "${pkgdir}/usr/include/gbm.h"
-  rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}

extra/mesa/git_fixes.diff

@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+ </pre>
+
+
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+                                           border, internalFormat, texFormat);
+
+                /* Give the texture to the driver.  <pixels> may be null. */
+-               if (compressed) {
+-                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+-                                                 imageSize, pixels);
+-               }
+-               else {
+-                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+-                                       type, pixels, unpack);
++               if (width > 0 && height > 0 && depth > 0) {
++                  if (compressed) {
++                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++                                                    imageSize, pixels);
++                  }
++                  else {
++                     ctx->Driver.TexImage(ctx, dims, texImage, format,
++                                          type, pixels, unpack);
++                  }
+                }
+
+                check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches.  Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+    if (!_mesa_is_compressed_format(ctx, format))
+       return GL_INVALID_ENUM;
+
+-   if (width < 1 || width > maxTextureSize)
++   if (width < 0 || width > maxTextureSize)
+       return GL_INVALID_VALUE;
+
+-   if ((height < 1 || height > maxTextureSize)
++   if ((height < 0 || height > maxTextureSize)
+        && dimensions > 1)
+       return GL_INVALID_VALUE;
+
+--
+cgit v0.9.0.2-2-gbebe

extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch

@@ -1,44 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }

extra/opencv/PKGBUILD

@@ -10,7 +10,7 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')

extra/pyqt/PKGBUILD

@@ -8,24 +8,21 @@
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.4
-pkgrel=2
+pkgver=4.9.5
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
-        "PyQt4-4.7.3-qreal_float_support.patch"
-        'fix-pyuic4.patch')
-md5sums=('a0b6a820633366365af5124ddbd059c7'
-         'a20d7022e91071f838bd4908851a0f7b'
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz"
+        "PyQt4-4.7.3-qreal_float_support.patch")
+md5sums=('e4cdd6619c63655f7510efb4df8462fb'
          'c493d8ea8e3199d649b60eeb45e07aec')
 
 build() {
   cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
   patch -p1 -i "${srcdir}"/PyQt4-4.7.3-qreal_float_support.patch
-  patch -p1 -i "${srcdir}"/fix-pyuic4.patch
 
   cd "${srcdir}"
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -59,7 +56,6 @@ package_pyqt-common(){
   cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
   
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
@@ -77,7 +73,6 @@ package_pyqt(){
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
 
@@ -85,7 +80,7 @@ package_python2-pyqt(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
   depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
-              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
   provides=('python2-qt')
@@ -97,7 +92,7 @@ package_python2-pyqt(){
   # Fix conflicts with pyqt
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt-common
+  # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
   rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api

extra/pyqt/fix-pyuic4.patch

@@ -1,85 +0,0 @@
-diff -urN a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
---- a/pyuic/uic/Compiler/qobjectcreator.py	2012-06-26 07:09:46.000000000 -0600
-+++ b/pyuic/uic/Compiler/qobjectcreator.py	2012-07-18 09:41:19.483732249 -0600
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@
-         assert widgetClass not in self._widgets 
-         self._widgets[widgetClass] = (baseClass, module)
- 
--
-     def _resolveBaseclass(self, baseClass):
-         try:
-             for x in range(0, 10):
-@@ -114,19 +113,17 @@
-         except KeyError:
-             raise ValueError("unknown baseclass %s" % baseClass)
-         
--
-     def search(self, cls):
-         try:
--            self._usedWidgets.add(cls)
-             baseClass = self._resolveBaseclass(self._widgets[cls][0])
-             DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--            
--            return type(cls, (baseClass,),
--                        {"module" : ""})
--        
-         except KeyError:
-             return None
- 
-+        self._usedWidgets.add(cls)
-+
-+        return type(cls, (baseClass, ), {"module" : ""})
-+
-     def _writeImportCode(self):
-         imports = {}
-         for widget in self._usedWidgets:
-diff -urN a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
---- a/pyuic/uic/objcreator.py	2012-06-26 07:09:46.000000000 -0600
-+++ b/pyuic/uic/objcreator.py	2012-07-18 09:39:01.227387101 -0600
-@@ -102,19 +102,26 @@
-         self._modules.append(self._customWidgets)
- 
-     def createQObject(self, classname, *args, **kwargs):
--        # Handle scoped names, typically static factory methods.
--        parts = classname.split('.')
--        factory = self.findQObjectType(parts[0])
--
--        if factory is not None:
--            for part in parts[1:]:
--                factory = getattr(factory, part, None)
--                if factory is None:
--                    break
--            else:
--                return self._cpolicy.instantiate(factory, *args, **kwargs)
-+        # Handle regular and custom widgets.
-+        factory = self.findQObjectType(classname)
- 
--        raise NoSuchWidgetError(classname)
-+        if factory is None:
-+            # Handle scoped names, typically static factory methods.
-+            parts = classname.split('.')
-+
-+            if len(parts) > 1:
-+                factory = self.findQObjectType(parts[0])
-+
-+                if factory is not None:
-+                    for part in parts[1:]:
-+                        factory = getattr(factory, part, None)
-+                        if factory is None:
-+                            break
-+
-+            if factory is None:
-+                raise NoSuchWidgetError(classname)
-+
-+        return self._cpolicy.instantiate(factory, *args, **kwargs)
- 
-     def invoke(self, rname, method, args=()):
-         return self._cpolicy.invoke(rname, method, args)

extra/python/PKGBUILD

@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 143817 2011-11-29 13:33:42Z stephane $
+# $Id: PKGBUILD 169007 2012-10-17 10:19:56Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - removed valgrind from makedepends, can't build it for ARM
+#  - removed valgrind from makedepends
 #  - removed --with-valgrind from configure line
 
-plugrel=1
-
 pkgname=python
-pkgver=3.2.3
-pkgrel=3
-_pybasever=3.2
+pkgver=3.3.0
+pkgrel=1
+_pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite3')
-optdepends=('tk: for tkinter' 'sqlite3')
+makedepends=('tk' 'sqlite')
+optdepends=('tk: for tkinter' 'sqlite')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823')
+sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -43,7 +41,6 @@ build() {
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
-              --with-wide-unicode \
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
               --with-system-ffi
@@ -54,7 +51,8 @@ build() {
 check() {
   cd "${srcdir}/Python-${pkgver}"
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
+     test_urllib test_uuid test_pydoc
 }
 
 package() {
@@ -69,11 +67,11 @@ package() {
   ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
 
   # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}mu.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
+  ln -sf ../../libpython${_pybasever}m.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
 
   # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
+  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
 
   # License
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

extra/qt3/PKGBUILD

@@ -5,19 +5,17 @@
 #  - added arm.patch to fix compiling on ARM with GCC >= 4
 #    Source: http://lists.trolltech.com/qt-embedded-interest/2007-03/msg00003.html
 
-plugrel=1
-
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt/index.html"
 license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
+depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft'
          'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
+makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3' 'mesa')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 options=('!libtool')
 install=qt.install

extra/vlc/PKGBUILD

@@ -7,8 +7,8 @@
 #  - drop oss support
 
 pkgname=vlc
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -59,7 +59,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('a7e79565e3df07dcf9abc6cad3ac26bb')
+md5sums=('f36dab8f126922c56b372388b7fade47')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

extra/xine-lib/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgname=xine-lib
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org"
@@ -15,11 +15,11 @@ license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
              'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'glu')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin' \
-            'mesa: for using the opengl plugin' \
+            'glu: for using the opengl plugin' \
             'wavpack: for using the wavpack plugin' \
             'faad2: for using the faad plugin' \
             'libmng: for using the mng plugin' \