diff options
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb) | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.bb index 6d230c3316..884973d237 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.3.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.1.4.bb | |||
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
26 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ | 26 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ |
27 | file://mips64_cpu_detection.patch \ | 27 | file://mips64_cpu_detection.patch \ |
28 | " | 28 | " |
29 | SRC_URI[md5sum] = "dcc20dd2682ea01c678b7b8324339d43" | 29 | SRC_URI[md5sum] = "5307931aeb7aaee5e1509d9996040661" |
30 | SRC_URI[sha256sum] = "0c3020452880581a8face91595b239198078645e7d7184273b8bcc7758beb63d" | 30 | SRC_URI[sha256sum] = "f1f049a82fcfbf156564e73a3935d7e750891fab2abf302e735104fd4050a7e1" |
31 | 31 | ||
32 | # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 | 32 | # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 |
33 | ARM_INSTRUCTION_SET_armv4 = "arm" | 33 | ARM_INSTRUCTION_SET_armv4 = "arm" |
@@ -44,7 +44,7 @@ inherit autotools pkgconfig | |||
44 | 44 | ||
45 | PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ | 45 | PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ |
46 | bzlib gpl lzma theora x264 \ | 46 | bzlib gpl lzma theora x264 \ |
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}" | 47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" |
48 | 48 | ||
49 | # libraries to build in addition to avutil | 49 | # libraries to build in addition to avutil |
50 | PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" | 50 | PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" |
@@ -73,6 +73,7 @@ PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" | |||
73 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" | 73 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" |
74 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" | 74 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" |
75 | PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" | 75 | PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" |
76 | PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" | ||
76 | PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" | 77 | PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" |
77 | 78 | ||
78 | # Check codecs that require --enable-nonfree | 79 | # Check codecs that require --enable-nonfree |
@@ -89,10 +90,6 @@ EXTRA_OECONF = " \ | |||
89 | --enable-pic \ | 90 | --enable-pic \ |
90 | --enable-shared \ | 91 | --enable-shared \ |
91 | --enable-pthreads \ | 92 | --enable-pthreads \ |
92 | --disable-libxcb \ | ||
93 | --disable-libxcb-shm \ | ||
94 | --disable-libxcb-xfixes \ | ||
95 | --disable-libxcb-shape \ | ||
96 | ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ | 93 | ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ |
97 | \ | 94 | \ |
98 | --cross-prefix=${TARGET_PREFIX} \ | 95 | --cross-prefix=${TARGET_PREFIX} \ |