diff options
Diffstat (limited to 'common/recipes-multimedia')
13 files changed, 0 insertions, 247 deletions
diff --git a/common/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend b/common/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend deleted file mode 100644 index 17f101db..00000000 --- a/common/recipes-multimedia/ffmpeg/ffmpeg_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG_append_amdgpu = " vdpau" -PACKAGECONFIG_append_radeon = " vdpau" diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend deleted file mode 100644 index d2975992..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -RDEPENDS_gstreamer1.0-meta-video_append_amd = " \ - gstreamer1.0-plugins-good-video4linux2 \ - gstreamer1.0-plugins-good-isomp4 \ - gstreamer1.0-plugins-good-deinterlace \ - gstreamer1.0-plugins-good-audioparsers \ - gstreamer1.0-plugins-good-id3demux \ - gstreamer1.0-plugins-good-videomixer \ -" diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-adjust-gstomx.conf-for-mesa.patch b/common/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-adjust-gstomx.conf-for-mesa.patch deleted file mode 100644 index 8a413227..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-adjust-gstomx.conf-for-mesa.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b9e5a41ec439d9ccbe18aaa6b7437ca2be82498a Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 6 Apr 2017 15:45:12 +0500 -Subject: [PATCH] adjust gstomx.conf for mesa-omx - -Signed-off-by: Arindam Nath <arindam.nath@amd.com> -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - config/bellagio/gstomx.conf | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/config/bellagio/gstomx.conf b/config/bellagio/gstomx.conf -index 5ca8ba6..48c243d 100644 ---- a/config/bellagio/gstomx.conf -+++ b/config/bellagio/gstomx.conf -@@ -1,7 +1,7 @@ - [omxmpeg4videodec] - type-name=GstOMXMPEG4VideoDec - core-name=/usr/local/lib/libomxil-bellagio.so.0 --component-name=OMX.st.video_decoder.mpeg4 -+component-name=OMX.mesa.video_decoder.mpeg4 - rank=257 - in-port-index=0 - out-port-index=1 -@@ -10,16 +10,15 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang - [omxh264dec] - type-name=GstOMXH264Dec - core-name=/usr/local/lib/libomxil-bellagio.so.0 --component-name=OMX.st.video_decoder.avc -+component-name=OMX.mesa.video_decoder.avc - rank=257 - in-port-index=0 - out-port-index=1 --hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-changed-port-0-to-1 - - [omxmpeg4videoenc] - type-name=GstOMXMPEG4VideoEnc - core-name=/usr/local/lib/libomxil-bellagio.so.0 --component-name=OMX.st.video_encoder.mpeg4 -+component-name=OMX.mesa.video_encoder.mpeg4 - rank=0 - in-port-index=0 - out-port-index=1 -@@ -28,8 +27,24 @@ hacks=event-port-settings-changed-ndata-parameter-swap;video-framerate-integer;s - [omxaacenc] - type-name=GstOMXAACEnc - core-name=/usr/local/lib/libomxil-bellagio.so.0 --component-name=OMX.st.audio_encoder.aac -+component-name=OMX.mesa.audio_encoder.aac - rank=0 - in-port-index=0 - out-port-index=1 - hacks=event-port-settings-changed-ndata-parameter-swap -+ -+[omxmpeg2dec] -+type-name=GstOMXMPEG2VideoDec -+core-name=/usr/local/lib/libomxil-bellagio.so.0 -+component-name=OMX.mesa.video_decoder.mpeg2 -+rank=256 -+in-port-index=0 -+out-port-index=1 -+ -+[omxh264enc] -+type-name=GstOMXH264Enc -+core-name=/usr/local/lib/libomxil-bellagio.so.0 -+component-name=OMX.mesa.video_encoder.avc -+rank=256 -+in-port-index=0 -+out-port-index=1 --- -2.11.1 - diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.%.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.%.bbappend deleted file mode 100644 index 628ea68e..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.%.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# -# Remove plugins-bad from DEPENDS as it is -# not strictly needed. -# -DEPENDS_remove_amd = "gstreamer1.0-plugins-bad" - -SRC_URI_append_amd = " file://0001-adjust-gstomx.conf-for-mesa.patch" - -# -# This package should not have commercial license flags. -# There is discussion in the OE community about fixing this -# but in the meantime we'll explicitly remove it here. -# -LICENSE_FLAGS_remove = "commercial" diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend deleted file mode 100644 index 3669410b..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PACKAGECONFIG_append_amd = " faad" - -EXTRA_OECONF_remove_amd = " --disable-vdpau" -EXTRA_OECONF_append_amd = " --enable-vdpau" diff --git a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend deleted file mode 100644 index 8ce382ed..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PACKAGECONFIG_append_amd = " x264" - -FILES_${PN}-x264_append_amd = " ${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/common/recipes-multimedia/libomxil/libomxil/0001-Added-NULL-pointer-check-for-failure-scenario.patch b/common/recipes-multimedia/libomxil/libomxil/0001-Added-NULL-pointer-check-for-failure-scenario.patch deleted file mode 100644 index e86f2d4b..00000000 --- a/common/recipes-multimedia/libomxil/libomxil/0001-Added-NULL-pointer-check-for-failure-scenario.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3eb67fb18c26f6cdf4daf7dc3f987b217315e984 Mon Sep 17 00:00:00 2001 -From: Indrajit Das <indrajit-kumar.das@amd.com> -Date: Tue, 29 Mar 2016 22:51:13 +0530 -Subject: [PATCH] Added NULL pointer check for failure scenario - ---- - src/base/omx_base_component.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/base/omx_base_component.c b/src/base/omx_base_component.c -index 4156c37..86c6795 100644 ---- a/src/base/omx_base_component.c -+++ b/src/base/omx_base_component.c -@@ -1631,12 +1631,17 @@ OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_MessageHandler(OMX_COMPONENTTYP - } - } - else { -+ if(NULL != omx_base_component_Private->ports) -+ { - pPort=omx_base_component_Private->ports[message->messageParam]; - if(omx_base_component_Private->state!=OMX_StateLoaded) { - err = pPort->FlushProcessingBuffers(pPort); - DEBUG(DEB_LEV_FULL_SEQ, "In %s: Port Flush completed for Comp %s\n",__func__,omx_base_component_Private->name); - } - err = pPort->Port_DisablePort(pPort); -+ } -+ else -+ printf("Skipping NULL pointer access\n"); - } - /** This condition is added to pass the tests, it is not significant for the environment */ - if (err != OMX_ErrorNone) { --- -2.1.4 - diff --git a/common/recipes-multimedia/libomxil/libomxil/0001-test-components-fix-linking-issue.patch b/common/recipes-multimedia/libomxil/libomxil/0001-test-components-fix-linking-issue.patch deleted file mode 100644 index 4704c30a..00000000 --- a/common/recipes-multimedia/libomxil/libomxil/0001-test-components-fix-linking-issue.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a923a068ec8c44a88cfcac545d6d0cee074cbffa Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Fri, 20 May 2016 16:09:39 +0500 -Subject: [PATCH] test/components: fix linking issue - -The test binaries pick up incorrect rpaths due to the wrong -usage of linking of the libomxil-bellagio lib which -is produced by the same package. -We now use the libtool description file in the link -command to correctly identify and pick up the libs -without hardcoding. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> -Upstream-status: Pending ---- - test/components/audio_effects/Makefile.am | 4 ++-- - test/components/resource_manager/Makefile.am | 4 ++-- - -diff --git a/test/components/audio_effects/Makefile.am b/test/components/audio_effects/Makefile.am -index b28b992..ee9cffa 100644 ---- a/test/components/audio_effects/Makefile.am -+++ b/test/components/audio_effects/Makefile.am -@@ -1,6 +1,6 @@ - check_PROGRAMS = omxvolcontroltest omxaudiomixertest - --bellagio_LDADD = -lomxil-bellagio -+bellagio_LDADD = $(top_builddir)/src/libomxil-bellagio.la - common_CFLAGS = -I$(top_srcdir)/test/components/common -I$(includedir) - - omxvolcontroltest_SOURCES = omxvolcontroltest.c omxvolcontroltest.h -diff --git a/test/components/resource_manager/Makefile.am b/test/components/resource_manager/Makefile.am -index fcc1d99..c24d32c 100644 ---- a/test/components/resource_manager/Makefile.am -+++ b/test/components/resource_manager/Makefile.am -@@ -1,6 +1,6 @@ - check_PROGRAMS = omxrmtest omxprioritytest - --bellagio_LDADD = -lomxil-bellagio -+bellagio_LDADD = $(top_builddir)/src/libomxil-bellagio.la - common_CFLAGS = -I$(top_srcdir)/test/components/common -I$(includedir) - - omxrmtest_SOURCES = omxrmtest.c omxrmtest.h --- -1.9.1 diff --git a/common/recipes-multimedia/libomxil/libomxil_0.9.3.bbappend b/common/recipes-multimedia/libomxil/libomxil_0.9.3.bbappend deleted file mode 100644 index aadab2cd..00000000 --- a/common/recipes-multimedia/libomxil/libomxil_0.9.3.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_amd = " file://0001-test-components-fix-linking-issue.patch" - -RDEPENDS_${PN}_append_amd = " libomx-mesa" -RDEPENDS_${PN}-test_append_amd = " bash" - -# -# This package should not have commercial license flags. -# There is discussion in the OE community about fixing this -# but in the meantime we'll explicitly remove it here. -# -LICENSE_FLAGS_remove = "commercial" - -SRC_URI_append_amd = " file://0001-Added-NULL-pointer-check-for-failure-scenario.patch" - -# -# The upstream sources expect that "make check" is run -# after "make install" and we have to jump through some -# extra hoops since we are cross building to avoid RPATH -# issues. -# -do_install_append_amd () { - oe_runmake includedir=${D}${includedir} LDFLAGS="${LDFLAGS}" check - install test/components/audio_effects/omxvolcontroltest ${D}${bindir} - install test/components/audio_effects/omxaudiomixertest ${D}${bindir} - install test/components/resource_manager/omxrmtest ${D}${bindir} -} - -PACKAGES_prepend_amd = "${PN}-test " -FILES_${PN}-test_amd = "${bindir}/omxvolcontroltest ${bindir}/omxaudiomixertest ${bindir}/omxrmtest" - -pkg_postinst_ontarget_${PN}_amd () { - OMX_BELLAGIO_REGISTRY=${ROOT_HOME}/.omxregister ${bindir}/omxregister-bellagio -v -} diff --git a/common/recipes-multimedia/mpv/mpv_%.bbappend b/common/recipes-multimedia/mpv/mpv_%.bbappend deleted file mode 100644 index 45addc3c..00000000 --- a/common/recipes-multimedia/mpv/mpv_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG_append_amdx86 = " drm gbm vdpau vaapi" -PACKAGECONFIG_remove_amdx86 = "lua" - -EXTRA_OECONF_remove = "--disable-gl" -EXTRA_OECONF_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--disable-gl', d)}" diff --git a/common/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch b/common/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch deleted file mode 100644 index 7d16e1a4..00000000 --- a/common/recipes-multimedia/pulseaudio/pulseaudio/disable_autospawn_by_default.patch +++ /dev/null @@ -1,17 +0,0 @@ -For AMD BSPs we solely rely on the pulseaudio systemd service -to start a server. So we disable PA autospawning by default. - -diff --git a/src/pulse/client.conf.in2 b/src/pulse/client.conf.in -index 17753b0..6896640 100644 ---- a/src/pulse/client.conf.in2 -+++ b/src/pulse/client.conf.in -@@ -22,7 +22,7 @@ - ; default-server = - ; default-dbus-server = - --; autospawn = yes -+autospawn = no - ; allow-autospawn-for-root = no - ; daemon-binary = @PA_BINARY@ - ; extra-arguments = --log-target=syslog - diff --git a/common/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/common/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend deleted file mode 100644 index a7ef8c54..00000000 --- a/common/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend_amd := "${@bb.utils.contains_any("DISTRO", "mel mel-lite", "", "${THISDIR}/${PN}:", d)}" - -# Disable autospawning, so init manager can be used to control the -# daemon deterministically -SRC_URI_append_amd = " ${@bb.utils.contains_any("DISTRO", "mel mel-lite", "", "file://disable_autospawn_by_default.patch", d)}" diff --git a/common/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/common/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend deleted file mode 100644 index 0c850614..00000000 --- a/common/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)}" |