diff options
| author | zeising <zeising@FreeBSD.org> | 2014-04-17 02:28:47 +0800 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2014-04-17 02:28:47 +0800 |
| commit | 0d308966c11339773e9f09cdd69a8b5876b4f04e (patch) | |
| tree | fc8323f5d400038235fda42a6096107239789049 /Mk | |
| parent | 2ff2f3dac9805ec42de1b5cab42db4952b63bb93 (diff) | |
| download | freebsd-ports-gnome-0d308966c11339773e9f09cdd69a8b5876b4f04e.tar.gz freebsd-ports-gnome-0d308966c11339773e9f09cdd69a8b5876b4f04e.tar.zst freebsd-ports-gnome-0d308966c11339773e9f09cdd69a8b5876b4f04e.zip | |
The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery:
NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE
This update switches over to use the new xorg stack by default on FreeBSD 9
and 10 stable, on osversions where vt(9) is available.
It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in
/etc/make.conf .
FreeBSD 8-STABLE and released versions of FreeBSD still use
the old version.
A package repository with binary packages for new xorg will
be available soon.
This patch also contains updates of libxcb and related ports, pixman, as well
as some drivers and utilities.
Bump portrevisions for xf86-* ports, as well as virtualbox-ose-additions due
to xserver version change.
Apart from these updates, the way shared libraries are handled has been
changed for all xorg ports, as well as libxml2 and freetype, which means
ltverhack is gone and as a consequence shared libraries have been bumped.
The plan is that this change will make library bumps less likely in the
future.
All affected ports have had their portrevisions bumped as a consequence of
this.
Fix some issues where WITH_NEW_XORG weren't detected properly on CURRENT.
Update instructions, hardware support, and more notes can be found on
https://wiki.freebsd.org/Graphics
Thanks to: all testers, bdrewery and the FreeBSD x11@ team
exp-run by: bdrewery [1]
PR: ports/187602 [1]
Approved by: portmgr (bdrewery), core (jhb)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.xorg.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6bdf841c358f..3709d7d06a00 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1253,7 +1253,7 @@ WARNING+= "If you do not want to see this message again set NO_WARNING_PKG_INSTA # Enable new xorg for FreeBSD versions after Radeon KMS was imported unless # WITHOUT_NEW_XORG is set. -.if ${OSVERSION} >= 1100000 +.if (${OSVERSION} >= 902510 && ${OSVERSION} < 1000000) || ${OSVERSION} >= 1000704 . if !defined(WITHOUT_NEW_XORG) WITH_NEW_XORG?= yes . else diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index a2ba2517b294..106463146e58 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -29,7 +29,7 @@ Xorg_Pre_Include= bsd.xorg.mk .if defined(XORG_CAT) # Default variables, common to all new modular xorg ports. -.if !defined(USE_TGZ) +.if !defined(USE_TGZ) && !defined(USE_XZ) USE_BZIP2= yes .endif GNU_CONFIGURE= yes @@ -65,6 +65,7 @@ USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \ CFLAGS+= -fno-optimize-sibling-calls . endif CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' +USES+= libtool . endif . if ${XORG_CAT} == "font" @@ -139,7 +140,7 @@ post-install: .endif . if ${XORG_CAT} == "lib" -USES+= pathfix +USES+= pathfix libtool USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif |