sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-25 07:26:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change bsd.xorg.mk to USES=xorg and USES=xorg-cat

Browse source 
Change the handling of xorg dependencies to use the USES framework instead
of bsd.xorg.mk.  bsd.xorg.mk is split into two parts:
* USES=xorg for ports depending on xorg ports with USE_XORG
* USES=xorg-cat for xorg ports with XORG_CAT

USES=xorg is fairly straight forward.  The components needed are specified
with USE_XORG, and USES=xorg is needed to pull in this part of the
framework.

USES=xorg-cat requires that the category, previously specified with
XORG_CAT, now be passed as an argument to xorg-cat, like this
USES=xorg-cat:category.  Not specifying a category is an error.
Further, it is also possible to specify which build system to use.  The
default if nothing is specified is autoconf, but meson will also be supported.
This is added with a second argument: USES=xorg-cat:category[,buildsystem].

Detailed changelog:
* Add support in Uses/xorg-cat.mk to specify build system.  Previously, only
  autoconf was supported for xorg ports, but with this change, it's possible
  to use meson instead.  Autoconf is still the defaultx, if nothing else is
  specified.  The meson support is still disabled, and requires more testing.
* Add support in Uses/xorg-cat.mk to pull sources from freedesktop.org
  gitlab.
  When specifying USE_GITLAB in a port using xorg-cat, then various GL_*
  variables will be set up automatically, as well as needed changes to the
  build.
* Switch x11-drivers/xf86-video-intel to use the USE_GITLAB framework.
* While touching xf86-video-intel, switch to USES=xorg xorg-cat:driver, and
  pet portlint.
* Add compat shims and warnings to bsd.port.mk, which will handle the old
  style ports Makefiles.
* Change Uses/gl.mk and Uses/motif.mk to use this new framework.
* Change Uses/autoreconf.mk to check and add dependencies later.  This is
  needed because xorg-cat uses autoreconf, and without this fix
  dependencies were not added properly.
* Be stricter about checking for arguments in USE_XORG, previously, :build
  and :run were accepted, but not supported.  Only the default or :both
  supported.
* Change multimedia/gstreamer1-vaapi to handle the stricter argument
  checking in USE_XORG, and add USES=xorg
* change x11/xscope to get distinfo from xorg-cat, instead of rolling it's
  own, and add USES=xorg-cat

PR:		238988 (exp-run)
Reviewed by:	antoine, tcberner, tijl, mat, tobik
Approved by:	portmgr (antoine)
Obtained from:	FreeBSD Graphics Team development repo
		https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/usesxorg
Sponsored by:	B3 Init (zeising)
Differential Revision:	https://reviews.freebsd.org/D20724
This commit is contained in:
Niclas Zeising 2019-08-26 09:45:15 +00:00
parent 0c5e0fd5ea
commit 9d1b627466
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=509895
10 changed files with 334 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mk/Uses/autoreconf.mk
View file

@ -56,13 +56,6 @@
_INCLUDE_USES_AUTORECONF_MK= yes _INCLUDE_USES_AUTORECONF_MK= yes
_USES_POST+= autoreconf _USES_POST+= autoreconf
BUILD_DEPENDS+= autoconf>=2.69:devel/autoconf \
automake>=1.16.1:devel/automake
.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool
.endif
AUTORECONF?= ${LOCALBASE}/bin/autoreconf AUTORECONF?= ${LOCALBASE}/bin/autoreconf
AUTORECONF_WRKSRC?= ${WRKSRC} AUTORECONF_WRKSRC?= ${WRKSRC}
@ -71,6 +64,13 @@ AUTORECONF_WRKSRC?= ${WRKSRC}
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK) .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
_INCLUDE_USES_AUTORECONF_POST_MK= yes _INCLUDE_USES_AUTORECONF_POST_MK= yes
BUILD_DEPENDS+= autoconf>=2.69:devel/autoconf \
automake>=1.16.1:devel/automake
.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
BUILD_DEPENDS+= libtoolize:devel/libtool
.endif
.if empty(autoreconf_ARGS) .if empty(autoreconf_ARGS)
_USES_configure+= 470:do-autoreconf _USES_configure+= 470:do-autoreconf
do-autoreconf: do-autoreconf:

5
Mk/Uses/gl.mk
View file

@ -46,5 +46,10 @@ LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS}
.endif .endif
.endfor .endfor
# We onlu need USES=xorg if we want USE_XORG modules
.if defined(USE_XORG) && !empty(USE_XORG)
.include "${USESDIR}/xorg.mk"
.endif
# _INCLUDE_USES_GL_MK # _INCLUDE_USES_GL_MK
.endif .endif

5
Mk/Uses/motif.mk
View file

@ -27,4 +27,9 @@ LIB_DEPENDS+= libXm.so.4:x11-toolkits/open-motif
MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp
MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" MAKE_ENV+= MOTIFLIB="${MOTIFLIB}"
# We onlu need USES=xorg if we want USE_XORG modules
.if defined(USE_XORG) && !empty(USE_XORG)
.include "${USESDIR}/xorg.mk"
.endif
.endif .endif

185
Mk/Uses/xorg-cat.mk Normal file
View file

@ -0,0 +1,185 @@
# $FreeBSD$
#
# xorg ports categories and other things needed to build xorg ports.
# This is intended only for ports of xorg and freedesktop.org applications.
#
# Use USES=xorg and USE_XORG to depend on various xorg components.
#
# Feature: xorg-cat
# Usage: USES=xorg-cat:category[,buildsystem]
#
# category is one of:
# * app Installs applications, no shared libraries.
# * data Installs only data.
# * doc no particular notes
# * driver depends on xorgproto at least
# * font don't install .pc file
# * lib various dependencies, install .pc file, needs
# pathfix
# * proto install .pc file, needs pathfix, most only needed at
# build time.
# * util no particular notes
# * xserver xorg x servers
#
# These categories has to match upstream categories. Don't invent
# your own.
#
# builsystem is one of:
# * autotools (default)
# * meson (experimental)
#
#
# By defining USE_GITLAB and GL_COMMIT, it is possible to pull code straight
# from the freedesktop.org gitlab, instead of official release tarballs.
#
#.MAINTAINER: x11@FreeBSD.org
.if !defined(_INCLUDE_USES_XORG_CAT_MK)
_INCLUDE_USES_XORG_CAT_MK=yes
_XORG_CATEGORIES= app data doc driver font lib proto util xserver
_XORG_BUILDSYSTEMS= autotools meson
_XORG_CAT= # empty
_XORG_BUILDSYS= # empty
. if empty(xorg-cat_ARGS)
IGNORE= no arguments specified to xorg-cat
. endif
. for _arg in ${xorg-cat_ARGS}
. if ${_XORG_CATEGORIES:M${_arg}}
. if empty(_XORG_CAT)
_XORG_CAT= ${_arg}
. else
IGNORE= multipe xorg categories specified via xorg-cat:${xorg-cat_ARGS:ts,}
. endif
. elif ${_XORG_BUILDSYSTEMS:M${_arg}}
. if empty(_XORG_BUILDSYS)
_XORG_BUILDSYS= ${_arg}
. else
IGNORE= multipe xorg build systems specified via xorg-cat:${xorg-cat_ARGS:ts,}
. endif
. else
IGNORE= unknown argument specified via xorg-cat:${xorg-cat_ARGS:ts,}
. endif
. endfor
# Default to the autotools build system
. if empty(_XORG_BUILDSYS)
_XORG_BUILDSYS= autotools
. endif
# Default variables, common to all new modular xorg ports.
. if empty(USES:Mtar)
EXTRACT_SUFX?= .tar.bz2
. endif
DIST_SUBDIR= xorg/${_XORG_CAT}
. if ${_XORG_BUILDSYS} == meson
IGNORE= meson build not supported yet
.include "${USESDIR}/meson.mk"
. elif ${_XORG_BUILDSYS} == autotools
GNU_CONFIGURE= yes
. else
# This should not happen
IGNORE= unknown build system specified via xorg-cat:${xorg-cat_ARGS:ts,}
. endif
. if defined(USE_GITLAB)
# Set up things for fetching from freedesktop.org gitlab.
# This can be overridden using normal GL_* macros in the ports Makefile.
# We make a best guess for GL_ACCOUNT and GL_PROJECT.
GL_SITE?= https://gitlab.freedesktop.org/xorg
GL_ACCOUNT?= ${_XORG_CAT}
GL_PROJECT?= ${PORTNAME:tl}
. if ${_XORG_BUILDSYS} == meson
# set up meson stuff here
. else
# Things from GL doesn't come with pre-generated configure, add dependency on
# autoreconf and run it, if we're using autotools.
.include "${USESDIR}/autoreconf.mk"
. endif
. else
MASTER_SITES?= XORG/individual/${_XORG_CAT}
. endif
#
## All xorg ports needs pkgconfig to build, but some ports look for pkgconfig
## and then continues the build.
.include "${USESDIR}/pkgconfig.mk"
#
## All xorg ports needs xorg-macros.
. if ${PORTNAME} != xorg-macros
USE_XORG+= xorg-macros
. endif
. if ${_XORG_CAT} == app
# Nothing at the moment
. elif ${_XORG_CAT} == data
# Nothing at the moment.
. elif ${_XORG_CAT} == driver
USE_XORG+= xi xorg-server xorgproto
. if ${_XORG_BUILDSYS} == meson
# Put special stuff for meson here
. else
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
libtool_ARGS?= # empty
.include "${USESDIR}/libtool.mk"
INSTALL_TARGET= install-strip
. endif
. elif ${_XORG_CAT} == font
FONTNAME?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
. if ${_XORG_BUILDSYS} == meson
# Put special stuff for meson here
. else
CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts
CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts
. endif
. if !defined(NOFONT)
.include "${USESDIR}/fonts.mk"
BUILD_DEPENDS+= mkfontscale>=0:x11-fonts/mkfontscale \
bdftopcf:x11-fonts/bdftopcf
PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \
"@comment ${FONTSDIR}/fonts.scale"
. endif
. elif ${_XORG_CAT} == lib
.include "${USESDIR}/pathfix.mk"
. if ${_XORG_BUILDSYS} == meson
# put meson stuff here
. else
libtool_ARGS?= # empty
.include "${USESDIR}/libtool.mk"
USE_LDCONFIG= yes
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
. elif ${_XORG_CAT} == proto
.include "${USESDIR}/pathfix.mk"
. elif ${_XORG_CAT} == xserver
DISTNAME?= xorg-server-${PORTVERSION}
.include "${USESDIR}/pathfix.mk"
. if ${_XORG_BUILDSYS} == meson
# put meson stuff here
. else
CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \
--with-fontrootdir=${LOCALBASE}/share/fonts
. endif
LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
USE_XORG+= fontutil
. endif # ${_XORG_CAT} == <category>
# We onlu need USES=xorg if we want USE_XORG modules
. if defined(USE_XORG) && !empty(USE_XORG)
.include "${USESDIR}/xorg.mk"
. endif
.endif

273
Mk/bsd.xorg.mk → Mk/Uses/xorg.mk
View file

@ -1,171 +1,101 @@
#-*- tab-width: 4; -*-
# ex:ts=4
#
# bsd.xorg.mk - Support for X.Org ports and dependencies
#
# Created by: Florent Thoumie <flz@FreeBSD.org>
#
# !!! Here be dragons !!! (yeah, here as well...)
#
# $FreeBSD$ # $FreeBSD$
# #
# Originally from bsd.xorg.mk
.if !defined(_POSTMKINCLUDED) && !defined(Xorg_Pre_Include) # Created by: Florent Thoumie <flz@FreeBSD.org>
Xorg_Include_MAINTAINER= x11@FreeBSD.org
Xorg_Pre_Include= bsd.xorg.mk
# Some notes:
# #
# app - Installs applications, no shared libraries. # Feature: xorg
# data - Installs only data. # Usage: USES=xorg
# doc - no particular notes # USE_XORG=<component>
# driver - depends on xorgproto at least #
# font - don't install .pc file # Not specifying USE_XORG with USES=xorg is an error.
# lib - various dependencies, install .pc file, needs pathfix #
# proto - install .pc file, needs pathfix, most only needed at build time. # Components can be found in the XORG_MODULES list below.
# xserver - there's only one atm, I guess everything can fit into the port itself #
#
# If you feel something is missing from the list, please let us know.
#
# MAINTAINER: x11@FreeBSD.org
.if defined(XORG_CAT) .if !defined(_INCLUDE_USES_XORG_MK)
# Default variables, common to all new modular xorg ports. _INCLUDE_USES_XORG_MK= yes
.if !defined(USES) || ! ${USES:Mtar*} _USES_POST+= xorg
USES+= tar:bzip2
.endif .endif
GNU_CONFIGURE= yes
# for some reason this makes mkfontscale and others fail in the install target
#INSTALL_TARGET= install-strip
DIST_SUBDIR= xorg/${XORG_CAT}
MASTER_SITES?= ${MASTER_SITE_XORG} # Set up things after bsd.port.post.mk.
MASTER_SITE_SUBDIR?= individual/${XORG_CAT} # This way ports can add things to USE_XORG even after bsd.port.pre.mk is
# included.
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XORG_POST_MK)
_INCLUDE_USES_XORG_POST_MK= yes
# All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and . if !empty(xorg_ARGS)
# then continues the build. IGNORE= USES=xorg takes no arguments
USES+= pkgconfig
# All xorg ports needs xorg-macros.
. if ${PORTNAME} != xorg-macros
USE_XORG+= xorg-macros
. endif
. if ${XORG_CAT} == "app"
# Nothing at the moment
. endif
. if ${XORG_CAT} == "data"
# Nothing at the moment.
. endif
. if ${XORG_CAT} == "driver"
USE_XORG+= xorg-server xorgproto xi
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
USES+= libtool
INSTALL_TARGET= install-strip
. endif
. if ${XORG_CAT} == "font"
FONTNAME?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts
CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts
. if !defined(NOFONT)
USES+= fonts
BUILD_DEPENDS+= mkfontscale>=0:x11-fonts/mkfontscale \
bdftopcf:x11-fonts/bdftopcf
PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \
"@comment ${FONTSDIR}/fonts.scale"
. endif
. endif . endif
. if ${XORG_CAT} == "lib" . if !defined(USE_XORG)
USES+= pathfix libtool IGNORE= need to specify xorg modules with USE_XORG
USE_LDCONFIG= yes . endif
CONFIGURE_ARGS+=--enable-malloc0returnsnull
. endif
. if ${XORG_CAT} == "proto" # List of xorg modules
USES+= pathfix XORG_MODULES= dmx \
. endif fontenc \
fontutil \
. if ${XORG_CAT} == "xserver" ice \
DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 libfs \
WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} oldx \
USES+= pathfix pciaccess \
CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \ pixman \
--with-fontrootdir=${LOCALBASE}/share/fonts sm \
x11 \
LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri xau \
USE_XORG+= fontutil:build xaw \
. endif xaw6 \
xaw7 \
.endif xbitmaps \
xcb \
.endif xcomposite \
xcursor \
.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include) xdamage \
xdmcp \
Xorg_Post_Include= bsd.xorg.mk xevie \
xext \
xfixes \
xfont \
xfont2 \
xfontcache \
xft \
xi \
xinerama \
xkbfile \
xkbui \
xmu \
xmuu \
xorg-macros \
xorg-server \
xorgproto \
xp \
xpm \
xprintapputil \
xprintutil \
xrandr \
xrender \
xres \
xscrnsaver \
xshmfence \
xt \
xtrans \
xtrap \
xtst \
xv \
xvmc \
xxf86dga \
xxf86misc \
xxf86vm
# Register all xorg .pc files here. # Register all xorg .pc files here.
# foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS. # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
XORG_MODULES= dmx \
fontenc \
fontutil \
ice \
libfs \
oldx \
pciaccess \
pixman \
sm \
x11 \
xau \
xaw \
xaw6 \
xaw7 \
xbitmaps \
xcb \
xcomposite \
xcursor \
xdamage \
xdmcp \
xevie \
xext \
xfixes \
xfont \
xfont2 \
xfontcache \
xft \
xi \
xinerama \
xkbfile \
xkbui \
xmu \
xmuu \
xorg-macros \
xorg-server \
xorgproto \
xp \
xpm \
xprintapputil \
xprintutil \
xrandr \
xrender \
xres \
xscrnsaver \
xshmfence \
xt \
xtrans \
xtrap \
xtst \
xv \
xvmc \
xxf86dga \
xxf86misc \
xxf86vm
dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx
fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc
fontutil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util fontutil_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE
libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS
oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX
@ -198,7 +128,7 @@ xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu
xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu
xorg-macros_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros xorg-macros_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
xorgproto_BUILD_DEPENDS= xorgproto>=0:x11/xorgproto xorgproto_BUILD_DEPENDS= xorgproto>=0:x11/xorgproto
xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
xprintapputil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil xprintapputil_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
@ -218,22 +148,27 @@ xxf86dga_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86
xxf86misc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc xxf86misc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc
xxf86vm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm xxf86vm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
.for _module in ${USE_XORG:M*\:both:C/\:.*//g} # Add explicit X options to avoid problems with false positives in configure
. if ${XORG_MODULES:M${_module}} == "" . if defined(GNU_CONFIGURE)
IGNORE= requires unknown xorg module (${_module}) CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
. endif . endif
RUN_DEPENDS+= ${${_module}_BUILD_DEPENDS}
.endfor
.for _module in ${USE_XORG:C/\:.*//g} . for _module in ${USE_XORG:M*\:both:C/\:.*//g}
. if ${XORG_MODULES:M${_module}} == "" . if ${XORG_MODULES:M${_module}} == ""
IGNORE= requires unknown xorg module (${_module}) IGNORE= requires unknown xorg module (${_module})
. endif . endif
LIB_PC_DEPENDS+= ${${_module}_LIB_PC_DEPENDS} RUN_DEPENDS+= ${${_module}_BUILD_DEPENDS}
BUILD_DEPENDS+= ${${_module}_BUILD_DEPENDS} . endfor
.endfor
RUN_DEPENDS+= ${LIB_PC_DEPENDS} . for _module in ${USE_XORG:C/\:both$//g}
BUILD_DEPENDS+= ${LIB_PC_DEPENDS} . if ${XORG_MODULES:M${_module}} == ""
IGNORE= requires unknown xorg module (${_module})
. endif
LIB_PC_DEPENDS+=${${_module}_LIB_PC_DEPENDS}
BUILD_DEPENDS+= ${${_module}_BUILD_DEPENDS}
. endfor
RUN_DEPENDS+= ${LIB_PC_DEPENDS}
BUILD_DEPENDS+= ${LIB_PC_DEPENDS}
.endif .endif

31
Mk/bsd.port.mk
View file

@ -396,9 +396,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes # Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes
# Linux ldconfig to be used when USE_LDCONFIG is defined. # Linux ldconfig to be used when USE_LDCONFIG is defined.
## ##
# USE_XORG - Set to a list of X.org module dependencies.
# Implies inclusion of bsd.xorg.mk.
##
# USE_TEX - A list of the TeX dependencies the port has. # USE_TEX - A list of the TeX dependencies the port has.
# #
## ##
@ -1331,10 +1328,6 @@ DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL}
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
.if defined(USE_XORG) || defined(XORG_CAT)
.include "${PORTSDIR}/Mk/bsd.xorg.mk"
.endif
PACKAGES?= ${PORTSDIR}/packages PACKAGES?= ${PORTSDIR}/packages
TEMPLATES?= ${PORTSDIR}/Templates TEMPLATES?= ${PORTSDIR}/Templates
KEYWORDS?= ${PORTSDIR}/Keywords KEYWORDS?= ${PORTSDIR}/Keywords
@ -1352,6 +1345,18 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.include "${PORTSDIR}/Mk/bsd.local.mk" .include "${PORTSDIR}/Mk/bsd.local.mk"
.endif .endif
.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg})
DEV_WARNING+= "Using USE_XORG alone is deprecated, please use USES=xorg"
USES+= xorg
.endif
.if defined(XORG_CAT)
DEV_WARNING+= "Using XORG_CAT is deprecated, please use USES=xorg-cat:category"
.if !defined(USES) || !${USES:Mxorg-cat*}
USES+= xorg-cat:${XORG_CAT}
.endif
.endif
.if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} )) .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php" DEV_WARNING+= "Using USE_PHP alone is deprecated, please use USES=php"
USES+= php USES+= php
@ -1914,8 +1919,9 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \
.include "${PORTSDIR}/Mk/bsd.local.mk" .include "${PORTSDIR}/Mk/bsd.local.mk"
.endif .endif
.if defined(USE_XORG) || defined(XORG_CAT) .if defined(USE_XORG) && (!defined(USES) || ( defined(USES) && !${USES:Mxorg} ))
.include "${PORTSDIR}/Mk/bsd.xorg.mk" DEV_WARNING+= "Using USE_XORG alone is deprecated, please use USES=xorg"
_USES_POST+= xorg
.endif .endif
.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1) .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
@ -1968,13 +1974,6 @@ CONFIGURE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
MAKE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} MAKE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
.endif .endif
.if defined(USE_XORG)
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
.endif
.endif
# Macro for doing in-place file editing using regexps # Macro for doing in-place file editing using regexps
REINPLACE_ARGS?= -i.bak REINPLACE_ARGS?= -i.bak
REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS}

4
multimedia/gstreamer1-vaapi/Makefile
View file

@ -18,12 +18,12 @@ LIB_DEPENDS= libva.so:multimedia/libva
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip
USES= compiler:c11 gettext-runtime gmake gnome libtool \ USES= compiler:c11 gettext-runtime gmake gnome libtool \
pkgconfig tar:xz pkgconfig tar:xz xorg
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_GNOME= glib20 USE_GNOME= glib20
USE_GSTREAMER1= bad gl USE_GSTREAMER1= bad gl
USE_GL= gl USE_GL= gl
USE_XORG= x11 xrandr xrender xorgproto:build USE_XORG= x11 xrandr xrender xorgproto
OPTIONS_DEFINE= DRM WAYLAND OPTIONS_DEFINE= DRM WAYLAND

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

@ -4,8 +4,6 @@
PORTNAME= xf86-video-intel PORTNAME= xf86-video-intel
PORTVERSION= 2.99.917.20181203 PORTVERSION= 2.99.917.20181203
CATEGORIES= x11-drivers CATEGORIES= x11-drivers
MASTER_SITES= http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/
DISTNAME= ${PORTNAME}-${COMMIT_ID}
MAINTAINER= x11@FreeBSD.org MAINTAINER= x11@FreeBSD.org
COMMENT= Driver for Intel integrated graphics chipsets COMMENT= Driver for Intel integrated graphics chipsets
@ -13,21 +11,19 @@ COMMENT= Driver for Intel integrated graphics chipsets
LICENSE= MIT # various LICENSE= MIT # various
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxcb-util.so:x11/xcb-util \
libdrm.so:graphics/libdrm
COMMIT_ID= e5ff8e1828f97891c819c919d7115c6e18b2eb1f
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= Intel integrated GPU only exists in Intel x86 processors/chipsets ONLY_FOR_ARCHS_REASON= Intel integrated GPU only exists in Intel x86 processors/chipsets
LIB_DEPENDS= libxcb-util.so:x11/xcb-util \
libdrm.so:graphics/libdrm
USES= cpe xorg xorg-cat:driver
USE_GITLAB= yes
GL_COMMIT= e5ff8e1828f97891c819c919d7115c6e18b2eb1f
USE_GL= gl USE_GL= gl
USE_LDCONFIG= yes
XORG_CAT= driver
USE_XORG= pciaccess pixman x11 xcb xext xrender xv xvmc USE_XORG= pciaccess pixman x11 xcb xext xrender xv xvmc
USE_LDCONFIG= yes
USES+= cpe autoreconf
CPE_VENDOR= x CPE_VENDOR= x
OPTIONS_SINGLE= ACCEL OPTIONS_SINGLE= ACCEL

6
x11-drivers/xf86-video-intel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1543827685 TIMESTAMP = 1561472772
SHA256 (xorg/driver/xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.bz2) = 11b7e70c6efecad6540eda24c7370b47597f92dea9b24ca031d83b89eb6a8337 SHA256 (xorg/driver/driver-xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f_GL0.tar.gz) = cbb6a10695b9e8b41fef1bafe5c4d9ddf710acb1ccba8e141378493bacda982e
SIZE (xorg/driver/xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.bz2) = 1247314 SIZE (xorg/driver/driver-xf86-video-intel-e5ff8e1828f97891c819c919d7115c6e18b2eb1f_GL0.tar.gz) = 1693563

3
x11/xscope/Makefile
View file

@ -4,14 +4,13 @@ PORTNAME= xscope
PORTVERSION= 1.4.1 PORTVERSION= 1.4.1
PORTREVISION= 2 PORTREVISION= 2
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= XORG/individual/${XORG_CAT}/
MAINTAINER= x11@FreeBSD.org MAINTAINER= x11@FreeBSD.org
COMMENT= X Window Protocol Viewer COMMENT= X Window Protocol Viewer
LICENSE= MIT LICENSE= MIT
XORG_CAT= app USES= xorg xorg-cat:app
USE_XORG= xorgproto x11 xext USE_XORG= xorgproto x11 xext
PLIST_FILES= bin/xscope man/man1/xscope.1.gz PLIST_FILES= bin/xscope man/man1/xscope.1.gz