Merge branch 'master' of git://github.com/OpenELEC/OpenELEC.tv into openelec-kernel-next

This commit is contained in:
Stephan Raue 2011-06-21 11:25:10 +02:00
commit af7cb03fd7
19 changed files with 31 additions and 25 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="atk"
PKG_VERSION="2.0.0"
PKG_VERSION="2.0.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="strace"
PKG_VERSION="4.5.20"
PKG_VERSION="4.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://sourceforge.net/projects/strace/"
PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libimobiledevice"
PKG_VERSION="1.0.4"
PKG_VERSION="1.1.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="tiff"
PKG_VERSION="4.0.0beta6"
PKG_VERSION="4.0.0beta7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -39,11 +39,11 @@ LDFLAGS="$LDFLAGS -lexpat" \
--with-threads \
--enable-unicode=ucs4 \
make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib"
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib"
make PYTHON_MODULES_INCLUDE=$ROOT/$TOOLCHAIN/include \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib" \
make PYTHON_MODULES_INCLUDE="$ROOT/$TOOLCHAIN/include /usr/include" \
PYTHON_MODULES_LIB="$ROOT/$TOOLCHAIN/lib /usr/lib" \
install
# symlink python binary to python2 (needed for Mesa)

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="cifs-utils"
PKG_VERSION="4.8.1"
PKG_VERSION="5.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="ethtool"
PKG_VERSION="2.6.36"
PKG_VERSION="2.6.39"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://sourceforge.net/projects/gkernel/"
PKG_URL="$SOURCEFORGE_SRC/gkernel/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/build/libssh/*.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/build/src/*.so* $INSTALL/usr/lib

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="libssh"
PKG_VERSION="0.4.8"
PKG_VERSION="0.5.0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OpenSource"
PKG_SITE="http://www.libssh.org/"
PKG_URL="http://www.libssh.org/files/0.4/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="http://www.libssh.org/files/0.5/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="zlib libgcrypt"
PKG_BUILD_DEPENDS="toolchain zlib libgcrypt"
PKG_PRIORITY="optional"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="pygobject"
PKG_VERSION="2.28.4"
PKG_VERSION="2.28.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="simplejson"
PKG_VERSION="2.1.3"
PKG_VERSION="2.1.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="usbutils"
PKG_VERSION="0.91"
PKG_VERSION="003"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="ccache"
PKG_VERSION="3.1.4"
PKG_VERSION="3.1.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-fglrx"
PKG_VERSION="11.5"
PKG_VERSION="11.6"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="gtk+"
PKG_VERSION="2.24.4"
PKG_VERSION="2.24.5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="gtk-doc"
PKG_VERSION="1.15"
PKG_VERSION="1.17"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="pango"
PKG_VERSION="1.28.4"
PKG_VERSION="1.29.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.pango.org/"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.28/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.29/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft"
PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft"
PKG_PRIORITY="optional"

View File

@ -51,6 +51,9 @@ for i in $PKG_URL; do
*.tar.gz | *.tgz)
tar xzf $f -C $3
;;
*.tar.xz | *.txz)
tar xJf $f -C $3
;;
*.7z)
mkdir -p $3/$1
7z x -o$3/$1 $f

View File

@ -58,7 +58,10 @@ rm -rf $BUILD/$1[-_]git*
if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
$SCRIPTS/extract $1 "$1*.tbz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.gz" $BUILD
$SCRIPTS/extract $1 "$1*.tar.xz" $BUILD
$SCRIPTS/extract $1 "$1*.txz" $BUILD
$SCRIPTS/extract $1 "$1*.tgz" $BUILD
$SCRIPTS/extract $1 "$1*.7z" $BUILD
fi