From patchwork Sun Sep 25 13:14:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 715 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1453709vsd; Sun, 25 Sep 2016 06:14:51 -0700 (PDT) X-Received: by 10.194.189.143 with SMTP id gi15mr1470389wjc.149.1474809291042; Sun, 25 Sep 2016 06:14:51 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c185si4432908wmf.132.2016.09.25.06.14.50; Sun, 25 Sep 2016 06:14:51 -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; 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 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 6BAE4689E21; Sun, 25 Sep 2016 16:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f48.google.com (mail-vk0-f48.google.com [209.85.213.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 935E0689DFB for ; Sun, 25 Sep 2016 16:14:24 +0300 (EEST) Received: by mail-vk0-f48.google.com with SMTP id v205so23037901vke.1 for ; Sun, 25 Sep 2016 06:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=3K3qpUl1yMH3yOClQ3bbXBroCWddBzlPhue4+K+cuOQ=; b=r/wJPTzq3rkm3nfAoxks09XyFauNqwzcU+C+mUvRC/KDKoHjPXDLSd3Q2C8dceOnLB xdEggRiP5+AQNGB++3zNVDlPpR6TIKIJJVsZwUOigaz1I66nUX1mXXOdpED/eBlojAq4 Qrjboww/MhTEWNF9bagM81H+i9QYFB/DnkukGRp0XgLfFsMnu09V22QoCC6QAwRGucTc mld5btHLRnKieWL4+S2GZitKW6gQ48hjcgyK9bQK5cBGZMHbIQhwrD+zfx4rQchwf+mG Qree61o/D33iIzY416myPBgKA5VppL4iGJpMP90gANPRsnHfedQaYoa1bASx+uG61N5g +UXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=3K3qpUl1yMH3yOClQ3bbXBroCWddBzlPhue4+K+cuOQ=; b=b5cVe7hPKckOe/JPySBLZusIOna3xqM8YEwPa9+UwVsQ76a1n3zW5nG7FNHkJ84X/s wnoV3RkUFt0kNKRIQDUlwt3ZU+xWdYFoGyiWZD1WfBWE5/QMMbhA/xzYglTWIgeKuCGD mZoBYCIaRcACd3jWk7haH4wghjmjtEgcyeJsSFpMtCEjbfFtyRnS2RC6SXZOKI64StaZ 87dHlFOkWntQ0o+UyngPalYqEw42JkSjkl81jrcQjsRQFhQuFZsh8hsBLWa6mMCoYUTs 3i9PAVYsmV4YKlqiyuaRU+Jm/9M2SIkjO2SZ10z3Qj/cEnEsEd8rw20NE9OYg7ZIl0sl tsGg== X-Gm-Message-State: AA6/9Rkxwk2jRD3n5InfEYBY2uiKb+G7RrL2u6T/4B4zL2l7OHIzCLEZUZVPGxl9gQgt9VzBCANNb220nuCFUg== X-Received: by 10.31.11.1 with SMTP id 1mr4459933vkl.118.1474809280256; Sun, 25 Sep 2016 06:14:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.46.67 with HTTP; Sun, 25 Sep 2016 06:14:39 -0700 (PDT) In-Reply-To: <64e8af59-cdb7-34ae-9c6b-d2f6bd169a05@itanimul.li> References: <20160925120019.GA24554@kimiko.pkh.me> <20160925122856.952-1-josh@itanimul.li> <5e436fd4-2917-7cb2-1ab5-6fff3e632ad7@itanimul.li> <64e8af59-cdb7-34ae-9c6b-d2f6bd169a05@itanimul.li> From: Carl Eugen Hoyos Date: Sun, 25 Sep 2016 15:14:39 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] lavd/sdl2: add sdl alias 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" 2016-09-25 14:59 GMT+02:00 Josh de Kock : > > > On 25/09/2016 13:57, Carl Eugen Hoyos wrote: >> >> 2016-09-25 14:51 GMT+02:00 Josh de Kock : >>> >>> On 25/09/2016 13:45, Carl Eugen Hoyos wrote: >>>> >>>> >>>> 2016-09-25 14:28 GMT+02:00 Josh de Kock : >>>>> >>>>> >>>>> Signed-off-by: Josh de Kock >>>>> --- >>>>> >>>>> The --enable-sdl2 option is not being renamed because it's a fairly >>>>> big change and sdl2 is incompatible with sdl. >>>> >>>> >>>> >>>> How is (old) sdl in FFmpeg incompatible with the new sdl2 in FFmpeg? >>>> >>>> Please rename it. >>> >>> >>> Do you have a way to rename the option but not the device? >> >> >> I don't understand this question: >> How is the name of a configure option disabling an external library >> related to the name of a device in libavdevice? > > Sorry, I meant the external lib, not the device. > >>> Unless you're suggesting renaming the whole device, and then >>> I'd like to know a way to have the check_pkg_config work with a >>> different library name to what it searches for. >> >> >> There is an option --disable-foo that you removed and instead >> you added a new optoin --disable-foo2. Please rename >> --disable-foo2 to --disable-foo. >> > Yes, I'm saying I don't know how to achieve this without renaming the ext > lib name (which obviously can't change). [autodetect] --enable-x11grab enable X11 grabbing (legacy) [no] @@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST=" opengl openssl schannel + sdl sdl2 securetransport videotoolbox @@ -5846,6 +5847,7 @@ if enabled gcrypt; then fi fi +disabled sdl && disable sdl2 if ! disabled sdl2; then SDL2_CONFIG="${cross_prefix}sdl2-config" if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then An better and shorter alternative is "if ! disabled sdl; then" Carl Eugen diff --git a/configure b/configure index f593191..dbd16de 100755 --- a/configure +++ b/configure @@ -291,7 +291,7 @@ External library support: if gnutls is not used [no] --disable-schannel disable SChannel SSP, needed for TLS support on Windows if openssl and gnutls are not used [autodetect] - --disable-sdl2 disable sdl2 [autodetect] + --disable-sdl disable sdl2 [autodetect] --disable-securetransport disable Secure Transport, needed for TLS support on OSX if openssl and gnutls are not used