Commit graph

126 commits

Author SHA1 Message Date
Koop Mast
61f7258c32 Fix typo.
Submitted by:	Herbert J. Skuhra <h.skuhra@gmail.com>
2013-10-24 19:50:23 +00:00
Koop Mast
785722b1cf Document xorg-server use after free CVE.
Reviewed by:	zeising@
2013-10-24 13:05:10 +00:00
Niclas Zeising
6456a79045 Fix patches. Remove two unneeded ones, and add new patches to fix sparc64.
This was missed in the mesa update.

This syncs x11-server/xorg-server with the xorg development repo

Bump portrevision again in case.
Apologies for the churn!

Obtained from:	xorg development repo
2013-09-29 23:46:47 +00:00
Niclas Zeising
23f2e96944 Fix perl dependency.
Submitted by: Barbara Guida <bar@FreeBSD.org>
2013-09-29 23:32:01 +00:00
Niclas Zeising
5a4c543c2b The FreeBSD graphics/x11 team proudly presents
a kwm, zeising production:

MESA 9.1.6

Starring:
Mesa 9.1.6, including libGL, libGLU and dri (new xorg only)
Addition of libEGL and libglesv2
KMS support for ATI graphics cards in 10-current (new xorg only)
Improved sparc64 support for new xorg. [1]
pixman 0.30.2, including shlib bump and portrevision bumps
libX11 1.6.2
Make absolute pointing devices work with x11-drivers/xf86-input-mouse
x11-drivers/xf86-video-ati 7.2.0 for 10-current (KMS aware ati driver)

Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
When updating MESA related ports (libGL, dri) you need to remove old versions
first.  See UPDATING for details.

PR:		ports/181962 [2]
Submitted by:	marius [1]
		zeising [2]
Exp-run by:	bdrewery
Approved by:	portmgr (bdrewery)

Thanks to all who helped testing!
2013-09-29 17:01:41 +00:00
Baptiste Daroussin
eea5b447da Add NO_STAGE all over the place in preparation for the staging support (cat: x11-servers) 2013-09-20 23:52:24 +00:00
Niclas Zeising
c17dedd527 Plug two more use before initialized with the new x server.
Noted by:	clang
Obtained from:	xorg development repo
2013-08-14 11:58:48 +00:00
Andrej Zverev
2e118d08ae - Convert to new perl framework
Approved by:	bapt@ (x11@)
2013-08-04 15:01:34 +00:00
Niclas Zeising
927cfacb14 Enable AIGLX by default on xorg-server 1.12. (WITH_NEW_XORG)
Bump portrevision for 1.12

Obtained from:	xorg development repo
2013-06-27 18:38:27 +00:00
Niclas Zeising
c20d929bcc Readd the dix_events.c patch that was removed with the xorg update.
There have been some reports of problems with pointer focus and other
related issues in Mwm and open-motif without this patch.
Bump portrevision for old xorg.

PR:		ports/179397
Submitted by:	William Bulley <web@umich.edu>
2013-06-26 20:00:39 +00:00
Jung-uk Kim
95f49b08d0 Add a patch to fix upstream bug 18451 for 1.7.7.
https://bugs.freedesktop.org/show_bug.cgi?id=18451
http://cgit.freedesktop.org/xorg/xserver/patch/?id=6dae7f3

Analyzed by:	dim
PR:		ports/179625
2013-06-17 21:51:48 +00:00
Koop Mast
ddb2e5e6a1 Don't install the README.compiled file, it got installed in a directory
not owned by xorg-server. This will fix poudriere -t

Submitted by:	miwi
2013-06-16 20:50:52 +00:00
Niclas Zeising
5f84f960af Fix patching on powerpc with new xorg.
PR:		ports/179229
Submitted by:	jhibbits (PR), zeising (patch)
2013-06-14 14:39:18 +00:00
Niclas Zeising
92ea0d614b The FreeBSD x11 team proudly presents
an zeising, kwm, miwi, bapt, eadler production:

Xorg 7.7

Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.

PR:		ports/177942
Exp-run by:	miwi
Approved by:	portmgr (miwi)

Thanks to all who helped testing!
2013-05-25 14:37:02 +00:00
Niclas Zeising
8ed49557f8 Add a new xorg module, to use with USE_XORG: xorg-macros. This module
pulls in devel/xorg-macros.
Convert all ports that depends on xorg-macros to use this USE_XORG.
Split up the long XORG_MODULES= list in bsd.xorg.mk to have only one module
on each line.
Add xorg-macros dependency to xorg-server.

Reviewed by:	kwm, bapt
Obtained from:	xorg development repo (partly)
2013-03-11 19:14:28 +00:00
Niclas Zeising
83d33b71ca Fix the patch used to make xorg-server build with clang on i386.
Noticed by:	Barbara Guida <barbara.freebsd@gmail.com>
PR:		ports/175776 [1]
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> [1]
Approved by:	kwm, miwi (mentors, implicit)
2013-02-02 21:45:42 +00:00
Niclas Zeising
b1d186d5f3 Fix build on i386 when building with clang.
PR:		ports/174286 (inspired by)
Submitted by:	deeptech71 <deeptech71@gmail.com>
Tested by:	crees, kwm
Approved by:	kwm, miwi (mentors, implicit)
Obtained from:	xorg-dev repo
2013-01-19 12:35:40 +00:00
Niclas Zeising
fa8e223204 Add a patch to fix a couple of cases of use before initialized in the new
xorg-server.  Without this patch, xorg-server compiled with clang segfaults.
Bump portrevision since clang is default compiler on current.

Reviewed by:	kwm
Approved by:	kwm, miwi (mentors, implicit)
2012-12-14 11:02:48 +00:00
Alberto Villa
bf0a5354d3 - Add missing "defined".
Approved by:	eadler, kwm (x11@)
Feature safe:	yes
2012-11-15 12:47:11 +00:00
Koop Mast
04a589dee4 Solve libGL.so and libglx.so conflict situation between libGL, xorg-server and
the nvidia-driver. Install the libraries in port specific directories.
Use pkg-install and pkg-deinstall scripts to update the hardlinks to the
default locations of these files.

While here clean up some @dirrmtry lines in xorg-server plist for directories
that aren.t created by xorg-server.

Motivator:	pkgng
Inspiration:	irc, freebsd-x11@ mailinglist discussion (sorry can't find it
		anymore to give credit the people)
Reviewed by:	danfe@ (for nvidia parts), bapt@
Approved by:	danfe@ (for nvidia parts)
With hat:	x11@
2012-08-31 15:44:41 +00:00
Koop Mast
2c361035bb Replace some spaces with tabs, and remove double defined variables in PLIST_SUB. 2012-08-29 11:30:31 +00:00
Niclas Zeising
7761aefad2 Fix the build of xorg related ports when the base system is compiled with
clang as system compiler and cpp is clang cpp (as opposed to GNU cpp).
This is done by removing the configure test for cpp completely.  Using
clang cpp will make some manual pages as well as some scripts get slightly
wierd whitespace formatting.  However, it does not affect the function of
the scripts or the instructions in the manual pages.

PR:             ports/166373
Submitted by:   Jakub Lach <jakub_lach@mailplus.pl> (PR)
Patch by:       me (with ideas from PR and mailing list)
Tested by:      Jakub Lach <jakub_lach@mailplus.pl>, me
Approved by:    kwm (mentor)
Obtained from:  xorg staging area
2012-07-29 18:26:00 +00:00
Baptiste Daroussin
abb421178b Add new OPTIONS_EXCLUSE_${ARCH} to be able to exclude an option on the given arch
Fix xorg-server on sparc64 by excluing the HAL option on sparc64 has it used to
be before convertion to new options framework [1]

Reported by:	marius@
Tested by:	marius@
Approved by:	kwm [1]
2012-07-13 10:23:57 +00:00
Baptiste Daroussin
43c93c7817 Convert to new options framework
while here remove the NO_SUID_XSERVER which was redundant with the options and
fix a bug[1] (defining an option after bsd.port.pre.mk) which was a workaround of
limitations of the old framework

Reported by:	ak@ [1]
Reviewed by:	kwm@, miwi@
Approved by:	kwm@, miwi@
2012-06-06 12:56:30 +00:00
Christian Weisgerber
ca030a712f Revert "dix: use the event mask of the grab for TryClientEvents."
http://cgit.freedesktop.org/xorg/xserver/commit/?id=018c878e9495b21146c8f38617fdd1bf6d8cc73b

This fixes delivery of button press events to clients.
In particular, it fixes irrecoverable focus loss in mwm(1).

Approved by:	miwi
Obtained from:	Xorg upstream
2012-04-24 17:28:04 +00:00
Martin Wilke
29e347e197 - Please welcome Xorg 7.5.2
The Xorg Team is pleased to announce the next round of Xorg updates.
       The team created a new flag called WITH_NEW_XORG that users can include
       in /etc/make.conf. This was created for the intel KMS work being done
       althouthough It probably works for other chips. Unfortunately, the intel
       KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
       Older version of FreeBSD will not be supported. Intel users will need
       to patch their source manually with Konstantin?s KMS kernel patch to get
       the newer chips to work. Please carefully read UPDATING entry.

Changes:

        - libdrm 2.4.31 (including KMS support)
        - mesa 7.11.2
        - xorg-server 1.10.6
        - a lot of new Graphic Drivers.

    I would like to thank:

         Koop Mast
         Eitan Adler
         Niclas Zeising
         and all helpers and testers from x11@.
2012-04-21 17:03:32 +00:00
Martin Wilke
e1c6649edf - Remove WITH_FBSD10_FIX, is no longer needed 2011-11-09 15:26:04 +00:00
Martin Wilke
690535e580 - Fix build on FreeBSD 10.0
Notes: all x11@ ports fixed for FreeBSD 10
2011-10-29 07:04:53 +00:00
Koop Mast
185fd9100b Fix CVE-2011-4028 and CVE-2011-4029.
Obtained from:	upstream xorg-server
Security:	8441957c-f9b4-11e0-a78a-bcaec565249c
2011-10-18 18:25:44 +00:00
Koop Mast
28a3558f38 Fix the "exaGetPixmapFirstPixel called for invalid bpp" problem. This bug
is more visible with XFCE.

PR:		ports/156721
Submitted by:	Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de>
Obtained from:	xorg-server upstream
With hat:	x11@
2011-08-07 07:17:59 +00:00
Christian Weisgerber
336870fe10 Revert "dix: use the event mask of the grab for TryClientEvents."
http://cgit.freedesktop.org/xorg/xserver/commit/?id=018c878e9495b21146c8f38617fdd1bf6d8cc73b

This fixes delivery of button press events to clients.
In particular, it fixes irrecoverable focus loss in mwm(1).

Approved by:	miwi
Obtained from:	Xorg upstream
2011-02-27 23:16:09 +00:00
Martin Wilke
d594ccc94f - Please welcome Xorg 7.5.1
The X-Server has been patched to the latest 1.7.X series, drivers
and fonts have been updated to the latest versions. This update includes
some components from Xorg 7.6 with a lot of improvements, and it seems
that the performance is much better than the old version. Also this
Update fix build issues with clang and binutils 2.17.50 in current,
remove 6.X gruft and de-author pkg-descr.

I would like to thank:

	Beat Gaetzi
	Dima Panov
	Koop Mast
	Eitan Adler
	and all Testers.

PR:		ports/147646
		ports/148035
		ports/148744
		ports/150223
		ports/152889
		ports/154457
2011-02-25 16:52:50 +00:00
Stanislav Sedov
24aa2a2676 - There's no nv(4x) manpage in xorg-server distribution anymore.
Reported by:	nathanw
Feature safe:	yes
2011-01-25 02:07:10 +00:00
Stanislav Sedov
3c334f3c81 - Fix build on powerpc64.
PR:		ports/147568, ports/153644
Submitted by:	nwhitehorn, Matthew Rezny <mrezny@hexaneinc.com>
Feature safe:	yes
2011-01-25 01:53:11 +00:00
Martin Wilke
0040fcc0b6 - Fix build on ppc
Submitted by:	Andreas Tobler
2010-05-05 05:02:25 +00:00
Martin Wilke
f4936121f9 - Update to Xorg 7.5
The Intel drivers was patched to work with
the new server. The drivers for Vesa, NV,NVIDIA and
ATI have been tested thoroughfully and seem to work fine.
A complete changelog of Xorg 7.5 can you read here:

http://www.x.org/releases/X11R7.5/

A note to FreeBSD 6.X users: We strongly recommend you
to update your system to 7.x or above.

For updating try

portupgrade -af \*

or:

portmaster -af

Please report any problems and issus to x11 (at) FreeBSD.org.

Thanks to beat@, rnoland@, fluffy@, stas@ and all testers for their help
and Feeback.

Tested by:	Community and 2x exp-runs
2010-05-01 11:41:07 +00:00
Marius Strobl
5286f4f791 Given that HAL doesn't work on sparc64 and always needs to be disabled
there anyway change the default to off for that architecture.

Approved by:	rnoland
2010-02-08 00:20:08 +00:00
Robert Noland
4aabe04a2e Update xorg-server and friends to 1.6.5. 2010-02-07 15:24:07 +00:00
Marcel Moolenaar
7220595e7c Allow building on ia64. This does not make it functional, because
ia64 doesn't have any non-serial console. It does allow xorg to
build though and in particular xorg-drivers. The latter depends on
xorg-server.

Ok'd: rnoland@
2009-06-19 23:19:01 +00:00
Robert Noland
a588a7ab6e Update Xserver and friends to 1.6.1 2009-05-07 19:40:18 +00:00
Robert Noland
fd559155d1 Update Xorg server to 1.6.0
o Update randrproto, libXrandr and xrandr to 1.3.0
	o Update xf86-video-intel to 2.6.3
	o Update other less common drivers as needed
	o Mark a bunch of un-maintained input drivers ignored
	o Update the various slave X server ports as well
2009-04-04 04:04:01 +00:00
Marius Strobl
38c027f72e Given that the x86-centric approach of mmap(2)'ing PCI memory via
mem(4) doesn't work on sparc64, revert to the pre-libpciaccess
approach of using the tty(4) device opened by the X server there.
Hopefully we have proper MI means of doing so one day.

Approved by:	flz
2009-03-31 20:19:04 +00:00
Robert Noland
ffca734ac6 Add the patch that I missed in the last commit. 2009-03-08 23:07:06 +00:00
Robert Noland
e8bb983dff Add a patch from git to fix issues with gnome-2.25.
Requested by:	marcus
2009-03-08 23:03:47 +00:00
Robert Noland
7841a19b63 Add a patch to handle memory barriers on amd64 the same as linux.
This is reported to prevent some lockups with the nv driver on amd64.

http://bugs.freedesktop.org/show_bug.cgi?id=3168
2009-03-02 19:29:23 +00:00
Robert Noland
212fd061b1 Add a patch to deal with the hald/xorg startup race. With this patch
it should be safe for hald to start even after the Xserver.

Obtained from:	xorg-devel
2009-02-08 07:23:46 +00:00
Jung-uk Kim
68bcf49d36 - Replace open(2)/close(2) pairs with stat(2). Closing mouse device has
a side effect of changing current operation level and sysmouse(4) lets
you open /dev/sysmouse multiple times unlike other mouse drivers.
- Check if /dev/mouse is linked to /dev/psm0 or /dev/ums0.
- Simplify the patches a little while I am here.
2009-02-04 18:31:01 +00:00
Jung-uk Kim
4dad67f31a - Partially back out the previous attempt to fix PS/2 protocol support.
Extended PS/2 protocol without moused(8) is only supported from FreeBSD 7.1
and above.
- Try default PS/2 and USB mouse ports if /dev/sysmouse does not exist.
Previously, it was only available when HAL support was compiled in.
They should be able to handle SysMouse protocol at operation level 1.
- Check protocol for ums(4) as it only supports SysMouse protocol.
- Sync X server with mouse driver.

Reviewed by:	rnoland
2009-02-03 02:20:31 +00:00
Florent Thoumie
c23ee21635 Build record and xtrap extensions.
PR:		ports/131033
Submitted by:	"Sergey N. Voronkov" <serg@tmn.ru>
2009-01-27 09:31:22 +00:00
Robert Noland
d67cfa7582 Add dependency on dri2proto
Approved by:	garga (mentor, implicit)
2009-01-25 18:43:39 +00:00