From 9c4a574e556ed43e75704f28889daa53fa896ba4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 27 Feb 2015 18:00:32 +0000 Subject: libva: merge recipe and .inc As there's just a single libva recipe now having .bb and .inc split only complicates packaging. Signed-off-by: Ross Burton Signed-off-by: Darren Hart --- common/recipes-multimedia/libva/libva.inc | 46 -------------------------- common/recipes-multimedia/libva/libva_1.4.1.bb | 46 ++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 48 deletions(-) delete mode 100644 common/recipes-multimedia/libva/libva.inc (limited to 'common/recipes-multimedia') diff --git a/common/recipes-multimedia/libva/libva.inc b/common/recipes-multimedia/libva/libva.inc deleted file mode 100644 index f7f50024..00000000 --- a/common/recipes-multimedia/libva/libva.inc +++ /dev/null @@ -1,46 +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" - -INC_PR = "r1" - -DEPENDS = "libdrm virtual/mesa virtual/libgles1 virtual/libgles2 virtual/egl" - -inherit autotools-brokensep pkgconfig - -EXTRA_OECONF = "--disable-dummy-driver" - -PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ - ${@base_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/common/recipes-multimedia/libva/libva_1.4.1.bb b/common/recipes-multimedia/libva/libva_1.4.1.bb index 23a499c7..0d157da8 100644 --- a/common/recipes-multimedia/libva/libva_1.4.1.bb +++ b/common/recipes-multimedia/libva/libva_1.4.1.bb @@ -1,6 +1,48 @@ -require libva.inc +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." -SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/libva/${BP}.tar.bz2" +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] = "8e3e7096750c14d1f98da807df7c1ba5" SRC_URI[sha256sum] = "0662af0ecdf1cfd2bb47e86f5bf66009554fe12ce7bf5b9cec6a2cc43f3f4c11" + +DEPENDS = "libdrm virtual/mesa virtual/libgles1 virtual/libgles2 virtual/egl" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--disable-dummy-driver" + +PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ + ${@base_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}" -- cgit v1.2.3-54-g00ecf