package/ffmpeg: add optional dependency to libxcb
PATCH 1/1 package/ffmpeg: add optional dependency to libxcb
ffmpeg 3.3 added optional support for libxcb:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/Changelog#l282
This patch ensures a reproducable build of libavdevice.so:
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libxcb.so.1] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shm.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shape.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-xfixes.so.0] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]
compared to
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]
--- package/ffmpeg/Config.in | 7 +++++++ package/ffmpeg/ffmpeg.mk | 11 +++++++++++ 2 files changed, 18 insertions(+)
package/ffmpeg/Config.in +7 -0
@@ -67,6 +67,13 @@ config BR2_PACKAGE_FFMPEG_FFPROBE FFprobe is a utility to determine the audio and video characteristics of a container file. +config BR2_PACKAGE_FFMPEG_XCBGRAB + bool "Build X11 screen grabbing" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBXCB + help + X11 screen grabbing using libxcb. + config BR2_PACKAGE_FFMPEG_AVRESAMPLE bool "Build libavresample" help
package/ffmpeg/ffmpeg.mk +11 -0
@@ -96,6 +96,17 @@ else FFMPEG_CONF_OPTS += --disable-ffprobe endif +ifeq ($(BR2_PACKAGE_FFMPEG_XCBGRAB),y) +FFMPEG_CONF_OPTS += \ + --enable-libxcb \ + --enable-libxcb-shape \ + --enable-libxcb-shm \ + --enable-libxcb-xfixes +FFMPEG_DEPENDENCIES += libxcb +else +FFMPEG_CONF_OPTS += --disable-libxcb +endif + ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y) FFMPEG_CONF_OPTS += --enable-postproc else
Signature · 1 line
2.25.0
Thomas Petazzoni
AppliedPATCH 1/1 package/ffmpeg: add optional dependency to libxcb
Quoted 25 lines · On Sun, 5 Apr 2020 16:52:07 +0200 Bernd Kuhls <[email protected]> wrote:
ffmpeg 3.3 added optional support for libxcb:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/Changelog#l282This patch ensures a reproducable build of libavdevice.so:
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libxcb.so.1] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shm.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shape.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-xfixes.so.0] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]compared to
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]
Quoted 5 lines
Signed-off-by Bernd Kuhls <[email protected]>--- package/ffmpeg/Config.in | 7 +++++++ package/ffmpeg/ffmpeg.mk | 11 +++++++++++ 2 files changed, 18 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/ffmpeg: add optional dependency to libxcb
In reply to Bernd KuhlsQuoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
ffmpeg 3.3 added optional support for libxcb:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/Changelog#l282This patch ensures a reproducable build of libavdevice.so:
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libxcb.so.1] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shm.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-shape.so.0] 0x0000000000000001 (NEEDED) Shared library: [libxcb-xfixes.so.0] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]compared to
Quoted 8 lines
$ readelf -a output/target/usr/lib/libavdevice.so | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libavfilter.so.7] 0x0000000000000001 (NEEDED) Shared library: [libavformat.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavcodec.so.58] 0x0000000000000001 (NEEDED) Shared library: [libavutil.so.56] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0]Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard