aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2017-09-15 08:04:36 -0700
committerGitHub <noreply@github.com>2017-09-15 08:04:36 -0700
commit7c8c37ab2fa136876914a69cc8b7a5a43c622c86 (patch)
treedb40c40d05ab36cc0c5b2a427591ad544e02b623
parent69c5d326bf821194c5db43ad6e9f3431382bcc0a (diff)
parentdf109437d0edbe0e5aa30cb961d1d2bb99a9b69f (diff)
downloadmeta-amd-7c8c37ab2fa136876914a69cc8b7a5a43c622c86.tar.gz
meta-amd-7c8c37ab2fa136876914a69cc8b7a5a43c622c86.tar.bz2
meta-amd-7c8c37ab2fa136876914a69cc8b7a5a43c622c86.zip
Merge pull request #457 from abelal/ffmpeg_v1000
ffmpeg v1000
-rw-r--r--meta-v1000/conf/local.conf.append.v10003
-rw-r--r--meta-v1000/recipes-core/packagegroups/packagegroup-multimedia-risky.bbappend1
-rw-r--r--meta-v1000/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend1
3 files changed, 4 insertions, 1 deletions
diff --git a/meta-v1000/conf/local.conf.append.v1000 b/meta-v1000/conf/local.conf.append.v1000
index 92c34763..bac98044 100644
--- a/meta-v1000/conf/local.conf.append.v1000
+++ b/meta-v1000/conf/local.conf.append.v1000
@@ -35,7 +35,8 @@ COMMERCIAL_LIC_FLAGS_MULTIMEDIA = "commercial_gstreamer1.0-plugins-ugly \
commercial_lame \
commercial_mpeg2dec \
commercial_gstreamer1.0-libav \
- commercial_mpg123"
+ commercial_mpg123 \
+ commercial_ffmpeg"
LICENSE_FLAGS_WHITELIST_append = "${@' ${COMMERCIAL_LIC_FLAGS_MULTIMEDIA}' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
CORE_IMAGE_EXTRA_INSTALL_append = "${@' packagegroup-multimedia-risky' if bb.utils.to_boolean('${INCLUDE_COMMERCIAL_MULTIMEDIA}') else ''}"
diff --git a/meta-v1000/recipes-core/packagegroups/packagegroup-multimedia-risky.bbappend b/meta-v1000/recipes-core/packagegroups/packagegroup-multimedia-risky.bbappend
new file mode 100644
index 00000000..92c1cc5d
--- /dev/null
+++ b/meta-v1000/recipes-core/packagegroups/packagegroup-multimedia-risky.bbappend
@@ -0,0 +1 @@
+RDEPENDS_${PN}_append_v1000 = " ffmpeg"
diff --git a/meta-v1000/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/meta-v1000/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
new file mode 100644
index 00000000..53f3483c
--- /dev/null
+++ b/meta-v1000/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG_append_v1000 = " vaapi"