From patchwork Thu Oct 12 22:38:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5545 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp30140jah; Thu, 12 Oct 2017 15:38:42 -0700 (PDT) X-Received: by 10.223.148.38 with SMTP id 35mr3776449wrq.49.1507847922006; Thu, 12 Oct 2017 15:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507847921; cv=none; d=google.com; s=arc-20160816; b=msQ1U2ZnFLl1yV8dVxdbSh2eTvMjhB3/iYqjFLjLUZAutlbgMO4Iw1cw++8pZsPbWO eTAcUVSnxqMYYD9U1nxIijOR7ho7iQsXbhfIV1i49AOBXtiG+x435t5HJdVxePVKaThr O8cUxv4EIsqXpxxOJuq5xyo3tujAN17q0ysOXfYnuAhjEY1bwL/Ui0EuCouCfWOlW7jU X/loXg3AnU3eE1x3k49nuCBNOqDNXvABOXjkEtgJKcgrQTdU9Yezg2d5fJ8WR8j3hOXq pdAvPyLy1EAaZS5b8P8frklXA0jGFZRo9UJOYywDETi72xJhjrjpa56ZJhFvm6AbOl83 MHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=6CBnMbKSQ0LSqx54nOlEC3Rnp+vmvzWO18jviMmtgTw=; b=PW7mNYfBY5yFa3FABp0BwgFAMkqQJQ7LWvXRGCuSdj2V7bezysSzm5oS/FJOnSt/JK HU6BBeKU0xPvCcJNEAp7/Raw4zUqQVpUXkFeGKDcS6pCw0fdtfA8TwFNA2GRPGDE64Cs ApGS6uwao98Pi8s6sp1aetpytXbZWdJ7IEA3nlp5IPa2QRGemfgMhY8o0u7bqU7TG7nz Ewglwm61KZD10wD8yfeoKKQh3k9dk52iqs2Od1pIpoNQNRHF8hFdIHPaoi1PVw/rzbRL 5PsCkwD3sYFTR9ngm13/WxCzVnWSb5TLkxzfIbX9jQCyI86AaPtwzOl1ygGjMbzPeH69 JxlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nWIJl/yF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m6si14201481wrf.171.2017.10.12.15.38.41; Thu, 12 Oct 2017 15:38:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nWIJl/yF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7381668A02F; Fri, 13 Oct 2017 01:38:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f172.google.com (mail-qk0-f172.google.com [209.85.220.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC4DF689FF1 for ; Fri, 13 Oct 2017 01:38:30 +0300 (EEST) Received: by mail-qk0-f172.google.com with SMTP id y23so2991211qkb.10 for ; Thu, 12 Oct 2017 15:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=ptpBH27l27A53LRPkDUN4F5AaGku4e1H45FbG31LNAI=; b=nWIJl/yFjtpYqGVWChZmUhjVPj8wQTxolqNAf+MDyLPTGL4V46HkMUNUTpvmLwMsff LvhL134Iz3Hho/qA+w1Ds5dYQPMnnDKGYSQGX2h8ktFPtohmjtxxZvzEh9T/cwFN2Npq j/4vWUF9tCx4CNLlgPyBEUAqNafCB1sFKeRPBDUF/eq1hcEmXodt1kxMPNbqEwPAByhF 60ZkTvUcwnjErfg8B7WQ0dXXT3TxDmlvtdp0aZqSMYbBQsyAfsljc64+kfmFO+CIpLUA tdk0OnFQLUPSxfJNqbmMSFYXiXdtyID8QofSqygz8VCOT+jZbYGGvnknPcoTOGbYB4hk JVGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=ptpBH27l27A53LRPkDUN4F5AaGku4e1H45FbG31LNAI=; b=tA07pRdRVW8T3zPCTEcQr+fk5Lb4Go2GSegQir6Dz968MbxMevCnOnKh8xMN4+jCPs Rf/YusKe6qcuxrlUAhGO72WbALdtU17IRMCV3ra8pqK1mmqHa3m23v0L+W+LyDEYskPn s3gIY5k2qOP/AELRKI8vnaxLKwMGqBN/JeC4W7/wqzvtpjJzfz3O9DBN3QwwhORqGcYk fkcR+RoOrr62lFxBqyti4CCPmSLUTWfbdTpI7sZoIsc2ReLOx6Stci6guJb5A4N7mV+x IgVy9baQiLCf4LORHqKJoNC79NqDKNhmQ+7JEGNXq1yoXw92RhBigS2dhCZB+q8E4SPL 66kA== X-Gm-Message-State: AMCzsaWvgraClIrjE/bWlsnba0UI3Qt/gOEkYQ+z88XTqmNBkVwTG2Bp GqLyEmiFS+kKvTgvAO6q872hjO/E X-Google-Smtp-Source: ABhQp+TRge7X/fEj3or4wJV4lbpbiW/FcE2mtC1o5c1RUq0xPh0EVy/Ih3qtyxTPWOem++j2ONP+fw== X-Received: by 10.55.8.133 with SMTP id 127mr2539618qki.287.1507847912594; Thu, 12 Oct 2017 15:38:32 -0700 (PDT) Received: from [192.168.0.4] ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id l71sm10235596qkh.52.2017.10.12.15.38.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2017 15:38:31 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org References: <20171011212622.A0E83175447@albiero.videolan.org> <20171012002236.GB11608@nb4> <34e27316-ffc8-f815-d03d-37bbd4b922c5@gmail.com> <20171012165656.GG6009@nb4> <80511c36-5370-c366-8889-d31204c7e9b6@gmail.com> <20171012192506.GI6009@nb4> <99a0e804-c4e7-78b5-66a6-29e4bed53b88@gmail.com> <20171012213345.GR6009@nb4> <20171012214134.GS6009@nb4> <33f01734-9a99-e32e-7ce4-44100a4eedd0@gmail.com> <9976e1ca-1fcd-59ee-69a0-4d48625753c3@gmail.com> From: James Almer Message-ID: Date: Thu, 12 Oct 2017 19:38:28 -0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Subject: Re: [FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63' X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 10/12/2017 7:34 PM, Carl Eugen Hoyos wrote: > 2017-10-13 0:24 GMT+02:00 James Almer : >> On 10/12/2017 7:19 PM, Carl Eugen Hoyos wrote: >>> 2017-10-13 0:12 GMT+02:00 James Almer : >>>> On 10/12/2017 6:50 PM, Carl Eugen Hoyos wrote: >>>>> 2017-10-12 23:45 GMT+02:00 James Almer : >>>>>> On 10/12/2017 6:41 PM, Michael Niedermayer wrote: >>>>> >>>>>>> also video4linux is gone >>>>>>> >>>>>>> ./configure >>>>>>> config.h:#define CONFIG_V4L2_INDEV 0 >>>>>>> >>>>>>> and with a branch with all that reverted: >>>>>>> ./configure >>>>>>> config.h:#define CONFIG_V4L2_INDEV 1 >>>>>> >>>>>> v4l2 is not autodetected. >>>>> >>>>> I tested several old versions, for the last 10 years, >>>>> v4l2 indev was auto-detected. >>>>> >>>>> From tests with really old versions I know that >>>>> video4linux (1) was always auto-detected (or >>>>> auto-enabled). >>>>> >>>>> Carl Eugen >>>> >>>> configure has the line >>>> >>>> --enable-libv4l2 enable libv4l2/v4l-utils [no] >>>> >>>> And before the commit i mentioned, it had the line >>>> >>>> libv4l2_indev_deps="libv4l2" >>>> >>>> If you check alldevices.c, there's no indev called "libv4l2_indev", only >>>> one called "v4l2_indev". >>>> Since the latter had no dependency on libv4l2, it was of course always >>>> enabled by default. I changed that in 734ed38931 (see ticket #6729, >>>> where doing that fixed a failure). >>>> >>>> So that indev being auto-enabled might have been a mistake all this time. >>> >>> Sorry, what are you talking about? >>> v4l2 was added in 2006 and auto-detected ever since. >>> Before 2006, there was already v4l (1) which was >>> auto-enabled since forever afair. >>> >>> There is a helper library called libv4l2 that - luckily - >>> is not auto-detected and shouldn't be. >> >> So v4l2_indev should not depend on libv4l2? > > No, definitely not. > >> Any idea why doing that fixed ticket #6729? > > Iiuc, it disabled v4l2 so all related build errors > were fixed. > > Since I am so slow, could you explain what issues > were fixed by 6dfcbd80? The extralibs from the libv4l2 pkg-config package were not added to the ld command line for the user. By making v4l2_indev depend on that package, that was solved. Does the attached patch look like a better solution for this? From 2f4b0bc8b551f0a8ef5f02f6be4177a420e90a65 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 12 Oct 2017 19:36:19 -0300 Subject: [PATCH] configure: make v4l2 devices not depend on libv4l2 But use it if available. Signed-off-by: James Almer --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ade67a31bb..5b3d1887fa 100755 --- a/configure +++ b/configure @@ -3116,7 +3116,6 @@ kmsgrab_indev_deps="libdrm" lavfi_indev_deps="avfilter" libcdio_indev_deps="libcdio" libdc1394_indev_deps="libdc1394" -v4l2_indev_deps="libv4l2" openal_indev_deps="openal" opengl_outdev_deps="opengl" oss_indev_deps_any="soundcard_h sys_soundcard_h" @@ -3127,7 +3126,9 @@ sdl2_outdev_deps="sdl2" sndio_indev_deps="sndio" sndio_outdev_deps="sndio" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" +v4l2_indev_suggest="libv4l2" v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" +v4l2_outdev_suggest="libv4l2" vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes"