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

This commit is contained in:
Stephan Raue 2012-07-10 19:01:13 +02:00
commit 0a78fc9396
5 changed files with 11 additions and 8 deletions

View File

@ -1,3 +1,6 @@
2.1.3
- update to makemkv-1.7.6
2.1.2 2.1.2
- update to makemkv-1.7.4 - update to makemkv-1.7.4

View File

@ -19,13 +19,13 @@
################################################################################ ################################################################################
PKG_NAME="makemkv" PKG_NAME="makemkv"
PKG_VERSION="1.7.4" PKG_VERSION="1.7.6"
PKG_REV="2" PKG_REV="3"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"
PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3" PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
PKG_URL="http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_oss.tar.gz" PKG_URL="http://www.makemkv.com/download/${PKG_NAME}-oss-${PKG_VERSION}.tar.gz"
PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}_v${PKG_VERSION}_bin.tar.gz" PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz"
PKG_DEPENDS="openssl" PKG_DEPENDS="openssl"
PKG_BUILD_DEPENDS="toolchain openssl" PKG_BUILD_DEPENDS="toolchain openssl"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"

View File

@ -27,8 +27,8 @@ require_eglibc $1
[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION mkdir -p $BUILD/$PKG_NAME-$PKG_VERSION
mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_oss $BUILD/$PKG_NAME-$PKG_VERSION/lib mv $BUILD/${PKG_NAME}-oss-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/lib
mv $BUILD/${PKG_NAME}_v${PKG_VERSION}_bin $BUILD/$PKG_NAME-$PKG_VERSION/bin mv $BUILD/${PKG_NAME}-bin-${PKG_VERSION} $BUILD/$PKG_NAME-$PKG_VERSION/bin
echo "### Applying upstream patches ###" echo "### Applying upstream patches ###"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-addon-xvdr" PKG_NAME="xbmc-addon-xvdr"
PKG_VERSION="df31b08" PKG_VERSION="75445e7"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -23,7 +23,7 @@
# evironment variables that are not user defined. # evironment variables that are not user defined.
################################################################################ ################################################################################
PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]' PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] '
export PS1 export PS1
TERM="linux" TERM="linux"