Merge branch 'hfstools' of git://github.com/travisghansen/OpenELEC.tv

Conflicts:
	packages/network/openssh/install

packages/graphics/glew/patches/test.patch

@@ -0,0 +1,20 @@
+--- glew-1.6.0/config/Makefile.linux.orig	2011-05-07 12:08:25.427908940 -0600
++++ glew-1.6.0/config/Makefile.linux	2011-05-07 12:08:50.345126195 -0600
+@@ -1,15 +1,9 @@
+ NAME = $(GLEW_NAME)
+-CC = cc
+-LD = cc
++CC = $(CC)
++LD = $(CC)
+ PICFLAG = -fPIC
+ M_ARCH ?= $(shell uname -m)
+-ifeq (x86_64,${M_ARCH})
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib64
+-LIBDIR = $(GLEW_DEST)/lib64
+-else
+-LDFLAGS.EXTRA = -L/usr/X11R6/lib
+ LIBDIR = $(GLEW_DEST)/lib
+-endif
+ LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+ LDFLAGS.STATIC = -Wl,-Bstatic
+ LDFLAGS.DYNAMIC = -Wl,-Bdynamic

packages/network/openssh/install

@@ -43,3 +43,4 @@ if [ $SFTP_SERVER = "yes" ]; then
   mkdir -p $INSTALL/usr/libexec
     cp $PKG_BUILD/sftp-server $INSTALL/usr/libexec
 fi
+

packages/toolchain/math/ppl/meta

@@ -25,6 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cs.unipr.it/ppl"
 PKG_URL="http://www.cs.unipr.it/ppl/Download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/ppl-0.11.2.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache gmp"
 PKG_PRIORITY="optional"