jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephan Raue 2014-01-17 14:56:20 +01:00
commit 7b6c157a8f
5 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/graphics/Mesa/package.mk
View File

@ -23,8 +23,8 @@ PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"
PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11 systemd"
PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"

9
packages/sysutils/open-vm-tools/package.mk
View File

@ -18,12 +18,12 @@
################################################################################
PKG_NAME="open-vm-tools"
PKG_VERSION="9.2.3-1031360"
PKG_VERSION="9.4.0-1280544"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://open-vm-tools.sourceforge.net"
PKG_URL="$SOURCEFORGE_SRC/project/open-vm-tools/open-vm-tools/stable-9.2.x/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_URL="$SOURCEFORGE_SRC/project/open-vm-tools/open-vm-tools/stable-9.4.x/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS="glib"
PKG_BUILD_DEPENDS_TARGET="toolchain glib"
PKG_PRIORITY="optional"
@ -45,14 +45,11 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
--without-x \
--without-icu \
--without-procps \
--with-kernel-release=$OPENVMTOOLS_KERNEL_VER \
--with-linuxdir=$(ls -d $ROOT/$BUILD/linux-*)"
--without-kernel-modules"
PKG_MAKE_OPTS_TARGET="CFLAGS+=-DG_DISABLE_DEPRECATED"
makeinstall_target() {
mkdir -p $INSTALL/lib/modules/$(get_module_dir)/open-vm-tools
cp -PR ../modules/linux/vmxnet/vmxnet.ko $INSTALL/lib/modules/$(get_module_dir)/open-vm-tools
mkdir -p $INSTALL/usr/lib
cp -PR libvmtools/.libs/libvmtools.so* $INSTALL/usr/lib

13
packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch
View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index b79026d..ac73873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,7 +947,7 @@ if test "$os" = "linux"; then
LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lrt"
- MODULES="$MODULES vmxnet vmhgfs"
+ MODULES="$MODULES vmxnet"
# See if we need vmci and vsock modules. Starting with 3.9 they made
# their way into mainline kernel.
if test "$osVersion" -lt 309000; then

26
packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch
View File

@ -1,26 +0,0 @@
diff --git a/configure b/configure
index 3861c20..bec644c 100755
--- a/configure
+++ b/configure
@@ -2881,7 +2881,7 @@ if test "$with_kernel_modules" = "yes"; then
if test ! -d "$LINUXDIR/kernel/"; then
as_fn_error $? "$LINUXDIR/kernel does not exist" "$LINENO" 5
fi
- LINUXINCLUDE="$LINUXDIR/build/include"
+ LINUXINCLUDE="$LINUXDIR/include"
if test ! -d "$LINUXINCLUDE"; then
as_fn_error $? "Can't find include dir under $LINUXDIR" "$LINENO" 5
fi
diff --git a/configure.ac b/configure.ac
index be4a7c0..2bf6779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ if test "$with_kernel_modules" = "yes"; then
if test ! -d "$LINUXDIR/kernel/"; then
AC_MSG_ERROR([$LINUXDIR/kernel does not exist])
fi
- LINUXINCLUDE="$LINUXDIR/build/include"
+ LINUXINCLUDE="$LINUXDIR/include"
if test ! -d "$LINUXINCLUDE"; then
AC_MSG_ERROR([Can't find include dir under $LINUXDIR])
fi

2
packages/x11/driver/xf86-video-vmware/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xf86-video-vmware"
PKG_VERSION="31bff9f7f3d9a68fd1449532e8ab50065de63857"
PKG_VERSION="8da981712f62050076cff53e1b40ed1e307fcca8"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"