Re: x11/nvidia-driver / Compilation has failed

Ali Mashtizadeh <mashtizadeh_at_gmail.com> writes:

> 2011/8/31 Alexey Dokuchaev <danfe_at_freebsd.org>:
>> On Mon, Aug 29, 2011 at 02:59:48PM +0200, Olivier Smedts wrote:
>>> 2011/8/29 ken <ken_at_tydfam.jp>:
>>> > Could I test your patch for nvidia-driver, too?
>>> > I cannot find your patch in this mail.
>>>
>>> I took the patch in :
>>> http://lists.freebsd.org/pipermail/freebsd-current/2011-August/026515.html
>>>
>>> And it worked for me.
>>
>> Should be fixed in the port itself now (also updated to 280.13).
>
> Is there any reason I should still be hitting this bug when building
> on 9-STABLE? With Linux compatibility disabled I can build the driver,
> but the kernel refuses to load it saying it's incompatible with my
> kernel version.

Only if you're using 285.05.09 with the port. And it'd affect both
/stable/9 and /head users.

  // from src/nv-freebsd.h:
  #if __FreeBSD_version >= 900041
  #include <sys/capability.h>
  #else
  #define fget(td, fd, cap, fp) fget(td, fd, fp)
  #endif

attached mail follows:

Can you commit below tiny change? It should make testing the new version a
bit easier for people who are impatient to wait for the next port update.

That version also includes tunable support similar to ports/156386.

  $ make
  [...]
  nvidia_linux.c:40:51: error: too many arguments to function call, expected 4, have 5
      if ((error = fget(td, args->fd, CAP_IOCTL, 0, &fp)) != 0)
                   ~~~~                             ^~~
  _at_/sys/file.h:186:1: note: 'fget' declared here
  int fget(struct thread *td, int fd, cap_rights_t rights, struct file **fpp);
  ^
  1 error generated.

Index: x11/nvidia-driver/Makefile
===================================================================
RCS file: /a/.csup/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- x11/nvidia-driver/Makefile	31 Aug 2011 12:30:24 -0000	1.109
+++ x11/nvidia-driver/Makefile	4 Oct 2011 05:33:52 -0000
_at__at_ -112,7 +113,7 _at__at_ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/status != status/status != RM_OK/' \
 		${WRKSRC}/src/nvidia_os.c
 # Fix the build after fget(9) KPI was changed in r224778
-.if ${OSVERSION} > 900040 && ${NVVERSION} >= 1952200
+.if ${OSVERSION} > 900040 && ${NVVERSION} >= 1952200 && ${NVVERSION} < 2850509
 	${REINPLACE_CMD} -e '/fget/s/&fp/0, &/' ${WRKSRC}/src/nvidia_linux.c
 .endif
 .if defined(WITH_FREEBSD_AGP)