Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: fix optional glx dependency

PATCH New Bernd Kuhls 5 participants 12 messages Oct 23, 2019 – May 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/x11r7/xserver_xorg-server: fix optional glx dependency

Typo was added by commit
https://git.buildroot.net/buildroot/commit/?id=c2856aa2857d616788684a053f1c886da00d977f

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
index c15047cbe4..41c82ad930 100644
@@ -120,7 +120,7 @@ else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
 XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
 else
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

Without this patch the build of xserver_xorg-server, switched to virtual opengl provider, will fail:

checking for XSERVERCFLAGS... no
configure: error: Package requirements (fixesproto >= 5.0 damageproto

Quoted 1 line

= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0

xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto

Quoted 1 line

= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3

pixman-1 >= 0.27.2 videoproto recordproto >= 1.13.99.1 resourceproto

Quoted 1 line

= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto

presentproto >= 1.1 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2

Quoted 1 line

= 2.0.0 xau xshmfence >= 1.1 xdmcp) were not met:

Package 'dri', required by 'virtual:world', not found

---
v2: no changes, included in new series switching xserver_xorg-server
to virtual opengl provider

 package/mesa3d-headers/dri.pc            | 10 ++++++++++
 package/mesa3d-headers/mesa3d-headers.mk |  9 ++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 package/mesa3d-headers/dri.pc
package/mesa3d-headers/dri.pc new file +10 -0
new file mode 100644
index 0000000000..bd9a33b6c6
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+dridriverdir=/usr/lib/dri
+
+Name: dri
+Description: Direct Rendering Infrastructure
+Version: @VERSION@
+Cflags: -I${includedir}
package/mesa3d-headers/mesa3d-headers.mk +2 -7
index 8670184742..99d6e52498 100644
@@ -34,13 +34,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 # Not using $(SED) because we do not want to work in-place, and $(SED)
 # contains -i.
 define MESA3D_HEADERS_BUILD_DRI_PC
-	sed -e 's:@\(exec_\)\?prefix@:/usr:' \
-	    -e 's:@libdir@:$${exec_prefix}/lib:' \
-	    -e 's:@includedir@:$${prefix}/include:' \
-	    -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \
-	    -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
-	    -e 's:@DRI_PC_REQ_PRIV@::' \
-	    $(@D)/src/mesa/drivers/dri/dri.pc.in \
+	sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
+	    package/mesa3d-headers/dri.pc \
 	    >$(@D)/src/mesa/drivers/dri/dri.pc
 endef
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

Tested xserver_xorg-server and nvidia-driver builds with this patch applied

Quoted 71 lines · Bernd Kuhls

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

Without this patch the build of xserver_xorg-server, switched to virtual opengl provider, will fail:

checking for XSERVERCFLAGS... no
configure: error: Package requirements (fixesproto >= 5.0 damageproto

Quoted 1 line

= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0

xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto

Quoted 1 line

= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3

pixman-1 >= 0.27.2 videoproto recordproto >= 1.13.99.1 resourceproto

Quoted 1 line

= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto

presentproto >= 1.1 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2

Quoted 1 line

= 2.0.0 xau xshmfence >= 1.1 xdmcp) were not met:

Package 'dri', required by 'virtual:world', not found

---
v2: no changes, included in new series switching xserver_xorg-server
to virtual opengl provider

  package/mesa3d-headers/dri.pc            | 10 ++++++++++
  package/mesa3d-headers/mesa3d-headers.mk |  9 ++-------
  2 files changed, 12 insertions(+), 7 deletions(-)

create mode 100644 package/mesa3d-headers/dri.pc

package/mesa3d-headers/dri.pc new file +10 -0
new file mode 100644
index 0000000000..bd9a33b6c6
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+dridriverdir=/usr/lib/dri
+
+Name: dri
+Description: Direct Rendering Infrastructure
+Version: @VERSION@
+Cflags: -I${includedir}
package/mesa3d-headers/mesa3d-headers.mk +2 -7
index 8670184742..99d6e52498 100644
@@ -34,13 +34,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
  # Not using $(SED) because we do not want to work in-place, and $(SED)
  # contains -i.
  define MESA3D_HEADERS_BUILD_DRI_PC
-	sed -e 's:@\(exec_\)\?prefix@:/usr:' \
-	    -e 's:@libdir@:$${exec_prefix}/lib:' \
-	    -e 's:@includedir@:$${prefix}/include:' \
-	    -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \
-	    -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
-	    -e 's:@DRI_PC_REQ_PRIV@::' \
-	    $(@D)/src/mesa/drivers/dri/dri.pc.in \
+	sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
+	    package/mesa3d-headers/dri.pc \
  	    >$(@D)/src/mesa/drivers/dri/dri.pc
  endef
 
Signature · 4 lines
Vincent Fazio
Embedded Software Engineer - Linux
Extreme Engineering Solutions, Inc
http://www.xes-inc.com
#3 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

In reply to Bernd Kuhls

Hello Bernd,

Quoted 8 lines · On Wed, 23 Oct 2019 08:22:19 +0200 Bernd Kuhls <[email protected]> wrote:

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

I am sorry, but I don't understand the reasoning behind this patch. If the new meson build system produces a dri.pc file, why don't we use it? What is wrong with it?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

[posted and mailed]

Thomas Petazzoni <[email protected]> wrote in news:20200425225823.2f68e8ef at windsurf.home:

Quoted 9 lines

Hello Bernd,

Quoted 4 lines · On Wed, 23 Oct 2019 08:22:19 +0200 Bernd Kuhls <[email protected]> wrote:

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:

https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?
h=19.2#n93

Quoted 8 lines
Quoted 4 lines

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

I am sorry, but I don't understand the reasoning behind this patch. If the new meson build system produces a dri.pc file, why don't we use it? What is wrong with it?

Hi Thomas,

the mesa3d-headers package does not use the mesa3d meson build system, it uses the buildroot generic-package infrastructure and copies files from the mesa3d source tarball, which is lacking dri.pc.in now, to staging dir.

Regards, Bernd

#5 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

In reply to Thomas Petazzoni

On 2020-04-25 22:58 +0200, Thomas Petazzoni spake thusly:

Quoted 10 lines

Hello Bernd,

Quoted 5 lines · On Wed, 23 Oct 2019 08:22:19 +0200 Bernd Kuhls <[email protected]> wrote:

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

Quoted 7 lines
Quoted 3 lines

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

I am sorry, but I don't understand the reasoning behind this patch. If the new meson build system produces a dri.pc file, why don't we use it? What is wrong with it?

Because mesa3d-headers is not a meson package, but a generic package: it only installs a select set of headers, and dri.pc when xorg is enabled.

So, the dri.pc generated by the meson buildsystem, is not generated.

Since there is now no template anymore in the source tree, we need to get one from wmewhere...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

In reply to Bernd Kuhls

Bernd, All,

On 2019-10-23 08:22 +0200, Bernd Kuhls spake thusly:

Quoted 17 lines

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

Without this patch the build of xserver_xorg-server, switched to virtual opengl provider, will fail:

checking for XSERVERCFLAGS... no
configure: error: Package requirements (fixesproto >= 5.0 damageproto

Quoted 1 line

= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0

xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto

Quoted 1 line

= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3

Quoted 8 lines

pixman-1 >= 0.27.2 videoproto recordproto >= 1.13.99.1 resourceproto

Quoted 1 line

= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto

presentproto >= 1.1 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2

Quoted 1 line

= 2.0.0 xau xshmfence >= 1.1 xdmcp) were not met:

Package 'dri', required by 'virtual:world', not found

I have entirely reworked the commit log to be more explicit about the meson buildsystem referecne that is confusing.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 52 lines

---
v2: no changes, included in new series switching xserver_xorg-server
to virtual opengl provider

 package/mesa3d-headers/dri.pc            | 10 ++++++++++
 package/mesa3d-headers/mesa3d-headers.mk |  9 ++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 package/mesa3d-headers/dri.pc
package/mesa3d-headers/dri.pc new file +10 -0
new file mode 100644
index 0000000000..bd9a33b6c6
@@ -0,0 +1,10 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+dridriverdir=/usr/lib/dri
+
+Name: dri
+Description: Direct Rendering Infrastructure
+Version: @VERSION@
+Cflags: -I${includedir}
package/mesa3d-headers/mesa3d-headers.mk +2 -7
index 8670184742..99d6e52498 100644
@@ -34,13 +34,8 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 # Not using $(SED) because we do not want to work in-place, and $(SED)
 # contains -i.
 define MESA3D_HEADERS_BUILD_DRI_PC
-	sed -e 's:@\(exec_\)\?prefix@:/usr:' \
-	    -e 's:@libdir@:$${exec_prefix}/lib:' \
-	    -e 's:@includedir@:$${prefix}/include:' \
-	    -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \
-	    -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
-	    -e 's:@DRI_PC_REQ_PRIV@::' \
-	    $(@D)/src/mesa/drivers/dri/dri.pc.in \
+	sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
+	    package/mesa3d-headers/dri.pc \
 	    >$(@D)/src/mesa/drivers/dri/dri.pc
 endef
 
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#7 lore raw

PATCH v2 2/3 package/mesa3d-headers: fix install of dri.pc

Quoted 26 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Bernd, All,
On 2019-10-23 08:22 +0200, Bernd Kuhls spake thusly:

Quoted 22 lines

Due to the switch of mesa3d to the meson build system the upstream tarball does not include dri.pc.in anymore, it is created during the build now:
https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/drivers/dri/meson.build?h=19.2#n93

In order to provide dri.pc we need to add a version taken from a dri- based mesa3d build to our source repository, by doing so we can reduce the number of sed commands.

Without this patch the build of xserver_xorg-server, switched to virtual opengl provider, will fail:

checking for XSERVERCFLAGS... no
configure: error: Package requirements (fixesproto >= 5.0 damageproto

Quoted 1 line

= 1.1 xcmiscproto >= 1.2.0 xtrans >= 1.3.5 bigreqsproto >= 1.1.0

xproto >= 7.0.31 randrproto >= 1.6.0 renderproto >= 0.11 xextproto

Quoted 1 line

= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3

pixman-1 >= 0.27.2 videoproto recordproto >= 1.13.99.1 resourceproto

Quoted 1 line

= 1.2.0 xf86driproto >= 2.1.0 glproto >= 1.4.17 dri >= 7.8.0 dri3proto

presentproto >= 1.1 xineramaproto xkbfile pixman-1 >= 0.27.2 xfont2

Quoted 1 line

= 2.0.0 xau xshmfence >= 1.1 xdmcp) were not met:

Quoted 8 lines
Quoted 3 lines

Package 'dri', required by 'virtual:world', not found

I have entirely reworked the commit log to be more explicit about the meson buildsystem referecne that is confusing.

Applied to master, thanks.

Committed to 2020.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH 3/3 package/x11r7/xserver_xorg-server: switch to virtual opengl provider

In reply to Bernd Kuhls

This allows to use xserver_xorg-server without mesa3d.

Build-tested using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_NVIDIA_DRIVER=y

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -2
index 41c82ad930..8ccc04224d 100644
@@ -120,9 +120,9 @@ else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
-XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
+XSERVER_XORG_SERVER_DEPENDENCIES += libgl
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
 endif
Signature · 1 line
2.20.1
#9 lore raw

PATCH 3/3 package/x11r7/xserver_xorg-server: switch to virtual opengl provider

Quoted 10 lines · On Wed, 23 Oct 2019 08:22:20 +0200 Bernd Kuhls <[email protected]> wrote:

This allows to use xserver_xorg-server without mesa3d.

Build-tested using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_NVIDIA_DRIVER=y

Quoted 4 lines
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH 3/3 package/x11r7/xserver_xorg-server: switch to virtual opengl provider

Am Fri, 25 Oct 2019 20:10:55 +0200 schrieb Thomas Petazzoni:

Quoted 17 lines
Quoted 8 lines · On Wed, 23 Oct 2019 08:22:20 +0200 Bernd Kuhls <[email protected]> wrote:

This allows to use xserver_xorg-server without mesa3d.

Build-tested using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_NVIDIA_DRIVER=y

Quoted 5 lines

Signed-off-by: Bernd Kuhls
<[email protected]>

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 3 lines

Applied to master, thanks.

Thomas

Hi Thomas,

you applied patches 1 & 3 of this series but did not commit patch 2:
http://patchwork.ozlabs.org/patch/1181847/

This will cause a build error with xserver_xorg-server as noted in the commit message of patch 2.

Regards, Bernd

#11 lore raw

PATCH 1/3 package/x11r7/xserver_xorg-server: fix optional glx dependency

In reply to Bernd Kuhls
Quoted 7 lines · On Wed, 23 Oct 2019 08:22:18 +0200 Bernd Kuhls <[email protected]> wrote:

Typo was added by commit
https://git.buildroot.net/buildroot/commit/?id=c2856aa2857d616788684a053f1c886da00d977f

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com