[Mesa-dev] [PATCH] nouveau: don't assume libdrm include prefix

[Ilia Mirkin]

On Wed, Mar 19, 2014 at 11:43 PM, Jonathan Gray <jsg at jsg.id.au> wrote:
> drm headers may be installed in a different directory

I'm curious -- how can this happen? Looking at Makefile.am from
drm:nouveau/Makefile.am:

libdrm_nouveauincludedir = ${includedir}/libdrm
libdrm_nouveauinclude_HEADERS = nouveau.h

>
> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
> ---
>  src/gallium/drivers/nouveau/nouveau_context.h   | 2 +-
>  src/gallium/drivers/nouveau/nouveau_screen.c    | 2 +-
>  src/gallium/drivers/nouveau/nouveau_vp3_video.h | 2 +-
>  src/gallium/drivers/nouveau/nouveau_winsys.h    | 2 +-
>  src/mesa/drivers/dri/nouveau/nouveau_driver.h   | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git src/gallium/drivers/nouveau/nouveau_context.h src/gallium/drivers/nouveau/nouveau_context.h
> index bad5ab7..c8d9d84 100644
> --- src/gallium/drivers/nouveau/nouveau_context.h
> +++ src/gallium/drivers/nouveau/nouveau_context.h
> @@ -2,7 +2,7 @@
>  #define __NOUVEAU_CONTEXT_H__
>
>  #include "pipe/p_context.h"
> -#include <libdrm/nouveau.h>
> +#include <nouveau.h>
>
>  #define NOUVEAU_MAX_SCRATCH_BUFS 4
>
> diff --git src/gallium/drivers/nouveau/nouveau_screen.c src/gallium/drivers/nouveau/nouveau_screen.c
> index 19892b1..9d71bf7 100644
> --- src/gallium/drivers/nouveau/nouveau_screen.c
> +++ src/gallium/drivers/nouveau/nouveau_screen.c
> @@ -14,7 +14,7 @@
>  #include <errno.h>
>  #include <stdlib.h>
>
> -#include <libdrm/nouveau_drm.h>
> +#include <nouveau_drm.h>
>
>  #include "nouveau_winsys.h"
>  #include "nouveau_screen.h"
> diff --git src/gallium/drivers/nouveau/nouveau_vp3_video.h src/gallium/drivers/nouveau/nouveau_vp3_video.h
> index 0193ed0..88c14ec 100644
> --- src/gallium/drivers/nouveau/nouveau_vp3_video.h
> +++ src/gallium/drivers/nouveau/nouveau_vp3_video.h
> @@ -20,7 +20,7 @@
>   * OTHER DEALINGS IN THE SOFTWARE.
>   */
>
> -#include <libdrm/nouveau.h>
> +#include <nouveau.h>
>
>  #include "pipe/p_defines.h"
>  #include "vl/vl_video_buffer.h"
> diff --git src/gallium/drivers/nouveau/nouveau_winsys.h src/gallium/drivers/nouveau/nouveau_winsys.h
> index 9993ed6..51effb1 100644
> --- src/gallium/drivers/nouveau/nouveau_winsys.h
> +++ src/gallium/drivers/nouveau/nouveau_winsys.h
> @@ -6,7 +6,7 @@
>
>  #include "pipe/p_defines.h"
>
> -#include <libdrm/nouveau.h>
> +#include <nouveau.h>
>
>  #ifndef NV04_PFIFO_MAX_PACKET_LEN
>  #define NV04_PFIFO_MAX_PACKET_LEN 2047
> diff --git src/mesa/drivers/dri/nouveau/nouveau_driver.h src/mesa/drivers/dri/nouveau/nouveau_driver.h
> index b6a8276..8b46e51 100644
> --- src/mesa/drivers/dri/nouveau/nouveau_driver.h
> +++ src/mesa/drivers/dri/nouveau/nouveau_driver.h
> @@ -38,7 +38,7 @@
>  #undef NDEBUG
>  #include <assert.h>
>
> -#include <libdrm/nouveau.h>
> +#include <nouveau.h>
>  #include "nouveau_screen.h"
>  #include "nouveau_state.h"
>  #include "nouveau_surface.h"
> --
> 1.8.5.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev