Skip to contentSkip to conversation

Revert "gst1-libav: switch to unbundled"

PATCH New Bernd Kuhls 2 participants 4 messages Mar 23, 2019 – Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/2 Revert "gst1-libav: switch to unbundled"

This reverts commit 5dcb8aa0ba46e16b929c7c7fc9cea2d6c26201f4.

This patch re-enables the usage of bundled ffmpeg code because gst1-libav 1.14.x is blocking the bump to ffmpeg 4.x.

A fix to build the bundled ffmpeg code on arm/aarch64 was added.

---
v5: no changes, gstreamer 2.16.x with support for ffmpeg 4.x
was not released yet

 package/gstreamer1/gst1-libav/Config.in     |  5 --
 package/gstreamer1/gst1-libav/gst1-libav.mk | 81 ++++++++++++++++++++-
 2 files changed, 79 insertions(+), 7 deletions(-)
package/gstreamer1/gst1-libav/Config.in +0 -5
index 23d78b6ad1..2ff6028231 100644
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_GST1_LIBAV
 	bool "gst1-libav"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
-	select BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	help
 	  GStreamer plugin (formerly gst-ffmpeg).
@@ -10,7 +8,4 @@ config BR2_PACKAGE_GST1_LIBAV
 	  This package contains GStreamer plugins based on
 	  the libav project.
 
-	  The codecs, muxers, bitstreams and filters to build can be
-	  selected in the ffmpeg package.
-
 	  http://gstreamer.freedesktop.org/
package/gstreamer1/gst1-libav/gst1-libav.mk +79 -2

91 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH v5 2/2 package/ffmpeg: bump to version 4.1.2

From: Louis-Paul Cordier <[email protected]>

FFserver is not supported anymore
Remove patch 0001: fixed upstream in cae6f806a6367c7760ab6ed059d343d4a8eebd56 Remove patch 0002 to 0004: accepted upstream

[Bernd: bump to 4.1.2]

---
v4 -> v5: bumped to version 4.1.2 (Bernd) v3 -> v4: bumped to version 4.1.1 (Bernd) v2 -> v3: (feedback Thomas Petazzoni)
- Fix commit title.
- Check and explain why patches are removed.
- Populate Config.in.legacy with ffserver removal.

 Config.in.legacy                              |   6 ++
 package/ffmpeg/0001-ffmpeg-pthreads.patch     |  34 ------
 ...cenc-Fix-building-with-libfdk-aac-v2.patch | 100 ------------------
 ...stently-use-a-proper-version-check-m.patch |  99 -----------------
 ...dk-aac-Don-t-use-defined-in-a-define.patch |  72 -------------
 package/ffmpeg/Config.in                      |   6 --
 package/ffmpeg/ffmpeg.hash                    |   2 +-
 package/ffmpeg/ffmpeg.mk                      |   8 +-
 8 files changed, 8 insertions(+), 319 deletions(-)
 delete mode 100644 package/ffmpeg/0001-ffmpeg-pthreads.patch
 delete mode 100644 package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch
 delete mode 100644 package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch
 delete mode 100644 package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch
Config.in.legacy +6 -0
index 0a0bce41f9..2abe54a74b 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.05"
 
+config BR2_PACKAGE_FFMPEG_FFSERVER
+	bool "Build ffserver"
+	depends on BR2_USE_MMU # fork()
+	help
+	  On July 10th, 2016, ffserver program has been dropped.
+
 config BR2_PACKAGE_LIBUMP
 	bool "libump package removed"
 	select BR2_LEGACY
package/ffmpeg/0001-ffmpeg-pthreads.patch deleted +0 -34
deleted file mode 100644
index c6d75d2297..0000000000
@@ -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 <[email protected]>
-X-Patchwork-Id: 5688
-Message-Id: <[email protected]>
-To: FFmpeg development discussions and patches <[email protected]>
-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 <[email protected]>
----
- 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"
package/ffmpeg/0002-libfdk-aacenc-Fix-building-with-libfdk-aac-v2.patch deleted +0 -100

100 lines not on this page · raw message

package/ffmpeg/0003-libfdk-aac-Consistently-use-a-proper-version-check-m.patch deleted +0 -99

99 lines not on this page · raw message

package/ffmpeg/0004-libfdk-aac-Don-t-use-defined-in-a-define.patch deleted +0 -72

72 lines not on this page · raw message

package/ffmpeg/Config.in +0 -6
index 2d94c5712a..eec7ce0f6b 100644
@@ -63,12 +63,6 @@ config BR2_PACKAGE_FFMPEG_FFPLAY
 comment "ffplay needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_FFMPEG_FFSERVER
-	bool "Build ffserver"
-	depends on BR2_USE_MMU # fork()
-	help
-	  FFserver is a streaming server for both audio and video.
-
 config BR2_PACKAGE_FFMPEG_FFPROBE
 	bool "Build ffprobe"
 	help
package/ffmpeg/ffmpeg.hash +1 -1
index e00c4ec56c..208dfb5cf6 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 741cbd6394eaed370774ca4cc089eaafbc54d0824b9aa360d4b3b0cbcbc4a92c  ffmpeg-3.4.5.tar.xz
+sha256 b95f0ae44798ab1434155ac7f81f30a7e9760a02282e4b5898372c22a335347b  ffmpeg-4.1.2.tar.xz
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe  COPYING.LGPLv2.1
 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff  LICENSE.md
package/ffmpeg/ffmpeg.mk +1 -7
index b86d465df8..f7f882cb95 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 3.4.5
+FFMPEG_VERSION = 4.1.2
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
@@ -84,12 +84,6 @@ else
 FFMPEG_CONF_OPTS += --disable-ffplay
 endif
 
-ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y)
-FFMPEG_CONF_OPTS += --enable-ffserver
-else
-FFMPEG_CONF_OPTS += --disable-ffserver
-endif
-
 ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
 FFMPEG_CONF_OPTS += --enable-avresample
 else
Signature · 1 line
2.20.1
#2 lore raw

PATCH v5 2/2 package/ffmpeg: bump to version 4.1.2

Hello,

Config.in.legacy endif · line 150

Quoted 2 lines · On Sat, 23 Mar 2019 13:28:18 +0100 Bernd Kuhls <[email protected]> wrote:
Config.in.legacy +2 -0
+config BR2_PACKAGE_FFMPEG_FFSERVER
+	bool "Build ffserver"

That's a pretty bad title for Config.in.legacy, so I changed it to:

bool "ffmpeg ffserver removed"

Config.in.legacy endif · line 151

Quoted 1 line
Config.in.legacy +1 -0
+	depends on BR2_USE_MMU # fork()

Replicating this dependency is not necessary. However, "select BR2_LEGACY" was missing.

I fixed those two issues and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v5 1/2 Revert "gst1-libav: switch to unbundled"

In reply to Bernd Kuhls
Quoted 11 lines · On Sat, 23 Mar 2019 13:28:17 +0100 Bernd Kuhls <[email protected]> wrote:

This reverts commit 5dcb8aa0ba46e16b929c7c7fc9cea2d6c26201f4.

This patch re-enables the usage of bundled ffmpeg code because gst1-libav 1.14.x is blocking the bump to ffmpeg 4.x.

A fix to build the bundled ffmpeg code on arm/aarch64 was added.

---
v5: no changes, gstreamer 2.16.x with support for ffmpeg 4.x
was not released yet

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com