From owner-freebsd-multimedia@FreeBSD.ORG Fri Jul 15 06:17:39 2011 Return-Path: Delivered-To: freebsd-multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FF511065672 for ; Fri, 15 Jul 2011 06:17:39 +0000 (UTC) (envelope-from itetcu@FreeBSD.org) Received: from worf.ds9.tecnik93.com (worf.ds9.tecnik93.com [81.196.207.130]) by mx1.freebsd.org (Postfix) with ESMTP id E009D8FC17 for ; Fri, 15 Jul 2011 06:17:38 +0000 (UTC) Received: from [10.88.103.219] (unknown [109.166.128.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by worf.ds9.tecnik93.com (Postfix) with ESMTPSA id 70F0822C55AF; Fri, 15 Jul 2011 08:58:00 +0300 (EEST) References: <20110714205415.GA3304@triton8.kn-bremen.de> User-Agent: K-9 Mail for Android In-Reply-To: <20110714205415.GA3304@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Ion-Mihai Tetcu Date: Fri, 15 Jul 2011 08:57:44 +0300 To: Juergen Lock ,freebsd-multimedia@FreeBSD.org Message-ID: <065a6e78-49d9-4431-b557-7b486c92c32f@email.android.com> Cc: Subject: Re: Fixing skype multimedia/linux_v4l2wrapper dependency on 8 X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2011 06:17:39 -0000 Juergen Lock wrote: >Hi! > > 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: net-im/skype/Makefile >=================================================================== >RCS file: /home/pcvs/ports/net-im/skype/Makefile,v >retrieving revision 1.60 >diff -u -p -r1.60 Makefile >--- net-im/skype/Makefile 12 May 2011 08:15:48 -0000 1.60 >+++ net-im/skype/Makefile 14 Jul 2011 16:43:55 -0000 >@@ -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_INBASE} != "1" >RUN_DEPENDS+= linux_v4l2wrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod > . endif > .else >Index: net-im/skype-devel/Makefile >=================================================================== >RCS file: /home/pcvs/ports/net-im/skype-devel/Makefile,v >retrieving revision 1.50 >diff -u -p -r1.50 Makefile >--- net-im/skype-devel/Makefile 17 May 2011 07:56:19 -0000 1.50 >+++ net-im/skype-devel/Makefile 14 Jul 2011 16:43:55 -0000 >@@ -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_INBASE} != "1" >RUN_DEPENDS+= linux_v4l2wrapper-kmod>=1.0:${PORTSDIR}/multimedia/linux_v4l2wrapper-kmod > . endif > .else >Index: multimedia/linux_v4l2wrapper-kmod/Makefile >=================================================================== >RCS file: /home/pcvs/ports/multimedia/linux_v4l2wrapper-kmod/Makefile,v >retrieving revision 1.3 >diff -u -p -r1.3 Makefile >--- multimedia/linux_v4l2wrapper-kmod/Makefile 10 Jun 2011 19:07:36 >-0000 1.3 >+++ multimedia/linux_v4l2wrapper-kmod/Makefile 14 Jul 2011 16:43:55 >-0000 >@@ -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_INBASE} == "1" > IGNORE= is already in kernel > .else > .if !exists(${SYSDIR}/Makefile) >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 >+.else >+.if ${OSVERSION} == 900036 || ${OSVERSION} == 802508 >+LINUX_V4L2_INBASE!= ($(SYSCTL) -n kern.features.linuxulator_v4l2 >2>/dev/null || true) >+.else >+LINUX_V4L2_INBASE= 0 >+.endif >+.endif I'm in vacation until monday, please commit if you have the time. Thanks. -- Sent from my Android phone with K-9 Mail. Please excuse my brevity.