Date: Wed, 19 Jun 2013 13:18:19 +0200 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org> To: emulation@freebsd.org Subject: patch to clean up Linux DRI ports Message-ID: <51C1937B.1080802@freebsd.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------050208060808030406000909
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Hi,
right now we have three Linux DRI ports around:
- graphics/linux-dri74 (Ubuntu 9.09)
- graphics/linux_dri (unknown, PORTVERSION 7.0)
- graphics/linux-f10-dri
Currently graphics/linux-dri74 is the default. I plan to modify
bsd.linux-apps.mk and bsd.port.mk to change this to linux-f10-dri, after
which the other two ports can be removed.
See the attached patch (INDEX build is fine, no runtime testing done yet).
Regards,
René
--------------050208060808030406000909
Content-Type: text/x-patch;
name="dri-cleanup.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="dri-cleanup.diff"
Index: Mk/bsd.linux-apps.mk
===================================================================
--- Mk/bsd.linux-apps.mk (revision 321235)
+++ Mk/bsd.linux-apps.mk (working copy)
@@ -141,7 +141,7 @@
dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2
dri_DETECT= ${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dri_PORT= ${PORTSDIR}/graphics/linux-dri74
+dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
dri_DEPENDS= xorglibs
esound_f10_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk (revision 321235)
+++ Mk/bsd.port.mk (working copy)
@@ -1940,7 +1940,8 @@
_GL_glu_USE_XORG= glproto dri2proto
_GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw
_GL_glut_LIB_DEPENDS= glut.12:${PORTSDIR}/graphics/freeglut
-_GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux-dri74
+# XXX rene linux-dri port should have automated versioning as in bsd.linux-apps.mk
+_GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux-f10-dri
.if defined(USE_GL)
. if ${USE_GL:L} == "yes"
--------------050208060808030406000909--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51C1937B.1080802>