Page MenuHomeFreeBSD
Files F103099086

D1351.id2809.diff
No OneTemporary
Actions

D1351.id2809.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1225,14 +1225,6 @@
.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"
Index: Mk/bsd.sanity.mk
===================================================================
--- Mk/bsd.sanity.mk
+++ Mk/bsd.sanity.mk
@@ -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}
Index: games/sea-defender/Makefile
===================================================================
--- games/sea-defender/Makefile
+++ games/sea-defender/Makefile
@@ -47,10 +47,6 @@
.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}
Index: games/sea-defender/files/extra-snoutlib_gldefs.h
===================================================================
--- games/sea-defender/files/extra-snoutlib_gldefs.h
+++ games/sea-defender/files/extra-snoutlib_gldefs.h
@@ -1,11 +0,0 @@
---- 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);
Index: multimedia/libva-intel-driver/Makefile
===================================================================
--- multimedia/libva-intel-driver/Makefile
+++ multimedia/libva-intel-driver/Makefile
@@ -30,16 +30,6 @@
.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
Index: textproc/ibus/Makefile
===================================================================
--- textproc/ibus/Makefile
+++ textproc/ibus/Makefile
@@ -107,11 +107,6 @@
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
Index: textproc/ibus/files/extra-xigrabkeycode
===================================================================
--- textproc/ibus/files/extra-xigrabkeycode
+++ /dev/null
@@ -1,29 +0,0 @@
---- ui/gtk3/keybindingmanager.vala.orig 2014-02-03 14:11:48.000000000 -0500
-+++ ui/gtk3/keybindingmanager.vala 2014-02-03 14:12:18.000000000 -0500
-@@ -35,6 +35,8 @@
- Gdk.ModifierType.HYPER_MASK |
- Gdk.ModifierType.META_MASK);
-
-+ public static const int META_CORE_KEYBOARD_ID = 3;
-+
- /**
- * Helper class to store keybinding
- */
-@@ -254,7 +256,7 @@
- XI.set_mask(evmask.mask, XI.EventType.KeyRelease);
-
- int retval = XI.grab_keycode (xdisplay,
-- XI.AllMasterDevices,
-+ META_CORE_KEYBOARD_ID,
- keycode,
- xdisplay.default_root_window(),
- X.GrabMode.Async,
-@@ -275,7 +277,7 @@
- }
-
- int retval = XI.ungrab_keycode (xdisplay,
-- XI.AllMasterDevices,
-+ META_CORE_KEYBOARD_ID,
- keycode,
- xdisplay.default_root_window(),
- get_grab_modifiers(modifiers));
Index: x11-servers/xephyr/Makefile
===================================================================
--- x11-servers/xephyr/Makefile
+++ x11-servers/xephyr/Makefile
@@ -23,10 +23,7 @@
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
.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/py-kivy/Makefile
===================================================================
--- x11-toolkits/py-kivy/Makefile
+++ x11-toolkits/py-kivy/Makefile
@@ -82,12 +82,6 @@
.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
Index: x11/kde4-workspace/Makefile
===================================================================
--- x11/kde4-workspace/Makefile
+++ x11/kde4-workspace/Makefile
@@ -107,10 +107,6 @@
.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
Index: x11/xorg-minimal/Makefile
===================================================================
--- x11/xorg-minimal/Makefile
+++ x11/xorg-minimal/Makefile
@@ -32,7 +32,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 21, 11:27 PM (10 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14767565
Default Alt Text
D1351.id2809.diff (6 KB)

Event Timeline