diff options
| -rw-r--r-- | common/Makefile.am | 1 | ||||
| -rw-r--r-- | common/fourcc.h (renamed from src/armada_fourcc.h) | 8 | ||||
| -rw-r--r-- | etnaviv/Makefile.am | 2 | ||||
| -rw-r--r-- | etnaviv/etnaviv_xv.c | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/armada_drm_xv.c | 4 |
6 files changed, 11 insertions, 9 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 1e8bf51..4b43f16 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -28,6 +28,7 @@ libcommon_la_SOURCES = \ cpu_access.h \ drawable_desc.c \ fbutil.h \ + fourcc.h \ gal_extension.h \ get_first_pixel.c \ glyph_assemble.c \ diff --git a/src/armada_fourcc.h b/common/fourcc.h index 6d8e5d1..efe2d62 100644 --- a/src/armada_fourcc.h +++ b/common/fourcc.h @@ -1,5 +1,9 @@ -#ifndef ARMADA_FOURCC_H -#define ARMADA_FOURCC_H +#ifndef COMMON_FOURCC_H +#define COMMON_FOURCC_H + +#include <drm/drm_fourcc.h> +/* pick up on the Xorg fourcc.h. */ +#include <fourcc.h> #define GUID4CC(a,b,c,d) { a,b,c,d, 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71 } diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am index 95e3775..fe69566 100644 --- a/etnaviv/Makefile.am +++ b/etnaviv/Makefile.am @@ -16,7 +16,7 @@ AM_CFLAGS = $(filter-out -Wnested-externs -Wcast-qual -Wredundant-decls \ -Werror=write-strings -Wshadow,$(CWARNFLAGS)) \ $(XORG_CFLAGS) $(ETNAVIV_CFLAGS) $(DRMARMADA_CFLAGS) $(UDEV_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/common + -I$(top_srcdir)/src -iquote $(top_srcdir)/common ETNA_COMMON_SOURCES = \ etnaviv.c \ diff --git a/etnaviv/etnaviv_xv.c b/etnaviv/etnaviv_xv.c index 85beeb2..12489e5 100644 --- a/etnaviv/etnaviv_xv.c +++ b/etnaviv/etnaviv_xv.c @@ -19,10 +19,10 @@ #include "xf86Crtc.h" #include "xf86xv.h" #include "damage.h" -#include "fourcc.h" #include <X11/extensions/Xv.h> #include "compat-api.h" +#include "fourcc.h" #include "pixmaputil.h" #include "utils.h" #include "xv_attribute.h" diff --git a/src/Makefile.am b/src/Makefile.am index 3afed38..3bf4abb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ AM_CFLAGS = $(filter-out -Wnested-externs -Wcast-qual -Wredundant-decls \ -Werror=write-strings -Wshadow,$(CWARNFLAGS)) \ $(XORG_CFLAGS) $(DRMARMADA_CFLAGS) $(UDEV_CFLAGS) \ - -I$(top_srcdir)/common + -iquote $(top_srcdir)/common armada_drv_la_LTLIBRARIES = armada_drv.la armada_drv_la_LDFLAGS = -module -avoid-version @@ -28,7 +28,6 @@ armada_drv_la_SOURCES = armada_accel.h \ armada_drm.c \ armada_drm.h \ armada_drm_xv.c \ - armada_fourcc.h \ armada_ioctl.h \ common_drm.c \ common_drm.h \ diff --git a/src/armada_drm_xv.c b/src/armada_drm_xv.c index 751d6b3..7c88ad1 100644 --- a/src/armada_drm_xv.c +++ b/src/armada_drm_xv.c @@ -18,16 +18,14 @@ #include "armada_accel.h" #include "armada_drm.h" #include "common_drm.h" -#include "drm_fourcc.h" #include "xf86Crtc.h" #include "xf86xv.h" -#include "fourcc.h" #include "utils.h" #include <X11/extensions/Xv.h> #include <X11/Xatom.h> -#include "armada_fourcc.h" #include "armada_ioctl.h" +#include "fourcc.h" #include "xv_attribute.h" #include "xv_image_format.h" #include "xvbo.h" |