void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merged the xorg-server-1.17 branch.

Browse source 
broken drivers:

 - AMD catalyst (needs xorg-server-1.16)
 - xf86-video-geode (needs API changes)
 - xf86-video-openchrome (needs API changes)
This commit is contained in:
Juan RP 2015-02-06 22:40:59 +01:00
commit a1c9a91d0e
20 changed files with 148 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/nvidia-stable/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux (long-lived series)"
pkgname=nvidia-stable pkgname=nvidia-stable
version=340.76 version=340.76
revision=2 revision=3
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -13,7 +13,7 @@ only_for_archs="i686 x86_64"
repository="nonfree" repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<19 nvidia-stable-dkms-${version}_${revision} pkg-config" depends="virtual?xserver-abi-video<20 nvidia-stable-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0" conflicts="catalyst>=0"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}" provides="nvidia-${version}_${revision} libGL-${version}_${revision}"

4
srcpkgs/nvidia/template
View file

@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia pkgname=nvidia
version=346.35 version=346.35
revision=2 revision=3
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -13,7 +13,7 @@ only_for_archs="i686 x86_64"
repository="nonfree" repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<19 nvidia-dkms-${version}_${revision} pkg-config" depends="virtual?xserver-abi-video<20 nvidia-dkms-${version}_${revision} pkg-config"
conflicts="catalyst>=0" conflicts="catalyst>=0"
provides="libGL-${version}_${revision}" provides="libGL-${version}_${revision}"

8
srcpkgs/nvidia304/template
View file

@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
pkgname=nvidia304 pkgname=nvidia304
version=304.125 version=304.125
revision=2 revision=3
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license" license="Propietary NVIDIA license"
homepage="http://www.nvidia.com" homepage="http://www.nvidia.com"
@ -12,7 +12,7 @@ repository="nonfree"
create_wrksrc=yes create_wrksrc=yes
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
short_desc="${_desc} - Libraries and Utilities" short_desc="${_desc} - Libraries and Utilities"
depends="virtual?xserver-abi-video<19 ${pkgname}-dkms-${version}_${revision} pkg-config" depends="virtual?xserver-abi-video<20 ${pkgname}-dkms-${version}_${revision} pkg-config"
provides="nvidia-${version}_${revision} libGL-${version}_${revision}" provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
replaces="nvidia>=0 libGL>=0" replaces="nvidia>=0 libGL>=0"
conflicts="catalyst>=0" conflicts="catalyst>=0"
@ -33,6 +33,10 @@ do_extract() {
./${_pkg}.run --extract-only ./${_pkg}.run --extract-only
rm -f ${_pkg}.run rm -f ${_pkg}.run
} }
do_configure() {
cd ${_pkg}
patch -sNp0 -i ${XBPS_SRCPKGDIR}/nvidia/files/linux-3.18.patch
}
do_install() { do_install() {
cd ${_pkg} cd ${_pkg}

25
srcpkgs/virtualbox-ose/patches/004-system-xorg.patch
View file

@ -1,6 +1,5 @@
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk --- src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000 +++ src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
@@ -63,18 +63,12 @@ @@ -63,18 +63,12 @@
VBoxOGL_INCS = . VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd) if1of ($(KBUILD_TARGET), linux solaris freebsd)
@ -25,9 +24,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
VBoxOGL_DEFS += VBOX_NO_NATIVEGL VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif endif
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk --- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000
--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000 +++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
VBoxGuestR3LibShared VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE ifndef VBOX_ONLY_TESTSUITE
@ -39,9 +37,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile
endif endif
endif endif
LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk --- src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 +++ src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -17,6 +17,10 @@ @@ -17,6 +17,10 @@
SUB_DEPTH = ../../../.. SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk include $(KBUILD_PATH)/subheader.kmk
@ -53,9 +50,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-
# Include sub-makefiles. # Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk --- src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000 +++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -29,7 +29,6 @@ @@ -29,7 +29,6 @@
# vboxmouse_drv # vboxmouse_drv
# #
@ -112,9 +108,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk V
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \ vboxmouse_drv_16_INCS := \
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk --- src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000 +++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -53,7 +53,6 @@ @@ -53,7 +53,6 @@
# vboxvideo_drv # vboxvideo_drv
# #

30
srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch Normal file
View file

@ -0,0 +1,30 @@
--- src/VBox/Additions/x11/vboxvideo/edid.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/edid.c 2015-02-05 07:37:15.213061546 +0100
@@ -44,6 +44,7 @@
* Dave Airlie <airlied@redhat.com>
*/
+#include <xorg/xorg-server.h>
#include <misc.h>
#include <xf86DDC.h>
#include <xf86Crtc.h>
--- src/VBox/Additions/x11/vboxvideo/pointer.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/pointer.c 2015-02-05 07:48:43.910512564 +0100
@@ -22,6 +22,7 @@
# include <Pci.h>
#endif
+#include <xorg/xorg-server.h>
#include "xf86.h"
#define NEED_XF86_TYPES
#include <iprt/string.h>
--- src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2015-02-05 07:38:16.019638643 +0100
@@ -59,6 +59,7 @@
# include <string.h>
#endif
+#include <xorg/xorg-server.h>
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6

9
srcpkgs/virtualbox-ose/template
View file

@ -1,9 +1,8 @@
# Template file for 'virtualbox-ose' # Template file for 'virtualbox-ose'
pkgname=virtualbox-ose pkgname=virtualbox-ose
version=4.3.20 version=4.3.20
revision=4 revision=5
wrksrc="VirtualBox-${version}" wrksrc="VirtualBox-${version}"
patch_args="-Np1"
short_desc="General-purpose full virtualizer for x86 hardware" short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org" homepage="http://virtualbox.org"
@ -18,7 +17,7 @@ hostmakedepends="perl pkg-config dev86 yasm acpica-utils"
makedepends="libressl-devel>=2.1.3 libcurl-devel libpng-devel>=1.6 libvpx-devel makedepends="libressl-devel>=2.1.3 libcurl-devel libpng-devel>=1.6 libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.16<1.17 pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.17<1.18
device-mapper-devel docbook-xsl" device-mapper-devel docbook-xsl"
if [ "$XBPS_MACHINE" = "x86_64" ]; then if [ "$XBPS_MACHINE" = "x86_64" ]; then
@ -44,6 +43,7 @@ do_configure() {
--disable-python --disable-kmods --nofatal --disable-python --disable-kmods --nofatal
} }
do_build() { do_build() {
export USERNAME="$(whoami)"
source ./env.sh source ./env.sh
kmk ${makejobs} all kmk ${makejobs} all
} }
@ -134,8 +134,7 @@ virtualbox-ose-dkms_package() {
} }
virtualbox-ose-guest_package() { virtualbox-ose-guest_package() {
lib32disabled=yes lib32disabled=yes
replaces="runit-void<20141013_2" depends="xserver-abi-video-19_1 virtualbox-ose-guest-dkms-${version}_${revision}"
depends="xserver-abi-video-18_1 virtualbox-ose-guest-dkms-${version}_${revision}"
short_desc+=" - guest utilities" short_desc+=" - guest utilities"
pkg_install() { pkg_install() {

6
srcpkgs/xf86-video-ati/template
View file

@ -1,15 +1,15 @@
# Template build file for 'xf86-video-ati'. # Template build file for 'xf86-video-ati'.
pkgname=xf86-video-ati pkgname=xf86-video-ati
version=7.5.0 version=7.5.0
revision=1 revision=2
lib32disabled=yes lib32disabled=yes
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-glamor" configure_args="--enable-glamor"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xf86driproto libudev-devel libpciaccess-devel makedepends="xf86driproto libudev-devel libpciaccess-devel
libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.16<1.17" libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1 mesa-ati-dri" depends="virtual?xserver-abi-video-19_1 mesa-ati-dri"
replaces="xf86-video-ati>=0" replaces="xf86-video-ati>=0"
short_desc="Xorg ATI Radeon video driver" short_desc="Xorg ATI Radeon video driver"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"

56
srcpkgs/xf86-video-cirrus/patches/df389885adf71ed.patch Normal file
View file

@ -0,0 +1,56 @@
From df389885adf71ed3b045c2fde9fd3ba4329e1a58 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Sat, 20 Sep 2014 18:51:17 +1000
Subject: cirrus: don't use pciTag
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 36f2039..bd5e52f 100644
--- src/alp_driver.c
+++ src/alp_driver.c
@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
pCir->Chipset = pCir->pEnt->chipset;
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
PCI_DEV_DEV(pCir->PciInfo),
PCI_DEV_FUNC(pCir->PciInfo));
+#endif
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
if (!xf86IsPc98())
diff --git a/src/cir.h b/src/cir.h
index 0a5d403..84f64b5 100644
--- src/cir.h
+++ src/cir.h
@@ -23,7 +23,9 @@ typedef struct {
ScrnInfoPtr pScrn;
CARD32 properties;
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
unsigned long PIOReg;
union {
struct lgRec *lg;
diff --git a/src/lg_driver.c b/src/lg_driver.c
index c20bbd0..589d14e 100644
--- src/lg_driver.c
+++ src/lg_driver.c
@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
PCI_DEV_DEV(pCir->PciInfo),
PCI_DEV_FUNC(pCir->PciInfo));
+#endif
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
--
cgit v0.10.2

6
srcpkgs/xf86-video-cirrus/template
View file

@ -1,12 +1,12 @@
# Template build file for 'xf86-video-cirrus'. # Template build file for 'xf86-video-cirrus'.
pkgname=xf86-video-cirrus pkgname=xf86-video-cirrus
version=1.5.2 version=1.5.2
revision=4 revision=5
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.16<1.17" makedepends="xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg Cirrus Logic video driver" short_desc="Xorg Cirrus Logic video driver"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT" license="MIT"

6
srcpkgs/xf86-video-fbdev/template
View file

@ -1,12 +1,12 @@
# Template build file for 'xf86-video-fbdev'. # Template build file for 'xf86-video-fbdev'.
pkgname=xf86-video-fbdev pkgname=xf86-video-fbdev
version=0.4.4 version=0.4.4
revision=4 revision=5
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.16<1.17" makedepends="xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg framebuffer video driver" short_desc="Xorg framebuffer video driver"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT" license="MIT"

8
srcpkgs/xf86-video-fbturbo/template
View file

@ -1,7 +1,7 @@
# Template build file for 'xf86-video-fbturbo'. # Template build file for 'xf86-video-fbturbo'.
pkgname=xf86-video-fbturbo pkgname=xf86-video-fbturbo
version=0.4.0 version=0.4.0
revision=7 revision=8
build_style=gnu-configure build_style=gnu-configure
short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices" short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
homepage="http://github.com/ssvb/xf86-video-fbturbo" homepage="http://github.com/ssvb/xf86-video-fbturbo"
@ -11,9 +11,9 @@ distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz"
checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
only_for_archs="armv6l armv7l" only_for_archs="armv6l armv7l"
hostmakedepends="pkg-config xorg-server-devel>=1.16<1.17" hostmakedepends="pkg-config xorg-server-devel>=1.17<1.18"
makedepends="libXrandr-devel xorg-server-devel>=1.16<1.17" makedepends="libXrandr-devel xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
replaces="xf86-video-fbturbo>=0" replaces="xf86-video-fbturbo>=0"
if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then

5
srcpkgs/xf86-video-geode/template
View file

@ -6,8 +6,9 @@ lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
# This is x86 specific. # This is x86 specific.
only_for_archs=i686 only_for_archs=i686
makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.16<1.17" broken="does not build with xorg-server-1.17"
depends="virtual?xserver-abi-video-18_1" makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg AMD Geode GX/LX video driver" short_desc="Xorg AMD Geode GX/LX video driver"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"

4
srcpkgs/xf86-video-intel/template
View file

@ -8,8 +8,8 @@ configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
hostmakedepends="pkg-config dri2proto>=2.6" hostmakedepends="pkg-config dri2proto>=2.6"
makedepends="libudev-devel libdrm-devel libpciaccess-devel libXext-devel makedepends="libudev-devel libdrm-devel libpciaccess-devel libXext-devel
libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel>=0.3.9 MesaLib-devel libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel>=0.3.9 MesaLib-devel
xorg-server-devel>=1.16<1.17" xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1 mesa-intel-dri" depends="virtual?xserver-abi-video-19_1 mesa-intel-dri"
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
short_desc="Xorg DDX Intel video driver" short_desc="Xorg DDX Intel video driver"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"

15
srcpkgs/xf86-video-modesetting/template
View file

@ -1,15 +0,0 @@
# Template build file for 'xf86-video-modesetting'.
pkgname=xf86-video-modesetting
version=0.9.0
revision=2
lib32disabled=yes
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.16<1.17"
depends="virtual?xserver-abi-video-18_1"
short_desc="X.org generic modesetting video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
license="MIT"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=90cf085573203dfadd48ea69bd694c4d04ccbe088b6855e9c85c34bb8a95d75c

6
srcpkgs/xf86-video-nouveau/template
View file

@ -1,13 +1,13 @@
# Template build file for 'xf86-video-nouveau'. # Template build file for 'xf86-video-nouveau'.
pkgname=xf86-video-nouveau pkgname=xf86-video-nouveau
version=1.0.11 version=1.0.11
revision=1 revision=2
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.16<1.17" makedepends="libudev-devel libdrm-devel xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1 mesa-nouveau-dri" depends="virtual?xserver-abi-video-19_1 mesa-nouveau-dri"
short_desc="Xorg opensource NVIDIA video driver" short_desc="Xorg opensource NVIDIA video driver"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://nouveau.freedesktop.org/wiki/" homepage="http://nouveau.freedesktop.org/wiki/"

5
srcpkgs/xf86-video-openchrome/template
View file

@ -4,11 +4,12 @@ version=0.3.1
revision=6 revision=6
lib32disabled=yes lib32disabled=yes
only_for_archs=i686 only_for_archs=i686
broken="does not build xorg-server-1.17"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
MesaLib-devel xorg-server-devel>=1.16<1.17" MesaLib-devel xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg VIA Unichromes video driver" short_desc="Xorg VIA Unichromes video driver"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT" license="MIT"

6
srcpkgs/xf86-video-sisusb/template
View file

@ -1,12 +1,12 @@
# Template build file for 'xf86-video-sisusb'. # Template build file for 'xf86-video-sisusb'.
pkgname=xf86-video-sisusb pkgname=xf86-video-sisusb
version=0.9.6 version=0.9.6
revision=7 revision=8
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.16<1.17" makedepends="xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg SiS USB video driver" short_desc="Xorg SiS USB video driver"
homepage="http://xorg.freedesktop.org/" homepage="http://xorg.freedesktop.org/"
license="Custom" license="Custom"

6
srcpkgs/xf86-video-vesa/template
View file

@ -2,12 +2,12 @@
pkgname=xf86-video-vesa pkgname=xf86-video-vesa
version="2:2.3.3" version="2:2.3.3"
wrksrc="${pkgname}-${version#*:}" wrksrc="${pkgname}-${version#*:}"
revision=4 revision=5
lib32disabled=yes lib32disabled=yes
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.16<1.17" makedepends="xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1" depends="virtual?xserver-abi-video-19_1"
short_desc="Xorg VESA video driver" short_desc="Xorg VESA video driver"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT" license="MIT"

6
srcpkgs/xf86-video-vmware/template
View file

@ -1,14 +1,14 @@
# Template build file for 'xf86-video-vmware'. # Template build file for 'xf86-video-vmware'.
pkgname=xf86-video-vmware pkgname=xf86-video-vmware
version=13.1.0 version=13.1.0
revision=1 revision=2
lib32disabled=yes lib32disabled=yes
only_for_archs="i686 x86_64" only_for_archs="i686 x86_64"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-vmwarectrl-client" configure_args="--enable-vmwarectrl-client"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="libdrm-devel MesaLib-devel>=10.1 xorg-server-devel>=1.16<1.17" makedepends="libdrm-devel MesaLib-devel>=10.1 xorg-server-devel>=1.17<1.18"
depends="virtual?xserver-abi-video-18_1 mesa-vmwgfx-dri" depends="virtual?xserver-abi-video-19_1 mesa-vmwgfx-dri"
short_desc="Modular Xorg VMware virtual video driver" short_desc="Modular Xorg VMware virtual video driver"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"

10
srcpkgs/xorg-server/template
View file

@ -1,6 +1,6 @@
# Template build file for 'xorg-server'. # Template build file for 'xorg-server'.
pkgname=xorg-server pkgname=xorg-server
version=1.16.3 version=1.17.0
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@ -20,7 +20,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD" license="MIT/X11, BSD"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
checksum=5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb checksum=4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166
lib32disabled=yes lib32disabled=yes
@ -34,10 +34,11 @@ makedepends="
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel
wayland-devel libepoxy-devel" wayland-devel libepoxy-devel xcb-util-renderutil-devel"
# See hw/xfree86/common/xf86Module.h. Only care for the major version. # See hw/xfree86/common/xf86Module.h. Only care for the major version.
depends="xkeyboard-config" depends="xkeyboard-config"
provides="xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1" provides="xserver-abi-extension-9_1 xserver-abi-input-21_1 xserver-abi-video-19_1"
replaces="xf86-video-modesetting>=0"
# Package build options # Package build options
build_options="systemd" build_options="systemd"
@ -77,7 +78,6 @@ xorg-server-xnest_package() {
vmove usr/share/man/man1/Xnest.1 vmove usr/share/man/man1/Xnest.1
} }
} }
xorg-server-xephyr_package() { xorg-server-xephyr_package() {
short_desc="X server outputting to a window on a pre-existing X display" short_desc="X server outputting to a window on a pre-existing X display"
pkg_install() { pkg_install() {