[meta-intel] [PATCH 1/4] libva: merge -dev and -dbg packages

[Tom Zanussi]

Pulled into meta-intel/master (patches 1-4).

Thanks,

Tom

On Fri, 2013-10-18 at 23:38 +0100, Ross Burton wrote:
> It's not recommended to split -dev and -dbg packages up this finely, so merge
> them back together into single -dev and -dbg packages.
> 
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  common/recipes-multimedia/libva/libva.inc |   21 ---------------------
>  1 file changed, 21 deletions(-)
> 
> diff --git a/common/recipes-multimedia/libva/libva.inc b/common/recipes-multimedia/libva/libva.inc
> index 021c71e..3d924a8 100644
> --- a/common/recipes-multimedia/libva/libva.inc
> +++ b/common/recipes-multimedia/libva/libva.inc
> @@ -28,9 +28,6 @@ EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'wayland', '--disable-waylan
>  
>  PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
>  PROVIDES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl"
> -PACKAGES =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
> -PACKAGES =+ "${PN}-x11-dbg ${PN}-tpi-dbg ${PN}-glx-dbg ${PN}-egl-dbg"
> -RPROVIDES_${PN}-dev =+ "${PN}-x11-dev ${PN}-tpi-dev ${PN}-glx-dev ${PN}-egl-dev"
>  
>  RDEPENDS_${PN}-tpi =+ "${PN}"
>  RDEPENDS_${PN}-x11 =+ "${PN}"
> @@ -44,21 +41,3 @@ 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}-x11-dev =+ "${libdir}/libva-x11*${SOLIBSDEV}"
> -FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*${SOLIBSDEV}"
> -FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*${SOLIBSDEV}"
> -FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*${SOLIBSDEV}"
> -FILES_${PN}-x11-dev =+ "${libdir}/libva-x11*.la"
> -FILES_${PN}-tpi-dev =+ "${libdir}/libva-tpi*.la"
> -FILES_${PN}-glx-dev =+ "${libdir}/libva-glx*.la"
> -FILES_${PN}-egl-dev =+ "${libdir}/libva-egl*.la"
> -FILES_${PN}-x11-dev =+ "${libdir}/pkgconfig/libva-x11*.pc"
> -FILES_${PN}-tpi-dev =+ "${libdir}/pkgconfig/libva-tpi*.pc"
> -FILES_${PN}-glx-dev =+ "${libdir}/pkgconfig/libva-glx*.pc"
> -FILES_${PN}-egl-dev =+ "${libdir}/pkgconfig/libva-egl*.pc"
> -
> -FILES_${PN}-x11-dbg =+ "${libdir}/.debug/libva-x11.*"
> -FILES_${PN}-tpi-dbg =+ "${libdir}/.debug/libva-tpi.*"
> -FILES_${PN}-glx-dbg =+ "${libdir}/.debug/libva-glx.*"
> -FILES_${PN}-egl-dbg =+ "${libdir}/.debug/libva-egl.*"