[meta-arago][scarthgap/master][PATCH v2 7/7] ffmpeg: Remove bbappend to disable x264

[Andrew Davis <afd@ti.com>]

The x264 codec is no longer enabled by default in oe-core, remove the
extra disabling. The x264 codec is not the only codec that makes this
package license flag commercial, so removing that flag after only
disabling one codec is not correct. All potentially troublesome codecs
should be evaluated before setting LICENSE_FLAGS_ACCEPTED to approve
of the license flags.

Signed-off-by: Andrew Davis <afd@ti.com>
---

Changes for v2:
 - Move some LICENSE_FLAGS_ACCEPTED items to previous patch

 meta-arago-distro/conf/distro/arago.conf                 | 9 ++++-----
 .../recipes-multimedia/ffmpeg/ffmpeg_%.bbappend          | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 033b8fcd..f27a6128 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -163,11 +163,10 @@ require conf/distro/include/branding-${ARAGO_BRAND}.inc
 # Disable meta-virtualization sanity check and warning
 SKIP_META_VIRT_SANITY_CHECK = "1"
 
-# oe-core uses external libav instead of internal libav for gst-ffmpeg. We
-# disable by default the codecs in libav that causes issues with shipping an
-# Arago based SDK. No need to prevent gst-ffmpeg from being used since we
-# disable troublesome software.
-LICENSE_FLAGS_ACCEPTED = "commercial_gstreamer1.0-libav"
+# Codecs in libav and ffmpeg with questionable patent statuses are not
+# included by default. If you enable any of those codecs you should check
+# if the below acceptance flags still work for your software distribution
+LICENSE_FLAGS_ACCEPTED = "commercial_ffmpeg commercial_gstreamer1.0-libav"
 
 # Do not package own copy of perl into devkit, rely on host one
 ASSUME_PROVIDED += "nativesdk-perl"
diff --git a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
deleted file mode 100644
index d2f22d8e..00000000
--- a/meta-arago-distro/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-PR:append = ".arago0"
-
-PACKAGECONFIG:remove = "x264"
-LICENSE_FLAGS = ""
-- 
2.39.2