mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
2de2863b49
8
.gitignore
vendored
8
.gitignore
vendored
@ -18,3 +18,11 @@ mkpkg-temp
|
|||||||
|
|
||||||
# private working directory
|
# private working directory
|
||||||
/.work/
|
/.work/
|
||||||
|
|
||||||
|
# symlinks...
|
||||||
|
/sources
|
||||||
|
/.work
|
||||||
|
|
||||||
|
# backup files
|
||||||
|
*.orig
|
||||||
|
|
||||||
|
@ -56,8 +56,9 @@ SED="sed -i"
|
|||||||
|
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
|
PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
|
||||||
if [[ $PKG_DIR = *$'\n'* ]]; then
|
if [ "${PKG_DIR}" != "$(echo $PKG_DIR | tr -d '\n')" ]; then
|
||||||
echo -e "Error - multiple package folders:\n$PKG_DIR"
|
echo "Error - multiple package folders:"
|
||||||
|
echo "$PKG_DIR"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
2
packages/3rdparty/lib/xine-lib/build
vendored
2
packages/3rdparty/lib/xine-lib/build
vendored
@ -26,6 +26,8 @@ VDR_GUI_ADDON_DIR="/storage/.xbmc/addons/script.video.vdr-gui"
|
|||||||
|
|
||||||
cd $PKG_BUILD
|
cd $PKG_BUILD
|
||||||
|
|
||||||
|
strip_lto
|
||||||
|
|
||||||
./autogen.sh --host=$TARGET_NAME \
|
./autogen.sh --host=$TARGET_NAME \
|
||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--with-external-ffmpeg \
|
--with-external-ffmpeg \
|
||||||
|
@ -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
|
[ ! -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))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
do_autoreconf $PKG_BUILD
|
do_autoreconf $PKG_BUILD
|
||||||
|
@ -50,7 +50,7 @@ fi
|
|||||||
if [ ! -f $STAMP ]; then
|
if [ ! -f $STAMP ]; then
|
||||||
rm -f $STAMP
|
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))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
for p in $PKG_BUILD_DEPENDS; do
|
for p in $PKG_BUILD_DEPENDS; do
|
||||||
|
@ -43,7 +43,7 @@ fi
|
|||||||
|
|
||||||
$SCRIPTS/build $@
|
$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))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
if [ -f $PKG_DIR/addon ]; then
|
if [ -f $PKG_DIR/addon ]; then
|
||||||
|
@ -58,7 +58,7 @@ if [ -n "$PKG_URL" ]; then
|
|||||||
|
|
||||||
rm -f $STAMP
|
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))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do
|
until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do
|
||||||
|
@ -65,7 +65,7 @@ fi
|
|||||||
|
|
||||||
$SCRIPTS/build $@
|
$SCRIPTS/build $@
|
||||||
|
|
||||||
printf "%${INDENT}c INSTALL $1\n" >&$SILENT_OUT
|
printf "%${INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT
|
||||||
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
for p in $PKG_DEPENDS; do
|
for p in $PKG_DEPENDS; do
|
||||||
|
@ -47,7 +47,7 @@ done
|
|||||||
|
|
||||||
[ -f "$STAMP" ] && exit 0
|
[ -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))
|
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
|
||||||
|
|
||||||
rm -rf $BUILD/$1[-_][0-9]*
|
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`
|
PATCH=`basename $i`
|
||||||
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
|
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
|
||||||
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
|
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;
|
continue;
|
||||||
else
|
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
|
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -94,7 +94,7 @@ done
|
|||||||
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
|
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
|
||||||
|
|
||||||
for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
|
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.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
|
||||||
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config
|
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config
|
||||||
|
Loading…
x
Reference in New Issue
Block a user