Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-07-19 17:27:37 +02:00
commit 2de2863b49
9 changed files with 22 additions and 11 deletions

8
.gitignore vendored
View File

@ -18,3 +18,11 @@ mkpkg-temp
# private working directory
/.work/
# symlinks...
/sources
/.work
# backup files
*.orig

View File

@ -56,8 +56,9 @@ SED="sed -i"
if [ -n "$1" ]; then
PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
if [[ $PKG_DIR = *$'\n'* ]]; then
echo -e "Error - multiple package folders:\n$PKG_DIR"
if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then
echo "Error - multiple package folders:"
echo "$PKG_DIR"
exit 1
fi
fi

View File

@ -26,6 +26,8 @@ VDR_GUI_ADDON_DIR="/storage/.xbmc/addons/script.video.vdr-gui"
cd $PKG_BUILD
strip_lto
./autogen.sh --host=$TARGET_NAME \
--build=$HOST_NAME \
--with-external-ffmpeg \

View File

@ -24,7 +24,7 @@
[ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1
printf "%${INDENT}c AUTORECONF $1\n" >&$SILENT_OUT
printf "%${INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
do_autoreconf $PKG_BUILD

View File

@ -50,7 +50,7 @@ fi
if [ ! -f $STAMP ]; then
rm -f $STAMP
printf "%${INDENT}c BUILD $1\n" >&$SILENT_OUT
printf "%${INDENT}c BUILD $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
for p in $PKG_BUILD_DEPENDS; do

View File

@ -43,7 +43,7 @@ fi
$SCRIPTS/build $@
printf "%${INDENT}c CREATE ADDON $1\n" >&$SILENT_OUT
printf "%${INDENT}c CREATE ADDON $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
if [ -f $PKG_DIR/addon ]; then

View File

@ -58,7 +58,7 @@ if [ -n "$PKG_URL" ]; then
rm -f $STAMP
printf "%${INDENT}c GET $1\n" >&$SILENT_OUT
printf "%${INDENT}c GET $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do

View File

@ -65,7 +65,7 @@ fi
$SCRIPTS/build $@
printf "%${INDENT}c INSTALL $1\n" >&$SILENT_OUT
printf "%${INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
for p in $PKG_DEPENDS; do

View File

@ -47,7 +47,7 @@ done
[ -f "$STAMP" ] && exit 0
printf "%${INDENT}c UNPACK $1\n" >&$SILENT_OUT
printf "%${INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
rm -rf $BUILD/$1[-_][0-9]*
@ -82,10 +82,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
PATCH=`basename $i`
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
printf "%${INDENT}c SKIP PATCH: $i\n" >&$SILENT_OUT
printf "%${INDENT}c SKIP PATCH: $i\n" ' '>&$SILENT_OUT
continue;
else
printf "%${INDENT}c APPLY PATCH: $i\n" >&$SILENT_OUT
printf "%${INDENT}c APPLY PATCH: $i\n" ' '>&$SILENT_OUT
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
fi
fi
@ -94,7 +94,7 @@ done
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
printf "%${INDENT}c FIXCONFIG: $config\n" >&$SILENT_OUT
printf "%${INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT
[ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config