mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-16 03:24:07 +00:00
Code Issues Releases Activity

x11/libxcvt: avoid conflict with xorg-server

Browse Source 
Nowadays, kde5 depends on both xorg-server and xwayland-devel.
Once upstream of both switches to libxcvt and xwayland-devel is
updated it'd make kde5 uninstallable. Backporting to xorg-server
is complicated by numerious patch conflicts and autotools.

Stop installing cvt(1) as Xwayland doesn't use xorg.conf(5).
This commit is contained in:
Jan Beich 2021-03-25 18:58:14 +00:00
parent 79eb8c4474
commit 862a720c83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=569221
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11-servers/xorg-server/Makefile
View File

@ -81,7 +81,6 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure
.endif
.if ${SLAVE_PORT} == "no"
CONFLICTS_INSTALL+= libxcvt # bin/cvt, https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/637
USE_GL+= gbm
USE_XORG+= pciaccess
CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \

2
x11/libxcvt/Makefile
View File

@ -10,8 +10,6 @@ COMMENT= Calculate VESA CVT mode lines
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= xorg-server # bin/cvt
USES= meson
USE_GITLAB= yes
GL_SITE= https://gitlab.freedesktop.org

4
x11/libxcvt/pkg-plist
View File

@ -1,6 +1,6 @@
bin/cvt
@comment bin/cvt
include/libxcvt/libxcvt.h
include/libxcvt/libxcvt_mode.h
lib/libxcvt.so
libdata/pkgconfig/libxcvt.pc
man/man1/cvt.1.gz
@comment man/man1/cvt.1.gz