package/x11r7/xserver_xorg-server: bump version to 1.18.0

PATCH New Bernd Kuhls 2 participants 5 messages Dec 19, 2015

lore

Share & tools

lore

Bernd Kuhls

author

2015-12-19 14:22 UTC #0 lore raw

PATCH v4 1/2 package/x11r7/xserver_xorg-server: bump version to 1.18.0

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

---
v2: - removed legacy handling (Thomas, Arnout)
- fixed option definition of BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 (Thomas)

 package/x11r7/xserver_xorg-server/Config.in                | 12 ++++++------
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

package/x11r7/xserver_xorg-server/Config.in +6 -6

index 84f0298..e2eec55 100644
@@ -58,20 +58,20 @@ if BR2_PACKAGE_XSERVER_XORG_SERVER
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
 	bool
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 	bool
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
 	int
 	default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
-	default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+	default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 
 choice
 	bool "X Window System server version"
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
-	bool "1.17.4"
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+	bool "1.18.0"
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14

@@ -82,7 +82,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+	default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
 choice

package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +3 -3

index 0119e37..72c00c4 100644
@@ -1,6 +1,6 @@
 # From http://lists.x.org/archives/xorg-announce/2014-June/002440.html
 sha1   7a95765e56b124758fcd7b609589e65b8870880b                                xorg-server-1.14.7.tar.bz2
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
-# From http://lists.x.org/archives/xorg-announce/2015-October/002650.html
-sha1	139c4d6795eb4c3848616cc514d134532975e49e				xorg-server-1.17.4.tar.bz2
-sha256	0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457	xorg-server-1.17.4.tar.bz2
+# From http://lists.x.org/archives/xorg-announce/2015-November/002655.html
+sha1	f37f9ca17d211552c775c3ce78ff03385026bf3a				xorg-server-1.18.0.tar.bz2
+sha256	195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e	xorg-server-1.18.0.tar.bz2

Signature · 1 line

2.6.4

Bernd Kuhls

author

2015-12-19 14:22 UTC #1 lore raw

PATCH v4 2/2 package/x11r7/xdriver_xf86-video-nouveau: new package

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

---
v2: no changes

 package/x11r7/Config.in                            |  1 +
 package/x11r7/xdriver_xf86-video-nouveau/Config.in | 18 ++++++++++++++++
 .../xdriver_xf86-video-nouveau.hash                |  2 ++
 .../xdriver_xf86-video-nouveau.mk                  | 25 ++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/Config.in
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
 create mode 100644 package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk

package/x11r7/Config.in +1 -0

index 4e996fc..2f87cbd 100644
@@ -173,6 +173,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-video-mach64/Config.in
 		source package/x11r7/xdriver_xf86-video-mga/Config.in
 		source package/x11r7/xdriver_xf86-video-neomagic/Config.in
+		source package/x11r7/xdriver_xf86-video-nouveau/Config.in
 		source package/x11r7/xdriver_xf86-video-nv/Config.in
 		source package/x11r7/xdriver_xf86-video-openchrome/Config.in
 		source package/x11r7/xdriver_xf86-video-qxl/Config.in

package/x11r7/xdriver_xf86-video-nouveau/Config.in new file +18 -0

new file mode 100644
index 0000000..7e756e2
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
+	bool "xf86-video-nouveau"
+	depends on BR2_PACKAGE_MESA3D
+	select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBDRM_NOUVEAU
+	select BR2_PACKAGE_XPROTO_DRI2PROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	help
+	  Nouveau video driver
+
+	  http://nouveau.freedesktop.org
+
+comment "xf86-video-nouveau needs mesa3d"
+	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash new file +2 -0

new file mode 100644
index 0000000..9633641
@@ -0,0 +1,2 @@
+# From http://lists.x.org/archives/xorg-announce/2015-December/002662.html
+sha256	0ea057ad7fc31caba2d4e46c7e418fe2b3c762b04fb8d382f53383397fd8391e	xf86-video-nouveau-1.0.12.tar.bz2

package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk new file +25 -0

new file mode 100644
index 0000000..af84e79
@@ -0,0 +1,25 @@
+################################################################################
+#
+# xdriver_xf86-video-nouveau
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.12
+XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT
+XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE_FILES = COPYING
+XDRIVER_XF86_VIDEO_NOUVEAU_DEPENDENCIES = \
+	host-pkgconf \
+	libdrm \
+	xproto_dri2proto \
+	xproto_randrproto \
+	xproto_renderproto \
+	xproto_videoproto \
+	xproto_xextproto \
+	xserver_xorg-server
+
+# xdriver_xf86-video-nouveau requires O_CLOEXEC
+XDRIVER_XF86_VIDEO_NOUVEAU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
+$(eval $(autotools-package))

Signature · 1 line

2.6.4

Thomas Petazzoni

2015-12-19 14:56 UTC #2 lore raw

PATCH v4 2/2 package/x11r7/xdriver_xf86-video-nouveau: new package

Dear Bernd Kuhls,

Quoted 3 lines · Bernd Kuhls

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

I've applied, but it triggers a kconfig warning (which already existed for some other packages):

warning: (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU && BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU && BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU) selects BR2_PACKAGE_LIBDRM_NOUVEAU which has unmet direct dependencies (BR2_PACKAGE_LIBDRM && (BR2_i386 || BR2_x86_64))

So it already existed for BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU and BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU, and your package (BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU) just adds a new bogus select. I've still applied your package because this issue needs to be fixed separately, and address for all three Config.in options.

Essentially, this happens because I'm building on ARM, and the BR2_PACKAGE_LIBDRM_NOUVEAU option is only available on i386 and x86_64. However, I wonder why BR2_PACKAGE_LIBDRM_NOUVEAU is not available on ARM, since I'm pretty sure that the Nouveau driver is used on ARM on some Tegra platforms.

Right now, this causes a build failure:

checking for LIBDRM_NOUVEAU... no
configure: error: Package requirements (libdrm_nouveau >= 2.4.25) were not met:

With the following (not very minimal) configuration:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2015.11-rc1-71-g90d1299.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_7=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU=y
BR2_PACKAGE_LIBGLFW=y
BR2_PACKAGE_LIBSOIL=y
# BR2_TARGET_ROOTFS_TAR is not set

Can you have a look?

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2015-12-19 16:57 UTC #3 lore raw

PATCH v4 2/2 package/x11r7/xdriver_xf86-video-nouveau:new package

Hi Thomas,

Am Sat, 19 Dec 2015 15:56:47 +0100 schrieb Thomas Petazzoni:

Quoted 4 lines

Dear Bernd Kuhls,
[...]
I've still applied your package because this issue needs to be fixed separately, and address for all three Config.in options.

thanks!

Quoted 5 lines

Essentially, this happens because I'm building on ARM, and the BR2_PACKAGE_LIBDRM_NOUVEAU option is only available on i386 and x86_64. However, I wonder why BR2_PACKAGE_LIBDRM_NOUVEAU is not available on ARM, since I'm pretty sure that the Nouveau driver is used on ARM on some Tegra platforms.

Looking at libdrm/Config.in the restriction on Intel hardware was added in 2013, it seems no one cared until now ;)

$ git blame package/libdrm/Config.in | grep -A2 NOUVEAU
b35acfff (Spenser Gilliland 2013-09-05 23:25:15 -0500 37) config BR2_PACKAGE_LIBDRM_NOUVEAU
b35acfff (Spenser Gilliland 2013-09-05 23:25:15 -0500 38) 	bool "nouveau"
b35acfff (Spenser Gilliland 2013-09-05 23:25:15 -0500 39) 	depends on BR2_i386 || BR2_x86_64

Quoted 1 line

Right now, this causes a build failure:

Should be fixed by
http://patchwork.ozlabs.org/patch/559217/
http://patchwork.ozlabs.org/patch/559218/

Regards, Bernd

Thomas Petazzoni

Applied

2015-12-19 14:53 UTC #4 lore raw

PATCH v4 1/2 package/x11r7/xserver_xorg-server: bump version to 1.18.0

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 5 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>
---
v2: - removed legacy handling (Thomas, Arnout)
- fixed option definition of BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 (Thomas)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com