From d60a9fce3a6bbc18ba58766665a20e9311bc72a3 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 15 Oct 2018 19:20:45 +0000 Subject: [PATCH] graphics/mesa-libs: enable WAYLAND by default here and in consumers PR: 227509 Approved by: ??? Exp-run by: antoine (NOT YET) --- graphics/mesa-dri/Makefile | 3 ++- graphics/mesa-libs/Makefile | 3 ++- mail/thunderbird/Makefile | 2 +- multimedia/libva-utils/Makefile | 2 ++ multimedia/libva/Makefile | 2 ++ multimedia/mpv/Makefile | 3 ++- multimedia/vlc3/Makefile | 4 ++-- sysutils/gnome-control-center/Makefile | 2 ++ www/firefox-esr/Makefile | 1 + www/firefox/Makefile | 2 +- www/firefox/Makefile.options | 2 +- www/webkit2-gtk3/Makefile | 4 ++-- x11-toolkits/gtk30/Makefile | 4 ++-- 13 files changed, 22 insertions(+), 12 deletions(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 84925638b351..40408de14e1b 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -3,7 +3,7 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ @@ -12,6 +12,7 @@ USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence xv xvmc OPTIONS_DEFINE= TEXTURE VAAPI VDPAU WAYLAND OPTIONS_DEFAULT=TEXTURE +OPTIONS_DEFAULT=WAYLAND OPTIONS_SUB= yes TEXTURE_DESC= Enable texture-float support (patent encumbered) diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index c61aa4e276fe..a260e6b4b853 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -3,7 +3,7 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients @@ -12,6 +12,7 @@ USE_XORG= xorgproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm OPTIONS_DEFINE= WAYLAND +OPTIONS_DEFAULT=WAYLAND OPTIONS_SUB= yes WAYLAND_DESC= Enable support for the Wayland platform in EGL diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 4292becb3c20..0319a9894be8 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile index fa5a10043c8c..c4ad8ebe637a 100644 --- a/multimedia/libva-utils/Makefile +++ b/multimedia/libva-utils/Makefile @@ -2,6 +2,7 @@ PORTNAME= libva-utils PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -22,6 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= intel OPTIONS_DEFINE= DEBUG WAYLAND +OPTIONS_DEFAULT=WAYLAND WAYLAND_DESC= Support wayland protocol OPTIONS_SUB= yes diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 5e9d29b3607b..3d7783326c3b 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -2,6 +2,7 @@ PORTNAME= libva PORTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -30,6 +31,7 @@ LDFLAGS+= -lpthread CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES OPTIONS_DEFINE= DEBUG WAYLAND +OPTIONS_DEFAULT=WAYLAND WAYLAND_DESC= Support wayland protocol OPTIONS_SUB= yes diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 0a5b96dc5fa2..d5190a78287b 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -4,6 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.29.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf @@ -43,7 +44,7 @@ CONFIGURE_ARGS= --docdir="${EXAMPLESDIR}" \ OPTIONS_DEFINE= ARCHIVE ASS DOCS LCMS2 LUAJIT MANPAGES TEST UCHARDET ZSH EXAMPLES OPTIONS_DEFAULT= ARCHIVE ASS DVDREAD DVDNAV MANPAGES OPENGL UCHARDET \ - V4L VAAPI VDPAU X11 YTDL + V4L VAAPI VDPAU WAYLAND X11 YTDL OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU WAYLAND X11 diff --git a/multimedia/vlc3/Makefile b/multimedia/vlc3/Makefile index 14afbeaac0a6..1616f9812d0a 100644 --- a/multimedia/vlc3/Makefile +++ b/multimedia/vlc3/Makefile @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 3.0.4 -PORTEPOCH= 4 +PORTEPOCH= 5 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -75,7 +75,7 @@ OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA CHROMECAST DBUS DCA DOCS DVDREAD \ OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ LIVEMEDIA LUA MAD MPEG2 OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \ - V4L VAAPI VCD VDPAU VORBIS X11 + V4L VAAPI VCD VDPAU VORBIS WAYLAND X11 OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle rendering diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index acab83da349b..c5997c479791 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnome-control-center PORTVERSION= 3.28.2 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -54,6 +55,7 @@ GLIB_SCHEMAS= org.gnome.ControlCenter.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= WAYLAND +OPTIONS_DEFAULT=WAYLAND OPTIONS_DEFINE_i386= CHEESE OPTIONS_DEFAULT_i386= CHEESE diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 28a52b95846c..8c28cb2e61f4 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.3.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ca6eb67a8107..b784e16706aa 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 63.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index 827f7cfbf189..d0f8e9a278f7 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -4,7 +4,7 @@ OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \ INTEGER_SAMPLES LIBPROXY \ OPTIMIZED_CFLAGS PROFILE TEST WAYLAND -OPTIONS_DEFAULT+= DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \ +OPTIONS_DEFAULT+= DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE WAYLAND \ ${OPTIONS_MULTI_AUDIO:NSNDIO} \ ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 73909bcfa535..ccf104fc82f3 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -3,7 +3,7 @@ PORTNAME= webkit PORTVERSION= 2.20.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 @@ -64,7 +64,7 @@ INSTALL_TARGET= install BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 OPTIONS_DEFINE= DEBUG GEOIP NPAPI WAYLAND -OPTIONS_DEFAULT= GEOIP +OPTIONS_DEFAULT= GEOIP WAYLAND OPTIONS_DEFAULT_i386= NPAPI OPTIONS_DEFAULT_amd64= NPAPI OPTIONS_SUB= yes diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 909722844a22..890bc621de88 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -5,7 +5,7 @@ PORTNAME= gtk PORTVERSION= 3.22.30 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -54,7 +54,7 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY WAYLAND -OPTIONS_DEFAULT=CUPS COLORD BROADWAY +OPTIONS_DEFAULT=CUPS COLORD BROADWAY WAYLAND OPTIONS_EXCLUDE_FreeBSD_10= WAYLAND OPTIONS_SUB= yes