Merge remote branch 'upstream/master' into gpt

This commit is contained in:
Matthias Saou 2011-12-20 15:57:44 +01:00
commit cfc52f8a23
8 changed files with 21 additions and 11 deletions

View File

@ -24,6 +24,7 @@
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
cp $PKG_BUILD/ffplay $ADDON_BUILD/$PKG_ADDON_ID/bin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
cp $PKG_BUILD/ffpresets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg

View File

@ -22,6 +22,8 @@
. config/options $1
export pkg_config="$ROOT/$TOOLCHAIN/bin/pkg-config"
# libav fails building with LTO support
strip_lto
@ -69,7 +71,7 @@ cd $PKG_BUILD/
--enable-logging \
--enable-doc \
--enable-ffmpeg \
--disable-ffplay \
--enable-ffplay \
--disable-ffprobe \
--disable-ffserver \
--enable-avdevice \

View File

@ -1,3 +1,6 @@
2.0.1
- add 'ffplay' binary
2.0.0
- prepare for OpenELEC-2.0 release

View File

@ -20,13 +20,13 @@
PKG_NAME="libav"
PKG_VERSION="0.7.2"
PKG_REV="0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.libav.org"
PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2 SDL"
PKG_PRIORITY="optional"
PKG_SECTION="lib/multimedia"
PKG_SHORTDESC="libav: A complete audio and video stream library"

View File

@ -1,3 +1,6 @@
2.0.1
- fix service script
2.0.0
- prepare for OpenELEC-2.0 release

View File

@ -20,7 +20,7 @@
PKG_NAME="transmission"
PKG_VERSION="2.42"
PKG_REV="0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"

View File

@ -46,7 +46,7 @@ mkdir -p /storage/downloads/incoming
mkdir -p /storage/downloads/watch
if [ -z "$TRANSMISSION_IP" ]; then
TRANSMISSION_IP='*.*.*.*'
TRANSMISSION_IP="*.*.*.*"
fi
TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads"
@ -54,7 +54,7 @@ TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming
TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch"
TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log"
TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission"
TRANSMISSION_ARG="$TRANSMISSION_ARG -a '$TRANSMISSION_IP'"
TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP"
if [ "$TRANSMISSION_AUTH" = "true" ]; then
TRANSMISSION_ARG="$TRANSMISSION_ARG -t"

View File

@ -120,11 +120,12 @@ make
$MAKEINSTALL
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
$SYSROOT_PREFIX/usr/bin/sdl-config
mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
# cp sdl.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
cp $SYSROOT_PREFIX/usr/bin/sdl-config $ROOT/$TOOLCHAIN/bin
#$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/sdl-config
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
$ROOT/$TOOLCHAIN/bin/sdl-config
mkdir -p $ROOT/$TOOLCHAIN/bin
cp $SYSROOT_PREFIX/usr/bin/sdl-config $ROOT/$TOOLCHAIN/bin
$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $ROOT/$TOOLCHAIN/bin/sdl-config