Responsible Changed From-To: freebsd-ports-bugs->freebsd-x11 Over to maintainer (via the GNATS Auto Assign Tool)
I don't see any value enabling libdrm_radeon right now... AFAIK, it only provides the TTM/GEM api which we don't have support for. Otherwise, this all looks fine. robert. -- Robert Noland <rnoland@FreeBSD.org> FreeBSD
Robert Noland <rnoland@FreeBSD.org> writes: > I don't see any value enabling libdrm_radeon right now... AFAIK, it only > provides the TTM/GEM api which we don't have support for. I thought the support for that api in libdrm may be useful sometime in future. It'll reduce one step to use it once we have support for it. Anyway, I don't mind if you remove that option and skip pkg-plist diff for it. > Otherwise, this all looks fine. > > robert.
Here are updated patches: - new nouveau snapshot 20090716.b1b2330 (tested on Xserver 1.6.1) - remove installation of experimental radeon api from libdrm --- libdrm.diff begins here --- Index: graphics/libdrm/Makefile =================================================================== RCS file: /home/csup/ports/graphics/libdrm/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- graphics/libdrm/Makefile 16 May 2009 00:35:42 -0000 1.16 +++ graphics/libdrm/Makefile 19 Jul 2009 22:19:06 -0000 @@ -6,7 +6,7 @@ # PORTNAME= libdrm -PORTVERSION= 2.4.11 +PORTVERSION= 2.4.12 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ Index: graphics/libdrm/distinfo =================================================================== RCS file: /home/csup/ports/graphics/libdrm/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- graphics/libdrm/distinfo 16 May 2009 00:35:42 -0000 1.12 +++ graphics/libdrm/distinfo 19 Jul 2009 22:18:58 -0000 @@ -1,3 +1,3 @@ -MD5 (libdrm-2.4.11.tar.bz2) = e0e66fae165d0b665b61e9516bf33ade -SHA256 (libdrm-2.4.11.tar.bz2) = 5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c -SIZE (libdrm-2.4.11.tar.bz2) = 407127 +MD5 (libdrm-2.4.12.tar.bz2) = 15d26219c046377d5fcb1cb37e7b03a2 +SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31 +SIZE (libdrm-2.4.12.tar.bz2) = 414175 --- libdrm.diff ends here --- --- 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 17 Jul 2009 18:12:57 -0000 @@ -20,12 +20,17 @@ MAN4= nouveau.4x MAKE_JOBS_SAFE= yes -SNAPDATE= 20090514 -SNAPREV= 9656762 +SNAPDATE= 20090716 +SNAPREV= b1b2330 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) 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 17 Jul 2009 18:13:03 -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.20090716.b1b2330.tar.bz2) = f3d1e4781920d503c62c5f86a6d7a12b +SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090716.b1b2330.tar.bz2) = d4b64ed8517fc9f64fc614064ca17737a4da9dcc857a2b968155622af70c3050 +SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090716.b1b2330.tar.bz2) = 547530 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 ---
On Sun, Jul 19, 2009 at 10:50:03PM +0000, Anonymous wrote: <snip> > +Installing it should be as simple as below procedure provided you have > +base sources in /usr/src. > + > + # cd /usr/src/sys You also need to create modules/drm/nouveau, otherwise modules/drm/nouveau/Makefile isn't created: # mkdir modules/drm/nouveau > + # 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 --- Thanks for updating the driver. Yuri
Yuri Pankov <yuri.pankov@gmail.com> writes: > On Sun, Jul 19, 2009 at 10:50:03PM +0000, Anonymous wrote: > <snip> > > +Installing it should be as simple as below procedure provided you have > > +base sources in /usr/src. > > + > > + # cd /usr/src/sys > > You also need to create modules/drm/nouveau, otherwise modules/drm/nouveau/Makefile isn't created: > # mkdir modules/drm/nouveau No, you don't need to create the directory explicitly. It should be created by patch(1) for you because `-p0' option was specified. > > > + # 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 --- > > Thanks for updating the driver. > > Yuri
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 <bsd.port.mk> 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 ---
rnoland 2009-08-01 17:39:21 UTC FreeBSD ports repository Modified files: graphics/libdrm Makefile distinfo Log: Update to 2.4.12 PR: 136806 Submitted by: Anonymous <swell.k@gmail.com> Revision Changes Path 1.17 +1 -1 ports/graphics/libdrm/Makefile 1.13 +3 -3 ports/graphics/libdrm/distinfo _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
rnoland 2009-08-01 17:42:44 UTC FreeBSD ports repository Modified files: x11-drivers/xf86-video-nouveau Makefile distinfo Added files: x11-drivers/xf86-video-nouveau Makefile.rev pkg-message Log: Update to newer snapshot. This and the updated libdrm bump the API version to 0.0.14 which requires an updated kernel patch. See pkg-message for details. PR: 136806 Submitted by: Anonymous <swell.k@gmail.com> Revision Changes Path 1.7 +18 -9 ports/x11-drivers/xf86-video-nouveau/Makefile 1.1 +2 -0 ports/x11-drivers/xf86-video-nouveau/Makefile.rev (new) 1.4 +3 -3 ports/x11-drivers/xf86-video-nouveau/distinfo 1.1 +15 -0 ports/x11-drivers/xf86-video-nouveau/pkg-message (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!