kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]

Browse source 
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG=
to /etc/make.conf to get the old version.

Update several xorg related ports, including:
x11/libxcb 1.9.1 -> 1.9.3
graphics/libdrm 2.4.46 -> 2.4.50
x11/pixman 0.30.2 -> 0.32.4
x11/xkeyboard-config 2.9 -> 2.10.1
x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0

Fix dissapearing cursor in xf86-video-vmware [2]

Stagify all x11@-owned ports

Bump portrevisions for xf86-* ports due to xserver version change.

Fix fallout from updates where needed.

Thanks to:	all testersi, bdrewery and the FreeBSD x11@ team
exp-run by:	bdrewery [1]
PR:		ports/184684 [1], ports/181385 [2]
Submitted by:	Douglas Carmichael <dcarmich@dcarmichael.net> [2]
Approved by:	portmgr (bdrewery), core (jhb) [0]
This commit is contained in:
Niclas Zeising 2013-12-16 11:11:09 +00:00
parent 7b9110d87c
commit 47be7a61c9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336621
395 changed files with 1741 additions and 1410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mk/bsd.port.mk
View file

@ -1222,6 +1222,16 @@ WITH_PKGNG?= yes
.endif
.endif
# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless
# WITHOUT_NEW_XORG is set.
.if ${OSVERSION} >= 1100000
. if !defined(WITHOUT_NEW_XORG)
WITH_NEW_XORG?= yes
. else
.undef WITH_NEW_XORG
. endif
.endif
# Only define tools here (for transition period with between pkg tools)
.include "${PORTSDIR}/Mk/bsd.commands.mk"

20
Mk/bsd.xorg.mk
View file

@ -56,21 +56,15 @@ USE_XORG+= xorg-macros
. endif
. if ${XORG_CAT} == "driver"
USE_XORG+= xorg-server xproto randrproto xi
USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \
inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
glproto xineramaproto resourceproto scrnsaverproto
# work around a llvm bug on i386, llvm bug #15806
# reproduced with clang 3.2 (current release) and 3.1
. if ${ARCH} == i386
CFLAGS+= -fno-optimize-sibling-calls
. endif
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
. if ${PORTNAME:M*input*}x != x
USE_XORG+= inputproto videoproto fontsproto renderproto xextproto \
dri2proto
. elif ${PORTNAME:M*video*}x != x
USE_XORG+= videoproto fontsproto renderproto xextproto dri2proto
. else
IGNORE= doesn't contain either "video" or "input"
. endif
. endif
. if ${XORG_CAT} == "font"
@ -147,7 +141,7 @@ USES+= pathfix
CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb
LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto
USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
. endif
.endif
@ -171,6 +165,7 @@ XORG_MODULES= bigreqsproto \
dmx \
dmxproto \
dri2proto \
dri3proto \
evieproto \
fixesproto \
fontcacheproto \
@ -185,6 +180,7 @@ XORG_MODULES= bigreqsproto \
oldx \
pciaccess \
pixman \
presentproto \
printproto \
randrproto \
recordproto \
@ -238,6 +234,7 @@ XORG_MODULES= bigreqsproto \
xrender \
xres \
xscrnsaver \
xshmfence \
xt \
xtrans \
xtrap \
@ -254,6 +251,7 @@ damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTS
dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
dri2proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
dri3proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto
evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
@ -268,6 +266,7 @@ libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-f
oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
presentproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto
printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
recordproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
@ -322,6 +321,7 @@ xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x
xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
xscrnsaver_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
xt_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
xshmfence_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence
xtrans_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
xtrap_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
xtst_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst

29
UPDATING
View file

@ -5,6 +5,35 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20131216:
AFFECTS: users of x11/xorg, graphics/libGL, graphics/dri, all xorg ports
AUTHOR: zeising@FreeBSD.org
The default xorg version has been switched on FreeBSD CURRENT.
To upgrade graphics/libGL, graphics/dri and related MESA ports, it is
neccessary to first remove the old versions of those ports.
No special upgrade procedure is needed for xorg port but it is
necessary to recompile all xorg drivers (xf86-*) and other ports that
depend on the xserver version, including
emulators/virtualbox-ose-additions. Portrevisions have been bumped
where needed, but users of drivers not in the ports tree will need to
recompile those.
If it is important to stay on the old versions, it is possible to
specify WITHOUT_NEW_XORG= in /etc/make.conf to get the old xorg
distribution.
To update:
# pkg_delete -f libGL-\* dri-\*
or
# pkg delete -f libGL dri
followed by
# portmaster -a
or
# portupgrade -a
20131214:
AFFECTS: users of databases/db4*
AUTHOR: mandree@FreeBSD.org

1
astro/viking/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= viking
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/

2
cad/pdnmesh/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= pdnmesh
PORTVERSION= 0.2.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}

1
cad/repsnapper/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= repsnapper
PORTVERSION= 2.3.2a3
PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= https://codeload.github.com/timschmidt/repsnapper/tar.gz/
DISTNAME= ${PORTVERSION}

2
deskutils/pinot/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= pinot
PORTVERSION= 1.06
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
#MASTER_SITES= http://colinf.chez.com/pinot/

5
devel/gccmakedep/Makefile
View file

@ -13,10 +13,7 @@ XORG_CAT= util
BUILD_DEPENDS= tradcpp:${PORTSDIR}/devel/tradcpp
MAN1= gccmakedep.1
PLIST_FILES= bin/gccmakedep
PLIST_FILES= bin/gccmakedep man/man1/gccmakedep.1.gz
CONFIGURE_ENV+= ac_cv_path_RAWCPP=tradcpp
NO_STAGE= yes
.include <bsd.port.mk>

1
devel/libpciaccess/Makefile
View file

@ -14,5 +14,4 @@ CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids
XORG_CAT= lib
NO_STAGE= yes
.include <bsd.port.mk>

5
devel/makedepend/Makefile
View file

@ -12,9 +12,6 @@ COMMENT= Dependency generator for makefiles
XORG_CAT= util
USE_XORG= xproto
PLIST_FILES= bin/makedepend
PLIST_FILES= bin/makedepend man/man1/makedepend.1.gz
MAN1= makedepend.1
NO_STAGE= yes
.include <bsd.port.mk>

2
devel/xorg-macros/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xorg-macros
PORTVERSION= 1.17.1
PORTVERSION= 1.18.0
CATEGORIES= devel x11
DISTNAME= util-macros-$(PORTVERSION)

4
devel/xorg-macros/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) = 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625
SIZE (xorg/util/util-macros-1.17.1.tar.bz2) = 79105
SHA256 (xorg/util/util-macros-1.18.0.tar.bz2) = e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b
SIZE (xorg/util/util-macros-1.18.0.tar.bz2) = 77830

2
emulators/catapult/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= catapult
PORTVERSION= 0.9.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION}
DISTNAME= openmsx-${PORTNAME}-${PORTVERSION}

1
emulators/qemu-devel/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= qemu
PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/:release \
LOCAL/nox:snapshot

2
emulators/tme/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= tme
PORTVERSION= 0.8
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://people.csail.mit.edu/fredette/tme/

1
emulators/virtualbox-ose-additions/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.2.20
PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

2
games/fuhquake/files/Makefile
View file

@ -187,7 +187,7 @@ CL_GLX_OBJS = \
CL_COMMON_LIBS = -lm
CL_X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext
CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lGL -lXxf86dga -lXxf86vm
CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lX11 -lGL -lXxf86dga -lXxf86vm
.c.o:
${CC} ${DO_CFLAGS} -c $< -o $*.o

2
games/klavaro/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= klavaro
PORTVERSION= 1.9.9
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/

2
graphics/cairo/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= cairo
PORTVERSION= 1.10.2
PORTREVISION= 6
PORTREVISION= 7
PORTEPOCH?= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/

11
graphics/freeglut/Makefile
View file

@ -28,7 +28,6 @@ DOCS= download.html freeglut.html freeglut_logo.png \
progress.html structure.html
BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes
NO_STAGE= yes
.include <bsd.port.options.mk>
pre-configure:
@ -43,17 +42,17 @@ post-build:
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for FILE in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
.endfor
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${STAGEDIR}${EXAMPLESDIR}
.for prog in ${BINS}
@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${EXAMPLESDIR}
@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${STAGEDIR}${EXAMPLESDIR}
.endfor
@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
.endif

24
graphics/libdrm/Makefile
View file

@ -17,7 +17,6 @@ USES= pkgconfig
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
NO_STAGE= yes
OPTIONS_DEFINE= MANPAGES
@ -42,28 +41,22 @@ PLIST_SUB+= KMS="@comment " NOUVEAU="@comment "
.endif
.if ${PORT_OPTIONS:MMANPAGES}
BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
xsltproc:${PORTSDIR}/textproc/libxslt
MAN3= drmAvailable.3 \
drmHandleEvent.3 \
drmModeGetResources.3
MAN7= drm-gem.7 \
drm-kms.7 \
drm-memory.7 \
drm-mm.7 \
drm-ttm.7 \
drm.7
BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
USE_GNOME+= libxslt:build
PLIST_SUB+= MAN=""
.else
CONFIGURE_ARGS+=--disable-manpages
PLIST_SUB+= MAN="@comment "
.endif
LIBDRM_VERSION= 2.4.46
LIBDRM_VERSION= 2.4.50
LIBDRM_REVISION=0
PLIST_SUB+= OLD="@comment " NEW=""
EXTRA_PATCHES+= ${FILESDIR}/extra-configure \
${FILESDIR}/extra-tests_modetest_Makefile.in \
${FILESDIR}/extra-tests_modetest_modetest.c \
${FILESDIR}/extra-tests_modetest_strchrnul.c
${FILESDIR}/extra-tests_modetest_strchrnul.c \
${FILESDIR}/extra-tests__radeon__radeon_ttm.c
CONFIGURE_ARGS+=--disable-vmwgfx
.else
CONFIGURE_ARGS= --enable-nouveau-experimental-api
@ -85,4 +78,7 @@ pre-patch:
s,i?86|x86_64),i?86|amd64|x86_64),g' \
${WRKSRC}/configure
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
.include <bsd.port.mk>

4
graphics/libdrm/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
SIZE (libdrm-2.4.17.tar.bz2) = 408882
SHA256 (libdrm-2.4.46.tar.bz2) = 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1
SIZE (libdrm-2.4.46.tar.bz2) = 554190
SHA256 (libdrm-2.4.50.tar.bz2) = 3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045
SIZE (libdrm-2.4.50.tar.bz2) = 563613

13
graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c Normal file
View file

@ -0,0 +1,13 @@
--- tests/radeon/radeon_ttm.c.orig 2013-11-07 11:34:28.207096353 +0100
+++ tests/radeon/radeon_ttm.c 2013-11-07 11:37:41.571085931 +0100
@@ -25,6 +25,10 @@
*/
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
+
+#include <xf86drm.h>
+
#include "rbo.h"
/* allocate as many single page bo to try to starve the kernel

28
graphics/libdrm/files/extra-tests_modetest_Makefile.in
View file

@ -1,6 +1,6 @@
--- tests/modetest/Makefile.in.orig 2013-04-04 15:41:48.212028807 +0200
+++ tests/modetest/Makefile.in 2013-04-04 15:45:21.384003991 +0200
@@ -36,8 +52,11 @@
--- tests/modetest/Makefile.in.orig 2013-10-11 18:46:07.000000000 +0200
+++ tests/modetest/Makefile.in 2013-11-07 11:30:15.274123603 +0100
@@ -80,8 +80,11 @@
host_triplet = @host@
@HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT)
@HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT)
@ -12,9 +12,9 @@
+@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS)
+@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS)
subdir = tests/modetest
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -53,7 +72,10 @@
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/build-aux/depcomp
@@ -98,7 +101,10 @@
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@ -26,23 +26,23 @@
modetest_OBJECTS = $(am_modetest_OBJECTS)
am__DEPENDENCIES_1 =
@HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -229,12 +265,10 @@
top_builddir = @top_builddir@
@@ -306,12 +312,12 @@
top_srcdir = @top_srcdir@
AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \
-I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
- -I$(top_srcdir) $(am__append_1)
-modetest_SOURCES = \
- buffers.c modetest.c buffers.h
-
+ -I$(top_srcdir) $(am__append_2)
+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1)
modetest_SOURCES = \
- buffers.c modetest.c buffers.h
+ buffers.c modetest.c buffers.h $(am__append_1)
modetest_LDADD = $(top_builddir)/libdrm.la \
- $(top_builddir)/libkms/libkms.la $(am__append_2)
+ $(top_builddir)/libkms/libkms.la $(am__append_3)
all: all-am
.SUFFIXES:
@@ -333,6 +370,7 @@
@@ -417,6 +423,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@

12
graphics/libdrm/files/extra-tests_modetest_modetest.c
View file

@ -1,6 +1,6 @@
--- tests/modetest/modetest.c.orig 2013-02-22 00:44:28.203705216 +0100
+++ tests/modetest/modetest.c 2013-02-22 00:44:56.803699770 +0100
@@ -57,6 +57,10 @@
--- tests/modetest/modetest.c.orig 2013-09-16 22:56:20.000000000 +0200
+++ tests/modetest/modetest.c 2013-11-07 11:32:10.534114644 +0100
@@ -59,6 +59,10 @@
#include "buffers.h"
@ -8,6 +8,6 @@
+char *strchrnul(const char *, int);
+#endif
+
drmModeRes *resources;
int fd, modes;
struct crtc {
drmModeCrtc *crtc;
drmModeObjectProperties *props;

9
graphics/libdrm/pkg-plist
View file

@ -70,6 +70,15 @@ libdata/pkgconfig/libdrm.pc
%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
%%NEW%%%%MAN%%man/man3/drmAvailable.3.gz
%%NEW%%%%MAN%%man/man3/drmHandleEvent.3.gz
%%NEW%%%%MAN%%man/man3/drmModeGetResources.3.gz
%%NEW%%%%MAN%%man/man7/drm-gem.7.gz
%%NEW%%%%MAN%%man/man7/drm-kms.7.gz
%%NEW%%%%MAN%%man/man7/drm-memory.7.gz
%%NEW%%%%MAN%%man/man7/drm-mm.7.gz
%%NEW%%%%MAN%%man/man7/drm-ttm.7.gz
%%NEW%%%%MAN%%man/man7/drm.7.gz
%%OLD%%@dirrm include/nouveau
%%NEW%%%%KMS%%@dirrm include/libkms
%%NEW%%@dirrm include/libdrm

2
graphics/libreatlas/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= libreatlas
PORTVERSION= 1.0.0a
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= graphics geography
MASTER_SITES= http://www.gaia-gis.it/gaia-sins/

1
graphics/mesa-demos/Makefile
View file

@ -23,7 +23,6 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFINE= NVIDIA
NVIDIA_DESC= Use NVIDIA's libraries
NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
${WRKSRC}/configure

2
multimedia/freetuxtv/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= freetuxtv
PORTVERSION= 0.6.5
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= GOOGLE_CODE

2
net/cvsup/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= cvsup
PORTVERSION= 16.1h
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= net devel
MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG}
MASTER_SITE_SUBDIR=development/CVSup/snapshots

2
net/tigervnc/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= tigervnc
PORTVERSION= 1.3.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net x11-servers
MASTER_SITES= SF:tigervnc
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc

2
print/photoprint/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= photoprint
DISTVERSION= 0.4.2-pre2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= print graphics
MASTER_SITES= http://www.blackfiveimaging.co.uk/photoprint/

2
sysutils/gtk-imonc/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= gtk-imonc
PORTVERSION= 0.6.4.1
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= sysutils
MASTER_SITES= http://stefan-strigler.de/download/

2
sysutils/nitrogen/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= nitrogen
PORTVERSION= 1.5.2
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://projects.l3ib.org/nitrogen/files/

1
textproc/xorg-sgml-doctools/Makefile
View file

@ -13,5 +13,4 @@ XORG_CAT= doc
USE_GMAKE= yes
USES= pathfix
NO_STAGE= yes
.include <bsd.port.mk>

3
x11-clocks/oclock/Makefile
View file

@ -10,7 +10,4 @@ COMMENT= Round clock application for X
XORG_CAT= app
USE_XORG= x11 xmu xext xt xkbfile
MAN1= oclock.1
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-clocks/oclock/pkg-plist
View file

@ -1,4 +1,5 @@
bin/oclock
man/man1/oclock.1.gz
share/X11/app-defaults/Clock-color
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11

3
x11-clocks/xclock/Makefile
View file

@ -12,7 +12,4 @@ XORG_CAT= app
USE_XORG= xrender xft xkbfile xt xaw
USES= iconv
MAN1= xclock.1
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-clocks/xclock/pkg-plist
View file

@ -1,4 +1,5 @@
bin/xclock
man/man1/xclock.1.gz
share/X11/app-defaults/XClock-color
share/X11/app-defaults/XClock
@dirrmtry share/X11/app-defaults

2
x11-drivers/input-wacom/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= input-wacom
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
PORTREVISION= 1
PORTREVISION= 3
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
SF/linuxwacom/xf86-input-wacom/:linuxwacom

3
x11-drivers/xf86-input-acecad/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org acecad input driver
XORG_CAT= driver
MAN4= acecad.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-acecad/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/acecad_drv.la
lib/xorg/modules/input/acecad_drv.so
man/man4/acecad.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

4
x11-drivers/xf86-input-elographics/Makefile
View file

@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org elographics input driver
XORG_CAT= driver
MAN4= elographics.4x
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
ELO_VERSION= 1.4.1
@ -19,5 +20,4 @@ ELO_VERSION= 1.2.4
ELO_REVISION= 0
.endif
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-elographics/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/elographics_drv.la
lib/xorg/modules/input/elographics_drv.so
man/man4/elographics.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-input-fpit/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-input-fpit
PORTVERSION= 1.4.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -10,6 +11,8 @@ COMMENT= X.Org fpit input driver
XORG_CAT= driver
USE_XORG= xrandr
.include <bsd.port.options.mk>
.if !defined(WITH_NEW_XORG)
IGNORE= does not build with X server 1.7.7
.endif

3
x11-drivers/xf86-input-hyperpen/Makefile
View file

@ -10,6 +10,8 @@ COMMENT= X.Org hyperpen input driver
XORG_CAT= driver
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
HYPERVER= 1.4.1
HYPERREVISION= 0
@ -19,5 +21,4 @@ HYPERREVISION= 6
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c
.endif
NO_STAGE= yes
.include <bsd.port.mk>

4
x11-drivers/xf86-input-joystick/Makefile
View file

@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org joystick input driver
XORG_CAT= driver
MAN4= joystick.4x
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
JOYVER= 1.6.2
@ -19,7 +20,6 @@ JOYVER= 1.5.0
JOYREVISION= 1
.endif
NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in

1
x11-drivers/xf86-input-joystick/pkg-plist
View file

@ -2,6 +2,7 @@ include/xorg/joystick-properties.h
lib/xorg/modules/input/joystick_drv.la
lib/xorg/modules/input/joystick_drv.so
libdata/pkgconfig/xorg-joystick.pc
man/man4/joystick.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

4
x11-drivers/xf86-input-keyboard/Makefile
View file

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-input-keyboard
PORTVERSION= 1.7.0
PORTVERSION= 1.8.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -9,7 +9,5 @@ COMMENT= X.Org keyboard input driver
XORG_CAT= driver
USE_XORG= kbproto
MAN4= kbd.4x
NO_STAGE= yes
.include <bsd.port.mk>

4
x11-drivers/xf86-input-keyboard/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838

14
x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c Normal file
View file

@ -0,0 +1,14 @@
Index: src/bsd_kbd.c
@@ -205,6 +205,12 @@
#endif
}
}
+/*
+ * Switch keyboards which are not attached to console in RAW mode
+ */
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+ ioctl(pInfo->fd, KDSKBMODE, K_RAW);
+#endif
return Success;
}

24
x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c Normal file
View file

@ -0,0 +1,24 @@
Index: src/kbd.c
@@ -25,6 +25,7 @@
#include "xf86.h"
#include "atKeynames.h"
+#include "xf86Priv.h"
#include "xf86Privstr.h"
#include <X11/extensions/XI.h>
@@ -392,6 +393,14 @@
RemoveEnabledDevice(pInfo->fd);
pKbd->KbdOff(pInfo, what);
device->public.on = FALSE;
+ /*
+ * Close device file for keyboards which are not attached
+ * to console, otherwise they can't be opened again after
+ * relogin when using session manager like xdm.
+ * X server will take care about console attached keyboards.
+ */
+ if (pInfo->fd != xf86Info.consoleFd)
+ close(pInfo->fd);
break;
default:

1
x11-drivers/xf86-input-keyboard/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/kbd_drv.la
lib/xorg/modules/input/kbd_drv.so
man/man4/kbd.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

6
x11-drivers/xf86-input-magictouch/Makefile
View file

@ -8,11 +8,13 @@ CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org magictouch input driver
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver
.endif
XORG_CAT= driver
MAN4= magictouch.4x
USE_AUTOTOOLS= libtool
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-magictouch/pkg-plist
View file

@ -1,6 +1,7 @@
lib/xorg/modules/input/magictouch_drv.a
lib/xorg/modules/input/magictouch_drv.la
lib/xorg/modules/input/magictouch_drv.so
man/man4/magictouch.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-input-mouse/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-input-mouse
PORTVERSION= 1.9.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -9,7 +10,5 @@ COMMENT= X.Org mouse input driver
XORG_CAT= driver
USES= pathfix
MAN4= mousedrv.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-mouse/pkg-plist
View file

@ -2,6 +2,7 @@ include/xorg/xf86-mouse-properties.h
lib/xorg/modules/input/mouse_drv.la
lib/xorg/modules/input/mouse_drv.so
libdata/pkgconfig/xorg-mouse.pc
man/man4/mousedrv.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

6
x11-drivers/xf86-input-mutouch/Makefile
View file

@ -8,13 +8,11 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org mutouch input driver
XORG_CAT= driver
MAN4= mutouch.4x
.include <bsd.port.options.mk>
.if !defined(WITH_NEW_XORG)
IGNORE= does not build with xorg-server 1.7.7
.else
.endif
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-mutouch/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/mutouch_drv.la
lib/xorg/modules/input/mutouch_drv.so
man/man4/mutouch.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

4
x11-drivers/xf86-input-penmount/Makefile
View file

@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org penmount input driver
XORG_CAT= driver
MAN4= penmount.4x
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
PEN_VERSION= 1.5.0
@ -19,5 +20,4 @@ PEN_VERSION= 1.4.1
PEN_REVISION= 1
.endif
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-penmount/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/penmount_drv.la
lib/xorg/modules/input/penmount_drv.so
man/man4/penmount.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

31
x11-drivers/xf86-input-synaptics/Makefile
View file

@ -10,29 +10,12 @@ COMMENT= X.Org synaptics input driver
CONFLICTS= synaptics-[0-9]*
OPTIONS_DEFINE= HAL
OPTIONS_DEFAULT=HAL
NO_STAGE= yes
.include <bsd.port.options.mk>
USES= pathfix
USE_XORG= x11 xtst
XORG_CAT= driver
.if ${PORT_OPTIONS:MHAL}
PLIST_SUB+= HAL=""
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
.else
PLIST_SUB+= HAL="@comment "
.endif
MAN1= syndaemon.1 \
synclient.1
MAN4= synaptics.4x
.if defined(WITH_NEW_XORG)
SYNAPTICS_VERSION= 1.7.1
SYNAPTICS_VERSION= 1.7.2
SYNAPTICS_REVISION= 0
PLIST_SUB+= NEW="" OLD="@comment "
.else
@ -42,16 +25,4 @@ PLIST_SUB+= NEW="@comment " OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in
.endif
post-install:
.if ${PORT_OPTIONS:MHAL}
${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
${PREFIX}/share/hal/fdi/policy/10osvendor/
.if !defined(WITH_NEW_XORG)
${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
${PREFIX}/share/hal/fdi/policy/20thirdparty/
.endif
.endif
.include <bsd.port.mk>

4
x11-drivers/xf86-input-synaptics/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
SHA256 (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170

10
x11-drivers/xf86-input-synaptics/pkg-plist
View file

@ -5,14 +5,12 @@ include/xorg/synaptics-properties.h
lib/xorg/modules/input/synaptics_drv.la
lib/xorg/modules/input/synaptics_drv.so
libdata/pkgconfig/xorg-synaptics.pc
man/man1/synclient.1.gz
man/man1/syndaemon.1.gz
man/man4/synaptics.4x.gz
%%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
%%NEW%%@dirrmtry share/X11/xorg.conf.d
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg
@dirrmtry include/xorg
%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
%%HAL%%@dirrmtry share/hal/fdi/policy
%%HAL%%@dirrmtry share/hal/fdi
%%HAL%%@dirrmtry share/hal

7
x11-drivers/xf86-input-vmmouse/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= xf86-input-vmmouse
PORTVERSION= 13.0.0
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -14,17 +15,15 @@ XORG_CAT= driver
CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
USE_GMAKE= yes
MAN1= vmmouse_detect.1
MAN4= vmmouse.4x
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures.
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
PLIST_SUB+= NEW=""
.else
PLIST_SUB+= NEW="@comment "
.endif
NO_STAGE= yes
.include <bsd.port.mk>

2
x11-drivers/xf86-input-vmmouse/pkg-plist
View file

@ -2,6 +2,8 @@ bin/vmmouse_detect
libexec/hal/scripts/hal-probe-vmmouse
lib/xorg/modules/input/vmmouse_drv.la
lib/xorg/modules/input/vmmouse_drv.so
man/man1/vmmouse_detect.1.gz
man/man4/vmmouse.4x.gz
%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
@dirrmtry lib/xorg/modules/input

5
x11-drivers/xf86-input-void/Makefile
View file

@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org void input driver
XORG_CAT= driver
MAN4= void.4x
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
VOID_VERSION= 1.4.0
@ -19,6 +20,4 @@ VOID_VERSION= 1.3.1
VOID_REVISION= 0
.endif
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-input-void/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/input/void_drv.la
lib/xorg/modules/input/void_drv.so
man/man4/void.4x.gz
@dirrmtry lib/xorg/modules/input
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-video-apm/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-video-apm
PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org apm display driver
XORG_CAT= driver
MAN4= apm.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-apm/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/apm_drv.la
lib/xorg/modules/drivers/apm_drv.so
man/man4/apm.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-ark/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-ark
PORTVERSION= 0.7.5
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -9,5 +10,4 @@ COMMENT= X.Org ark display driver
XORG_CAT= driver
NO_STAGE= yes
.include <bsd.port.mk>

5
x11-drivers/xf86-video-ati/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-ati
PORTVERSION= ${ATI_VERSION}
PORTREVISION= ${ATI_REVISION}
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -10,17 +11,17 @@ COMMENT= X.Org ati display driver
USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
MAN4= ati.4x radeon.4x
NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
ATI_VERSION= 6.14.6
ATI_REVISION= 1
CONFIGURE_ARGS+=--disable-kms
PLIST_SUB+= OLD=""
.else
ATI_VERSION= 7.2.0
ATI_REVISION= 1
CONFIGURE_ARGS+=--disable-udev
EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
PLIST_SUB+= OLD="@comment "

2
x11-drivers/xf86-video-ati/pkg-plist
View file

@ -8,6 +8,8 @@ lib/xorg/modules/drivers/radeon_drv.so
%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
man/man4/ati.4x.gz
man/man4/radeon.4x.gz
@dirrmtry lib/xorg/modules/drivers
%%OLD%%@dirrmtry lib/xorg/modules/multimedia
@dirrmtry lib/xorg/modules

3
x11-drivers/xf86-video-chips/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-video-chips
PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org chips display driver
XORG_CAT= driver
MAN4= chips.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-chips/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/chips_drv.la
lib/xorg/modules/drivers/chips_drv.so
man/man4/chips.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-video-cirrus/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org cirrus display driver
XORG_CAT= driver
MAN4= cirrus.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-cirrus/pkg-plist
View file

@ -4,6 +4,7 @@ lib/xorg/modules/drivers/cirrus_drv.la
lib/xorg/modules/drivers/cirrus_drv.so
lib/xorg/modules/drivers/cirrus_laguna.la
lib/xorg/modules/drivers/cirrus_laguna.so
man/man4/cirrus.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

4
x11-drivers/xf86-video-cyrix/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -12,7 +12,5 @@ IGNORE= requires pciVideoPtr typedef
XORG_CAT= driver
USE_XORG= xextproto xf86dgaproto
MAN4= cyrix.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-cyrix/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/cyrix_drv.la
lib/xorg/modules/drivers/cyrix_drv.so
man/man4/cyrix.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-dummy/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.7
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -10,5 +11,4 @@ COMMENT= X.Org dummy display driver
XORG_CAT= driver
USE_XORG= xf86dgaproto
NO_STAGE= yes
.include <bsd.port.mk>

4
x11-drivers/xf86-video-fbdev/Makefile
View file

@ -2,14 +2,12 @@
PORTNAME= xf86-video-fbdev
PORTVERSION= 0.4.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org fbdev display driver
XORG_CAT= driver
MAN4= fbdev.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-fbdev/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/fbdev_drv.la
lib/xorg/modules/drivers/fbdev_drv.so
man/man4/fbdev.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-video-glint/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-glint
PORTVERSION= 1.2.8
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -11,7 +12,5 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xf86dgaproto glproto
MAN4= glint.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-glint/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/glint_drv.la
lib/xorg/modules/drivers/glint_drv.so
man/man4/glint.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-video-i128/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-video-i128
PORTVERSION= 1.3.6
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i128 display driver
XORG_CAT= driver
MAN4= i128.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-i128/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/i128_drv.la
lib/xorg/modules/drivers/i128_drv.so
man/man4/i128.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

3
x11-drivers/xf86-video-i740/Makefile
View file

@ -2,13 +2,12 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.4
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org i740 display driver
XORG_CAT= driver
MAN4= i740.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-i740/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/i740_drv.la
lib/xorg/modules/drivers/i740_drv.so
man/man4/i740.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

8
x11-drivers/xf86-video-imstt/Makefile
View file

@ -2,16 +2,16 @@
PORTNAME= xf86-video-imstt
PORTVERSION= 1.1.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org imstt display driver
IGNORE= requires pciVideoPtr typedef
BROKEN= Does not build, requires pciVideoPtr typedef.
DEPRECATED= Broken, unsupported and unmaintained upstream.
EXPIRATION_DATE=2014-01-31
XORG_CAT= driver
MAN4= imstt.4x
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-imstt/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/imstt_drv.la
lib/xorg/modules/drivers/imstt_drv.so
man/man4/imstt.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

24
x11-drivers/xf86-video-intel/Makefile
View file

@ -23,14 +23,11 @@ USE_XORG= glproto \
xrender \
xvmc
MAN4= intel.4x
NO_STAGE= yes
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
INTEL_VERSION= 2.21.15
INTEL_REVISION= 0
INTEL_REVISION= 1
CONFIGURE_ENV+= xorg_cv_cc_flag__Wno_maybe_uninitialized=no
CONFIGURE_ARGS+= --enable-sna
MAKE_JOBS_UNSAFE=yes
@ -39,10 +36,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \
${PATCHDIR}/extra-src_sna_kgem.c \
${PATCHDIR}/extra-clang \
${PATCHDIR}/extra-i915kms
LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util
LIB_DEPENDS+= libxcb-util.so:${PORTSDIR}/x11/xcb-util
.else
INTEL_VERSION= 2.7.1
INTEL_REVISION= 5
INTEL_REVISION= 6
PLIST_SUB+= OLD=""
EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
@ -65,14 +62,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \
${PATCHDIR}/extra-uxa_uxa-priv.h
.endif
.include <bsd.port.pre.mk>
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
.if defined(WITH_NEW_XORG)
pre-configure:
.if !exists(${LOCALBASE}/lib/libkms.so)
@${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
@${FALSE}
.endif
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

1
x11-drivers/xf86-video-intel/pkg-plist
View file

@ -16,6 +16,7 @@ lib/xorg/modules/drivers/intel_drv.so
%%OLD%%lib/xorg/modules/drivers/sil164.so
%%OLD%%lib/xorg/modules/drivers/tfp410.la
%%OLD%%lib/xorg/modules/drivers/tfp410.so
man/man4/intel.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

2
x11-drivers/xf86-video-mach64/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@ -12,5 +13,4 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= glproto xf86driproto xf86miscproto
NO_STAGE= yes
.include <bsd.port.mk>

1
x11-drivers/xf86-video-mga/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= xf86-video-mga
PORTVERSION= 1.6.3
PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= x11-drivers

2
x11-drivers/xf86-video-neomagic/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

3
x11-drivers/xf86-video-newport/Makefile
View file

@ -2,15 +2,14 @@
PORTNAME= xf86-video-newport
PORTVERSION= 0.2.4
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org newport display driver
XORG_CAT= driver
MAN4= newport.4x
NO_STAGE= yes
post-patch:
${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
-e 's|MAXSHORT|SHRT_MAX|g' \

1
x11-drivers/xf86-video-newport/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/newport_drv.la
lib/xorg/modules/drivers/newport_drv.so
man/man4/newport.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

11
x11-drivers/xf86-video-nouveau/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= xf86-video-nouveau
PORTVERSION= 0.0.10.${SNAPDATE}
DISTVERSIONSUFFIX=.${SNAPREV}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= x11-drivers
MASTER_SITES= ftp://ftp.lissyara.su/users/Guest/distfiles/
@ -13,13 +13,12 @@ COMMENT= Free nouveau display driver for nvidia-based cards
XORG_CAT= driver
USE_XORG= xf86driproto glproto
MAN4= nouveau.4x
# also doesn't work with mesa (libGL) version higher than 7.4.x
BROKEN= Does not build
DEPRECATED= Not supported, missing kernel support. use the nvidia driver.
EXPIRATION_DATE=2014-01-31
# also doesn't work with mesa (libGL) version higher then 7.4.x
IGNORE= Not supported, missing kernel support. use the nvidia driver.
NO_STAGE= yes
post-configure:
${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h

1
x11-drivers/xf86-video-nouveau/pkg-plist
View file

@ -1,5 +1,6 @@
lib/xorg/modules/drivers/nouveau_drv.la
lib/xorg/modules/drivers/nouveau_drv.so
man/man4/nouveau.4x.gz
@dirrmtry lib/xorg/modules/drivers
@dirrmtry lib/xorg/modules
@dirrmtry lib/xorg

4
x11-drivers/xf86-video-nv/Makefile
View file

@ -2,14 +2,12 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org nv display driver
XORG_CAT= driver
MAN4= nv.4x
NO_STAGE= yes
.include <bsd.port.mk>

Some files were not shown because too many files have changed in this diff Show more