Skip to content

Commit

Permalink
The FreeBSD x11@ and graphics team proudly presents
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@zeising
zeising committed Apr 16, 2014
1 parent 2ff2f3d commit 0d30896
Show file tree
Hide file tree
Showing 1,008 changed files with 1,452 additions and 1,002 deletions.
2 changes: 1 addition & 1 deletion Mk/bsd.port.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Mk/bsd.xorg.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -139,7 +140,7 @@ post-install:
.endif

. if ${XORG_CAT} == "lib"
USES+= pathfix
USES+= pathfix libtool
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
Expand Down
52 changes: 52 additions & 0 deletions UPDATING
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,58 @@ 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.

20140416:
AFFECTS: users of x11/xorg graphics/dri graphics/libGL and related ports
AUTHOR: [email protected]

The default xorg version has been switched on FreeBSD 10-STABLE and
FreeBSD 9-STABLE.

To upgrade graphics/libGL, graphics/dri and related MESA ports, it is
necessary to first remove the old versions of those ports.
No special upgrade procedure is needed for xorg ports 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.

For users in need of working console when using KMS drivers (intel and
radeon graphics cards) please use the new vt(9) console driver.
For more information, see https://wiki.freebsd.org/Graphics and
https://wiki.freebsd.org/Newcons .

To update:

# pkg_delete -f libGL-\* dri-\*
or
# pkg delete -f libGL dri
followed by
# portmaster graphics/dri graphics/libGL
or
# portupgrade graphics/dri graphics/libGL
and then
# portmaster -a
or
# portupgrade -a

20140416:
AFFECTS: users of print/freetype2 textproc/libxml2 x11/pixman and
graphics/freeglut
AUTHOR: [email protected] and [email protected]

The library version of the above libraries has been brought in line
with what upstream expects. To do this all users of these ports need
to be rebuilt. Portrevisions have been bumped as a consequence.

# portmaster -r freetype2 -r libxml2 -r pixman -r freeglut
or
# portupgrade -rf freetype2 libxml2 pixman freeglut

20140415:
AFFECTS: Users of mod_python3
AUTHOR: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion accessibility/gok/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

PORTNAME= gok
PORTVERSION= 2.30.1
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= accessibility sysutils gnome
MASTER_SITES= GNOME
Expand Down
1 change: 1 addition & 0 deletions archivers/libarchive/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= libarchive
PORTVERSION= 3.1.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers
MASTER_SITES= http://libarchive.org/downloads/
Expand Down
1 change: 1 addition & 0 deletions archivers/xar/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= xar
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_GENTOO}
Expand Down
2 changes: 1 addition & 1 deletion astro/boinc-astropulse/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= boinc-astropulse
PORTVERSION= 6.01
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://rene-ladan.nl/pub/distfiles/
Expand Down
2 changes: 1 addition & 1 deletion astro/boinc-setiathome-v7/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= boinc-setiathome-v7
PORTVERSION= 7.00
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://rene-ladan.nl/pub/distfiles/
Expand Down
2 changes: 1 addition & 1 deletion astro/celestia/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= celestia
PORTVERSION= 1.6.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION}
PKGNAMESUFFIX= -${CELESTIA_UI}
Expand Down
2 changes: 1 addition & 1 deletion astro/foxtrotgps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= foxtrotgps
PORTVERSION= 1.1.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= astro geography
MASTER_SITES= http://www.foxtrotgps.org/releases/

Expand Down
2 changes: 1 addition & 1 deletion astro/gpscorrelate/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gpscorrelate
PORTVERSION= 1.6.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= astro geography
MASTER_SITES= GH
DIST_SUBDIR= repacked
Expand Down
2 changes: 1 addition & 1 deletion astro/nightfall/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= nightfall
PORTVERSION= 1.70
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= astro
MASTER_SITES= http://www.la-samhna.de/nightfall/

Expand Down
2 changes: 1 addition & 1 deletion astro/openuniverse/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= openuniverse
DISTVERSION= 1.0beta3
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta3

Expand Down
1 change: 1 addition & 0 deletions astro/viking/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= viking
PORTVERSION= 1.5.1
PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= SF/${PORTNAME}/

Expand Down
2 changes: 1 addition & 1 deletion astro/xplanet/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= xplanet
PORTVERSION= 1.3.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= astro geography
MASTER_SITES= SF

Expand Down
2 changes: 1 addition & 1 deletion audio/amarok-kde4/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= amarok
PORTVERSION= 2.7.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
Expand Down
2 changes: 1 addition & 1 deletion audio/aqualung/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= aqualung
DISTVERSION= 0.9beta11
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
http://wickedmachine.net/mirror/
Expand Down
1 change: 1 addition & 0 deletions audio/denemo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= denemo
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= GNU

Expand Down
2 changes: 1 addition & 1 deletion audio/enscribe/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= enscribe
PORTVERSION= 0.1.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= audio graphics
MASTER_SITES= http://www.coppercloudmusic.com/enscribe/
EXTRACT_SUFX= .tgz
Expand Down
2 changes: 1 addition & 1 deletion audio/ezstream/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= ezstream
PORTVERSION= 0.5.6
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/ezstream/ \
http://svn.xiph.org/releases/ezstream/
Expand Down
2 changes: 1 addition & 1 deletion audio/fmit/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= fmit
PORTVERSION= 0.99.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://download.gna.org/fmit/
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
Expand Down
2 changes: 1 addition & 1 deletion audio/gbemol/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gbemol
PORTVERSION= 0.3.2
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= SF

Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-discogs/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-discogs
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-extraplaylist/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-extraplaylist
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-lastfm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-lastfm
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-lyrics/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-lyrics
PORTVERSION= 11.8.16
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/

Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-lyricsplugin/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-lyricsplugin
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-lyricwiki/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-lyricwiki
PORTVERSION= 11.8.16
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/

Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-mdcover/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-mdcover
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-mserver/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-mserver
PORTVERSION= 0.20.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gmpc-shout/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= gmpc-shout
PORTVERSION= 0.20.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
Expand Down
2 changes: 1 addition & 1 deletion audio/gnome-media/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

PORTNAME= gnome-media
PORTVERSION= 2.32.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
Expand Down
2 changes: 1 addition & 1 deletion audio/gspeakers/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

PORTNAME= gspeakers
PORTVERSION= 0.11
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

Expand Down
1 change: 1 addition & 0 deletions audio/icecast-kh/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= icecast
PORTVERSION= ${ICVERSION}.k${KH}
PORTREVISION= 1
CATEGORIES= audio net ipv6
PKGNAMESUFFIX= -kh
DISTNAME= ${PORTNAME}-${ICVERSION}-kh${KH}
Expand Down
1 change: 1 addition & 0 deletions audio/ices/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

PORTNAME= ices
PORTVERSION= 2.0.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio net
MASTER_SITES= http://downloads.xiph.org/releases/ices/ \
Expand Down
2 changes: 1 addition & 1 deletion audio/jack-rack/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= jack-rack
PORTVERSION= 1.4.7
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= SF

Expand Down
2 changes: 1 addition & 1 deletion audio/jamin/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

PORTNAME= jamin
PORTVERSION= 0.95.0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= SF

Expand Down
Loading

0 comments on commit 0d30896

Please sign in to comment.