From 7f25bbbda2a51f6e17cda64c2c108de6d74ec278 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 17 Jan 2014 15:45:52 +0200 Subject: [PATCH 1/3] Mesa: gbm needs udev --- packages/graphics/Mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk index dea22725e0..ea402b69e2 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/Mesa/package.mk @@ -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" From 96d5b306ed7c4c5fc7364af4e09b9c87cd407f9e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 17 Jan 2014 15:46:32 +0200 Subject: [PATCH 2/3] open-vm-tool: update to open-vm-tool-9.4.0-1280544. dont build kernel modules --- packages/sysutils/open-vm-tools/package.mk | 9 +++---- .../open-vm-tools-disable-vmhgfs.patch | 13 ---------- .../patches/open-vm-tools-linuxdir.patch | 26 ------------------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch delete mode 100644 packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index 2e475a30eb..0362da9fb5 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -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 diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch deleted file mode 100644 index d157944217..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-disable-vmhgfs.patch +++ /dev/null @@ -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 diff --git a/packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch b/packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch deleted file mode 100644 index d7919e41d8..0000000000 --- a/packages/sysutils/open-vm-tools/patches/open-vm-tools-linuxdir.patch +++ /dev/null @@ -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 From a54b7489cd3cd9e4a46a76538d3e1b70e7a617b8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 17 Jan 2014 15:47:12 +0200 Subject: [PATCH 3/3] xf86-video-vmware: update to xf86-video-vmware-8da981712f62050076cff53e1b40ed1e307fcca8 --- packages/x11/driver/xf86-video-vmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-vmware/package.mk b/packages/x11/driver/xf86-video-vmware/package.mk index c75b5a11a0..a4e7bb2281 100644 --- a/packages/x11/driver/xf86-video-vmware/package.mk +++ b/packages/x11/driver/xf86-video-vmware/package.mk @@ -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"