[FFmpeg-devel] [PATCH] configure: Fix bashism in openal check. (was: [PATCH] Bugfix for #9135)

Peter White peter.white at posteo.net
Tue Mar 2 19:36:07 EET 2021


On 02.03.21 17:56, James Almer wrote:
> On 3/2/2021 1:25 PM, Peter White wrote:
>> Sorry, apparently patches need to be sent inline, I just noticed. 
>> Please excuse my ignorance.
> 
> They don't need to be inline, although it is preferred. What they need 
> to be is made with git format-patch, which preserves authorship 
> information and commit message.

Thanks for your explanation. Hopefully now it is OK.

> Also, the commit message should be descriptive of what it fixes, and not 
> only reference a ticket number.

Like this?


 From 771ac6d3395f84d0969b088d2d0680281c1062d3 Mon Sep 17 00:00:00 2001
From: Peter White <peter.white at posteo.net>
Date: Tue, 2 Mar 2021 18:10:49 +0100
Subject: [PATCH] configure: Fix bashism in openal check.

Apparently zsh, when run in sh-compatibility mode (started as 'sh') is
very strict about command lists, which must always end with a semicolon.
Even dash let this one slide.

Fixes #9135
---
  configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index d11942fced..bcc845668b 100755
--- a/configure
+++ b/configure
@@ -6490,7 +6490,7 @@ enabled mmal              && { check_lib mmal 
interface/mmal/mmal.h mmal_port_co
                                 die "ERROR: mmal not found" &&
                                 check_func_headers 
interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
  enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" 
"-lopenal" "-lOpenAL32"; do
-                               check_lib openal 'AL/al.h' alGetError 
"${al_extralibs}" && break; done } ||
+                               check_lib openal 'AL/al.h' alGetError 
"${al_extralibs}" && break; done; } ||
                                 die "ERROR: openal not found"; } &&
                               { test_cpp_condition "AL/al.h" 
"defined(AL_VERSION_1_1)" ||
                                 die "ERROR: openal must be installed 
and version must be 1.1 or compatible"; }
-- 
2.25.1



More information about the ffmpeg-devel mailing list