diff options
| author | nox <nox@FreeBSD.org> | 2011-07-18 00:29:42 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2011-07-18 00:29:42 +0800 |
| commit | 240ce5ace3f40f489f0e7dbf2eb53dfaae101bcc (patch) | |
| tree | d96d78aa5d84db7a4af7a0ed517b5f1c7684a16e | |
| parent | 306369fea2401c7b7cc7a51815e5dfe4d103ba30 (diff) | |
| download | freebsd-ports-gnome-240ce5ace3f40f489f0e7dbf2eb53dfaae101bcc.tar.gz freebsd-ports-gnome-240ce5ace3f40f489f0e7dbf2eb53dfaae101bcc.tar.zst freebsd-ports-gnome-240ce5ace3f40f489f0e7dbf2eb53dfaae101bcc.zip | |
Fix skype multimedia/linux_v4l2wrapper dependency on 8.
Approved by: itetcu (skype ports maintainer)
Discussed on: -multimedia
| -rw-r--r-- | multimedia/linux_v4l2wrapper-kmod/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/linux_v4l2wrapper-kmod/Makefile.sub | 12 | ||||
| -rw-r--r-- | net-im/skype-devel/Makefile | 3 | ||||
| -rw-r--r-- | net-im/skype/Makefile | 3 |
4 files changed, 18 insertions, 13 deletions
diff --git a/multimedia/linux_v4l2wrapper-kmod/Makefile b/multimedia/linux_v4l2wrapper-kmod/Makefile index 71459088a447..1d2a5db1da14 100644 --- a/multimedia/linux_v4l2wrapper-kmod/Makefile +++ b/multimedia/linux_v4l2wrapper-kmod/Makefile @@ -38,18 +38,9 @@ MAKE_ENV+= SYSDIR="${SYSDIR}" CFLAGS+= ${DEBUG_FLAGS} -# try to avoid child processes when finding out if already in the kernel -.if ${OSVERSION} > 900036 || (${OSVERSION} < 900000 && ${OSVERSION} > 802508) -INBASE= 1 -.else -.if ${OSVERSION} == 900036 || ${OSVERSION} == 802508 -INBASE!= ($(SYSCTL) -n kern.features.linuxulator_v4l2 2>/dev/null || true) -.else -INBASE= 0 -.endif -.endif +.include "${.CURDIR}/Makefile.sub" -.if ${INBASE} == "1" +.if ${LINUX_V4L2_AVAILABLE} == "1" IGNORE= is already in kernel .else .if !exists(${SYSDIR}/Makefile) diff --git a/multimedia/linux_v4l2wrapper-kmod/Makefile.sub b/multimedia/linux_v4l2wrapper-kmod/Makefile.sub new file mode 100644 index 000000000000..e6f16d7c758d --- /dev/null +++ b/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_AVAILABLE= 1 +.else +.if ${OSVERSION} == 900036 || ${OSVERSION} == 802508 +LINUX_V4L2_AVAILABLE!= ($(SYSCTL) -n kern.features.linuxulator_v4l2 2>/dev/null || true) +.else +LINUX_V4L2_AVAILABLE= 0 +.endif +.endif diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index c201e32768ba..9ed0879186e1 100644 --- a/net-im/skype-devel/Makefile +++ b/net-im/skype-devel/Makefile @@ -45,10 +45,11 @@ USE_LINUX_APPS+=dri .endif .ifdef WITH_VIDEO +. include "${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod/Makefile.sub" RUN_DEPENDS+= webcamd>0:${PORTSDIR}/multimedia/webcamd USE_LINUX_APPS+=libv4l SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so " -. if ${OSVERSION} < 900036 +. if ${LINUX_V4L2_AVAILABLE} != "1" RUN_DEPENDS+= linux_v4l2wrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod . endif .else diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index 8da830e2fae2..ee69792088a3 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -46,10 +46,11 @@ USE_LINUX_APPS+=dri .endif .ifdef WITH_VIDEO +. include "${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod/Makefile.sub" RUN_DEPENDS+= webcamd>0:${PORTSDIR}/multimedia/webcamd USE_LINUX_APPS+=libv4l SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so " -. if ${OSVERSION} < 900036 +. if ${LINUX_V4L2_AVAILABLE} != "1" RUN_DEPENDS+= linux_v4l2wrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod . endif .else |