From owner-freebsd-x11@FreeBSD.ORG Wed Jul 22 05:30:10 2009 Return-Path: Delivered-To: freebsd-x11@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F27FE106566C for ; Wed, 22 Jul 2009 05:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E097A8FC08 for ; Wed, 22 Jul 2009 05:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6M5U9Xo013195 for ; Wed, 22 Jul 2009 05:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6M5U9br013192; Wed, 22 Jul 2009 05:30:09 GMT (envelope-from gnats) Date: Wed, 22 Jul 2009 05:30:09 GMT Message-Id: <200907220530.n6M5U9br013192@freefall.freebsd.org> To: freebsd-x11@FreeBSD.org From: Anonymous Cc: Subject: Re: ports/136806: [patch] graphics/libdrm: update to 2.4.12; X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Anonymous List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2009 05:30:10 -0000 The following reply was made to PR ports/136806; it has been noted by GNATS. From: Anonymous To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/136806: [patch] graphics/libdrm: update to 2.4.12; Date: Wed, 22 Jul 2009 09:21:07 +0400 I'll abuse this PR one more time. Here is an updated nouveau patch: - new snapshot 20090721.f70287c tested on Xserver 1.6.1 with drm-nouveau-062309.patch - move SNAPDATE and SNAPREV to ${MASTERDIR}/Makefile.rev Now, to get fresh snapshot one needs to run $ make maint-gen-distfile && make makesum without touching Makefile. And to get diff for it like I do $ ( cd ../..; cvs diff -upN x11-drivers/xf86-video-nouveau ) Note: with advent of AM_SILENT_RULES in f70287c revision you need automake-1.11 to be able to generate distfile. You can use my diff for now[1]. [1] ftp://ftp.lissyara.su/users/Guest/automake111.diff --- xf86-video-nouveau.diff begins here --- Index: x11-drivers/xf86-video-nouveau/Makefile =================================================================== RCS file: /home/csup/ports/x11-drivers/xf86-video-nouveau/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- x11-drivers/xf86-video-nouveau/Makefile 16 May 2009 14:01:34 -0000 1.6 +++ x11-drivers/xf86-video-nouveau/Makefile 22 Jul 2009 04:02:01 -0000 @@ -20,15 +20,18 @@ MAN4= nouveau.4x MAKE_JOBS_SAFE= yes -SNAPDATE= 20090514 -SNAPREV= 9656762 - post-configure: ${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h +post-install: .SILENT + ${ECHO_MSG} + ${CAT} ${PKGMESSAGE} + ${ECHO_MSG} + GIT_WORK= ${WRKDIR}/${PORTNAME}.git-clone -GIT_REV= $$(date -ur$$(git log --pretty=format:%ct -1 \ - ) +%Y%m%d).$$(git log --pretty=format:%h -1) +GIT_DATE= $$(date -ur$$(git log --pretty=format:%ct -1 ) +%Y%m%d) +GIT_REV= $$(git log --pretty=format:%h -1) +NEWDISTNAME= ${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_DATE}.${GIT_REV} maint-gen-distfile: git clone git://anongit.freedesktop.org/nouveau/xf86-video-nouveau \ @@ -37,11 +40,17 @@ maint-gen-distfile: ( cd ${GIT_WORK}; \ git log --stat >ChangeLog; \ autoreconf -if; \ - ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}.tar.bz2 \ - --exclude '.git*' --exclude autogen.sh --exclude autom4te.cache \ - -s "|${GIT_WORK}|${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}|" \ - ${GIT_WORK} ) + ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${NEWDISTNAME}${EXTRACT_SUFX} \ + --exclude '.git*' --exclude autogen.sh \ + --exclude autom4te.cache \ + -s "|${GIT_WORK}|${NEWDISTNAME}|" \ + ${GIT_WORK}; \ + ${ECHO_CMD} "SNAPDATE= ${GIT_DATE}" \ + >${MASTERDIR}/Makefile.rev; \ + ${ECHO_CMD} "SNAPREV= ${GIT_REV}" \ + >>${MASTERDIR}/Makefile.rev ) ${RM} -rf ${GIT_WORK} +.include "Makefile.rev" .include Index: x11-drivers/xf86-video-nouveau/Makefile.rev =================================================================== RCS file: x11-drivers/xf86-video-nouveau/Makefile.rev diff -N x11-drivers/xf86-video-nouveau/Makefile.rev --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-drivers/xf86-video-nouveau/Makefile.rev 22 Jul 2009 04:03:29 -0000 @@ -0,0 +1,2 @@ +SNAPDATE= 20090721 +SNAPREV= f70287c Index: x11-drivers/xf86-video-nouveau/distinfo =================================================================== RCS file: /home/csup/ports/x11-drivers/xf86-video-nouveau/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- x11-drivers/xf86-video-nouveau/distinfo 16 May 2009 14:01:34 -0000 1.3 +++ x11-drivers/xf86-video-nouveau/distinfo 22 Jul 2009 04:04:26 -0000 @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = 86aff4923c1b2143aae0f7f2ac65b5a3 -SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = eaa2f230770338c08839d0c6f7211ef9624a19eb305689f3f012df3ab92cb5c7 -SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = 556039 +MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090721.f70287c.tar.bz2) = b0782867e4e8783dde1a069a53161eed +SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090721.f70287c.tar.bz2) = a783f1d4699d338245cfbf0194073ec1e68ec642a802a3b6396cafd5ebd8cbff +SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090721.f70287c.tar.bz2) = 552613 Index: x11-drivers/xf86-video-nouveau/pkg-message =================================================================== RCS file: x11-drivers/xf86-video-nouveau/pkg-message diff -N x11-drivers/xf86-video-nouveau/pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-drivers/xf86-video-nouveau/pkg-message 15 Jul 2009 22:19:29 -0000 @@ -0,0 +1,15 @@ +The DRM part is still not in the kernel tree and will not be there +until it stabilized. It won't happen anytime soon. So, consider using +the following patch in the meantime unless you don't want any hardware +accelerated 2D like EXA and Xvideo. + +http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch + +Installing it should be as simple as below procedure provided you have +base sources in /usr/src. + + # cd /usr/src/sys + # fetch http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch + # patch -sp0 -i drm-nouveau-062309.patch + # cd modules/drm + # make depend all install --- xf86-video-nouveau.diff ends here ---