Merge branch 'testing'
Conflicts: srcpkgs/glamor-egl/template srcpkgs/virtualbox-ose/template srcpkgs/xf86-input-evdev/template srcpkgs/xf86-input-joystick/template srcpkgs/xf86-input-synaptics/template srcpkgs/xf86-input-vmmouse/template srcpkgs/xf86-input-wacom/template srcpkgs/xf86-video-ati/template srcpkgs/xf86-video-cirrus/template srcpkgs/xf86-video-fbdev/template srcpkgs/xf86-video-geode/template srcpkgs/xf86-video-intel/template srcpkgs/xf86-video-modesetting/template srcpkgs/xf86-video-nouveau/template srcpkgs/xf86-video-openchrome/template srcpkgs/xf86-video-sisusb/template srcpkgs/xf86-video-vesa/template srcpkgs/xf86-video-vmware/template srcpkgs/xorg-server/template This brings xorg-server 1.15 with related bumps for new ABI extensions.
This commit is contained in:
Juan RP
commit
034086e25c
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'glamor-egl'.
|
||||
pkgname=glamor-egl
|
||||
version=0.6.0
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="automake libtool pkg-config xorg-util-macros"
|
||||
makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.14<1.15"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="OpenGL based 2D rendering acceleration library"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.freedesktop.org/wiki/Software/Glamor/"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
pkgname=virtualbox-ose
|
||||
_vbox_distver=4.3.6
|
||||
version=${_vbox_distver}
|
||||
revision=1
|
||||
revision=2
|
||||
wrksrc="VirtualBox-${version}"
|
||||
patch_args="-Np1"
|
||||
short_desc="General-purpose full virtualizer for x86 hardware"
|
||||
|
|
@ -18,7 +18,7 @@ hostmakedepends="which perl pkg-config dev86 yasm acpica-utils"
|
|||
makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 libvpx-devel
|
||||
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
|
||||
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
|
||||
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.14
|
||||
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.15<1.16
|
||||
device-mapper-devel docbook-xsl shadow"
|
||||
|
||||
if [ "$XBPS_MACHINE" = "x86_64" ]; then
|
||||
|
|
@ -137,7 +137,7 @@ virtualbox-ose-dkms_package() {
|
|||
|
||||
virtualbox-ose-guest_package() {
|
||||
systemd_services="vboxservice.service on"
|
||||
depends="xserver-abi-video-14_1 virtualbox-ose-guest-dkms-${version}_${revision}"
|
||||
depends="xserver-abi-video-15_1 virtualbox-ose-guest-dkms-${version}_${revision}"
|
||||
short_desc+=" - guest utilities"
|
||||
|
||||
pkg_install() {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-input-evdev'.
|
||||
pkgname=xf86-input-evdev
|
||||
version=2.8.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14 mtdev-devel"
|
||||
depends="xserver-abi-input-19_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16 mtdev-devel"
|
||||
depends="xserver-abi-input-20_1"
|
||||
short_desc="Xorg event device input driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
|
|
@ -14,7 +14,7 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
|||
checksum=750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3
|
||||
|
||||
xf86-input-evdev-devel_package() {
|
||||
depends="xorg-server-devel ${sourcepkg}>=${version}"
|
||||
depends="xorg-server-devel ${sourcepkg}>=${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-input-joystick'.
|
||||
pkgname=xf86-input-joystick
|
||||
version=1.6.2
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-input-19_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-input-20_1"
|
||||
short_desc="Joystick Input driver for Xorg"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# Template build file for 'xf86-input-synaptics'.
|
||||
pkgname=xf86-input-synaptics
|
||||
version=1.7.2
|
||||
version=1.7.3
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libX11-devel libXtst-devel mtdev-devel
|
||||
pixman-devel libpciaccess-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-input-19_1"
|
||||
pixman-devel libpciaccess-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-input-20_1"
|
||||
short_desc="Xorg synaptics touchpad input driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.x.org/"
|
||||
license="MIT"
|
||||
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
|
||||
checksum=63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
|
||||
checksum=8b2a972043961195d056b84346317ec42bfa029095c9ee7aaf6deceba12e32d5
|
||||
|
||||
xf86-input-synaptics-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-input-vmmouse'.
|
||||
pkgname=xf86-input-vmmouse
|
||||
version=13.0.0
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-input-19_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-input-20_1"
|
||||
short_desc="Xorg VMware virtual mouse input driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Template build file for 'xf86-input-wacom'.
|
||||
pkgname=xf86-input-wacom
|
||||
version=0.23.0
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-xorg-conf-dir=/etc/X11/xorg.conf.d"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14 libXrandr-devel libXinerama-devel libXi-devel"
|
||||
depends="xserver-abi-input-19_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16 libXrandr-devel libXinerama-devel libXi-devel"
|
||||
depends="xserver-abi-input-20_1"
|
||||
short_desc="Xorg Wacom tablet input driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# Template build file for 'xf86-video-ati'.
|
||||
pkgname=xf86-video-ati
|
||||
version=7.3.0
|
||||
revision=1
|
||||
revision=2
|
||||
only_for_archs="i686 x86_64"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-glamor"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel
|
||||
libdrm-devel pixman-devel MesaLib-devel>=9.0.2 glamor-egl-devel
|
||||
xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1 mesa-ati-dri"
|
||||
xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1 mesa-ati-dri"
|
||||
replaces="xf86-video-ati>=0"
|
||||
short_desc="Xorg ATI Radeon video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-video-cirrus'.
|
||||
pkgname=xf86-video-cirrus
|
||||
version=1.5.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg Cirrus Logic video driver"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-video-fbdev'.
|
||||
pkgname=xf86-video-fbdev
|
||||
version=0.4.4
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg framebuffer video driver"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'xf86-video-fbturbo'.
|
||||
pkgname=xf86-video-fbturbo
|
||||
version=0.4.0
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=gnu-configure
|
||||
short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
|
||||
homepage="http://github.com/ssvb/xf86-video-fbturbo"
|
||||
|
|
@ -12,9 +12,9 @@ distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz"
|
|||
checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
|
||||
|
||||
only_for_archs="armv6l armv7l"
|
||||
hostmakedepends="pkg-config xorg-server-devel>=1.14"
|
||||
makedepends="libXrandr-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
hostmakedepends="pkg-config xorg-server-devel>=1.15<1.16"
|
||||
makedepends="libXrandr-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
replaces="xf86-video-fbturbo>=0"
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Template build file for 'xf86-video-geode'.
|
||||
pkgname=xf86-video-geode
|
||||
version=2.11.14
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=gnu-configure
|
||||
# This is x86 specific.
|
||||
only_for_archs=i686
|
||||
makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg AMD Geode GX/LX video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
# Template build file for 'xf86-video-intel'.
|
||||
pkgname=xf86-video-intel
|
||||
version=2.21.15
|
||||
version=2.99.909
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
|
||||
makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel
|
||||
libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel
|
||||
xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video>=14_1 mesa-intel-dri"
|
||||
xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video>=15_1 mesa-intel-dri"
|
||||
only_for_archs="i686 x86_64"
|
||||
short_desc="Xorg DDX Intel video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
license="MIT"
|
||||
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
||||
checksum=7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
|
||||
checksum=7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55
|
||||
|
||||
post_install() {
|
||||
vinstall COPYING 644 usr/share/licenses/${pkgname}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-video-modesetting'.
|
||||
pkgname=xf86-video-modesetting
|
||||
version=0.8.1
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="X.org generic modesetting video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# Template build file for 'xf86-video-nouveau'.
|
||||
pkgname=xf86-video-nouveau
|
||||
version=1.0.10
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1 mesa-nouveau-dri"
|
||||
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1 mesa-nouveau-dri"
|
||||
short_desc="Xorg opensource NVIDIA video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://nouveau.freedesktop.org/wiki/"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
# Template build file for 'xf86-video-openchrome'.
|
||||
pkgname=xf86-video-openchrome
|
||||
version=0.3.1
|
||||
revision=3
|
||||
revision=4
|
||||
only_for_archs=i686
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
|
||||
MesaLib-devel xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
MesaLib-devel xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg VIA Unichromes video driver"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# Template build file for 'xf86-video-sisusb'.
|
||||
pkgname=xf86-video-sisusb
|
||||
version=0.9.6
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=gnu-configure
|
||||
makedepends="pkg-config xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg SiS USB video driver"
|
||||
homepage="http://xorg.freedesktop.org/"
|
||||
license="Custom"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
pkgname=xf86-video-vesa
|
||||
version="2:2.3.3"
|
||||
wrksrc="${pkgname}-${version#*:}"
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1"
|
||||
makedepends="xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1"
|
||||
short_desc="Xorg VESA video driver"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT"
|
||||
|
|
|
|||
|
|
@ -1,179 +0,0 @@
|
|||
From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Clark <robdclark@gmail.com>
|
||||
Date: Mon, 10 Jun 2013 17:31:31 +0000
|
||||
Subject: vmwgfx: update for XA API changes
|
||||
|
||||
Signed-off-by: Rob Clark <robdclark@gmail.com>
|
||||
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
|
||||
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
|
||||
Tested-by: Jakob Bornecrantz <jakob@vmware.com>
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0631bcc..dccfb27 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
|
||||
PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
|
||||
fi
|
||||
if test x$BUILD_VMWGFX = xyes; then
|
||||
- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
|
||||
+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
|
||||
fi
|
||||
|
||||
DRIVER_NAME=vmware
|
||||
diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
|
||||
index 7de0772..2f007f0 100644
|
||||
--- vmwgfx/vmwgfx_dri2.c
|
||||
+++ vmwgfx/vmwgfx_dri2.c
|
||||
@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
|
||||
}
|
||||
|
||||
private->srf = srf;
|
||||
- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
|
||||
+ if (xa_surface_handle(srf, xa_handle_type_shared,
|
||||
+ &buffer->name, &buffer->pitch) != 0)
|
||||
return FALSE;
|
||||
|
||||
buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
|
||||
@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
|
||||
struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
|
||||
|
||||
if (--private->refcount == 0 && srf) {
|
||||
- xa_surface_destroy(srf);
|
||||
+ xa_surface_unref(srf);
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
|
||||
index 7863ba2..3002285 100644
|
||||
--- vmwgfx/vmwgfx_driver.c
|
||||
+++ vmwgfx/vmwgfx_driver.c
|
||||
@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
|
||||
+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
|
||||
+ &handle, &dummy) != 0) {
|
||||
LogMessage(X_ERROR, "Could not get present surface handle.\n");
|
||||
return FALSE;
|
||||
}
|
||||
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
|
||||
index 63df3a1..ed3c1ee 100644
|
||||
--- vmwgfx/vmwgfx_saa.c
|
||||
+++ vmwgfx/vmwgfx_saa.c
|
||||
@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
|
||||
vpix->malloc = NULL;
|
||||
}
|
||||
if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
|
||||
- xa_surface_destroy(vpix->hw);
|
||||
+ xa_surface_unref(vpix->hw);
|
||||
vpix->hw = NULL;
|
||||
}
|
||||
if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
|
||||
@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
|
||||
if (vpix->gmr && vsaa->can_optimize_dma) {
|
||||
uint32_t handle, dummy;
|
||||
|
||||
- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
|
||||
+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
|
||||
+ &handle, &dummy) != 0)
|
||||
goto out_err;
|
||||
if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
|
||||
to_hw) != 0)
|
||||
@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
|
||||
(int) to_hw,
|
||||
(struct xa_box *) REGION_RECTS(reg),
|
||||
REGION_NUM_RECTS(reg));
|
||||
+ if (to_hw)
|
||||
+ xa_context_flush(vsaa->xa_ctx);
|
||||
if (vpix->gmr)
|
||||
vmwgfx_dmabuf_unmap(vpix->gmr);
|
||||
if (ret)
|
||||
@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
|
||||
&spix->dirty_hw))
|
||||
return FALSE;
|
||||
|
||||
- xa_surface_destroy(vpix->hw);
|
||||
+ xa_surface_unref(vpix->hw);
|
||||
vpix->hw = NULL;
|
||||
|
||||
/*
|
||||
@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
|
||||
|
||||
(void) pScreen;
|
||||
if (src_vpix == dst_vpix || !src_vpix->hw ||
|
||||
- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
|
||||
+ xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
|
||||
+ &vsaa->src_handle, &dummy) != 0)
|
||||
return FALSE;
|
||||
|
||||
REGION_NULL(pScreen, &vsaa->present_region);
|
||||
@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
|
||||
return TRUE;
|
||||
|
||||
out_no_damage:
|
||||
- xa_surface_destroy(hw);
|
||||
+ xa_surface_unref(hw);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
|
||||
|
||||
if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
|
||||
xa_copy_done(vsaa->xa_ctx);
|
||||
+ xa_context_flush(vsaa->xa_ctx);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
|
||||
return;
|
||||
}
|
||||
xa_copy_done(vsaa->xa_ctx);
|
||||
+ xa_context_flush(vsaa->xa_ctx);
|
||||
}
|
||||
|
||||
static Bool
|
||||
@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
|
||||
struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
|
||||
|
||||
xa_composite_done(vsaa->xa_ctx);
|
||||
+ xa_context_flush(vsaa->xa_ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
|
||||
*/
|
||||
if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
|
||||
goto out_err;
|
||||
- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
|
||||
+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
|
||||
+ &handle, &dummy) != 0)
|
||||
goto out_err;
|
||||
depth = xa_format_depth(xa_surface_format(vpix->hw));
|
||||
|
||||
diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
|
||||
index 449266b..2971ed7 100644
|
||||
--- vmwgfx/vmwgfx_tex_video.c
|
||||
+++ vmwgfx/vmwgfx_tex_video.c
|
||||
@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
|
||||
|
||||
for (i=0; i<3; ++i) {
|
||||
if (priv->yuv[i]) {
|
||||
- xa_surface_destroy(priv->yuv[i]);
|
||||
+ xa_surface_unref(priv->yuv[i]);
|
||||
priv->yuv[i] = NULL;
|
||||
}
|
||||
for (j=0; j<2; ++j) {
|
||||
@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
|
||||
REGION_RESET(pScrn->pScreen, ®, &box);
|
||||
}
|
||||
|
||||
- if (xa_surface_handle(srf, &handle, &stride) != 0) {
|
||||
+ if (xa_surface_handle(srf, xa_handle_type_shared,
|
||||
+ &handle, &stride) != 0) {
|
||||
ret = BadAlloc;
|
||||
break;
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,13 +1,14 @@
|
|||
# Template build file for 'xf86-video-vmware'.
|
||||
pkgname=xf86-video-vmware
|
||||
version=13.0.1
|
||||
revision=3
|
||||
revision=4
|
||||
patch_args="-Np1"
|
||||
only_for_archs="i686 x86_64"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-vmwarectrl-client"
|
||||
hostmakedepends="automake libtool pkg-config xorg-util-macros"
|
||||
makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.14"
|
||||
depends="xserver-abi-video-14_1 mesa-vmwgfx-dri"
|
||||
makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.15<1.16"
|
||||
depends="xserver-abi-video-15_1 mesa-vmwgfx-dri"
|
||||
short_desc="Modular Xorg VMware virtual video driver"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'xorg-server'.
|
||||
pkgname=xorg-server
|
||||
version=1.14.5
|
||||
revision=2
|
||||
version=1.15.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
|
||||
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
|
||||
|
|
@ -17,19 +17,22 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT/X11, BSD"
|
||||
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
||||
checksum=8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1
|
||||
checksum=613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8
|
||||
|
||||
hostmakedepends="pkg-config perl flex"
|
||||
makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
|
||||
dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
|
||||
resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
|
||||
makedepends="
|
||||
libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.25 presentproto
|
||||
dri2proto>=2.1 dri3proto xf86driproto randrproto videoproto compositeproto scrnsaverproto
|
||||
resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto xcb-util-devel
|
||||
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel>=183
|
||||
openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
|
||||
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
|
||||
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
|
||||
libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel xkeyboard-config"
|
||||
libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel
|
||||
xkeyboard-config"
|
||||
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
|
||||
depends="xkeyboard-config"
|
||||
provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1"
|
||||
provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
|
||||
|
||||
# Package build options
|
||||
build_options="dri dri2 opengl"
|
||||
|
|
@ -111,12 +114,12 @@ xorg-server-xvfb_package() {
|
|||
}
|
||||
|
||||
xorg-server-devel_package() {
|
||||
depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto
|
||||
depends="libudev-devel dri2proto>=2.1 dri3proto presentproto glproto xf86driproto randrproto
|
||||
videoproto compositeproto scrnsaverproto resourceproto xineramaproto
|
||||
libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel
|
||||
libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel
|
||||
libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel
|
||||
libdrm-devel>=2.4.34"
|
||||
libxshmfence-devel libdrm-devel>=2.4.34"
|
||||
if [ "$build_option_opengl" ]; then
|
||||
depends+=" MesaLib-devel"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue