From patchwork Tue May 9 23:04:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reino Wijnsma X-Patchwork-Id: 3650 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp836673vsd; Thu, 11 May 2017 11:47:41 -0700 (PDT) X-Received: by 10.28.234.19 with SMTP id i19mr181625wmh.106.1494528461824; Thu, 11 May 2017 11:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494528461; cv=none; d=google.com; s=arc-20160816; b=ntVQzWMzaJlDefiQJKuR/4VswXW5M57VEmnqU+nOsEjk5UiGRv+4QTPtiL0go7xIes xVL8d3s4pMdQPb4O1ZRzKfufLfhu6ZUa+CAPMLL+4VECv10kHI19VsmSVlokhSSkLm7T /KNDFrvmOe4dcc9jWjb5qbxE2CljqsPDxGGg3V/FswaYy6T+qpX4ddCXOSV4DTV5LIpr GPEaTcQdxAZXzYe7ys/4/EaFXW85pqflCTGDITpGKstMyLPIPEOQ6FqUKGj/8yQ4wbca N8rz9RgOHXc764EaqUuTsOQ0ZSDeuJ4avos2VuT9czr1v7hHVZ402rqClrjrs77/rC8J vc+g== 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=BUrvpGtsAZT9zzM05dBPvqX/E3DFl7da/sh9nHovbTQ=; b=vIEcdWTNrbBYhb/ogv8Cjb7ncI089ORwAW9iTi1UTRLpSO0nwMC9q6f9CxMOoKLtvW H+gsX3Q6msH0ctGxJn6cq/IJ0Zdm8Pv/3PsB1NU5Pjk2mc2FDFKFktpGZ1vb6t2rED16 gHMJcRjJl5Nc31/M1OHh/OVLi2auX+uLBvlZSQFjLFKQFsevvw3RNgm2+FU/+gN86jXm PjCGT9Vq5qPdduCjP4shaqNuwzvZEeFaF2SOfrt2AiSou4LcbjhqrTvfpA3n1KFlwgcC bDY9q/1Sq763feAgTg8Z1G1+IRDf7VWIL5QCnAPToSdTNa3iIf36qi9PkBFhbsCYwj7n sP1A== 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 s53si1011076wrc.222.2017.05.11.11.47.41; Thu, 11 May 2017 11:47: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 4AB936882AF; Thu, 11 May 2017 21:47: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 79CEC680756 for ; Wed, 10 May 2017 02:04:31 +0300 (EEST) Received: from [IPv6:2001:980:2408:1:f0fb:276c:8608:6cef] ([IPv6:2001:980:2408:1:f0fb:276c:8608:6cef]) by smtp-cloud6.xs4all.net with ESMTP id JP4c1v0032bFU3l01P4dh8; Wed, 10 May 2017 01:04:37 +0200 To: ffmpeg-devel@ffmpeg.org From: Reino Wijnsma Message-ID: <59124B03.6040801@xs4all.nl> Date: Wed, 10 May 2017 01:04:35 +0200 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 11 May 2017 21:47:30 +0300 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] configure - "Check 'sdl2-config' first, then 'sdl2.pc'." 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. 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