Merge pull request #131 from CvH/virtual

Virtual bump for vbox guest additions and build fixes

packages/linux-drivers/vboxguest/package.mk

@@ -17,13 +17,12 @@
 ################################################################################
 
 PKG_NAME="vboxguest"
-PKG_VERSION="5.0.12"
+PKG_VERSION="5.0.20"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.virtualbox.org"
-PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain linux xf86-video-virtualbox"
-PKG_DEPENDS_TARGET="toolchain linux"
 PKG_NEED_UNPACK="$LINUX_DEPENDS"
 PKG_PRIORITY="optional"
 PKG_SECTION="driver"
@@ -38,10 +37,11 @@ pre_make_target() {
 }
 
 make_target() {
+  cd $(get_build_dir xf86-video-virtualbox)/src/${PKG_NAME}-${PKG_VERSION}/
   make KERN_DIR=$(kernel_path)
 }
 
 makeinstall_target() {
   mkdir -p $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
+  cp *.ko $INSTALL/lib/modules/$(get_module_dir)/$PKG_NAME
 }

packages/x11/driver/xf86-video-virtualbox/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-virtualbox"
-PKG_VERSION="5.0.12"
+PKG_VERSION="5.0.20"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"

packages/x11/lib/libXcomposite/package.mk

@@ -32,7 +32,12 @@ PKG_LONGDESC="X Composite Library"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+SHARED_SUPPORT="--disable-shared"
+if [ "$PROJECT" = "Virtual" ]; then
+  SHARED_SUPPORT="--enable-shared"
+fi
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static $SHARED_SUPPORT"
 
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"

packages/x11/lib/libXdamage/package.mk

@@ -32,7 +32,12 @@ PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAM
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+SHARED_SUPPORT="--disable-shared"
+if [ "$PROJECT" = "Virtual" ]; then
+  SHARED_SUPPORT="--enable-shared"
+fi
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static $SHARED_SUPPORT"
 
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"

packages/x11/lib/libXfixes/package.mk

@@ -32,7 +32,12 @@ PKG_LONGDESC="X Fixes Library"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+SHARED_SUPPORT="--disable-shared"
+if [ "$PROJECT" = "Virtual" ]; then
+  SHARED_SUPPORT="--enable-shared"
+fi
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static $SHARED_SUPPORT"
 
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"

tools/mkpkg/mkpkg_vboxguest

@@ -0,0 +1,52 @@
+#!/bin/sh
+################################################################################
+#      This file is part of LibreELEC - https://LibreELEC.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+# the script uses 7z to extract the iso to avoid root 
+# sudo apt-get install p7zip-full
+
+# set version you want to use
+if [ -z "$1" ]; then
+  echo "Usage: $0 5.0.123"
+  exit 0
+fi
+
+VBOX_VERSION="$1"
+
+echo "getting sources..."
+  mkdir vbox && cd vbox/
+  wget http://download.virtualbox.org/virtualbox/${VBOX_VERSION}/VBoxGuestAdditions_${VBOX_VERSION}.iso
+
+echo "extracting iso..."
+  7z e VBoxGuestAdditions_${VBOX_VERSION}.iso VBoxLinuxAdditions.run -r
+  chmod 0755 VBoxLinuxAdditions.run
+
+echo "extract VBoxLinuxAdditions.run..."
+  ./VBoxLinuxAdditions.run --tar xf
+
+echo "extract VBoxGuestAdditions-amd64..."
+  mkdir xf86-video-virtualbox-${VBOX_VERSION} 
+  tar -jxvf VBoxGuestAdditions-amd64.tar.bz2 -C xf86-video-virtualbox-${VBOX_VERSION}/
+
+echo "packing sources..."
+  tar cvJf xf86-video-virtualbox-${VBOX_VERSION}.tar.xz xf86-video-virtualbox-${VBOX_VERSION}
+  mv xf86-video-virtualbox-${VBOX_VERSION}.tar.xz ../xf86-video-virtualbox-${VBOX_VERSION}.tar.xz
+
+echo "remove temporary sourcedir..."
+  cd ..  
+  rm -rf vbox/