Opened 18 months ago

Closed 17 months ago

Last modified 16 months ago

#13302 closed Patch - Bug Fix (fixed)

Configure check_lib updates for FFMpeg merge

Reported by: Gary Buhrmaster Owned by: Peter Bennett
Priority: minor Milestone: 30.0
Component: MythTV - configure script Version: Master Head
Severity: medium Keywords:
Cc: Ticket locked: no

Description

The FFMpeg resync in 24f44de changed the function check_lib calling sequence (it adds a name first param). There are a couple of check_lib calls there were not converted in the MythTV configure script.

To reproduce failure for the first case (without patch): ./configure --enable-mythlogserver No reproducer provided for the second case (the external mpeg2 library support is still a WIP I believe).

Proposed patch:

diff --git a/mythtv/configure b/mythtv/configure
index 32e0098b9f..7bfac0307a 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -5874,7 +5874,7 @@ enabled ffmpeg_pthreads && enable pthreads
 # Check for libuuid for zeromq
 enabled mythlogserver || disable libuuid
 if enabled libuuid ; then
-  check_lib uuid/uuid.h uuid_generate -luuid || disable libuuid
+  check_lib uuid uuid/uuid.h uuid_generate -luuid || disable libuuid
   if disabled libuuid ; then
     die "ERROR: can not find libuuid. (debian uuid-dev; RedHat libuuid-devel)"
   fi
@@ -5987,7 +5987,7 @@ enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
                                die "ERROR: opengl not found."
                              }
 if enabled libmpeg2external; then
-    check_lib mpeg2dec/mpeg2.h mpeg2_init -lmpeg2 || disable libmpeg2external
+    check_lib libmpeg2external mpeg2dec/mpeg2.h mpeg2_init -lmpeg2 || disable libmpeg2external
     if disabled libmpeg2external; then
         die "Warning! No suitable external libmpeg2 found, use internal copy."
     fi

Change History (4)

comment:1 Changed 17 months ago by Peter Bennett

This regex finds the offending calls

check_lib *[^ ]*.h

It only found those two.

This will not happen in future - we are no longer merging ffmpeg new configure into MythTV configure when we resync ffmpeg.

Last edited 17 months ago by Peter Bennett (previous) (diff)

comment:2 Changed 17 months ago by Peter Bennett

Resolution: Fixed
Status: newclosed

Fixed in 4b1afb5e480

configure: fix bad check_lib calls.

The FFMpeg resync in 24f44de changed the function check_lib calling sequence (it adds a name first param). There are a couple of check_lib calls there were not converted in the MythTV configure script.

comment:3 Changed 17 months ago by Gary Buhrmaster <gary.buhrmaster@…>

Resolution: Fixedfixed

In 4b1afb5e48/mythtv:

configure: fix bad check_lib calls.

The FFMpeg resync in 24f44de changed the function check_lib calling
sequence (it adds a name first param). There are a couple of
check_lib calls there were not converted in the MythTV configure script.

Fixes #13302

Signed-off-by: Peter Bennett <pbennett@…>

comment:4 Changed 16 months ago by Stuart Auchterlonie

Milestone: needs_triage30.0
Note: See TracTickets for help on using tickets.