svn commit: r375286 - in head: Mk games/sea-defender games/sea-defender/files multimedia/libva-intel-driver textproc/ibus textproc/ibus/files x11-servers/xephyr x11-toolkits/py-kivy x11/kde4-worksp...
Jean-Sebastien Pedron
dumbbell at FreeBSD.org
Mon Dec 22 23:04:21 UTC 2014
Author: dumbbell (src committer)
Date: Mon Dec 22 23:04:17 2014
New Revision: 375286
URL: https://svnweb.freebsd.org/changeset/ports/375286
QAT: https://qat.redports.org/buildarchive/r375286/
Log:
Final removal of WITH_NEW_XORG
This knob was turned on for all version of FreeBSD in r369875
(2014-10-03) and officially deprecated. Since then, it was gradually
removed from many ports when they needed an update.
x11-servers/xorg-server was the last major user of this knob. The port
was updated to xserver 1.14 in r374982 (2014-12-19). The update got rid
of the knob, clearing the path to the final removal.
This commit changes ports who were checking for WITH_NEW_XORG and remove
its handling from bsd.port.mk.
While here, two sanity checks are added to warn user about WITH_KMS and
WITH_NEW_XORG which have no effect now.
Differential Revision: https://reviews.freebsd.org/D1351
Reviewed by: antoine, bapt, kwm
Approved by: portmgr (antoine, bapt), kwm
Added:
head/games/sea-defender/files/patch-snoutlib_gldefs.h
- copied unchanged from r375250, head/games/sea-defender/files/extra-snoutlib_gldefs.h
Deleted:
head/games/sea-defender/files/extra-snoutlib_gldefs.h
head/textproc/ibus/files/extra-xigrabkeycode
Modified:
head/Mk/bsd.port.mk
head/Mk/bsd.sanity.mk
head/games/sea-defender/Makefile
head/multimedia/libva-intel-driver/Makefile
head/textproc/ibus/Makefile
head/x11-servers/xephyr/Makefile
head/x11-toolkits/py-kivy/Makefile
head/x11/kde4-workspace/Makefile
head/x11/xorg-minimal/Makefile
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Mon Dec 22 23:01:56 2014 (r375285)
+++ head/Mk/bsd.port.mk Mon Dec 22 23:04:17 2014 (r375286)
@@ -1225,14 +1225,6 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[
.error OSREL (${OSREL}) and OSVERSION (${OSVERSION}) do not agree on major version number.
.endif
-# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless
-# WITHOUT_NEW_XORG is set.
-.if !defined(WITHOUT_NEW_XORG)
-WITH_NEW_XORG?= yes
-.else
-.undef WITH_NEW_XORG
-.endif
-
# Only define tools here (for transition period with between pkg tools)
.include "${PORTSDIR}/Mk/bsd.commands.mk"
Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk Mon Dec 22 23:01:56 2014 (r375285)
+++ head/Mk/bsd.sanity.mk Mon Dec 22 23:04:17 2014 (r375286)
@@ -7,6 +7,14 @@
WARNING+= "WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead"
.endif
+.if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG)
+WARNING+= "WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect"
+.endif
+
+.if defined(WITH_KMS) || defined(WITHOUT_KMS)
+WARNING+= "WITH_KMS was removed and has no effect"
+.endif
+
#.if defined(PKGORIGIN)
#.for _c in ${CATEGORIES}
#_CAT?= ${_c}
Modified: head/games/sea-defender/Makefile
==============================================================================
--- head/games/sea-defender/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/games/sea-defender/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -47,10 +47,6 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
-.if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+= ${FILESDIR}/extra-snoutlib_gldefs.h
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sea ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
Copied: head/games/sea-defender/files/patch-snoutlib_gldefs.h (from r375250, head/games/sea-defender/files/extra-snoutlib_gldefs.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/sea-defender/files/patch-snoutlib_gldefs.h Mon Dec 22 23:04:17 2014 (r375286, copy of r375250, head/games/sea-defender/files/extra-snoutlib_gldefs.h)
@@ -0,0 +1,11 @@
+--- snoutlib/gldefs.h.orig 2013-09-28 23:51:46.789551906 +0200
++++ snoutlib/gldefs.h 2013-09-28 23:52:40.941548852 +0200
+@@ -94,7 +94,7 @@
+ typedef GLboolean (GLFUNCDEF PFNGLISPROGRAMPROC) (GLuint);
+ typedef GLboolean (GLFUNCDEF PFNGLISSHADERPROC) (GLuint);
+ typedef void (GLFUNCDEF PFNGLLINKPROGRAMPROC) (GLuint);
+-typedef void (GLFUNCDEF PFNGLSHADERSOURCEPROC) (GLuint, GLsizei, const GLchar* *, const GLint *);
++typedef void (GLFUNCDEF PFNGLSHADERSOURCEPROC) (GLuint, GLsizei, const GLchar* const *, const GLint *);
+ typedef void (GLFUNCDEF PFNGLUSEPROGRAMPROC) (GLuint);
+ typedef void (GLFUNCDEF PFNGLUNIFORM1FPROC) (GLint, GLfloat);
+ typedef void (GLFUNCDEF PFNGLUNIFORM2FPROC) (GLint, GLfloat, GLfloat);
Modified: head/multimedia/libva-intel-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-driver/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/multimedia/libva-intel-driver/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -30,16 +30,6 @@ PLIST_FILES= lib/va/i965_drv_video.so
.include <bsd.port.pre.mk>
-.if defined(WITH_NEW_XORG)
-pre-configure:
-.if !exists(${LOCALBASE}/lib/libkms.so)
- @${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the KMS option enabled."
- @${FALSE}
-.endif
-.else
-IGNORE= this port needs libdrm version that is available when WITH_NEW_XORG is set
-.endif
-
post-patch: .SILENT
${REINPLACE_CMD} -e 's/-ldl//' \
${WRKSRC}/src/Makefile.am
Modified: head/textproc/ibus/Makefile
==============================================================================
--- head/textproc/ibus/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/textproc/ibus/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -107,11 +107,6 @@ PLIST_SUB+= COMPDIR=""
PLIST_SUB+= COMPDIR="@comment "
.endif
-# Workaround XIGrabKeycode/XIUngrabKeycode bug: XIAllMasterDevice does not work
-.if !defined(WITH_NEW_XORG)
-EXTRA_PATCHES+= ${FILESDIR}/extra-xigrabkeycode
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c
Modified: head/x11-servers/xephyr/Makefile
==============================================================================
--- head/x11-servers/xephyr/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/x11-servers/xephyr/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -23,10 +23,6 @@ PLIST_FILES= bin/Xephyr man/man1/Xephyr.
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/
-#.if defined(WITH_NEW_XORG)
- -${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
-#.else
- -${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
-#.endif
+ ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
.include "${MASTERDIR}/Makefile"
Modified: head/x11-toolkits/py-kivy/Makefile
==============================================================================
--- head/x11-toolkits/py-kivy/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/x11-toolkits/py-kivy/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -82,12 +82,6 @@ OPTIONS_GROUP_VIDEO+= PYGLET
.include <bsd.port.options.mk>
-.if ${ARCH} == i386
-.if !defined(WITH_NEW_XORG)
-BROKEN= Does not compile with old libGL on i386: Undefined symbol glBlendEquationSeparate
-.endif
-.endif
-
.if ${PORT_OPTIONS:MPDF}
.if empty(PORT_OPTIONS:MDOCS)
IGNORE= option PDF requires DOCS
Modified: head/x11/kde4-workspace/Makefile
==============================================================================
--- head/x11/kde4-workspace/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/x11/kde4-workspace/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -107,10 +107,6 @@ WALLPAPERS_RUN_DEPENDS= ${KDE4_PREFIX}/s
.include <bsd.port.options.mk>
-.ifndef(WITH_NEW_XORG)
-IGNORE= requires modern libGL. Please, set WITH_NEW_XORG and update your ports
-.endif
-
.if !exists(/usr/lib/libutempter.so)
LIB_DEPENDS+= libutempter.so:${PORTSDIR}/sysutils/libutempter
.endif
Modified: head/x11/xorg-minimal/Makefile
==============================================================================
--- head/x11/xorg-minimal/Makefile Mon Dec 22 23:01:56 2014 (r375285)
+++ head/x11/xorg-minimal/Makefile Mon Dec 22 23:04:17 2014 (r375286)
@@ -32,7 +32,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modu
RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/drivers/${VIDEO_DRIVER}_drv.so:${PORTSDIR}/x11-drivers/xf86-video-${VIDEO_DRIVER}
.endif
-.if ${VIDEO_DRIVER} == intel && defined(WITH_NEW_XORG)
+.if ${VIDEO_DRIVER} == intel
RUN_DEPENDS+= ${LOCALBASE}/lib/va/i965_drv_video.so:${PORTSDIR}/multimedia/libva-intel-driver
.endif
More information about the svn-ports-head
mailing list