diff mbox

[PATCH/next,09/13] package/x11r7/xserver_xorg-server: add version 1.18.0

Message ID 1447457203-27816-9-git-send-email-bernd.kuhls@t-online.de
State Changes Requested
Headers show

Commit Message

Bernd Kuhls Nov. 13, 2015, 11:26 p.m. UTC
Video drivers need ABI version 20 now:
http://cgit.freedesktop.org/xorg/xserver/commit/?id=a8a0f6464a33c12c1de495d74fd478c0d952643e

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xserver_xorg-server/Config.in                | 10 ++++++++++
 package/x11r7/xserver_xorg-server/xserver_xorg-server.hash |  3 +++
 2 files changed, 13 insertions(+)

Comments

Peter Korsgaard Nov. 14, 2015, 10:22 p.m. UTC | #1
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Video drivers need ABI version 20 now:
 > http://cgit.freedesktop.org/xorg/xserver/commit/?id=a8a0f6464a33c12c1de495d74fd478c0d952643e

Is there any sense in keeping the v1.17 series around? I would prefer to
not have to support 3 versions.
Bernd Kuhls Nov. 14, 2015, 10:40 p.m. UTC | #2
Am Sat, 14 Nov 2015 23:22:01 +0100 schrieb Peter Korsgaard:

>>>>>> "Bernd" == Bernd Kuhls
>>>>>> <bernd.kuhls@t-online.de> writes:
> 
>  > Video drivers need ABI version 20 now:
>  > http://cgit.freedesktop.org/xorg/xserver/commit/?
id=a8a0f6464a33c12c1de495d74fd478c0d952643e
> 
> Is there any sense in keeping the v1.17 series around? I would prefer to
> not have to support 3 versions.

Hi Peter,

nvidia-driver depends on ABI 19 (yes, I will send a patch in the next 
minutes, I do not use Nvidia hardware so i forgot about it), it is broken 
with X.org 1.18.0:

http://www.phoronix.com/scan.php?page=news_item&px=x.org-server-1.18-
video-abi

ftp://download.nvidia.com/XFree86/Linux-x86/358.09/README/
minimumrequirements.html

https://www.archlinux.org/news/xorg-1180-enters-testing/

Regards, Bernd
Bernd Kuhls Nov. 18, 2015, 6:20 p.m. UTC | #3
Am Sat, 14 Nov 2015 23:40:26 +0100 schrieb Bernd Kuhls:

> Am Sat, 14 Nov 2015 23:22:01 +0100 schrieb Peter Korsgaard:
> 
>>>>>>> "Bernd" == Bernd Kuhls
>>>>>>> <bernd.kuhls@t-online.de> writes:
>> 
>>  > Video drivers need ABI version 20 now:
>>  > http://cgit.freedesktop.org/xorg/xserver/commit/?
> id=a8a0f6464a33c12c1de495d74fd478c0d952643e
>> 
>> Is there any sense in keeping the v1.17 series around? I would prefer
>> to not have to support 3 versions.
> 
> Hi Peter,
> 
> nvidia-driver depends on ABI 19 (yes, I will send a patch in the next
> minutes, I do not use Nvidia hardware so i forgot about it), it is
> broken with X.org 1.18.0:

Hi,

Nvidia issued an update, I will post a new patch series in the coming 
days: http://www.nvidia.com/download/driverResults.aspx/95154/en-us

Regards, Bernd
Thomas Petazzoni Nov. 18, 2015, 6:36 p.m. UTC | #4
Dear Bernd Kuhls,

On Wed, 18 Nov 2015 19:20:45 +0100, Bernd Kuhls wrote:

> > nvidia-driver depends on ABI 19 (yes, I will send a patch in the next
> > minutes, I do not use Nvidia hardware so i forgot about it), it is
> > broken with X.org 1.18.0:
> 
> Nvidia issued an update, I will post a new patch series in the coming 
> days: http://www.nvidia.com/download/driverResults.aspx/95154/en-us

So thanks to this update we won't have to keep the ABI 19 compatible
X.org server version, right?

Thomas
Bernd Kuhls Nov. 18, 2015, 7:24 p.m. UTC | #5
Am Wed, 18 Nov 2015 19:36:47 +0100 schrieb Thomas Petazzoni:

> Dear Bernd Kuhls,
> 
> On Wed, 18 Nov 2015 19:20:45 +0100, Bernd Kuhls wrote:
> 
>> > nvidia-driver depends on ABI 19 (yes, I will send a patch in the next
>> > minutes, I do not use Nvidia hardware so i forgot about it), it is
>> > broken with X.org 1.18.0:
>> 
>> Nvidia issued an update, I will post a new patch series in the coming
>> days: http://www.nvidia.com/download/driverResults.aspx/95154/en-us
> 
> So thanks to this update we won't have to keep the ABI 19 compatible
> X.org server version, right?

Hi Thomas,

yes, I think so: https://github.com/OpenELEC/OpenELEC.tv/commit/
e5e95515c246a7676ce1227c9fbe1e07e6a9db19#commitcomment-14467959

I do not have Nvidia hardware to test myself, but I trust the OpenELEC 
project ;)

Regards, Bernd
diff mbox

Patch

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 84f0298..28db01a 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -61,14 +61,23 @@  config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
 	bool
 
+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_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_17
 	bool "1.17.4"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
@@ -82,6 +91,7 @@  endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
+	default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index 0119e37..012fbaf 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -4,3 +4,6 @@  sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        x
 # 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