From 466196fa2f619aa3d37ad6bfe13c11c72f910d16 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 15 Dec 2016 13:59:57 +0000 Subject: vaapi: remove as recipes moved to oe-core libva and gstreamer-vaapi are now part of oe-core, so remove them. The package names were changed to reflect the naming scheme, so update the machine configurations to follow. Signed-off-by: Ross Burton Signed-off-by: California Sullivan --- .../gstreamer/gstreamer-vaapi-1.0_1.8.2.bb | 6 --- .../gstreamer/gstreamer-vaapi.inc | 36 ---------------- .../gstreamer/gstreamer-vaapi/install-tests.patch | 43 ------------------- common/recipes-multimedia/libva/libva_1.7.2.bb | 49 ---------------------- conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- 6 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb delete mode 100644 common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc delete mode 100644 common/recipes-multimedia/gstreamer/gstreamer-vaapi/install-tests.patch delete mode 100644 common/recipes-multimedia/libva/libva_1.7.2.bb diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb deleted file mode 100644 index 3343baeb..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_1.8.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require gstreamer-vaapi.inc - -DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" - -SRC_URI[md5sum] = "5683e0e950160f6a4b5bcd47176baad0" -SRC_URI[sha256sum] = "5479e86f593d80c00bbd4a43b16b2027cb935412a2bb22c9ba4ac085627a9229" diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc deleted file mode 100644 index 6dea9cfc..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "VA-API support to GStreamer" -DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \ -based plugins for GStreamer and helper libraries: `vaapidecode', \ -`vaapiconvert', and `vaapisink'." - -REALPN = "gstreamer-vaapi" -FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALPN}", "${FILE_DIRNAME}/${REALPN}"], d)}" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libva" - -SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ - " - -S = "${WORKDIR}/${REALPN}-${PV}" - -inherit autotools pkgconfig gtk-doc - -PACKAGES =+ "${PN}-tests" - -PACKAGECONFIG ??= "drm \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" - -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" - -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a" -FILES_${PN}-tests = "${bindir}/*" diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/install-tests.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/install-tests.patch deleted file mode 100644 index d7def3a0..00000000 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/install-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2791dfde0de0abe8100fa833dfe1a9c2e74c2629 Mon Sep 17 00:00:00 2001 -From: Jianxun Zhang -Date: Thu, 21 Jan 2016 16:25:44 -0800 -Subject: [PATCH] Install tests - -This patch is updated for 0.6.1 - -Upstream-Status: Inappropriate - -Signed-off-by: Jianxun Zhang ---- - tests/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 3637d92..7cc6a97 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - simple-decoder \ - test-decode \ - test-display \ -@@ -9,13 +9,13 @@ noinst_PROGRAMS = \ - $(NULL) - - if USE_ENCODERS --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - simple-encoder \ - $(NULL) - endif - - if USE_GLX --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - test-textures \ - $(NULL) - endif --- -1.9.1 - diff --git a/common/recipes-multimedia/libva/libva_1.7.2.bb b/common/recipes-multimedia/libva/libva_1.7.2.bb deleted file mode 100644 index d72074db..00000000 --- a/common/recipes-multimedia/libva/libva_1.7.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Video Acceleration (VA) API for Linux" -DESCRIPTION = "Video Acceleration API (VA API) is a library (libVA) \ -and API specification which enables and provides access to graphics \ -hardware (GPU) acceleration for video processing on Linux and UNIX \ -based operating systems. Accelerated processing includes video \ -decoding, video encoding, subpicture blending and rendering. The \ -specification was originally designed by Intel for its GMA (Graphics \ -Media Accelerator) series of GPU hardware, the API is however not \ -limited to GPUs or Intel specific hardware, as other hardware and \ -manufacturers can also freely use this API for hardware accelerated \ -video decoding." - -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi" -BUGTRACKER = "https://bugs.freedesktop.org" - -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" - -SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/${BP}.tar.bz2" - -SRC_URI[md5sum] = "77d30af5a4bfaec6dddc2bdcbbd92ef5" -SRC_URI[sha256sum] = "5dd61cf16a5648b680e6146a58064e93be11bf4e65a9e4e30f1e9cb8ecfa2c13" - -DEPENDS = "libdrm virtual/mesa virtual/libgles1 virtual/libgles2 virtual/egl" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-dummy-driver" - -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" - -PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl ${PN}-wayland" - -RDEPENDS_${PN}-tpi =+ "${PN}" -RDEPENDS_${PN}-x11 =+ "${PN}" -RDEPENDS_${PN}-glx =+ "${PN}-x11" -RDEPENDS_${PN}-egl =+ "${PN}-x11" - -FILES_${PN}-dbg += "${libdir}/dri/.debug" - -FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" -FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}" -FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" -FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}" -FILES_${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index fb7bf23c..028801c6 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -12,7 +12,7 @@ MACHINE_FEATURES += "va-impl-intel" MACHINE_FEATURES += "wifi 3g nfc" MACHINE_FEATURES += "intel-ucode" -MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" +MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index a0e24ba8..1d7985e3 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -12,7 +12,7 @@ MACHINE_FEATURES += "va-impl-intel" MACHINE_FEATURES += "wifi 3g nfc" MACHINE_FEATURES += "intel-ucode" -MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" +MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware lms8" -- cgit v1.2.3-54-g00ecf