[PATCH 0/3] tests/docker: Fix linking with VirGL

[PATCH 0/3] tests/docker: Fix linking with VirGL

[Philippe Mathieu-Daudé]

We link with VirGL in our debian-amd64 (cross-host) docker image.

This series includes few fixes to keep testing it.

Philippe Mathieu-Daudé (3):
  tests/docker: Update VirGL git repository URL
  tests/docker: Remove obsolete VirGL --with-glx configure option
  tests/docker: Update VirGL to v0.8.0

 tests/docker/dockerfiles/debian-amd64.docker | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.21.1

[PATCH 1/3] tests/docker: Update VirGL git repository URL

[Philippe Mathieu-Daudé]

freedesktop.org is moving to a GitLab instance,
use the new url.

- https://www.fooishbar.org/blog/gitlab-fdo-introduction/
- https://gitlab.freedesktop.org/freedesktop/freedesktop/-/wikis/home

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/docker/dockerfiles/debian-amd64.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index 3b860af106..b67fad54cb 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -27,7 +27,7 @@ RUN apt update && \
         libegl1-mesa-dev \
         libepoxy-dev \
         libgbm-dev
-RUN git clone https://anongit.freedesktop.org/git/virglrenderer.git /usr/src/virglrenderer && \
+RUN git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git /usr/src/virglrenderer && \
     cd /usr/src/virglrenderer && git checkout virglrenderer-0.7.0
 RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --with-glx --disable-tests && make install
 
-- 
2.21.1

[PATCH 2/3] tests/docker: Remove obsolete VirGL --with-glx configure option

[Philippe Mathieu-Daudé]

The GLX configure option has been removed in 71c75f201d [*].
We missed that when updating to v0.7.0 in commit fab3220f97.

This silents:

  configure: creating ./config.status
  config.status: creating virglrenderer.pc
  ...
  configure: WARNING: unrecognized options: --with-glx

[*] https://gitlab.freedesktop.org/virgl/virglrenderer/commit/71c75f201d

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/docker/dockerfiles/debian-amd64.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index b67fad54cb..a1d40a56fa 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -29,7 +29,7 @@ RUN apt update && \
         libgbm-dev
 RUN git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git /usr/src/virglrenderer && \
     cd /usr/src/virglrenderer && git checkout virglrenderer-0.7.0
-RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --with-glx --disable-tests && make install
+RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --disable-tests && make install
 
 # netmap
 RUN apt update && \
-- 
2.21.1

[PATCH 3/3] tests/docker: Update VirGL to v0.8.0

[Philippe Mathieu-Daudé]

Building the qemu:debian-amd64 fails when building VirGL:

  make[2]: Entering directory '/usr/src/virglrenderer/src/gallium/auxiliary'
    CC       cso_cache/cso_cache.lo
    CC       cso_cache/cso_hash.lo
    CC       os/os_misc.lo
    CC       util/u_debug.lo
    CC       util/u_debug_describe.lo
    CC       util/u_format.lo
    GEN      util/u_format_table.c
  Traceback (most recent call last):
    File "./util/u_format_table.py", line 168, in <module>
      main()
    File "./util/u_format_table.py", line 164, in main
      write_format_table(formats)
    File "./util/u_format_table.py", line 132, in write_format_table
      print("   %s,\t/* is_array */" % (bool_map(format.is_array()),))
    File "/usr/src/virglrenderer/src/gallium/auxiliary/util/u_format_parse.py", line 164, in is_array
      return self.array_element() != None
    File "/usr/src/virglrenderer/src/gallium/auxiliary/util/u_format_parse.py", line 73, in __eq__
      return self.type == other.type and self.norm == other.norm and self.pure == other.pure and self.size == other.size
  AttributeError: 'NoneType' object has no attribute 'type'
  make[2]: Leaving directory '/usr/src/virglrenderer/src/gallium/auxiliary'
  make[2]: *** [Makefile:906: util/u_format_table.c] Error 1
  make[1]: *** [Makefile:631: install-recursive] Error 1

VirGL commits a8962eda1..a613dcc82 fix this problem.
Update to VirGL 0.8.0 which contains them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/docker/dockerfiles/debian-amd64.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index a1d40a56fa..c70c916343 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -28,7 +28,7 @@ RUN apt update && \
         libepoxy-dev \
         libgbm-dev
 RUN git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git /usr/src/virglrenderer && \
-    cd /usr/src/virglrenderer && git checkout virglrenderer-0.7.0
+    cd /usr/src/virglrenderer && git checkout virglrenderer-0.8.0
 RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --disable-tests && make install
 
 # netmap
-- 
2.21.1

Re: [PATCH 0/3] tests/docker: Fix linking with VirGL

[Philippe Mathieu-Daudé]

On 2/12/20 9:27 PM, Philippe Mathieu-Daudé wrote:
> We link with VirGL in our debian-amd64 (cross-host) docker image.
> 
> This series includes few fixes to keep testing it.

ping?

> 
> Philippe Mathieu-Daudé (3):
>    tests/docker: Update VirGL git repository URL
>    tests/docker: Remove obsolete VirGL --with-glx configure option
>    tests/docker: Update VirGL to v0.8.0
> 
>   tests/docker/dockerfiles/debian-amd64.docker | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 

Re: [PATCH 0/3] tests/docker: Fix linking with VirGL

[Philippe Mathieu-Daudé]

ping ping?

On 2/24/20 1:20 PM, Philippe Mathieu-Daudé wrote:
> On 2/12/20 9:27 PM, Philippe Mathieu-Daudé wrote:
>> We link with VirGL in our debian-amd64 (cross-host) docker image.
>>
>> This series includes few fixes to keep testing it.
> 
> ping?
> 
>>
>> Philippe Mathieu-Daudé (3):
>>    tests/docker: Update VirGL git repository URL
>>    tests/docker: Remove obsolete VirGL --with-glx configure option
>>    tests/docker: Update VirGL to v0.8.0
>>
>>   tests/docker/dockerfiles/debian-amd64.docker | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>

Re: [PATCH 0/3] tests/docker: Fix linking with VirGL

[Alex Bennée]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> ping ping?

Queued to testing/next, thanks.

>
> On 2/24/20 1:20 PM, Philippe Mathieu-Daudé wrote:
>> On 2/12/20 9:27 PM, Philippe Mathieu-Daudé wrote:
>>> We link with VirGL in our debian-amd64 (cross-host) docker image.
>>>
>>> This series includes few fixes to keep testing it.
>> ping?
>> 
>>>
>>> Philippe Mathieu-Daudé (3):
>>>    tests/docker: Update VirGL git repository URL
>>>    tests/docker: Remove obsolete VirGL --with-glx configure option
>>>    tests/docker: Update VirGL to v0.8.0
>>>
>>>   tests/docker/dockerfiles/debian-amd64.docker | 6 +++---
>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>


-- 
Alex Bennée