diff options
| -rw-r--r-- | .cirrus.yml | 1 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian10.docker | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/fedora-win32-cross.docker | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/fedora-win64-cross.docker | 1 | ||||
| -rwxr-xr-x | tests/vm/freebsd | 1 | ||||
| -rwxr-xr-x | tests/vm/haiku.x86_64 | 1 | ||||
| -rwxr-xr-x | tests/vm/netbsd | 1 | ||||
| -rwxr-xr-x | tests/vm/openbsd | 1 |
10 files changed, 3 insertions, 15 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 08db7c419f..62a9b57530 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,7 +87,6 @@ windows_msys2_task: C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \ diffutils git grep make pkg-config sed \ mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-setuptools \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2_image \ @@ -1912,9 +1912,6 @@ fi case "$meson" in git | internal) - if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then - error_exit "Python setuptools not found" - fi meson="$python ${source_path}/meson/meson.py" ;; *) meson=$(command -v "$meson") ;; diff --git a/meson.build b/meson.build index 5062407c70..e3386196ba 100644 --- a/meson.build +++ b/meson.build @@ -654,9 +654,8 @@ if get_option('vnc').enabled() vnc = declare_dependency() # dummy dependency png = dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', static: enable_static) - jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'], - required: get_option('vnc_jpeg'), - static: enable_static) + jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'), + method: 'pkg-config', static: enable_static) sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], required: get_option('vnc_sasl'), static: enable_static) @@ -1956,7 +1955,7 @@ if host_machine.system() == 'windows' '@OUTPUT@', get_option('prefix'), meson.current_source_dir(), - host_machine.cpu_family(), + host_machine.cpu(), '--', '-DDISPLAYVERSION=' + meson.project_version(), ] diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index 21cc671d71..73a3caac9c 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -30,7 +30,6 @@ RUN apt update && \ pkg-config \ psmisc \ python3 \ - python3-setuptools \ python3-sphinx \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 5903e1b0b4..087df598a0 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -30,7 +30,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 7f03cd8ffc..d5d2f5f00d 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -26,7 +26,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 04ee793381..09f3ee6cb8 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM): "pkgconf", "bzip2", "python37", - "py37-setuptools", "ninja", # gnu tools diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 37af48bf1b..2eb736dae1 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM): "devel:libusb_1.0", "devel:libz", "ninja", - "setuptools_python3" ] # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 596717cc76..b9efc269d2 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM): "pkgconf", "xz", "python37", - "py37-setuptools", "ninja-build", # gnu tools diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 386b2c72f7..4d1399378e 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM): "git", "pkgconf", "bzip2", "xz", - "py3-setuptools", "ninja", # gnu tools |