From 9592214d514f4e5f89eb485ff921aa0c33a49f1c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 17 Jan 2013 12:40:01 +0100
Subject: [PATCH] scripts/unpack: add support for version specific subfolders

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/unpack | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index 842623856c..eaf3673a55 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -77,15 +77,29 @@ fi
 [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
 [ -d $BUILD/${PKG_NAME} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}`
 
-for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
+for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do
   if [ -f "$i" ]; then
     PATCH=`basename $i`
     PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
     if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
-      printf "%${BUILD_INDENT}c SKIP PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c SKIP PATCH (common):   $i\n" ' '>&$SILENT_OUT
       continue;
     else
-      printf "%${BUILD_INDENT}c APPLY PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c APPLY PATCH (common):   $i\n" ' '>&$SILENT_OUT
+      cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+    fi
+  fi
+done
+
+for i in $PKG_DIR/patches/$PKG_VERSION/*.patch ; do
+  if [ -f "$i" ]; then
+    PATCH=`basename $i`
+    PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
+    if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
+      printf "%${BUILD_INDENT}c SKIP PATCH ($PKG_VERSION):   $i\n" ' '>&$SILENT_OUT
+      continue;
+    else
+      printf "%${BUILD_INDENT}c APPLY PATCH ($PKG_VERSION):   $i\n" ' '>&$SILENT_OUT
       cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
     fi
   fi
@@ -96,10 +110,10 @@ for i in $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch ; do
     PATCH=`basename $i`
     PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
     if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
-      printf "%${BUILD_INDENT}c SKIP PROJECT PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c SKIP PATCH (project):   $i\n" ' '>&$SILENT_OUT
       continue;
     else
-      printf "%${BUILD_INDENT}c APPLY PROJECT PATCH:   $i\n" ' '>&$SILENT_OUT
+      printf "%${BUILD_INDENT}c APPLY PATCH (project):   $i\n" ' '>&$SILENT_OUT
       cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
     fi
   fi