From owner-freebsd-emulation@FreeBSD.ORG Wed Jun 19 11:18:23 2013 Return-Path: Delivered-To: emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C85D47E0 for ; Wed, 19 Jun 2013 11:18:23 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from mail-bk0-x22a.google.com (mail-bk0-x22a.google.com [IPv6:2a00:1450:4008:c01::22a]) by mx1.freebsd.org (Postfix) with ESMTP id 56AE319D5 for ; Wed, 19 Jun 2013 11:18:23 +0000 (UTC) Received: by mail-bk0-f42.google.com with SMTP id jk13so2297514bkc.1 for ; Wed, 19 Jun 2013 04:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type; bh=srfforDFnAjdGU9mJ+9SbHvW+pIpsa4mpdBaOwFtq58=; b=ONi99lWep8OXXstZvVL8UVaFAyfLsdUqb3frF42fgzqqs6bCnXz18tRruZkWdX5HKP Uefzz4skAheltPag7oGZfzOoQdxdMabVWKpROx6f11w+gOsPh/tLMLei7djq95dVcr6N qQKbRce6aN0BwvMSTHP/elTPDBbE1un2+cuDNvOvHJe42IKZIhXKpGlDR8r7hgiLXmlF UvvOJMYfdt87TXMpVNOpkVChBMPZKCMOcT79eFSf6VhDlUuWICpnAT9IbcMpBP0LHWrU W6OgRSnFD6GjT4bCHfiJexrc9dgpQiw5mDYzC8ceEvW+OFwaYWgT5qXr/nk/aN4yCo7k MvUg== X-Received: by 10.204.236.69 with SMTP id kj5mr327412bkb.86.1371640702268; Wed, 19 Jun 2013 04:18:22 -0700 (PDT) Received: from ?IPv6:2001:980:d7ed:1:a026:8d9a:51b:5c01? ([2001:980:d7ed:1:a026:8d9a:51b:5c01]) by mx.google.com with ESMTPSA id qw6sm7617216bkb.4.2013.06.19.04.18.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Jun 2013 04:18:21 -0700 (PDT) Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= Message-ID: <51C1937B.1080802@freebsd.org> Date: Wed, 19 Jun 2013 13:18:19 +0200 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130615 Thunderbird/17.0.6 MIME-Version: 1.0 To: emulation@freebsd.org Subject: patch to clean up Linux DRI ports X-Enigmail-Version: 1.5.1 Content-Type: multipart/mixed; boundary="------------050208060808030406000909" X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jun 2013 11:18:23 -0000 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--