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

aur/xbmc-rbp-git/PKGBUILD

@@ -5,7 +5,7 @@
 buildarch=16
 
 pkgname=xbmc-rbp-git
-pkgver=13.20130804
+pkgver=13.20130805
 pkgrel=1
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
 arch=('armv6h')
@@ -25,7 +25,7 @@ install="xbmc.install"
 source=('xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch'
 	'xbmc.service')
 md5sums=('53483ae33fc0ef680555fc6aa1b27e0c'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5')
+         '36780e43d432c488259d9a899b1bcb28')
 
 _gitname="xbmc"
 _gitroot="git://github.com/xbmc"
@@ -54,7 +54,7 @@ prepare() {
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
   # Change outdated macro use 
-  find . -name 'configure*' | xargs grep -l AM_CONFIG_HEADER | xargs sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g'
+#  find . -name 'configure*' | xargs grep -l AM_CONFIG_HEADER | xargs sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g'
 
   # Patch to fix TexturePacker build. 
   patch -p1 -i ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch

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.10.4
+_basekernel=3.10.5
 pkgver=${_basekernel}
 pkgrel=1
 cryptover=1.6
@@ -19,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'bc' 'git')
 options=('!strip')
 source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
         'archlinuxarm.patch'
-        'support.patch'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'change-default-console-loglevel.patch'
@@ -29,9 +28,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch")
 
-md5sums=('0378156d0a4ebf155d083531c3cb3826'
+md5sums=('853d4bca2752a7ec6ca11a14d557d691'
          'c84965943b804f763f892e4f704ba73b'
-         'f5d3635da03cb45904bedd69b47133de'
          'eb059648b877ab24d3689c6c3ce173ed'
          'SKIP'
          '80b2fb500e6811495c6b072d7e6fd112'
@@ -64,10 +62,8 @@ msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
   # FS#26528
   patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
 
-msg2 "Add Arch Linux ARM patch for ARMv5te plug computers," 
-msg2 "requested additional support, mach-types"
+msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
   patch -Np1 -i "${srcdir}/archlinuxarm.patch"
-  patch -Np1 -i "${srcdir}/support.patch"
   cp "${srcdir}/mach-types" arch/arm/tools
 
 msg2 "Add BFQ patches"

core/linux-kirkwood/support.patch

@@ -1,10 +0,0 @@
---- a/drivers/usb/misc/sisusbvga/sisusb.c
-+++ b/drivers/usb/misc/sisusbvga/sisusb.c
-@@ -3247,6 +3247,7 @@
- 	{ USB_DEVICE(0x0711, 0x0903) },
- 	{ USB_DEVICE(0x0711, 0x0918) },
- 	{ USB_DEVICE(0x0711, 0x0920) },
-+	{ USB_DEVICE(0x0711, 0x0950) },
- 	{ USB_DEVICE(0x182d, 0x021c) },
- 	{ USB_DEVICE(0x182d, 0x0269) },
- 	{ }