xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Sep 17 19:48:15 UTC 2020
dri3/Makefile.am | 3
dri3/dri3.c | 4 -
dri3/dri3_priv.h | 1
dri3/dri3_request.c | 4 -
dri3/dri3_screen.c | 4 -
dri3/meson.build | 1
glamor/glamor_xv.c | 2
hw/kdrive/src/Makefile.am | 1
hw/kdrive/src/fourcc.h | 132 ------------------------------------------
hw/xfree86/common/Makefile.am | 3
hw/xfree86/common/meson.build | 1
hw/xfree86/sdksyms.sh | 2
include/Makefile.am | 1
include/meson.build | 1
present/Makefile.am | 3
present/meson.build | 1
present/present.c | 4 -
present/present_event.c | 4 -
present/present_execute.c | 4 -
present/present_fake.c | 4 -
present/present_fence.c | 4 -
present/present_notify.c | 4 -
present/present_priv.h | 1
present/present_request.c | 4 -
present/present_scmd.c | 4 -
present/present_screen.c | 4 -
present/present_vblank.c | 4 -
present/present_wnmd.c | 4 -
28 files changed, 9 insertions(+), 200 deletions(-)
New commits:
commit add3df2001a2eadc41c47683f50fdc0fd8b14964
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Tue Sep 15 11:43:16 2020 +0200
Consolidate fourcc.h
Move the copy in hw/xfree86/common to include/, and remove the one in
hw/kdrive/src/.
Fixes DIX glamor code including an xfree86 DDX header.
diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 6fef6ed0d..dbb490599 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -41,7 +41,7 @@
#include "glamor_transfer.h"
#include <X11/extensions/Xv.h>
-#include "../hw/xfree86/common/fourcc.h"
+#include <fourcc.h>
/* Reference color space transform data */
typedef struct tagREF_TRANSFORM {
float RefLuma;
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 08331502f..13ab6847a 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -13,7 +13,6 @@ KDRIVE_XV_SOURCES = \
endif
libkdrive_la_SOURCES = \
- fourcc.h \
kcmap.c \
kdrive.c \
kdrive.h \
diff --git a/hw/kdrive/src/fourcc.h b/hw/kdrive/src/fourcc.h
deleted file mode 100644
index 534ec452f..000000000
--- a/hw/kdrive/src/fourcc.h
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/*
- This header file contains listings of STANDARD guids for video formats.
- Please do not place non-registered, or incomplete entries in this file.
- A list of some popular fourcc's are at: http://www.webartz.com/fourcc/
- For an explanation of fourcc <-> guid mappings see RFC2361.
-*/
-
-#ifndef _XF86_FOURCC_H_
-#define _XF86_FOURCC_H_ 1
-
-#define FOURCC_YUY2 0x32595559
-#define XVIMAGE_YUY2 \
- { \
- FOURCC_YUY2, \
- XvYUV, \
- LSBFirst, \
- {'Y','U','Y','2', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 16, \
- XvPacked, \
- 1, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 2, 2, \
- 1, 1, 1, \
- {'Y','U','Y','V', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#define FOURCC_YV12 0x32315659
-#define XVIMAGE_YV12 \
- { \
- FOURCC_YV12, \
- XvYUV, \
- LSBFirst, \
- {'Y','V','1','2', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 12, \
- XvPlanar, \
- 3, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 2, 2, \
- 1, 2, 2, \
- {'Y','V','U', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#define FOURCC_I420 0x30323449
-#define XVIMAGE_I420 \
- { \
- FOURCC_I420, \
- XvYUV, \
- LSBFirst, \
- {'I','4','2','0', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 12, \
- XvPlanar, \
- 3, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 2, 2, \
- 1, 2, 2, \
- {'Y','U','V', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#define FOURCC_UYVY 0x59565955
-#define XVIMAGE_UYVY \
- { \
- FOURCC_UYVY, \
- XvYUV, \
- LSBFirst, \
- {'U','Y','V','Y', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 16, \
- XvPacked, \
- 1, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 2, 2, \
- 1, 1, 1, \
- {'U','Y','V','Y', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#define FOURCC_IA44 0x34344149
-#define XVIMAGE_IA44 \
- { \
- FOURCC_IA44, \
- XvYUV, \
- LSBFirst, \
- {'I','A','4','4', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 8, \
- XvPacked, \
- 1, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 1, 1, \
- 1, 1, 1, \
- {'A','I', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#define FOURCC_AI44 0x34344941
-#define XVIMAGE_AI44 \
- { \
- FOURCC_AI44, \
- XvYUV, \
- LSBFirst, \
- {'A','I','4','4', \
- 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
- 8, \
- XvPacked, \
- 1, \
- 0, 0, 0, 0, \
- 8, 8, 8, \
- 1, 1, 1, \
- 1, 1, 1, \
- {'I','A', \
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
- XvTopToBottom \
- }
-
-#endif /* _XF86_FOURCC_H_ */
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 5d344584d..39c1e90f0 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -55,7 +55,7 @@ AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
-I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \
-I$(top_builddir)
-sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
+sdk_HEADERS = compiler.h xf86.h xf86Module.h xf86Opt.h \
xf86PciInfo.h xf86Priv.h xf86Privstr.h \
xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
$(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \
@@ -67,7 +67,6 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
compiler.h \
- fourcc.h \
xf86.h \
xf86Bus.h \
xf86Config.h \
diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index a59aeb98f..8f68556d8 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -26,7 +26,6 @@ srcs_xorg_common = [
xorg_sdk_headers = [
'compiler.h',
- 'fourcc.h',
'xf86.h',
'xf86Module.h',
'xf86Opt.h',
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 4a13ca28d..5fd5b5c2f 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -123,7 +123,6 @@ cat > sdksyms.c << EOF
/* hw/xfree86/common/Makefile.am */
#include "compiler.h"
-#include "fourcc.h"
#include "xf86.h"
#include "xf86Module.h"
#include "xf86Opt.h"
@@ -251,6 +250,7 @@ cat > sdksyms.c << EOF
#include "exevents.h"
#include "extension.h"
#include "extnsionst.h"
+#include "fourcc.h"
#include "gc.h"
#include "gcstruct.h"
#include "globals.h"
diff --git a/include/Makefile.am b/include/Makefile.am
index bf066a61a..a1f241263 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -23,6 +23,7 @@ sdk_HEADERS = \
extension.h \
extinit.h \
extnsionst.h \
+ fourcc.h \
gc.h \
gcstruct.h \
globals.h \
diff --git a/hw/xfree86/common/fourcc.h b/include/fourcc.h
similarity index 100%
rename from hw/xfree86/common/fourcc.h
rename to include/fourcc.h
diff --git a/include/meson.build b/include/meson.build
index 0b89499c0..14f2be777 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -445,6 +445,7 @@ if build_xorg
'extension.h',
'extinit.h',
'extnsionst.h',
+ 'fourcc.h',
'gc.h',
'gcstruct.h',
'globals.h',
commit 62d8c1cc69e273199c9eb23e87b8631d32c56d33
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Tue Sep 15 11:41:34 2020 +0200
present: Include dix-config.h instead of xorg-config.h
This is DIX code.
diff --git a/present/Makefile.am b/present/Makefile.am
index 542f4ca9c..269bd5db5 100644
--- a/present/Makefile.am
+++ b/present/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libpresent.la
AM_CFLAGS = \
- -DHAVE_XORG_CONFIG_H \
- @DIX_CFLAGS@ @XORG_CFLAGS@
+ @DIX_CFLAGS@
libpresent_la_SOURCES = \
present.h \
diff --git a/present/meson.build b/present/meson.build
index 3dc1fc04b..026ccf90a 100644
--- a/present/meson.build
+++ b/present/meson.build
@@ -24,7 +24,6 @@ libxserver_present = static_library('libxserver_present',
common_dep,
dependency('presentproto', version: '>= 1.2')
],
- c_args: '-DHAVE_XORG_CONFIG_H'
)
install_data(hdrs_present, install_dir: xorgsdkdir)
diff --git a/present/present.c b/present/present.c
index 43581e378..217fe1d7a 100644
--- a/present/present.c
+++ b/present/present.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
#include <gcstruct.h>
diff --git a/present/present_event.c b/present/present_event.c
index 9aebfdfce..435b26b70 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
static RESTYPE present_event_type;
diff --git a/present/present_execute.c b/present/present_execute.c
index 58066db86..68a5878be 100644
--- a/present/present_execute.c
+++ b/present/present_execute.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
/*
diff --git a/present/present_fake.c b/present/present_fake.c
index 2350638ea..75e2508ba 100644
--- a/present/present_fake.c
+++ b/present/present_fake.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
#include "list.h"
diff --git a/present/present_fence.c b/present/present_fence.c
index 87e7e17d8..aca04a580 100644
--- a/present/present_fence.c
+++ b/present/present_fence.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
#include <gcstruct.h>
#include <misync.h>
diff --git a/present/present_notify.c b/present/present_notify.c
index e272e08dc..445954998 100644
--- a/present/present_notify.c
+++ b/present/present_notify.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
/*
diff --git a/present/present_priv.h b/present/present_priv.h
index bce67b21e..eb0c20fbb 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -23,6 +23,7 @@
#ifndef _PRESENT_PRIV_H_
#define _PRESENT_PRIV_H_
+#include "dix-config.h"
#include <X11/X.h>
#include "scrnintstr.h"
#include "misc.h"
diff --git a/present/present_request.c b/present/present_request.c
index f52efa52b..f3e5679b5 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
#include "randrstr.h"
#include <protocol-versions.h>
diff --git a/present/present_scmd.c b/present/present_scmd.c
index c7184e793..123e95cae 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
#include <misync.h>
#include <misyncstr.h>
diff --git a/present/present_screen.c b/present/present_screen.c
index 6efe3b3a2..05a810f5e 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
int present_request;
diff --git a/present/present_vblank.c b/present/present_vblank.c
index af14fe134..3c3f3ca1c 100644
--- a/present/present_vblank.c
+++ b/present/present_vblank.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
void
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index 3f78f02a0..7d1000a01 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "present_priv.h"
/*
commit 0ce93e5ba774a53459bac8c23016c5d3232038eb
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Tue Sep 15 11:38:55 2020 +0200
dri3: Include dix-config.h instead of xorg-config.h
This is DIX code.
diff --git a/dri3/Makefile.am b/dri3/Makefile.am
index e47a734e0..99c3718a5 100644
--- a/dri3/Makefile.am
+++ b/dri3/Makefile.am
@@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libdri3.la
AM_CFLAGS = \
- -DHAVE_XORG_CONFIG_H \
- @DIX_CFLAGS@ @XORG_CFLAGS@
+ @DIX_CFLAGS@
libdri3_la_SOURCES = \
dri3.h \
diff --git a/dri3/dri3.c b/dri3/dri3.c
index ba32facd7..191252969 100644
--- a/dri3/dri3.c
+++ b/dri3/dri3.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "dri3_priv.h"
#include <drm_fourcc.h>
diff --git a/dri3/dri3_priv.h b/dri3/dri3_priv.h
index b087a9529..f319d1770 100644
--- a/dri3/dri3_priv.h
+++ b/dri3/dri3_priv.h
@@ -23,6 +23,7 @@
#ifndef _DRI3PRIV_H_
#define _DRI3PRIV_H_
+#include "dix-config.h"
#include <X11/X.h>
#include "scrnintstr.h"
#include "misc.h"
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 958877efa..687168930 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "dri3_priv.h"
#include <syncsrv.h>
#include <unistd.h>
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index b98259753..3c7e5bf60 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -20,10 +20,6 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
#include "dri3_priv.h"
#include <syncsdk.h>
#include <misync.h>
diff --git a/dri3/meson.build b/dri3/meson.build
index 48ce0d9d6..d446fdda7 100644
--- a/dri3/meson.build
+++ b/dri3/meson.build
@@ -14,7 +14,6 @@ if build_dri3
srcs_dri3,
include_directories: inc,
dependencies: [ common_dep, libdrm_dep ],
- c_args: '-DHAVE_XORG_CONFIG_H'
)
endif
More information about the xorg-commit
mailing list