diff --git a/packages/addons/multimedia/libav/addon b/packages/addons/multimedia/libav/addon index a5207a1972..8ac9a510f6 100755 --- a/packages/addons/multimedia/libav/addon +++ b/packages/addons/multimedia/libav/addon @@ -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 diff --git a/packages/addons/multimedia/libav/build b/packages/addons/multimedia/libav/build index ec0c03a928..dd46b33c65 100755 --- a/packages/addons/multimedia/libav/build +++ b/packages/addons/multimedia/libav/build @@ -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 \ diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt index 46132ff039..cfdcfed00c 100644 --- a/packages/addons/multimedia/libav/changelog.txt +++ b/packages/addons/multimedia/libav/changelog.txt @@ -1,3 +1,6 @@ +2.0.1 +- add 'ffplay' binary + 2.0.0 - prepare for OpenELEC-2.0 release diff --git a/packages/addons/multimedia/libav/meta b/packages/addons/multimedia/libav/meta index e8abec953e..bebdc1f195 100644 --- a/packages/addons/multimedia/libav/meta +++ b/packages/addons/multimedia/libav/meta @@ -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" diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt index d9a7504187..9abb44f0ca 100644 --- a/packages/addons/service/downloadmanager/transmission/changelog.txt +++ b/packages/addons/service/downloadmanager/transmission/changelog.txt @@ -1,3 +1,6 @@ +2.0.1 +- fix service script + 2.0.0 - prepare for OpenELEC-2.0 release diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta index 07cbb67323..6b5a6b30f9 100644 --- a/packages/addons/service/downloadmanager/transmission/meta +++ b/packages/addons/service/downloadmanager/transmission/meta @@ -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/" diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service index 9e765e077c..9a780b0f53 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.service @@ -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" diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build index a17f05fafd..6d16cfb95b 100755 --- a/packages/multimedia/SDL/build +++ b/packages/multimedia/SDL/build @@ -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