Skip to contentSkip to conversation

mediastreamer: fix avcodec functions conflict

PATCH Superseded Giulio Benetti 3 participants 7 messages Sep 4, 2018 – Sep 28, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Autotools miss avcodec function check leading to conflicts between local functions and avcodec functions.

Add patch to swap $FFMPEG_LIBS and -lavutil which are checked when AC_CHECK_LIB on avcodec_* functions. $FFMPEG_LIBS contain -ldrm that must be listed after -lavutil.

Fixes:
http://autobuild.buildroot.net/results/394/3945e06ea0dd1e16013184fbab5b67b3561c87ce/
http://autobuild.buildroot.net/results/576/576c7d71313c45753848462717200b2b8ff5bb0e/
http://autobuild.buildroot.net/results/f33/f339ac6ea30815eeb8ecb144c971f56c06a9f995

---
Changes V2->V3:
* don't append -ldrm, swap $FFMPEG_LIBS with -lavutil

Changes V1->V2:
* merge -ldrm into FFMPEG_LIBS instead of repeating it thrice.

 ...ffmpeg-and-avcodec-function-conflict.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch new file +42 -0
new file mode 100644
index 0000000000..cdaa0fab24
@@ -0,0 +1,42 @@
+From d12e74a559602b3dff9a6bf38fcbb139535c9c9c Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Mon, 3 Sep 2018 20:27:00 +0200
+Subject: [PATCH] m4: fix local ffmpeg and avcodec function conflict
+
+Autotools miss avcodec function check.
+This is due to linker library list order, -ldrm is appended too early
+respect to -lavutil. This results in missing drm library functions for
+avcodec functions:
+- drmGetVersion()
+- drmFreeVersion()
+So these functions:
+- avcodec_get_context_defaults3
+- avcodec_open2
+- avcodec_encode_video2
+can't link correctly during check and they seem not to be present.
+Then macros HAVE_FUN_avcodec_* are not defined in mediastreamer-config.h
+So local avcodec functions conflict with real avcodec library functions.
+
+In acinclude.m4 file, swap $FFMPEG_LIBS and -lavutil if avcodec is found.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6c31ed82..89ff6643 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -110,7 +110,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
+ 			if test x$avcodec_found = xno ; then
+ 			   AC_MSG_WARN([Could not find libavcodec (from ffmpeg) headers and library.])
+ 			else
+-			   FFMPEG_LIBS="$FFMPEG_LIBS -lavutil"
++			   FFMPEG_LIBS="-lavutil $FFMPEG_LIBS"
+ 			fi
+ 			
+ 			
+-- 
+2.17.1
+
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Autotools miss avcodec function check leading to conflicts between local functions and avcodec functions.

Add patch to swap $FFMPEG_LIBS and -lavutil which are checked when AC_CHECK_LIB on avcodec_* functions. $FFMPEG_LIBS contain -ldrm that must be listed after -lavutil.

Fixes:
http://autobuild.buildroot.net/results/394/3945e06ea0dd1e16013184fbab5b67b3561c87ce/
http://autobuild.buildroot.net/results/576/576c7d71313c45753848462717200b2b8ff5bb0e/
http://autobuild.buildroot.net/results/f33/f339ac6ea30815eeb8ecb144c971f56c06a9f995

Quoted 7 lines

---
Changes V2->V3:
* don't append -ldrm, swap $FFMPEG_LIBS with -lavutil

Changes V1->V2:
* merge -ldrm into FFMPEG_LIBS instead of repeating it thrice.

Committed after extending the commit message to clarify that this is about static linking, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Hello Peter,

Il 04/09/2018 22:58, Peter Korsgaard ha scritto:

Quoted 19 lines
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Autotools miss avcodec function check leading to conflicts between local functions and avcodec functions.

Add patch to swap $FFMPEG_LIBS and -lavutil which are checked when AC_CHECK_LIB on avcodec_* functions. $FFMPEG_LIBS contain -ldrm that must be listed after -lavutil.

Fixes:
http://autobuild.buildroot.net/results/394/3945e06ea0dd1e16013184fbab5b67b3561c87ce/
http://autobuild.buildroot.net/results/576/576c7d71313c45753848462717200b2b8ff5bb0e/
http://autobuild.buildroot.net/results/f33/f339ac6ea30815eeb8ecb144c971f56c06a9f995

---
Changes V2->V3:
* don't append -ldrm, swap $FFMPEG_LIBS with -lavutil

Quoted 6 lines
Quoted 2 lines

Changes V1->V2:
* merge -ldrm into FFMPEG_LIBS instead of repeating it thrice.

Committed after extending the commit message to clarify that this is about static linking, thanks.

Sorry for my ignorance, so library order during linking is an issue only with static libraries?

Best regards
Giulio Benetti

#3 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 2 lines

Committed after extending the commit message to clarify that this is about static linking, thanks.

Sorry for my ignorance, so library order during linking is an issue only with static libraries?

Yes, when statically linking ld will only pull in the object files containing referenced symbols, so you need to list the libraries in the dependency order (E.G. if you call a function in library a that in turn calls a function in library b then you must use -la -b).

For details, see
E.G. https://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Quoted 10 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 2 lines

Committed after extending the commit message to clarify that this is about static linking, thanks.

Sorry for my ignorance, so library order during linking is an issue only with static libraries?

Quoted 7 lines

Yes, when statically linking ld will only pull in the object files containing referenced symbols, so you need to list the libraries in the dependency order (E.G. if you call a function in library a that in turn calls a function in library b then you must use -la -b).

For details, see
E.G. https://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking

Note the explanation of --start-group/--end-group, which is sometimes the
easiest way to fix a linking order issue.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#5 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

Hello all,

Il 05/09/2018 00:10, Arnout Vandecappelle ha scritto:

Quoted 18 lines · Peter Korsgaard
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 2 lines

Committed after extending the commit message to clarify that this is about static linking, thanks.

Sorry for my ignorance, so library order during linking is an issue only with static libraries?

Yes, when statically linking ld will only pull in the object files containing referenced symbols, so you need to list the libraries in the dependency order (E.G. if you call a function in library a that in turn calls a function in library b then you must use -la -b).

Quoted 5 lines
Quoted 2 lines

For details, see
E.G. https://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking

Note the explanation of --start-group/--end-group, which is sometimes the
easiest way to fix a linking order issue.

Thank you that clarified me a lot.
Giulio

#6 lore raw

PATCH v3 1/1 mediastreamer: fix avcodec functions conflict

In reply to Giulio Benetti
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Giulio" == Giulio Benetti <[email protected]> writes:

Autotools miss avcodec function check leading to conflicts between local functions and avcodec functions.

Add patch to swap $FFMPEG_LIBS and -lavutil which are checked when AC_CHECK_LIB on avcodec_* functions. $FFMPEG_LIBS contain -ldrm that must be listed after -lavutil.

Fixes:
http://autobuild.buildroot.net/results/394/3945e06ea0dd1e16013184fbab5b67b3561c87ce/
http://autobuild.buildroot.net/results/576/576c7d71313c45753848462717200b2b8ff5bb0e/
http://autobuild.buildroot.net/results/f33/f339ac6ea30815eeb8ecb144c971f56c06a9f995

Quoted 7 lines

---
Changes V2->V3:
* don't append -ldrm, swap $FFMPEG_LIBS with -lavutil

Changes V1->V2:
* merge -ldrm into FFMPEG_LIBS instead of repeating it thrice.

Committed to 2018.02.x and 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard