Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: fix mesa3d glx support

PATCH New unixmania at gmail.com 2 participants 4 messages Oct 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix mesa3d glx support

From: Carlos Santos <[email protected]>

Commit 5cb821d5635 added a new option to enable GLX support in mesa3d. Adjust xserver_xorg-server to use it.

---
 board/pandaboard/post-image.sh                   | 16 ----------------
 configs/pandaboard_defconfig                     |  3 ++-
 .../xserver_xorg-server/xserver_xorg-server.mk   |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100755 board/pandaboard/post-image.sh
board/pandaboard/post-image.sh deleted +0 -16
deleted file mode 100755
index 9cca1b1789..0000000000
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                           \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
-
-exit $?
configs/pandaboard_defconfig +2 -1
index bb4dd28783..408bced9c0 100644
@@ -6,7 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS2"
 BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pandaboard/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.62"
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
index a33cb25076..c15047cbe4 100644
@@ -120,7 +120,7 @@ else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),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.18.1
#1 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix mesa3d glx support

Am Sat, 12 Oct 2019 11:49:25 -0300 schrieb
unixmania-Re5JQEeQqe8AvxtiuMwx3w:

Quoted 2 lines
 board/pandaboard/post-image.sh                   | 16 ----------------
 configs/pandaboard_defconfig                     |  3 ++-

Hi Carlos,

are these changes related to xserver_xorg-server?

Regards, Bernd

#2 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix mesa3d glx support

Quoted 4 lines · Bernd Kuhls

Am Sat, 12 Oct 2019 11:49:25 -0300 schrieb
unixmania-Re5JQEeQqe8AvxtiuMwx3w:

Quoted 8 lines
Quoted 2 lines
 board/pandaboard/post-image.sh                   | 16 ----------------
 configs/pandaboard_defconfig                     |  3 ++-

Hi Carlos,

are these changes related to xserver_xorg-server?

Regards, Bernd

Yes, for sure.

Signature · 1 line
Carlos Santos <[email protected]>
#3 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix mesa3d glx support

Quoted 9 lines · Carlos Santos
Quoted 7 lines · Bernd Kuhls

Am Sat, 12 Oct 2019 11:49:25 -0300 schrieb
unixmania-Re5JQEeQqe8AvxtiuMwx3w:

Quoted 2 lines
 board/pandaboard/post-image.sh                   | 16 ----------------
 configs/pandaboard_defconfig                     |  3 ++-
Quoted 7 lines
Quoted 5 lines

Hi Carlos,

are these changes related to xserver_xorg-server?

Regards, Bernd

Yes, for sure.

No, the removal of configs/pandaboard_defconfig was a mistake. I will send a new patch.

Signature · 1 line
Carlos Santos <[email protected]>