Changeset View
Standalone View
x11-drivers/xf86-video-intel/Makefile
# Created by: lesi@FreeBSD.org | # Created by: lesi@FreeBSD.org | ||||
# $FreeBSD$ | # $FreeBSD$ | ||||
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 | ||||
LICENSE= MIT # various | LICENSE= MIT # various | ||||
LICENSE_FILE= ${WRKSRC}/COPYING | LICENSE_FILE= ${WRKSRC}/COPYING | ||||
LIB_DEPENDS= libxcb-util.so:x11/xcb-util \ | LIB_DEPENDS= libxcb-util.so:x11/xcb-util \ | ||||
libdrm.so:graphics/libdrm | libdrm.so:graphics/libdrm | ||||
COMMIT_ID= e5ff8e1828f97891c819c919d7115c6e18b2eb1f | USE_GITLAB= yes | ||||
GL_COMMIT= 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 | ||||
USE_GL= gl | USE_GL= gl | ||||
USE_LDCONFIG= yes | USE_LDCONFIG= yes | ||||
XORG_CAT= driver | XORG_CAT= driver | ||||
USE_XORG= pciaccess pixman x11 xcb xext xrender xv xvmc | USE_XORG= pciaccess pixman x11 xcb xext xrender xv xvmc | ||||
USES+= cpe autoreconf | USES+= cpe | ||||
tijl: If xorg-cat.mk includes autoreconf.mk now (because of the USE_GITLAB above) then you can remove… | |||||
Done Inline ActionsPorts that get libtool from xorg-cat.mk should not need to also have it as a USES. There are several reasons for needing autoreconf, and keeping track of if a port gets libtool from the framework and suddenly need it as USES in the port will lead to strange issues. I can fix the specific issue here with a work-around, but it doesn't fix the larger issue. As a side note, without the change to xf86-video-intel to pull things from gitlab instead of cgit.freedesktop.org, the build also fails, so this is not an issue specific to the USE_GITLAB stuff. zeising: Ports that get libtool from xorg-cat.mk should not need to also have it as a USES. There are… | |||||
Not Done Inline ActionsBut the need for libtool isn't sudden. The xorg-cat framework isn't creating the need for libtool. The need for autoreconf and libtool are determined by upstream. Normally the port Makefile would need "USES=autoreconf libtool". The fact that they can be omitted by setting XORG_CAT is just convenient shorthand and sometimes shorthand doesn't work and you have to spell it out. I don't see the strange issues you talk about. tijl: But the need for libtool isn't sudden. The xorg-cat framework isn't creating the need for… | |||||
Done Inline ActionsA lot of XORG_CAT ports need libtool, so it is handled by the current framework in bsd.xorg.mk. Some ports also require autoreconf, and are currently responsible for pulling in autoreconf themselves. This works in bsd.xorg.mk. I'm trying to get the same thing to work in the new Uses/xorg-cat.mk. Currently, my best idea is to move the check for libtool_ARGS later in autoreconf.mk (in the MKPOSTINCLUDE stage. This seems to solve the issue where the check for if a port needs libtoolize is done before libtool_ARGS is defined. Removing the libtool include from xorg-cat.mk would mean that a big number of ports needs to change, and suddenly keep track of the dependency on libtool themselves. It is possible to do this, but would make this change quite a lot larger, and also means functionality we have today get lost. zeising: A lot of XORG_CAT ports need libtool, so it is handled by the current framework in bsd.xorg.mk. | |||||
Not Done Inline ActionsAgreed. tijl: Agreed. | |||||
CPE_VENDOR= x | CPE_VENDOR= x | ||||
OPTIONS_SINGLE= ACCEL | OPTIONS_SINGLE= ACCEL | ||||
OPTIONS_SINGLE_ACCEL= SNA UXA | OPTIONS_SINGLE_ACCEL= SNA UXA | ||||
OPTIONS_DEFAULT= UXA | OPTIONS_DEFAULT= UXA | ||||
ACCEL_DESC= Default AccelMethod (if not specified in xorg.conf) | ACCEL_DESC= Default AccelMethod (if not specified in xorg.conf) | ||||
SNA_DESC= SandyBridge's New Acceleration | SNA_DESC= SandyBridge's New Acceleration | ||||
UXA_DESC= Unified Acceleration Architecture | UXA_DESC= Unified Acceleration Architecture | ||||
CONFIGURE_ARGS+= --disable-udev | CONFIGURE_ARGS+= --disable-udev | ||||
SNA_CONFIGURE_ON= --with-default-accel=sna | SNA_CONFIGURE_ON= --with-default-accel=sna | ||||
UXA_CONFIGURE_ON= --with-default-accel=uxa | UXA_CONFIGURE_ON= --with-default-accel=uxa | ||||
.include <bsd.port.mk> | .include <bsd.port.mk> |
If xorg-cat.mk includes autoreconf.mk now (because of the USE_GITLAB above) then you can remove this autoreconf. For egalax I would just add libtool to USES in the port Makefile.