From 181773a56c80de3ddfa4bdd424a3cf069ddf16a4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 2 Mar 2012 11:43:12 +0200 Subject: [PATCH] new package: xf86-video-vmware --- packages/x11/driver/xf86-video-vmware/build | 37 ++++++++++++ packages/x11/driver/xf86-video-vmware/install | 26 +++++++++ packages/x11/driver/xf86-video-vmware/meta | 36 ++++++++++++ ...gfx-avoid-including-a-library-header.patch | 57 +++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100755 packages/x11/driver/xf86-video-vmware/build create mode 100755 packages/x11/driver/xf86-video-vmware/install create mode 100644 packages/x11/driver/xf86-video-vmware/meta create mode 100644 packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch diff --git a/packages/x11/driver/xf86-video-vmware/build b/packages/x11/driver/xf86-video-vmware/build new file mode 100755 index 0000000000..d5662f2834 --- /dev/null +++ b/packages/x11/driver/xf86-video-vmware/build @@ -0,0 +1,37 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +xorg_drv_configure_prepend + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-static \ + --enable-vmwarectrl-client \ + --with-xorg-module-dir=$XORG_PATH_MODULES + +make diff --git a/packages/x11/driver/xf86-video-vmware/install b/packages/x11/driver/xf86-video-vmware/install new file mode 100755 index 0000000000..972b6d420f --- /dev/null +++ b/packages/x11/driver/xf86-video-vmware/install @@ -0,0 +1,26 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options + +mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/src/.libs/vmware_drv.so $INSTALL/$XORG_PATH_MODULES/drivers diff --git a/packages/x11/driver/xf86-video-vmware/meta b/packages/x11/driver/xf86-video-vmware/meta new file mode 100644 index 0000000000..29b4dd03ff --- /dev/null +++ b/packages/x11/driver/xf86-video-vmware/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program 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, or (at your option) +# any later version. +# +# This Program 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 OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="xf86-video-vmware" +PKG_VERSION="11.99.901" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="OSS" +PKG_SITE="http://www.vmware.com" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_DEPENDS="libX11 Mesa" +PKG_BUILD_DEPENDS="toolchain Mesa" +PKG_PRIORITY="optional" +PKG_SECTION="x11/driver" +PKG_SHORTDESC="xf86-video-vmware: The Xorg driver for vmware video" +PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video" +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch b/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch new file mode 100644 index 0000000000..7c18bad709 --- /dev/null +++ b/packages/x11/driver/xf86-video-vmware/patches/xf86-video-vmware-11.99.901-vmwgfx-avoid-including-a-library-header.patch @@ -0,0 +1,57 @@ +From 8ff19c2b2f288d6851b444dbda39544980837b73 Mon Sep 17 00:00:00 2001 +From: Thomas Hellstrom +Date: Wed, 1 Feb 2012 16:59:13 +0100 +Subject: [PATCH 1/4] vmwgfx: Avoid including a library header and use pixman + for type conversion + +The PictTransform type is a typedef of a pixman type. + +Signed-off-by: Thomas Hellstrom +--- + vmwgfx/vmwgfx_xa_composite.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/vmwgfx/vmwgfx_xa_composite.c b/vmwgfx/vmwgfx_xa_composite.c +index a2e3970..32246e8 100644 +--- a/vmwgfx/vmwgfx_xa_composite.c ++++ b/vmwgfx/vmwgfx_xa_composite.c +@@ -33,8 +33,8 @@ + #include "config.h" + #endif + ++#include + #include +-#include + #include "xa_composite.h" + #include "vmwgfx_saa.h" + #include "vmwgfx_saa_priv.h" +@@ -75,17 +75,17 @@ vmwgfx_matrix_from_pict_transform(PictTransform *trans, float *matrix) + if (!trans) + return FALSE; + +- matrix[0] = XFixedToDouble(trans->matrix[0][0]); +- matrix[3] = XFixedToDouble(trans->matrix[0][1]); +- matrix[6] = XFixedToDouble(trans->matrix[0][2]); ++ matrix[0] = pixman_fixed_to_double(trans->matrix[0][0]); ++ matrix[3] = pixman_fixed_to_double(trans->matrix[0][1]); ++ matrix[6] = pixman_fixed_to_double(trans->matrix[0][2]); + +- matrix[1] = XFixedToDouble(trans->matrix[1][0]); +- matrix[4] = XFixedToDouble(trans->matrix[1][1]); +- matrix[7] = XFixedToDouble(trans->matrix[1][2]); ++ matrix[1] = pixman_fixed_to_double(trans->matrix[1][0]); ++ matrix[4] = pixman_fixed_to_double(trans->matrix[1][1]); ++ matrix[7] = pixman_fixed_to_double(trans->matrix[1][2]); + +- matrix[2] = XFixedToDouble(trans->matrix[2][0]); +- matrix[5] = XFixedToDouble(trans->matrix[2][1]); +- matrix[8] = XFixedToDouble(trans->matrix[2][2]); ++ matrix[2] = pixman_fixed_to_double(trans->matrix[2][0]); ++ matrix[5] = pixman_fixed_to_double(trans->matrix[2][1]); ++ matrix[8] = pixman_fixed_to_double(trans->matrix[2][2]); + + return TRUE; + } +-- +1.7.8.3 +