Fixing skype multimedia/linux_v4l2wrapper dependency on 8
Alexander Leidinger
Alexander at Leidinger.net
Fri Jul 15 10:48:12 UTC 2011
Quoting Juergen Lock <nox at jelal.kn-bremen.de> (from Thu, 14 Jul 2011
22:54:15 +0200):
> Installing the skype ports with VIDEO knob on currently fails on
> up-to-date stable/8 because the multimedia/linux_v4l2wrapper port
> now detects it is not needed anymore (my patch has been committed
> to stable a while ago.) So I now made a patch that extracts the
> check whether the code is in the kernel into a seperate Makefile.sub
> that Linux ports that need V4L2 can include, and changed the skype
> ports to do just that. Does this look good and ok to commit?
> Index: multimedia/linux_v4l2wrapper-kmod/Makefile.sub
> @@ -0,0 +1,12 @@
> +# $FreeBSD$
> +
> +# try to avoid child processes when finding out if already in the kernel
> +.if ${OSVERSION} > 900036 || (${OSVERSION} < 900000 && ${OSVERSION}
> > 802508)
> +LINUX_V4L2_INBASE= 1
Here you say that it can be used, even if it is not compiled in and
not loaded.
> +.else
> +.if ${OSVERSION} == 900036 || ${OSVERSION} == 802508
> +LINUX_V4L2_INBASE!= ($(SYSCTL) -n kern.features.linuxulator_v4l2
> 2>/dev/null || true)
Here you say it can only be used *if it is loaded or compiled in*.
The correct name for the variable here would be LINUX_V4L2_INMEMORY.
If it is intended to have a variable which denotes both cases, I would
use a different name, maybe ..._OK or ..._AVAILABLE or something
similar.
> +.else
> +LINUX_V4L2_INBASE= 0
> +.endif
> +.endif
Bye,
Alexander.
--
The Constitution may not be perfect, but it's a lot better
than what we've got!
http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
More information about the freebsd-multimedia
mailing list