Fix win32/msys2 shader compilation & drop perl

[PATCH v2 0/5] Fix win32/msys2 shader compilation & drop perl

marcandre.lureau@redhat.com posted 5 patches 1 year, 3 months ago

Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230109181447.235989-1-marcandre.lureau@redhat.com

Maintainers: Ed Maste <emaste@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>

configure                                     |  8 +++---
meson.build                                   |  2 +-
.gitlab-ci.d/cirrus/freebsd-12.vars           |  2 +-
.gitlab-ci.d/cirrus/freebsd-13.vars           |  2 +-
.gitlab-ci.d/cirrus/macos-12.vars             |  2 +-
.gitlab-ci.d/windows.yml                      |  5 ++--
scripts/ci/setup/build-environment.yml        |  1 -
scripts/shaderinclude.pl                      | 16 ------------
scripts/shaderinclude.py                      | 26 +++++++++++++++++++
tests/docker/dockerfiles/alpine.docker        |  1 -
tests/docker/dockerfiles/centos8.docker       |  1 -
.../dockerfiles/debian-amd64-cross.docker     |  1 -
tests/docker/dockerfiles/debian-amd64.docker  |  1 -
.../dockerfiles/debian-arm64-cross.docker     |  1 -
.../dockerfiles/debian-armel-cross.docker     |  1 -
.../dockerfiles/debian-armhf-cross.docker     |  1 -
.../dockerfiles/debian-mips64el-cross.docker  |  1 -
.../dockerfiles/debian-mipsel-cross.docker    |  1 -
.../dockerfiles/debian-ppc64el-cross.docker   |  1 -
.../dockerfiles/debian-s390x-cross.docker     |  1 -
.../dockerfiles/debian-tricore-cross.docker   |  1 -
.../dockerfiles/fedora-win32-cross.docker     |  5 ++--
.../dockerfiles/fedora-win64-cross.docker     |  5 ++--
tests/docker/dockerfiles/fedora.docker        |  5 ++--
tests/docker/dockerfiles/opensuse-leap.docker |  1 -
tests/docker/dockerfiles/ubuntu2004.docker    |  1 -
tests/lcitool/libvirt-ci                      |  2 +-
tests/lcitool/projects/qemu.yml               |  1 -
tests/lcitool/refresh                         |  6 ++---
tests/qapi-schema/meson.build                 |  7 ++---
tests/vm/centos.aarch64                       |  2 +-
31 files changed, 50 insertions(+), 61 deletions(-)
delete mode 100644 scripts/shaderinclude.pl
create mode 100755 scripts/shaderinclude.py

Expand all Fold all

[PATCH v2 0/5] Fix win32/msys2 shader compilation & drop perl

Posted by marcandre.lureau@redhat.com 1 year, 3 months ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Hi,

Fix the shader compilation error on win32/msys2 and convert the related script
from perl to python.

v2:
- add a few patches to drop perl from the build dependencies
- add some tags for v1 patches
- add copyright header to the python script

Marc-André Lureau (5):
  build-sys: fix crlf-ending C code
  .gitlab-ci.d/windows: do not disable opengl
  configure: replace Perl usage with sed
  meson: replace Perl usage with Python
  Draft: Update lcitool

 configure                                     |  8 +++---
 meson.build                                   |  2 +-
 .gitlab-ci.d/cirrus/freebsd-12.vars           |  2 +-
 .gitlab-ci.d/cirrus/freebsd-13.vars           |  2 +-
 .gitlab-ci.d/cirrus/macos-12.vars             |  2 +-
 .gitlab-ci.d/windows.yml                      |  5 ++--
 scripts/ci/setup/build-environment.yml        |  1 -
 scripts/shaderinclude.pl                      | 16 ------------
 scripts/shaderinclude.py                      | 26 +++++++++++++++++++
 tests/docker/dockerfiles/alpine.docker        |  1 -
 tests/docker/dockerfiles/centos8.docker       |  1 -
 .../dockerfiles/debian-amd64-cross.docker     |  1 -
 tests/docker/dockerfiles/debian-amd64.docker  |  1 -
 .../dockerfiles/debian-arm64-cross.docker     |  1 -
 .../dockerfiles/debian-armel-cross.docker     |  1 -
 .../dockerfiles/debian-armhf-cross.docker     |  1 -
 .../dockerfiles/debian-mips64el-cross.docker  |  1 -
 .../dockerfiles/debian-mipsel-cross.docker    |  1 -
 .../dockerfiles/debian-ppc64el-cross.docker   |  1 -
 .../dockerfiles/debian-s390x-cross.docker     |  1 -
 .../dockerfiles/debian-tricore-cross.docker   |  1 -
 .../dockerfiles/fedora-win32-cross.docker     |  5 ++--
 .../dockerfiles/fedora-win64-cross.docker     |  5 ++--
 tests/docker/dockerfiles/fedora.docker        |  5 ++--
 tests/docker/dockerfiles/opensuse-leap.docker |  1 -
 tests/docker/dockerfiles/ubuntu2004.docker    |  1 -
 tests/lcitool/libvirt-ci                      |  2 +-
 tests/lcitool/projects/qemu.yml               |  1 -
 tests/lcitool/refresh                         |  6 ++---
 tests/qapi-schema/meson.build                 |  7 ++---
 tests/vm/centos.aarch64                       |  2 +-
 31 files changed, 50 insertions(+), 61 deletions(-)
 delete mode 100644 scripts/shaderinclude.pl
 create mode 100755 scripts/shaderinclude.py

-- 
2.39.0