Thu Oct 8 10:08:03 2015 UTC ()
fix build w/ current mesa. Based on patch from richard@
(tnn)
diff -r1.47 -r1.48 pkgsrc/x11/kde-workspace4/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/kde-workspace4/PLIST
diff -r1.3 -r1.4 pkgsrc/x11/kde-workspace4/PLIST.Linux
--- pkgsrc/x11/kde-workspace4/Makefile 2015/04/25 14:25:07 1.47
+++ pkgsrc/x11/kde-workspace4/Makefile 2015/10/08 10:08:03 1.48
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2015/04/25 14:25:07 tnn Exp $
+# $NetBSD: Makefile,v 1.48 2015/10/08 10:08:03 tnn Exp $
DISTNAME= kde-workspace-4.11.14
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -65,7 +65,7 @@
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-PLIST_VARS+= utempter noutempter
+PLIST_VARS+= gles utempter noutempter
.if ${OPSYS} == "Linux" && exists(/usr/include/utempter.h)
PLIST.utempter= yes
.elif ${OPSYS} == "FreeBSD" && exists(/usr/include/utempter.h)
@@ -74,11 +74,6 @@
PLIST.noutempter= yes
.endif
-PLIST_VARS+= gles
-.if ${OPSYS} == "Linux" && exists(/usr/include/GLES2/gl2.h)
-PLIST.gles= yes
-.endif
-
.if ${OPSYS} == "Linux"
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
@@ -141,6 +136,12 @@
.include "../../lang/python/extension.mk"
.include "../../devel/libusb/buildlink3.mk"
.include "../../devel/qjson/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.if ${X11_TYPE} == "modular" && !empty(MESALIB_SUPPORTS_EGL:M[yY][eE][sS])
+PLIST.gles= yes
+.elif exists(${X11BASE:Q}/include/GLES2/gl2.h)
+PLIST.gles= yes
+.endif
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
--- pkgsrc/x11/kde-workspace4/PLIST 2014/11/13 10:53:49 1.8
+++ pkgsrc/x11/kde-workspace4/PLIST 2015/10/08 10:08:03 1.9
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/11/13 10:53:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/10/08 10:08:03 tnn Exp $
bin/genkdmconf
bin/kaccess
bin/kapplymousetheme
@@ -29,6 +29,7 @@
bin/ksysguardd
bin/ksystraycmd
bin/kwin
+${PLIST.gles}bin/kwin_gles
${PLIST.noutempter}bin/kwrited
bin/oxygen-demo
bin/oxygen-settings
@@ -155,6 +156,7 @@
lib/kde4/kcm_krunner_kill.so
lib/kde4/kcm_ksplashthemes.so
lib/kde4/kcm_kwin4_effect_builtins.so
+${PLIST.gles}lib/kde4/kwin4_effect_gles_builtins.so
lib/kde4/kcm_kwin4_genericscripted.so
lib/kde4/kcm_kwin_scripts.so
lib/kde4/kcm_kwincompositing.so
@@ -339,6 +341,7 @@
lib/libkdeinit4_ksmserver.so
lib/libkdeinit4_ksysguard.so
lib/libkdeinit4_kwin.so
+${PLIST.gles}lib/libkdeinit4_kwin_gles.so
lib/libkdeinit4_kwin_rules_dialog.so
lib/libkdeinit4_plasma-desktop.so
lib/libkdeinit4_plasma-netbook.so
@@ -367,6 +370,9 @@
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
+${PLIST.gles}lib/libkwinglesutils.so
+${PLIST.gles}lib/libkwinglesutils.so.1
+${PLIST.gles}lib/libkwinglesutils.so.1.0.0
lib/libkwinglutils.so
lib/libkwinglutils.so.1
lib/libkwinglutils.so.1.0.0
--- pkgsrc/x11/kde-workspace4/PLIST.Linux 2014/03/26 13:24:52 1.3
+++ pkgsrc/x11/kde-workspace4/PLIST.Linux 2015/10/08 10:08:03 1.4
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2014/03/26 13:24:52 jperkin Exp $
-${PLIST.gles}bin/kwin_gles
+@comment $NetBSD: PLIST.Linux,v 1.4 2015/10/08 10:08:03 tnn Exp $
lib/kde4/kcm_joystick.so
-${PLIST.gles}lib/kde4/kwin4_effect_gles_builtins.so
lib/kde4/libexec/backlighthelper
-${PLIST.gles}lib/libkdeinit4_kwin_gles.so
-${PLIST.gles}lib/libkwinglesutils.so
-${PLIST.gles}lib/libkwinglesutils.so.1
-${PLIST.gles}lib/libkwinglesutils.so.1.0.0
share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
share/kde4/services/joystick.desktop