xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Feb 11 14:49:28 UTC 2025
.gitlab-ci.yml | 6 ++++--
.gitlab-ci/debian-install.sh | 9 +++++++++
include/os.h | 11 +++++++++++
os/osdep.h | 2 --
os/utils.c | 43 -------------------------------------------
render/picturestr.h | 9 +++++++++
xkb/ddxLoad.c | 2 +-
7 files changed, 34 insertions(+), 48 deletions(-)
New commits:
commit 5f1bdd0aa32bc815d96c25f8a4e3983850f39437
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Sep 6 12:55:03 2024 +0200
ci: add intel driver to build matrix
Add the intel driver to our CI, in order to prevent API breaks going
unnoticed again.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65b309042..ed5b8c076 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git'
XORG_DEBIAN_VERSION: 'bullseye-slim'
XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
- XORG_DEBIAN_TAG: '2024-11-14-wayland-protocols-1-38'
+ XORG_DEBIAN_TAG: '2025-02-10-intel'
XORG_FREEBSD_VERSION: '14.0'
XORG_FREEBSD_EXEC: ''
XORG_FREEBSD_TAG: '2024-06-10.0'
@@ -262,6 +262,8 @@ xf86-driver-build-test:
SHA: xf86-video-amdgpu-23.0.0
- REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
SHA: xf86-video-ati-22.0.0
+ - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
+ SHA: e6a4c4740c15ace9dd79dc7c18955f2eb413a6a5 # no release yet
- REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
SHA: master
- REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index f68ad3311..87b1f4bbb 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -65,6 +65,8 @@ apt-get install -y \
libx11-xcb-dev \
libxau-dev \
libxaw7-dev \
+ libxcb-dri2-0-dev \
+ libxcb-dri3-dev \
libxcb-glx0-dev \
libxcb-icccm4-dev \
libxcb-image0-dev \
@@ -79,6 +81,8 @@ apt-get install -y \
libxcb-xkb-dev \
libxcb-xv0-dev \
libxcb1-dev \
+ libxcursor-dev \
+ libxdamage-dev \
libxdmcp-dev \
libxext-dev \
libxfixes-dev \
@@ -90,12 +94,16 @@ apt-get install -y \
libxmu-dev \
libxmuu-dev \
libxpm-dev \
+ libxrandr-dev \
libxrender-dev \
libxres-dev \
libxshmfence-dev \
+ libxss-dev \
libxt-dev \
libxtst-dev \
libxv-dev \
+ libxvmc-dev \
+ libxxf86vm-dev \
libz-mingw-w64-dev \
linux-libc-dev/bullseye-backports \
mesa-common-dev \
@@ -108,6 +116,7 @@ apt-get install -y \
python3-mako \
python3-numpy \
python3-six \
+ valgrind \
weston \
x11-xkb-utils \
xfonts-utils \
commit d4f60b54628dfb7ac5d1a218f03aa2e94ec4026a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 10 15:00:16 2025 +0100
ci: workaround for building xf86-video-intel via autotools
This driver's meson build scripts are currently broken, but autotools
still works fine. So add a little workaround for forcing it to be built
via autotools, even if meson.build file is there.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab17016d6..65b309042 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -276,7 +276,7 @@ xf86-driver-build-test:
- git clone "$REPO" "$DRIVER"
- git -C "$DRIVER" checkout "$SHA"
- |
- if [[ -e "$DRIVER/meson.build" ]]; then
+ if [[ -e "$DRIVER/meson.build" ]] && [[ "$DRIVER" != "xf86-video-intel" ]]; then
.gitlab-ci/meson-build.sh -C "$DRIVER" --skip-test
else
pushd "$DRIVER" || exit 1
commit 9b3b938ede7bc3250c1b4ee3fa5427b3828245c5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 10 11:22:16 2025 +0100
os: re-add System() function for backwards compat
This function had been unexported long ago, but the Intel driver
still needs it. Adding a tiny temporary compat wrapper, so Intel
team has time to keep up with us.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/include/os.h b/include/os.h
index e26664d9a..560c7bd96 100644
--- a/include/os.h
+++ b/include/os.h
@@ -410,4 +410,15 @@ typedef _sigset_t sigset_t;
#define VErrorFSigSafe(...) VErrorF(__VA_ARGS__)
#define VErrorF(...) LogVMessageVerb(X_NONE, -1, __VA_ARGS__)
+/* only for backwards compat with drivers that haven't kept up yet
+ (xf86-video-intel)
+
+ @todo revise after next stable release
+*/
+_X_DEPRECATED
+static inline int System(const char* cmdline)
+{
+ return system(cmdline);
+}
+
#endif /* OS_H */
commit 5b6f2292a30267b6242cdbb7332f84a375b0684a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 10 11:19:28 2025 +0100
os: drop win32-only System() function
Not used anymore, so it can be dropped.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/os/osdep.h b/os/osdep.h
index b6d432874..86e1f6486 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -153,13 +153,11 @@ static inline void uname(struct utsname *uts) {
const char *Win32TempDir(void);
-int System(const char *cmdline);
static inline void Fclose(void *f) { fclose(f); }
static inline void *Fopen(const char *a, const char *b) { return fopen(a,b); }
#else /* WIN32 */
-int System(const char *);
void *Popen(const char *, const char *);
void *Fopen(const char *, const char *);
int Fclose(void *f);
diff --git a/os/utils.c b/os/utils.c
index afd4cef14..f0b706b8d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1241,49 +1241,6 @@ Win32TempDir(void)
else
return "/tmp";
}
-
-int
-System(const char *cmdline)
-{
- STARTUPINFO si = (STARTUPINFO) {
- .cb = sizeof(si),
- };
- PROCESS_INFORMATION pi = (PROCESS_INFORMATION){0};
- DWORD dwExitCode;
- char *cmd = strdup(cmdline);
-
- if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
- LPVOID buffer;
-
- if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &buffer, 0, NULL)) {
- ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
- }
- else {
- ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *) buffer);
- LocalFree(buffer);
- }
-
- free(cmd);
- return -1;
- }
- /* Wait until child process exits. */
- WaitForSingleObject(pi.hProcess, INFINITE);
-
- GetExitCodeProcess(pi.hProcess, &dwExitCode);
-
- /* Close process and thread handles. */
- CloseHandle(pi.hProcess);
- CloseHandle(pi.hThread);
- free(cmd);
-
- return dwExitCode;
-}
#endif
Bool
commit f837dee79dc8fa5c8ddc5c80cb492dd25722ba2b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 10 11:00:45 2025 +0100
win32: use lib system() instead of our own function
mingw32 has system() function, so we don't need our own implementation
anymore.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index a9a7ead59..e147aabce 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -184,7 +184,7 @@ RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
#ifndef WIN32
if (Pclose(out) == 0)
#else
- if (fclose(out) == 0 && System(buf) >= 0)
+ if (fclose(out) == 0 && system(buf) >= 0)
#endif
{
if (xkbDebugFlags)
commit 6789b911c45c3f0484f0bfdc1be0d86121ee2d2d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 10 10:47:32 2025 +0100
render: picturestr.h: re-add compat macros for intel driver
The ancient pict_f_vector and pixman_f_vector macros have been a fallout
from long ago transition to pixman and had been removed quite a while ago.
Unfortunately, Intel driver (which is not under our reign) hasn't been
kept up to date yet. So re-adding the compat macro, until Intel driver
team had a chance to keep up.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
diff --git a/render/picturestr.h b/render/picturestr.h
index 001d37bfa..9768ae1bc 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -534,4 +534,13 @@ extern _X_EXPORT Bool
extern _X_EXPORT Bool
PictureTransformPoint3d(PictTransformPtr transform, PictVectorPtr vector);
+/* only for backwards compat w/ drivers that haven't been updated yet
+ (xf86-video-intel) - don't ever use this in new code
+
+ @todo revise after next stable release
+*/
+
+#define pict_f_vector pixman_f_vector
+#define pict_f_transform pixman_f_transform
+
#endif /* _PICTURESTR_H_ */
More information about the xorg-commit
mailing list