From patchwork Thu May 11 10:53:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reino Wijnsma X-Patchwork-Id: 3647 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp637188vsd; Thu, 11 May 2017 03:53:41 -0700 (PDT) X-Received: by 10.28.199.10 with SMTP id x10mr4645804wmf.83.1494500021302; Thu, 11 May 2017 03:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494500021; cv=none; d=google.com; s=arc-20160816; b=aIuMHhi+siBl3+Sbp8o1QpjnzPV2sLOuaOqPFCUfMEjrjqKrxnKBhSlY7e7u3pHbOh udQsmU8ufaBm3e1ReypRmBFmMuv2B0xNN+lLrVmulhcBgefMrm9NrE3I92m/cJH3Qrev lQpAxUFvYAXbNl1CPzfABZfbgHUJlZnlt+UUFe9bNl6EYeKcGDtWxS8VKh0ltnzZ9kYZ F/fqXojRTOmaXcliONNkzTZ8EXWLF1tzbndTaAdrgixUYVIBhsi7d0/Z4gXmcR1V6ODW PVZpYDkMIIba7fNo4G9O35bcEbAcSoj60jCO7snjgJ3Uu6WFqNJL18LxhnzM1iD/6oU+ AFfg== 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 :mime-version:user-agent:date:message-id:from:to:delivered-to :arc-authentication-results; bh=7xhvJLPw1gAwjm7KnWkL8DOYlvrado1ioFxw8SNv7/8=; b=VqKKS7AQIdv2rmjzdAerKmMRW6+PfHs9yi5i4LOOVwEpC4I8KqWWcap8bXDiACatY8 iddbShg8ruVn8cEeDPuK0XV1i2pmwQEJV+XK03aw2ZPh4AZjbWofoVxes8cx3qYG14am EpCaNx50cg+rwShQCsM7u5vH3ML0zkiLvkasHlMtv+HWf3AjyXDkGnt9g0sXLgyikN2s JTJt/2vAzLo9OBAdNHlPa1xR7ulATykg91+P1AULjuTiYNInP5vUrenA7OrWmCSmJhLh M5ArMkLTM4dMYH1dVYXrltpBPAENljRKrVDSAsfmjiLNb1jepRAKPC3+qFp5ann0VMo/ ga2g== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d188si7215177wmc.0.2017.05.11.03.53.40; Thu, 11 May 2017 03:53: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AF09689891; Thu, 11 May 2017 13:53:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from lb2-smtp-cloud6.xs4all.net (lb2-smtp-cloud6.xs4all.net [194.109.24.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6992F6804F3 for ; Thu, 11 May 2017 13:53:25 +0300 (EEST) Received: from [IPv6:2001:980:2408:1:84c9:9dc5:936c:696c] ([IPv6:2001:980:2408:1:84c9:9dc5:936c:696c]) by smtp-cloud6.xs4all.net with ESMTP id JytX1v00421ondb01ytYv7; Thu, 11 May 2017 12:53:32 +0200 To: ffmpeg-devel@ffmpeg.org From: Reino Wijnsma Message-ID: <591442AD.1010800@xs4all.nl> Date: Thu, 11 May 2017 12:53:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] configure: Prioritize 'sdl2-config'-check 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" See https://trac.ffmpeg.org/ticket/6377. By prioritizing the 'sdl2-config'-check the librarylist that's needed to build FFPlay is setup automatically and one doesn't have to patch 'sdl2.pc' anymore. From 3f9c065f96815ffefaa39cda7bacd8132bfdf66c Mon Sep 17 00:00:00 2001 From: Reino Wijnsma Date: Wed, 10 May 2017 00:50:30 +0200 Subject: [PATCH] Check 'sdl2-config' first, then 'sdl2.pc'. --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5ae5227..275a1c1 100755 --- a/configure +++ b/configure @@ -5947,14 +5947,14 @@ 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 + if "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs) check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && check_func SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2 else - if "${SDL2_CONFIG}" --version > /dev/null 2>&1; then - sdl2_cflags=$("${SDL2_CONFIG}" --cflags) - sdl2_extralibs=$("${SDL2_CONFIG}" --libs) + if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags && check_func SDL_Init $sdl2_extralibs $sdl2_cflags && enable sdl2