From e77c28d1eed1b43e94ce057ba168401346e4de26 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:08:26 +0200
Subject: [PATCH 01/17] projects/Generic/linux: reenable ati drm support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 projects/Generic/linux/linux.i386.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index e0b84a14e8..e68915c49e 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.0-rc4 Kernel Configuration
+# Linux/i386 3.0.0-rc5 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2049,7 +2049,8 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_TTM=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
-# CONFIG_DRM_RADEON is not set
+CONFIG_DRM_RADEON=y
+CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_I810 is not set
 CONFIG_DRM_I915=y
 CONFIG_DRM_I915_KMS=y
@@ -2899,7 +2900,6 @@ CONFIG_CIFS_STATS2=y
 # CONFIG_CIFS_XATTR is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_NFSD_EXPORT is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set

From 619efec11c2eedd83e4f4d79cb5c5d780982292c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:10:53 +0200
Subject: [PATCH 02/17] Mesa: update gallium llvm support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/build | 4 ++++
 packages/graphics/Mesa/meta  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 439effc1ed..a897c51231 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -31,6 +31,9 @@ get_graphicdrivers
 
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  MESA_GALLIUM_LLVM="--enable-gallium-llvm"
+else
+  MESA_GALLIUM_LLVM="--disable-gallium-llvm"
 fi
 
 cd $PKG_BUILD
@@ -60,6 +63,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --disable-glw \
             --disable-motif \
             --with-gallium-drivers="$GALLIUM_DRIVERS" \
+            $MESA_GALLIUM_LLVM \
             --with-driver="dri" \
             --with-dri-drivers="$DRI_DRIVERS" \
             --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 8fb121c0d1..3ab1ac090d 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -40,5 +40,6 @@ get_graphicdrivers
 
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
-  PKG_DEPENDS="$PKG_DEPENDS llvm"
+# actually we dont need llvm installed because its linked statically
+#  PKG_DEPENDS="$PKG_DEPENDS llvm"
 fi

From f9191c6c397f782dbf38933c3dda13689b6a0823 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:12:29 +0200
Subject: [PATCH 03/17] projects/Generic/options: readd r300 graphic support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 projects/Generic/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/Generic/options b/projects/Generic/options
index 93e8c3e65f..4f42ca8c62 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -163,7 +163,7 @@
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
 # Space separated list is supported, 
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  GRAPHIC_DRIVERS="i915 i965 r200 fglrx nvidia vmware"
+  GRAPHIC_DRIVERS="i915 i965 r200 r300 fglrx nvidia vmware"
 
 # use libdrm-master (latest git) instead latest released version
   LIBDRM_MASTER="no"

From fd0da07387aaaa2b650bd27d3145df36316cf38c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:13:33 +0200
Subject: [PATCH 04/17] config/options: enable llvm support for r300 gallium
 driver

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/options | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/options b/config/options
index b76f35c396..4e2afa2368 100644
--- a/config/options
+++ b/config/options
@@ -77,7 +77,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -137,7 +137,7 @@ get_graphicdrivers() {
 #      DRI_DRIVERS="$DRI_DRIVERS,r300"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
-#      LLVM_SUPPORT="yes"
+      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then

From 703cc49915dbffa20e7608ec806234839ac67a20 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:13:58 +0200
Subject: [PATCH 05/17] config/options: enable llvm support for r600 gallium
 driver

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/options b/config/options
index 4e2afa2368..0be136f7b3 100644
--- a/config/options
+++ b/config/options
@@ -144,7 +144,7 @@ get_graphicdrivers() {
 #      DRI_DRIVERS="$DRI_DRIVERS,r600"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
-#      LLVM_SUPPORT="yes"
+      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then

From 815b9a8e98a34ef72041b01e6d8902fdb8f7faca Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:15:07 +0200
Subject: [PATCH 06/17] config/options: enable llvm support for nouveau gallium
 driver

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/options b/config/options
index 0be136f7b3..10a652bbf2 100644
--- a/config/options
+++ b/config/options
@@ -108,7 +108,7 @@ get_graphicdrivers() {
 #      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
-#      LLVM_SUPPORT="yes"
+      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then

From 758e5ee50a353a3d5a5444020818c7dc0a1406fd Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:24:43 +0200
Subject: [PATCH 07/17] config/options: split graphic options to a seperate
 file

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/graphic | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
 config/options | 81 +-------------------------------------------------
 2 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 config/graphic

diff --git a/config/graphic b/config/graphic
new file mode 100644
index 0000000000..26485bad04
--- /dev/null
+++ b/config/graphic
@@ -0,0 +1,79 @@
+get_graphicdrivers() {
+  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
+  fi
+
+  for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "fglrx" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "i915" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "i965" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i965"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "nouveau" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "nvidia" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
+      XORG_DRIVERS="$XORG_DRIVERS nvidia"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "omapfb" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r200" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,r200"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+#      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r300" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,r300"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "r600" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,r600"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "vmware" ]; then
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
+
+  done
+}
diff --git a/config/options b/config/options
index 10a652bbf2..d2a955d098 100644
--- a/config/options
+++ b/config/options
@@ -75,84 +75,5 @@ fi
     . $HOME/.openelec/$PROJECT/options
   fi
 
-get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
-  fi
-
-  for drv in $GRAPHIC_DRIVERS; do
-    if [ "$drv" = "fglrx" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
-      XORG_DRIVERS="$XORG_DRIVERS fglrx"
-      COMPOSITE_SUPPORT="yes"
-      XINERAMA_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "i915" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,i915"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "i965" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,i965"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "nouveau" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
-      XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "nvidia" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
-      XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      XINERAMA_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "omapfb" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS ompafb"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "r200" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,r200"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-#      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "r300" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,r300"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "r600" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,r600"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      LLVM_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "vmware" ]; then
-      XINERAMA_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
-    fi
-
-  done
-}
-
+. config/graphic
 . config/path $1

From 3251b739135a0f539a5289ca27ea70961473aadb Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 13:25:41 +0200
Subject: [PATCH 08/17] ntfs-3g_ntfsprogs: cleanup build file

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/ntfs-3g_ntfsprogs/build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/build b/packages/sysutils/ntfs-3g_ntfsprogs/build
index 77b1c60433..739edd32fb 100755
--- a/packages/sysutils/ntfs-3g_ntfsprogs/build
+++ b/packages/sysutils/ntfs-3g_ntfsprogs/build
@@ -29,7 +29,6 @@ cd $PKG_BUILD
             --enable-shared \
             --disable-static \
             --disable-dependency-tracking \
-            --with-fuse=external \
             --disable-library \
             --enable-posix-acls \
             --enable-mtab \

From 9fd137a67c66b7b079920a8b4178c158120f8703 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 15:43:46 +0200
Subject: [PATCH 09/17] wlan-firmware: update to wlan-firmware-0.0.5

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux-firmware/wlan-firmware/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux-firmware/wlan-firmware/meta b/packages/linux-firmware/wlan-firmware/meta
index 2d624d1725..2020a2162a 100644
--- a/packages/linux-firmware/wlan-firmware/meta
+++ b/packages/linux-firmware/wlan-firmware/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.4"
+PKG_VERSION="0.0.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

From 512241d945932f3a3dc983d4da856367c2ea9901 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 15:44:28 +0200
Subject: [PATCH 10/17] fuse: add mtab support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/fuse/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/fuse/build b/packages/sysutils/fuse/build
index f887ffa1a5..ea60500499 100755
--- a/packages/sysutils/fuse/build
+++ b/packages/sysutils/fuse/build
@@ -38,7 +38,7 @@ am_cv_func_iconv=yes \
             --enable-lib \
             --enable-util \
             --disable-example \
-            --disable-mtab \
+            --enable-mtab \
             --disable-rpath \
             --with-gnu-ld \
 

From 37c099191ccdab56f1e2ef510f7484c13b7b70fa Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 15:48:58 +0200
Subject: [PATCH 11/17] add script to create tarball from tag

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 create_tar.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 create_tar.sh

diff --git a/create_tar.sh b/create_tar.sh
new file mode 100755
index 0000000000..0802d9d04e
--- /dev/null
+++ b/create_tar.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2

From feead719a52794408e1715abe7e908f2f73cf1ca Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 16:13:20 +0200
Subject: [PATCH 12/17] Revert "udev: remove unneeded configure option"

This reverts commit a6beee44c01f0e36f28888074e06674a4cc8450d.
---
 packages/sysutils/udev/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build
index f3b1da0e71..b592e7927e 100755
--- a/packages/sysutils/udev/build
+++ b/packages/sysutils/udev/build
@@ -50,6 +50,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
             --disable-keymap \
             --disable-floppy \
             --disable-edd \
+            --disable-action_modeswitch \
             --without-selinux \
             --without-systemdsystemunitdir \
             --with-firmware-path=/lib/firmware \

From ebdcba4d7ea267d5500269525d073ba4d71f0719 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 16:13:45 +0200
Subject: [PATCH 13/17] Revert "udev: depends on gtk-doc"

This reverts commit 1dbf56453ec7922a355da51a59e6d263bdd82077.
---
 packages/sysutils/udev/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta
index 075531fe72..ae639474a7 100644
--- a/packages/sysutils/udev/meta
+++ b/packages/sysutils/udev/meta
@@ -27,7 +27,7 @@ PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 #PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="glib pciutils usbutils libusb-compat"
-PKG_BUILD_DEPENDS="toolchain glib gtk-doc pciutils usbutils libusb-compat"
+PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"
 PKG_SHORTDESC="udev: A Userspace Implementation for dynamic /dev nodes"

From a54b02aad02bdbda729d500609d5d73f61c5fd86 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 16:14:18 +0200
Subject: [PATCH 14/17] Revert "tools/mkpkg: add script to get and pack udev
 git sources"

This reverts commit 380b7e6f13f44aba6f2df37b9b5191a9ac4defa8.
---
 tools/mkpkg/mkpkg_udev | 43 ------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100755 tools/mkpkg/mkpkg_udev

diff --git a/tools/mkpkg/mkpkg_udev b/tools/mkpkg/mkpkg_udev
deleted file mode 100755
index 1b99e07707..0000000000
--- a/tools/mkpkg/mkpkg_udev
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  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, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-echo "getting sources..."
-  if [ ! -d udev.git ]; then
-    git clone git://git.kernel.org/pub/scm/linux/hotplug/udev.git udev.git
-  fi
-
-  cd udev.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf udev-$GIT_REV
-  cp -R udev.git udev-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf udev-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf udev-$GIT_REV.tar.xz udev-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf udev-$GIT_REV

From 30eb72240c3d2db0d47cb462b2507ad97c560fea Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 16:14:41 +0200
Subject: [PATCH 15/17] Revert "udev: update to udev-d971228"

This reverts commit 01ef3b2434ca562fc7a07ae3a52fb25840a360f9.
---
 packages/sysutils/udev/meta   |  5 ++---
 packages/sysutils/udev/unpack | 25 -------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100755 packages/sysutils/udev/unpack

diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta
index ae639474a7..a999e31272 100644
--- a/packages/sysutils/udev/meta
+++ b/packages/sysutils/udev/meta
@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="udev"
-PKG_VERSION="d971228"
+PKG_VERSION="171"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-#PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib pciutils usbutils libusb-compat"
 PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat"
 PKG_PRIORITY="optional"
diff --git a/packages/sysutils/udev/unpack b/packages/sysutils/udev/unpack
deleted file mode 100755
index f725bf32a4..0000000000
--- a/packages/sysutils/udev/unpack
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  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, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cp $SYSROOT_PREFIX/usr/share/gtk-doc/gtk-doc.make $PKG_BUILD

From 2510f12dfdb24e549a458f0563018512f4bca2e0 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 16:15:00 +0200
Subject: [PATCH 16/17] Revert "gtk-doc: install gtk-doc.make in toolchain"

This reverts commit 1a04172bdf1c150f1a2d20323d4daab52bac85fc.
---
 packages/x11/toolkits/gtk-doc/build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/x11/toolkits/gtk-doc/build b/packages/x11/toolkits/gtk-doc/build
index 0dec8d3700..fd93656bcd 100755
--- a/packages/x11/toolkits/gtk-doc/build
+++ b/packages/x11/toolkits/gtk-doc/build
@@ -25,5 +25,3 @@
 cd $PKG_BUILD
   mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
     cp gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal
-  mkdir -p $SYSROOT_PREFIX/usr/share/gtk-doc
-    cp gtk-doc.make $SYSROOT_PREFIX/usr/share/gtk-doc

From 09bf7ced247126a68f7acedf38cb3fec2453fd5c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 4 Jul 2011 18:39:05 +0200
Subject: [PATCH 17/17] upower: update to upower-0.9.12

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/upower/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta
index e5ff2eac5f..76f55343a7 100644
--- a/packages/sysutils/upower/meta
+++ b/packages/sysutils/upower/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="upower"
-PKG_VERSION="0.9.11"
+PKG_VERSION="0.9.12"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://upower.freedesktop.org/"
-PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="udev glib dbus dbus-glib polkit pm-utils"
 PKG_BUILD_DEPENDS="toolchain udev glib dbus dbus-glib gobject-introspection polkit"
 PKG_PRIORITY="optional"