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

This commit is contained in:
Stephan Raue 2013-12-13 13:14:02 +01:00
commit 55438eaf6d
17 changed files with 124 additions and 149 deletions

View File

@ -65,6 +65,20 @@ kernel_path() {
echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
}
# get package's build dir
get_build_dir() {
if [ ! -z $1 ] ; then
local _PKG_DIR=$(find $ROOT/packages -name $1)
if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
. $_PKG_DIR/package.mk
# TODO: remove
elif [ -d $_PKG_DIR -a -f $_PKG_DIR/meta ] ; then
. $_PKG_DIR/meta
fi
echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
fi
}
tolower(){
echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
}

View File

@ -91,17 +91,7 @@ SED="sed -i"
[ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
fi
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
XORG_PATH_DRI=/usr/lib/dri
XORG_PATH_XKB=/usr/share/X11/xkb

View File

@ -36,17 +36,19 @@ PKG_LONGDESC="vdr control plugin"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,17 +36,19 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,11 +36,6 @@ PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plu
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
@ -52,6 +47,13 @@ pre_make_target() {
MAKEFLAGS=-j1
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,13 +36,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
VDRSRC=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\" \
LIBDVBCSA=1"
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
@ -55,6 +48,15 @@ pre_make_target() {
MAKEFLAGS=-j1
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
VDRSRC=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale" \
LIBDVBCSA=1
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,16 +36,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
post_make_target() {
cd dist/epgdata2xmltv
make -j1

View File

@ -36,10 +36,12 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script

View File

@ -36,11 +36,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_make_target() {
# dont build parallel
MAKEFLAGS=-j1
@ -55,6 +50,13 @@ pre_configure_target() {
export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -36,17 +36,19 @@ PKG_LONGDESC="TV"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
export LDFLAGS="$LDFLAGS -fPIC"
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {
: # installation not needed, done by create-addon script
}

View File

@ -37,11 +37,6 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
LIBDIR=\".\" \
LOCALEDIR=\"./locale\""
pre_configure_target() {
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
@ -49,7 +44,15 @@ pre_configure_target() {
}
pre_build_target() {
ln -sf $ROOT/$BUILD/vdr-wirbelscan-[0-9]*/wirbelscan_services.h $PKG_BUILD
WIRBELSCAN_DIR=$(get_build_dir vdr-wirbelscan)
ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD
}
make_target() {
VDR_DIR=$(get_build_dir vdr)
make VDRDIR=$VDR_DIR \
LIBDIR="." \
LOCALEDIR="./locale"
}
makeinstall_target() {

View File

@ -50,10 +50,6 @@ STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
$SCRIPTS/unpack $PACKAGE_NAME
if [ -f $STAMP -a -f $PKG_DIR/need_build ]; then
$PKG_DIR/need_build $PACKAGE_NAME
fi
if [ -f $PKG_DIR/package.mk ]; then
if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
rm -f $STAMP
@ -236,20 +232,6 @@ if [ ! -f $STAMP ]; then
# virtual packages dont must be build, they only contains dependencies, so dont go further here
if [ ! "$PKG_SECTION" = "virtual" ]; then
if [ -z "$PKG_BUILD" ]; then
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
fi
# configure other variables
if [ "$TARGET" = "target" ]; then
INSTALL=$ROOT/$PKG_BUILD/.install_pkg
@ -382,27 +364,29 @@ if [ ! -f $STAMP ]; then
fi
if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
rm -rf $INSTALL/usr/include
rm -rf $INSTALL/usr/lib/pkgconfig
rm -rf $INSTALL/usr/share/aclocal
rm -rf $INSTALL/usr/share/bash-completion
rm -rf $INSTALL/usr/share/doc
rm -rf $INSTALL/usr/share/gtk-doc
rm -rf $INSTALL/usr/share/info
rm -rf $INSTALL/usr/share/locale
rm -rf $INSTALL/usr/share/man
rm -rf $INSTALL/usr/share/pkgconfig
find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
if [ -d $INSTALL ] ; then
rm -rf $INSTALL/usr/include
rm -rf $INSTALL/usr/lib/pkgconfig
rm -rf $INSTALL/usr/share/aclocal
rm -rf $INSTALL/usr/share/bash-completion
rm -rf $INSTALL/usr/share/doc
rm -rf $INSTALL/usr/share/gtk-doc
rm -rf $INSTALL/usr/share/info
rm -rf $INSTALL/usr/share/locale
rm -rf $INSTALL/usr/share/man
rm -rf $INSTALL/usr/share/pkgconfig
find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
if [ ! "$DEBUG" = yes ]; then
$STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
$STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
if [ ! "$DEBUG" = yes ]; then
$STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
$STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
fi
fi
fi
@ -420,18 +404,6 @@ if [ ! -f $STAMP ]; then
$SCRIPTS/autoreconf $PACKAGE_NAME
fi
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
if [ -f $PKG_DIR/build ]; then
$PKG_DIR/build $@ >&$VERBOSE_OUT

View File

@ -114,21 +114,6 @@ if [ -f $PKG_DIR/package.mk ]; then
# include buildfile
. $PKG_DIR/package.mk
# set PKG_BUILD variable
if [ -z "$PKG_BUILD" ]; then
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
fi
# install
if [ "$(type -t pre_install)" = "function" ]; then
pre_install
@ -141,17 +126,6 @@ if [ -f $PKG_DIR/package.mk ]; then
post_install
fi
elif [ -f $PKG_DIR/install ]; then
if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
elif [ -d "$BUILD/${PKG_NAME}" ]; then
PKG_BUILD="$BUILD/${PKG_NAME}"
fi
$PKG_DIR/install $@ >&$VERBOSE_OUT
fi

View File

@ -29,7 +29,6 @@ fi
$SCRIPTS/get $1
PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION"
STAMP=$PKG_BUILD/.openelec-unpack
mkdir -p $BUILD