From a4749db7e321d909bc41ddcbdbc99037982db5f6 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 13 Jan 2019 23:10:08 +0200 Subject: [PATCH 1/9] ffmpeg: downgrade to 3.3.9 as 3.4.x may cause some issues --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 7d64d8441c..f42c0a18b4 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 386f7601e865df6bddde05bb6927119b5a853f0b92e2e9834f59c125a17d3fc6 ffmpeg-3.4.4.tar.xz +sha256 ae34f14fffa65a1a59b256737ca9af7bf4e296b7c4320d42512350126ce06c84 ffmpeg-3.3.9.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index cf9abeb102..20791d28fb 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.4.4 +FFMPEG_VERSION = 3.3.9 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 5f1c0522656075fa37e218bb58d32966713a1f4a Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 14 Jan 2019 10:17:54 +0200 Subject: [PATCH 2/9] rpi-userland: add package hash --- package/rpi-userland/rpi-userland.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 47a1418df4..198317ccd3 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,2 +1,3 @@ # Locally computed sha256 748041975501a920c9b915bde24699ca1793aefcc60f5b95489d67f2c0accfa0 rpi-userland-d574b51a60a075baefe863670466ee24e6c4256e.tar.gz +sha256 f9a0366dcd7df1807385edd59774ee6a11463d830ddbe1386a152820ed4aef8a rpi-userland-6da49bce07d8061165e7fa9036af5fd9ae060221.tar.gz From eab1f3d03f8c1c590341847a11d9baef85dec669 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 14 Jan 2019 11:03:46 +0200 Subject: [PATCH 3/9] ffmpeg: remove unapplicable patch --- package/ffmpeg/0001-ffmpeg-pthreads.patch | 34 ----------------------- 1 file changed, 34 deletions(-) delete mode 100644 package/ffmpeg/0001-ffmpeg-pthreads.patch diff --git a/package/ffmpeg/0001-ffmpeg-pthreads.patch b/package/ffmpeg/0001-ffmpeg-pthreads.patch deleted file mode 100644 index c6d75d2297..0000000000 --- a/package/ffmpeg/0001-ffmpeg-pthreads.patch +++ /dev/null @@ -1,34 +0,0 @@ -From patchwork Wed Oct 25 13:32:36 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads -From: Mark Thompson -X-Patchwork-Id: 5688 -Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net> -To: FFmpeg development discussions and patches -Date: Wed, 25 Oct 2017 14:32:36 +0100 - -Fixes build with --disable-pthreads. - -Downloaded from upstream patchworks: -https://patchwork.ffmpeg.org/patch/5688/ - -Signed-off-by: Bernd Kuhls ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index c86e578..76523c8 100755 ---- a/configure -+++ b/configure -@@ -2780,7 +2780,7 @@ omx_rpi_select="omx" - qsvdec_select="qsv" - qsvenc_select="qsv" - vaapi_encode_deps="vaapi" --v4l2_m2m_deps_any="linux_videodev2_h" -+v4l2_m2m_deps="linux_videodev2_h pthreads" - - hwupload_cuda_filter_deps="cuda" - scale_npp_filter_deps="cuda libnpp" From fbcecf46a775ccbd7c200fc3cf4ebeb4ab76f66a Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Mon, 14 Jan 2019 18:31:43 +0200 Subject: [PATCH 4/9] ffmpeg 3.3 will not work with ffmpeg.mk for 3.4 --- package/ffmpeg/ffmpeg.mk | 51 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 39 deletions(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 20791d28fb..751d53b26a 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -49,14 +49,18 @@ FFMPEG_CONF_OPTS = \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ + --disable-libcdio \ --disable-libdc1394 \ --disable-libgsm \ --disable-libilbc \ + --disable-libnut \ + --disable-libopenjpeg \ + --disable-libschroedinger \ --disable-libvo-amrwbenc \ --disable-symver \ --disable-doc -FFMPEG_DEPENDENCIES += host-pkgconf +FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) FFMPEG_CONF_OPTS += --enable-gpl @@ -157,10 +161,7 @@ endif ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y) FFMPEG_CONF_OPTS += --enable-indevs ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -FFMPEG_CONF_OPTS += --enable-alsa FFMPEG_DEPENDENCIES += alsa-lib -else -FFMPEG_CONF_OPTS += --disable-alsa endif else FFMPEG_CONF_OPTS += --disable-indevs @@ -202,25 +203,18 @@ else FFMPEG_CONF_OPTS += --disable-libfdk-aac endif -ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy) -FFMPEG_CONF_OPTS += --enable-libcdio -FFMPEG_DEPENDENCIES += libcdio-paranoia -else -FFMPEG_CONF_OPTS += --disable-libcdio -endif - ifeq ($(BR2_PACKAGE_GNUTLS),y) FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl FFMPEG_DEPENDENCIES += gnutls else FFMPEG_CONF_OPTS += --disable-gnutls -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) # openssl isn't license compatible with GPL ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) FFMPEG_CONF_OPTS += --disable-openssl else FFMPEG_CONF_OPTS += --enable-openssl -FFMPEG_DEPENDENCIES += openssl +FFMPEG_DEPENDENCIES += libopenssl endif else FFMPEG_CONF_OPTS += --disable-openssl @@ -231,13 +225,6 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) FFMPEG_DEPENDENCIES += libebur128 endif -ifeq ($(BR2_PACKAGE_LIBDRM),y) -FFMPEG_CONF_OPTS += --enable-libdrm -FFMPEG_DEPENDENCIES += libdrm -else -FFMPEG_CONF_OPTS += --disable-libdrm -endif - ifeq ($(BR2_PACKAGE_LIBOPENH264),y) FFMPEG_CONF_OPTS += --enable-libopenh264 FFMPEG_DEPENDENCIES += libopenh264 @@ -267,10 +254,10 @@ else FFMPEG_CONF_OPTS += --disable-vdpau endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy) FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL -FFMPEG_DEPENDENCIES += rpi-userland +FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif @@ -357,13 +344,6 @@ else FFMPEG_CONF_OPTS += --disable-libwavpack endif -ifeq ($(BR2_PACKAGE_LIBICONV),y) -FFMPEG_CONF_OPTS += --enable-iconv -FFMPEG_DEPENDENCIES += libiconv -else -FFMPEG_CONF_OPTS += --disable-iconv -endif - # ffmpeg freetype support require fenv.h which is only # available/working on glibc. # The microblaze variant doesn't provide the needed exceptions @@ -381,13 +361,6 @@ else FFMPEG_CONF_OPTS += --disable-fontconfig endif -ifeq ($(BR2_PACKAGE_OPENJPEG),y) -FFMPEG_CONF_OPTS += --enable-libopenjpeg -FFMPEG_DEPENDENCIES += openjpeg -else -FFMPEG_CONF_OPTS += --disable-libopenjpeg -endif - ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy) FFMPEG_CONF_OPTS += --enable-libx264 FFMPEG_DEPENDENCIES += x264 @@ -403,10 +376,10 @@ FFMPEG_CONF_OPTS += --disable-libx265 endif ifeq ($(BR2_X86_CPU_HAS_MMX),y) -FFMPEG_CONF_OPTS += --enable-x86asm -FFMPEG_DEPENDENCIES += host-nasm +FFMPEG_CONF_OPTS += --enable-yasm +FFMPEG_DEPENDENCIES += host-yasm else -FFMPEG_CONF_OPTS += --disable-x86asm +FFMPEG_CONF_OPTS += --disable-yasm FFMPEG_CONF_OPTS += --disable-mmx endif From 15e0f2bbd2a8b7e1f3cda9a4230084532baaf412 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 16 Jan 2019 10:11:06 +0200 Subject: [PATCH 5/9] ffmpeg: upgrade (again) to 3.4.4 --- package/ffmpeg/0001-ffmpeg-pthreads.patch | 34 +++++++++++++++ package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 53 +++++++++++++++++------ 3 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 package/ffmpeg/0001-ffmpeg-pthreads.patch diff --git a/package/ffmpeg/0001-ffmpeg-pthreads.patch b/package/ffmpeg/0001-ffmpeg-pthreads.patch new file mode 100644 index 0000000000..c6d75d2297 --- /dev/null +++ b/package/ffmpeg/0001-ffmpeg-pthreads.patch @@ -0,0 +1,34 @@ +From patchwork Wed Oct 25 13:32:36 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads +From: Mark Thompson +X-Patchwork-Id: 5688 +Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net> +To: FFmpeg development discussions and patches +Date: Wed, 25 Oct 2017 14:32:36 +0100 + +Fixes build with --disable-pthreads. + +Downloaded from upstream patchworks: +https://patchwork.ffmpeg.org/patch/5688/ + +Signed-off-by: Bernd Kuhls +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index c86e578..76523c8 100755 +--- a/configure ++++ b/configure +@@ -2780,7 +2780,7 @@ omx_rpi_select="omx" + qsvdec_select="qsv" + qsvenc_select="qsv" + vaapi_encode_deps="vaapi" +-v4l2_m2m_deps_any="linux_videodev2_h" ++v4l2_m2m_deps="linux_videodev2_h pthreads" + + hwupload_cuda_filter_deps="cuda" + scale_npp_filter_deps="cuda libnpp" diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index f42c0a18b4..7d64d8441c 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ae34f14fffa65a1a59b256737ca9af7bf4e296b7c4320d42512350126ce06c84 ffmpeg-3.3.9.tar.xz +sha256 386f7601e865df6bddde05bb6927119b5a853f0b92e2e9834f59c125a17d3fc6 ffmpeg-3.4.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 751d53b26a..cf9abeb102 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.3.9 +FFMPEG_VERSION = 3.4.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -49,18 +49,14 @@ FFMPEG_CONF_OPTS = \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ - --disable-libcdio \ --disable-libdc1394 \ --disable-libgsm \ --disable-libilbc \ - --disable-libnut \ - --disable-libopenjpeg \ - --disable-libschroedinger \ --disable-libvo-amrwbenc \ --disable-symver \ --disable-doc -FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf +FFMPEG_DEPENDENCIES += host-pkgconf ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) FFMPEG_CONF_OPTS += --enable-gpl @@ -161,7 +157,10 @@ endif ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y) FFMPEG_CONF_OPTS += --enable-indevs ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +FFMPEG_CONF_OPTS += --enable-alsa FFMPEG_DEPENDENCIES += alsa-lib +else +FFMPEG_CONF_OPTS += --disable-alsa endif else FFMPEG_CONF_OPTS += --disable-indevs @@ -203,18 +202,25 @@ else FFMPEG_CONF_OPTS += --disable-libfdk-aac endif +ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy) +FFMPEG_CONF_OPTS += --enable-libcdio +FFMPEG_DEPENDENCIES += libcdio-paranoia +else +FFMPEG_CONF_OPTS += --disable-libcdio +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl FFMPEG_DEPENDENCIES += gnutls else FFMPEG_CONF_OPTS += --disable-gnutls -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) # openssl isn't license compatible with GPL ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) FFMPEG_CONF_OPTS += --disable-openssl else FFMPEG_CONF_OPTS += --enable-openssl -FFMPEG_DEPENDENCIES += libopenssl +FFMPEG_DEPENDENCIES += openssl endif else FFMPEG_CONF_OPTS += --disable-openssl @@ -225,6 +231,13 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) FFMPEG_DEPENDENCIES += libebur128 endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +FFMPEG_CONF_OPTS += --enable-libdrm +FFMPEG_DEPENDENCIES += libdrm +else +FFMPEG_CONF_OPTS += --disable-libdrm +endif + ifeq ($(BR2_PACKAGE_LIBOPENH264),y) FFMPEG_CONF_OPTS += --enable-libopenh264 FFMPEG_DEPENDENCIES += libopenh264 @@ -254,10 +267,10 @@ else FFMPEG_CONF_OPTS += --disable-vdpau endif -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy) +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL -FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland +FFMPEG_DEPENDENCIES += rpi-userland else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif @@ -344,6 +357,13 @@ else FFMPEG_CONF_OPTS += --disable-libwavpack endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +FFMPEG_CONF_OPTS += --enable-iconv +FFMPEG_DEPENDENCIES += libiconv +else +FFMPEG_CONF_OPTS += --disable-iconv +endif + # ffmpeg freetype support require fenv.h which is only # available/working on glibc. # The microblaze variant doesn't provide the needed exceptions @@ -361,6 +381,13 @@ else FFMPEG_CONF_OPTS += --disable-fontconfig endif +ifeq ($(BR2_PACKAGE_OPENJPEG),y) +FFMPEG_CONF_OPTS += --enable-libopenjpeg +FFMPEG_DEPENDENCIES += openjpeg +else +FFMPEG_CONF_OPTS += --disable-libopenjpeg +endif + ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy) FFMPEG_CONF_OPTS += --enable-libx264 FFMPEG_DEPENDENCIES += x264 @@ -376,10 +403,10 @@ FFMPEG_CONF_OPTS += --disable-libx265 endif ifeq ($(BR2_X86_CPU_HAS_MMX),y) -FFMPEG_CONF_OPTS += --enable-yasm -FFMPEG_DEPENDENCIES += host-yasm +FFMPEG_CONF_OPTS += --enable-x86asm +FFMPEG_DEPENDENCIES += host-nasm else -FFMPEG_CONF_OPTS += --disable-yasm +FFMPEG_CONF_OPTS += --disable-x86asm FFMPEG_CONF_OPTS += --disable-mmx endif From 03cc93c903ddbd5735556d6a456664347cff4f8e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 16 Jan 2019 10:13:29 +0200 Subject: [PATCH 6/9] Downgrade rpi-firmware & rpi-userland to more stable versions --- package/rpi-firmware/rpi-firmware.mk | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 2ebbc81b3d..7e878f5b6c 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 12e0bf86e08d6067372bc0a45d7e8a10d3113210 +RPI_FIRMWARE_VERSION = ce8652e2c743f02f04cb29f23611cbf13765483b RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index cc8a00322f..966179e5c5 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 6da49bce07d8061165e7fa9036af5fd9ae060221 +RPI_USERLAND_VERSION = a343dcad1dae4e93f4bfb99496697e207f91027e RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE From 040565736daa6e4b4663b6a767781aafeba9bac5 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 17 Jan 2019 09:37:53 +0200 Subject: [PATCH 7/9] rpi-firmware, rpi-userland: add hashes --- package/rpi-firmware/rpi-firmware.hash | 1 + package/rpi-userland/rpi-userland.hash | 1 + 2 files changed, 2 insertions(+) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 424679e0cc..ba7827e912 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,4 @@ # Locally computed sha256 d1f9c58957dfe681fff7e1cf1eabb9e0f6fdc99720f1d059fb24a37750573310 rpi-firmware-5b49caa17e91d0e64024380119ad739bb201c674.tar.gz sha256 4cc835ba0f437de494b391df7fdb88c96e6264a6c06a2c9e8371e304945e7540 rpi-firmware-12e0bf86e08d6067372bc0a45d7e8a10d3113210.tar.gz +sha256 e6dfad437e64f2925361a8927061d05764436faf2c0b412a5ae4a48995d6e8e4 rpi-firmware-ce8652e2c743f02f04cb29f23611cbf13765483b.tar.gz diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 198317ccd3..dcad97a619 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,4 @@ # Locally computed sha256 748041975501a920c9b915bde24699ca1793aefcc60f5b95489d67f2c0accfa0 rpi-userland-d574b51a60a075baefe863670466ee24e6c4256e.tar.gz sha256 f9a0366dcd7df1807385edd59774ee6a11463d830ddbe1386a152820ed4aef8a rpi-userland-6da49bce07d8061165e7fa9036af5fd9ae060221.tar.gz +sha256 f07a400b488425bb924df8ee94134099c2a0324369a9a75daf3f06bbf9e94f64 rpi-userland-a343dcad1dae4e93f4bfb99496697e207f91027e.tar.gz From b80aedfeaaa421ba4fbfea4afdc8ae4a4fd1f11a Mon Sep 17 00:00:00 2001 From: Joo Aun Saw Date: Fri, 18 Jan 2019 01:08:23 +1100 Subject: [PATCH 8/9] ffmpeg: fix omx code not checking endofframe flag --- package/ffmpeg/omx-handle-endofframe.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/ffmpeg/omx-handle-endofframe.patch diff --git a/package/ffmpeg/omx-handle-endofframe.patch b/package/ffmpeg/omx-handle-endofframe.patch new file mode 100644 index 0000000000..34cd8bc86e --- /dev/null +++ b/package/ffmpeg/omx-handle-endofframe.patch @@ -0,0 +1,31 @@ +Addresses https://github.com/raspberrypi/firmware/issues/1087 +--- + +diff -rupEbBN ffmpeg-3.4.4.org/libavcodec/omx.c ffmpeg-3.4.4/libavcodec/omx.c +--- ffmpeg-3.4.4.org/libavcodec/omx.c 2019-01-17 15:08:50.141300045 +1100 ++++ ffmpeg-3.4.4/libavcodec/omx.c 2019-01-17 16:07:12.337292988 +1100 +@@ -735,6 +735,7 @@ static int omx_encode_frame(AVCodecConte + int ret = 0; + OMX_BUFFERHEADERTYPE* buffer; + OMX_ERRORTYPE err; ++ int had_partial = 0; + + if (frame) { + uint8_t *dst[4]; +@@ -826,7 +827,7 @@ static int omx_encode_frame(AVCodecConte + // packet, or get EOS. + buffer = get_buffer(&s->output_mutex, &s->output_cond, + &s->num_done_out_buffers, s->done_out_buffers, +- !frame); ++ !frame || had_partial); + if (!buffer) + break; + +@@ -861,6 +862,7 @@ static int omx_encode_frame(AVCodecConte + s->output_buf = NULL; + s->output_buf_size = 0; + } ++ had_partial = 1; + } else { + // End of frame, and the caller provided a preallocated frame + if ((ret = ff_alloc_packet2(avctx, pkt, s->output_buf_size + buffer->nFilledLen, 0)) < 0) { From 9009ce0c629226aff991aafc64e501957ac34364 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 17 Jan 2019 23:05:07 +0200 Subject: [PATCH 9/9] Raspberry Pi (all): upgrade back rpi-userland and rpi-firmware --- package/rpi-firmware/rpi-firmware.hash | 2 -- package/rpi-firmware/rpi-firmware.mk | 2 +- package/rpi-userland/rpi-userland.hash | 3 +-- package/rpi-userland/rpi-userland.mk | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index ba7827e912..8e92adc35d 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,4 +1,2 @@ # Locally computed -sha256 d1f9c58957dfe681fff7e1cf1eabb9e0f6fdc99720f1d059fb24a37750573310 rpi-firmware-5b49caa17e91d0e64024380119ad739bb201c674.tar.gz sha256 4cc835ba0f437de494b391df7fdb88c96e6264a6c06a2c9e8371e304945e7540 rpi-firmware-12e0bf86e08d6067372bc0a45d7e8a10d3113210.tar.gz -sha256 e6dfad437e64f2925361a8927061d05764436faf2c0b412a5ae4a48995d6e8e4 rpi-firmware-ce8652e2c743f02f04cb29f23611cbf13765483b.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 7e878f5b6c..2ebbc81b3d 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = ce8652e2c743f02f04cb29f23611cbf13765483b +RPI_FIRMWARE_VERSION = 12e0bf86e08d6067372bc0a45d7e8a10d3113210 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index dcad97a619..83a195c45a 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,4 +1,3 @@ # Locally computed -sha256 748041975501a920c9b915bde24699ca1793aefcc60f5b95489d67f2c0accfa0 rpi-userland-d574b51a60a075baefe863670466ee24e6c4256e.tar.gz sha256 f9a0366dcd7df1807385edd59774ee6a11463d830ddbe1386a152820ed4aef8a rpi-userland-6da49bce07d8061165e7fa9036af5fd9ae060221.tar.gz -sha256 f07a400b488425bb924df8ee94134099c2a0324369a9a75daf3f06bbf9e94f64 rpi-userland-a343dcad1dae4e93f4bfb99496697e207f91027e.tar.gz + diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 966179e5c5..cc8a00322f 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = a343dcad1dae4e93f4bfb99496697e207f91027e +RPI_USERLAND_VERSION = 6da49bce07d8061165e7fa9036af5fd9ae060221 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE