Re: [PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

2018-03-05 Thread Emil Velikov 
On 1 March 2018 at 13:35, Jon Turney  wrote:
> On 28/02/2018 15:17, Emil Velikov wrote:
>>
>> On 28 February 2018 at 13:04, Jon Turney 
>> wrote:
>>>
>>> Signed-off-by: Jon Turney 
>>> ---
>>>   xorg.modules | 845
>>> ++-
>>>   1 file changed, 143 insertions(+), 702 deletions(-)
>>>
>>> diff --git a/xorg.modules b/xorg.modules
>>> index b34d14d..93bc8cf 100644
>>> --- a/xorg.modules
>>> +++ b/xorg.modules
>>> @@ -65,35 +65,7 @@
>>> 
>>> 
>>>   
>>
>>
>>> -  
>>
>> Should stay?
>
>
> Oops.
>
>>
>>> +  
>>>   
>>> 
>>>
>>> @@ -366,257 +338,13 @@
>>
>>
>>
>>> +  
>>
>> I'd say keep this as autotools and toggle as 2/2...
>>
>>> +>> +checkoutdir="xorg/proto/xorgproto"/>
>>>   
>>> -  
>>> -
>>> -
>>> 
>>> -
>>
>> .. hence this hunk will stay as-is and drop util-macros with 2/2?
>
>
> I don't really see using a meson as a change as this module didn't exists
> before, but I take your point that it reduces the diff.
>
>>
>> It's fairly fiddly to have the above subtleties within such a massive
>> patch.
>>
>> With the above, tweaks:
>> Reviewed-by: Emil Velikov 
>
>
> Updated patch attached.
>
The comments are addressed. I trust you haven't changed anything else ;-)
Fwiw my r-b still stands.

-Emil
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

2018-03-01 Thread Jon Turney 

On 28/02/2018 15:17, Emil Velikov wrote:

On 28 February 2018 at 13:04, Jon Turney <jon.tur...@dronecode.org.uk> wrote:

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
---
  xorg.modules | 845 ++-
  1 file changed, 143 insertions(+), 702 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index b34d14d..93bc8cf 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -65,35 +65,7 @@


  



-  

Should stay?


Oops.




+  
  


@@ -366,257 +338,13 @@




+  

I'd say keep this as autotools and toggle as 2/2...


+
  
-  
-
-

-

.. hence this hunk will stay as-is and drop util-macros with 2/2?


I don't really see using a meson as a change as this module didn't 
exists before, but I take your point that it reduces the diff.




It's fairly fiddly to have the above subtleties within such a massive patch.

With the above, tweaks:
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>


Updated patch attached.

From bde8ce73132a7c8c6cd1e2717019abc14d30e0d3 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.tur...@dronecode.org.uk>
Date: Tue, 27 Feb 2018 22:08:19 +0000
Subject: [PATCH util/modular] xorg.modules: Replace individual proto modules
 with xorgproto

v2:
Don't erroneously drop xcb-proto
Use autotools not meson to build xorgproto

Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
---
 xorg.modules | 839 ++-
 1 file changed, 142 insertions(+), 697 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index b34d14d..8ef74fb 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -65,35 +65,8 @@
   
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
   
-  
-  
-  
-  
-  
-  
-  
 
   
 
@@ -366,250 +339,9 @@
   -->
 
   
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
+  
+
 
   
 
@@ -624,8 +356,7 @@
 checkoutdir="xorg/lib/libAppleWM"/>
 
   
-  
-  
+  
   
   
 
@@ -636,8 +367,7 @@
 checkoutdir="xorg/lib/libFS"/>
 
   
-  
-  
+  
   
 
   
@@ -647,7 +377,7 @@
 checkoutdir="xorg/lib/libICE"/>
 
   
-  
+  
   
 
 
@@ -668,7 +398,7 @@
 checkoutdir="xorg/lib/libSM"/>
 
   
-  
+  
   
   
 
@@ -682,12 +412,7 @@
 checkoutdir="xorg/lib/libX11"/>
 
   
-  
-  
-  
-  
-  
-  
+  
   
   
 
@@ -701,8 +426,7 @@
 checkoutdir="xorg/lib/libXScrnSaver"/>
 
   
-  
-  
+  
   
   
 
@@ -713,7 +437,7 @@
 checkoutdir="xorg/lib/libXau"/>
 
   
-  
+  
 
   
 
@@ -722,7 +446,7 @@
 checkoutdir="xorg/lib/libXaw"/>
 
   
-  
+  
   
   
   
@@ -738,7 +462,7 @@
 checkoutdir="xorg/lib/libXaw3d"/>
 
   
-  
+  
   
   
   
@@ -754,8 +478,7 @@
 checkoutdir="xorg/lib/libXcomposite"/>
 
   
-  
-  
+  
   
   
   
@@ -767,7 +490,7 @@
 checkoutdir="xorg/lib/libXcursor"/>
 
   
-  
+  
   
   
   
@@ -779,9 +502,7 @@
 checkoutdir="xorg/lib/libXdamage"/>
 
   
-  
-  
-  
+  
   
   
 
@@ -792,7 +513,7 @@
 checkoutdir="xorg/lib/libXdmcp"/>
 
   
-  
+

Re: [PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

2018-02-28 Thread Emil Velikov 
On 28 February 2018 at 13:04, Jon Turney  wrote:
> Signed-off-by: Jon Turney 
> ---
>  xorg.modules | 845 
> ++-
>  1 file changed, 143 insertions(+), 702 deletions(-)
>
> diff --git a/xorg.modules b/xorg.modules
> index b34d14d..93bc8cf 100644
> --- a/xorg.modules
> +++ b/xorg.modules
> @@ -65,35 +65,7 @@
>
>
>  

> -  
Should stay?

> +  
>  
>
>
> @@ -366,257 +338,13 @@


> +  
I'd say keep this as autotools and toggle as 2/2...

> + +checkoutdir="xorg/proto/xorgproto"/>
>  
> -  
> -
> -
>
> -
.. hence this hunk will stay as-is and drop util-macros with 2/2?

It's fairly fiddly to have the above subtleties within such a massive patch.

With the above, tweaks:
Reviewed-by: Emil Velikov 

-Emil
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

2018-02-28 Thread Jeff Smith 
On Wed, Feb 28, 2018 at 7:04 AM, Jon Turney  wrote:
> Signed-off-by: Jon Turney 
> ---
>  xorg.modules | 845 
> ++-
>  1 file changed, 143 insertions(+), 702 deletions(-)
>
> diff --git a/xorg.modules b/xorg.modules
> index b34d14d..93bc8cf 100644
> --- a/xorg.modules
> +++ b/xorg.modules
> @@ -65,35 +65,7 @@
>
>
>  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  
> -  

The xcb-proto package has _not_ been supplanted by xorgproto.

> -  
> -  
> -  
> -  
> -  
> -  
> -  
> +  
>  
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH util/modular] xorg.modules: Replace individual proto modules with xorgproto

2018-02-28 Thread Jon Turney 
Signed-off-by: Jon Turney 
---
 xorg.modules | 845 ++-
 1 file changed, 143 insertions(+), 702 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index b34d14d..93bc8cf 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -65,35 +65,7 @@
   
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
 
   
 
@@ -366,257 +338,13 @@
   -->
 
   
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
+  
+
 
-  
-
-
   
-
-  
-
-  
-
-
-  
 
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-
-  
-
-
-  
+  
 
   
   
@@ -624,8 +352,7 @@
 checkoutdir="xorg/lib/libAppleWM"/>
 
   
-  
-  
+  
   
   
 
@@ -636,8 +363,7 @@
 checkoutdir="xorg/lib/libFS"/>
 
   
-  
-  
+  
   
 
   
@@ -647,7 +373,7 @@
 checkoutdir="xorg/lib/libICE"/>
 
   
-  
+  
   
 
 
@@ -668,7 +394,7 @@
 checkoutdir="xorg/lib/libSM"/>
 
   
-  
+  
   
   
 
@@ -682,12 +408,7 @@
 checkoutdir="xorg/lib/libX11"/>
 
   
-  
-  
-  
-  
-  
-  
+  
   
   
 
@@ -701,8 +422,7 @@
 checkoutdir="xorg/lib/libXScrnSaver"/>
 
   
-  
-  
+  
   
   
 
@@ -713,7 +433,7 @@
 checkoutdir="xorg/lib/libXau"/>
 
   
-  
+  
 
   
 
@@ -722,7 +442,7 @@
 checkoutdir="xorg/lib/libXaw"/>
 
   
-  
+  
   
   
   
@@ -738,7 +458,7 @@
 checkoutdir="xorg/lib/libXaw3d"/>
 
   
-  
+  
   
   
   
@@ -754,8 +474,7 @@
 checkoutdir="xorg/lib/libXcomposite"/>
 
   
-  
-  
+  
   
   
   
@@ -767,7 +486,7 @@
 checkoutdir="xorg/lib/libXcursor"/>
 
   
-  
+  
   
   
   
@@ -779,9 +498,7 @@
 checkoutdir="xorg/lib/libXdamage"/>
 
   
-  
-  
-  
+  
   
   
 
@@ -792,7 +509,7 @@
 checkoutdir="xorg/lib/libXdmcp"/>
 
   
-  
+  
 
 
   
@@ -804,8 +521,7 @@
 checkoutdir="xorg/lib/libXext"/>
 
   
-  
-  
+  
   
 
 
@@ -818,9 +534,7 @@
 checkoutdir="xorg/lib/libXfixes"/>
 
   
-  
-  
-  
+  
   
 
   
@@ -831,8 +545,7 @@
 tag="da4246c98bc51297daeec47c15181e179df94013"/>
 
   
-  
-  
+  
   
   
   
@@ -847,8 +560,7 @@
 checkoutdir="xorg/lib/libXfont"/>
 
   
-  
-  
+  
   
   
   
@@ -863,7 +575,7 @@
 checkoutdir="xorg/lib/libXft"/>
 
   
-  
+  
   
   
 
@@ -874,9 +586,7 @@
 checkoutdir="xorg/lib/libXi"/>
 
   
-  
-  
-  
+  
   
   
   
@@ -891,9 +601,7 @@
 checkoutdir="xorg/lib/libXinerama"/>
 
   
-  
-  
-  
+  
   
   
 
@@ -904,8 +612,7 @@
 checkoutdir="xorg/lib/libXmu"/>
 
   
-  
-  
+  
   
   
   
@@ -920,8 +627,7 @@
 checkoutdir="xorg/lib/libXpm"/>
 
   
-  
-  
+  
   
   
   
@@ -933,9 +639,7 @@
 checkoutdir="xorg/lib/libXrandr"/>
 
   
-  
-  
-  
+  
   
   
   
@@ -947,8 +651,7 @@
 checkoutdir="xorg/lib/libXrender"/>
 
   
-  
-  
+  
   
 
   
@@ -958,8 +661,7 @@
 checkoutdir="xorg/lib/libXRes"/>
 
   
-  
-