Re: [PATCH util/modular] release.sh: Add support for mesa-demos

[Andreas Boll]

2018-02-23 13:02 GMT+01:00 Emil Velikov <emil.l.veli...@gmail.com>:
> On 23 February 2018 at 09:40, Andreas Boll <andreas.boll@gmail.com> wrote:
>> Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
>> ---
>>  release.sh | 34 ++
>>  1 file changed, 22 insertions(+), 12 deletions(-)
>>
>> diff --git a/release.sh b/release.sh
>> index ff89d2e..2045197 100755
>> --- a/release.sh
>> +++ b/release.sh
>> @@ -264,8 +264,10 @@ get_section() {
>> if [ $? -ne 0 ]; then
>> echo "Error: unable to extract section from $module_url second 
>> field."
>> return 1
>> -   elif [ x"$section" != xdrm ] && [ x"$section" != xmesa ]; then
>> -   echo "Error: section $section is not supported, only libdrm and 
>> mesa are."
>> +   elif [ x"$section" != xdrm ] &&
>> +[ x"$section" != xmesa ] &&
>> +[ x"$section" != xdemos ]; then
>> +   echo "Error: section $section is not supported, only libdrm, 
>> mesa and demos are."
>> return 1
>> fi
>>  fi
>> @@ -582,7 +584,8 @@ process_module() {
>>  section_path=libdrm
>>  srv_path="/srv/$host_current/www/$section_path"
>>  list_cc=$list_dri_devel
>> -elif [ x"$section" = xmesa ]; then
>> +elif [ x"$section" = xmesa ] ||
>> + [ x"$section" = xdemos ]; then
>>  host_current=$host_mesa
>>  mesa_version=`echo $pkg_version | sed 's:-rc.*::'`
>>  section_path=archive
>> @@ -590,16 +593,23 @@ process_module() {
>>  list_to=$list_mesa_announce
>>  list_cc=$list_mesa_devel
>>
>> -# Prior to 17.0.x Mesa uses separate folder for each release
>> -if test `echo $mesa_version | cut -d'.' -f1` -lt 17; then
>> -section_path=$section_path/$mesa_version
>> +if [ x"$section" = xdemos ]; then
>> +section_path=$section_path/$section
>>  srv_path="/srv/$host_current/www/$section_path"
> Let's keep demos as a separate if statement. As-is it gets a bit fiddly to 
> read.
Ack

>
>> -echo "Info: creating mesa directory on web server:"
>> -ssh $USER_NAME$hostname mkdir -p $srv_path  &>/dev/null
>> -if [ $? -ne 0 ]; then
>> -echo "Error: cannot create the path \"$srv_path\" on the 
>> web server."
>> -cd $top_src
>> -return 1
>> +fi
>> +
>> +# Prior to 17.0.x Mesa uses separate folder for each release
>> +if [ x"$section" = xmesa ]; then
>> +if test `echo $mesa_version | cut -d'.' -f1` -lt 17; then
>> +section_path=$section_path/$mesa_version
>> +srv_path="/srv/$host_current/www/$section_path"
>> +echo "Info: creating mesa directory on web server:"
>> +ssh $USER_NAME$hostname mkdir -p $srv_path  &>/dev/null
>> +if [ $? -ne 0 ]; then
>> +echo "Error: cannot create the path \"$srv_path\" on 
>> the web server."
>> +cd $top_src
>> +return 1
>> +fi
> Pretty sure this section can go now. I'll send a patch in a second.
Yep

>
> -Emil

Sent an even shorter v2 patch.

Thanks,
Andreas
___
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] release.sh: remove workaround for early Mesa versions

[Andreas Boll]

Reviewed-by: Andreas Boll <andreas.boll@gmail.com>

2018-02-23 13:56 GMT+01:00 Emil Velikov <emil.l.veli...@gmail.com>:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
>  release.sh | 14 --
>  1 file changed, 14 deletions(-)
>
> diff --git a/release.sh b/release.sh
> index ff89d2e..99bd0c3 100755
> --- a/release.sh
> +++ b/release.sh
> @@ -584,24 +584,10 @@ process_module() {
>  list_cc=$list_dri_devel
>  elif [ x"$section" = xmesa ]; then
>  host_current=$host_mesa
> -mesa_version=`echo $pkg_version | sed 's:-rc.*::'`
>  section_path=archive
>  srv_path="/srv/$host_current/www/$section_path"
>  list_to=$list_mesa_announce
>  list_cc=$list_mesa_devel
> -
> -# Prior to 17.0.x Mesa uses separate folder for each release
> -if test `echo $mesa_version | cut -d'.' -f1` -lt 17; then
> -section_path=$section_path/$mesa_version
> -srv_path="/srv/$host_current/www/$section_path"
> -echo "Info: creating mesa directory on web server:"
> -ssh $USER_NAME$hostname mkdir -p $srv_path  &>/dev/null
> -if [ $? -ne 0 ]; then
> -echo "Error: cannot create the path \"$srv_path\" on the web 
> server."
> -cd $top_src
> -return 1
> -fi
> -fi
>  fi
>
>  # Module xkeyboard-config goes in a subdir of the xorg "data" section
> --
> 2.16.0
>
> ___
> 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
___
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 v2] release.sh: Add support for mesa-demos

[Andreas Boll]

v2: Rebase on Mesa cleanup.
Move demos into its own elif statement.

Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
Rebased on https://patchwork.freedesktop.org/patch/206466/

 release.sh | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 99bd0c3..b2071b6 100755
--- a/release.sh
+++ b/release.sh
@@ -264,8 +264,10 @@ get_section() {
if [ $? -ne 0 ]; then
echo "Error: unable to extract section from $module_url second 
field."
return 1
-   elif [ x"$section" != xdrm ] && [ x"$section" != xmesa ]; then
-   echo "Error: section $section is not supported, only libdrm and 
mesa are."
+   elif [ x"$section" != xdrm ] &&
+[ x"$section" != xmesa ] &&
+[ x"$section" != xdemos ]; then
+   echo "Error: section $section is not supported, only libdrm, mesa 
and demos are."
return 1
fi
 fi
@@ -588,6 +590,12 @@ process_module() {
 srv_path="/srv/$host_current/www/$section_path"
 list_to=$list_mesa_announce
 list_cc=$list_mesa_devel
+elif [ x"$section" = xdemos ]; then
+host_current=$host_mesa
+section_path=archive/$section
+srv_path="/srv/$host_current/www/$section_path"
+list_to=$list_mesa_announce
+list_cc=$list_mesa_devel
 fi
 
 # Module xkeyboard-config goes in a subdir of the xorg "data" section
-- 
2.11.0

___
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] release.sh: Add support for mesa-demos

[Andreas Boll]

Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
 release.sh | 34 ++
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/release.sh b/release.sh
index ff89d2e..2045197 100755
--- a/release.sh
+++ b/release.sh
@@ -264,8 +264,10 @@ get_section() {
if [ $? -ne 0 ]; then
echo "Error: unable to extract section from $module_url second 
field."
return 1
-   elif [ x"$section" != xdrm ] && [ x"$section" != xmesa ]; then
-   echo "Error: section $section is not supported, only libdrm and 
mesa are."
+   elif [ x"$section" != xdrm ] &&
+[ x"$section" != xmesa ] &&
+[ x"$section" != xdemos ]; then
+   echo "Error: section $section is not supported, only libdrm, mesa 
and demos are."
return 1
fi
 fi
@@ -582,7 +584,8 @@ process_module() {
 section_path=libdrm
 srv_path="/srv/$host_current/www/$section_path"
 list_cc=$list_dri_devel
-elif [ x"$section" = xmesa ]; then
+elif [ x"$section" = xmesa ] ||
+ [ x"$section" = xdemos ]; then
 host_current=$host_mesa
 mesa_version=`echo $pkg_version | sed 's:-rc.*::'`
 section_path=archive
@@ -590,16 +593,23 @@ process_module() {
 list_to=$list_mesa_announce
 list_cc=$list_mesa_devel
 
-# Prior to 17.0.x Mesa uses separate folder for each release
-if test `echo $mesa_version | cut -d'.' -f1` -lt 17; then
-section_path=$section_path/$mesa_version
+if [ x"$section" = xdemos ]; then
+section_path=$section_path/$section
 srv_path="/srv/$host_current/www/$section_path"
-echo "Info: creating mesa directory on web server:"
-ssh $USER_NAME$hostname mkdir -p $srv_path  &>/dev/null
-if [ $? -ne 0 ]; then
-echo "Error: cannot create the path \"$srv_path\" on the web 
server."
-cd $top_src
-return 1
+fi
+
+# Prior to 17.0.x Mesa uses separate folder for each release
+if [ x"$section" = xmesa ]; then
+if test `echo $mesa_version | cut -d'.' -f1` -lt 17; then
+section_path=$section_path/$mesa_version
+srv_path="/srv/$host_current/www/$section_path"
+echo "Info: creating mesa directory on web server:"
+ssh $USER_NAME$hostname mkdir -p $srv_path  &>/dev/null
+if [ $? -ne 0 ]; then
+echo "Error: cannot create the path \"$srv_path\" on the 
web server."
+cd $top_src
+return 1
+fi
 fi
 fi
 fi
-- 
2.16.1

___
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 2/2] release.sh: use https for URLs in announcement

[Andreas Boll]

Hi Emil,

please use https as host_protocol for mesa too.
It's supported since [1] got fixed.

[1] https://bugs.freedesktop.org/show_bug.cgi?id=92628

Thanks,
Andreas

2016-09-15 15:01 GMT+02:00 Emil Velikov :
> On 15 September 2016 at 11:13, Julien Cristau  wrote:
>> {xorg,dri,wayland,www}.freedesktop.org are all https now.
>>
> An earlier series of mine [1] uses a host_protocol variable to easily
> manage differences (mesa uses ftp for some reason).
>
> If you can take a look on the non-controversial bits (everything but
> 8, 9 & 10) I'd be really grateful.
>
> Fwiw these two are:
> Reviewed-by: Emil Velikov 
>
> -Emil
>
> [1] https://patchwork.freedesktop.org/series/9382/
> ___
> 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
___
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 inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

2016-03-30 6:26 GMT+02:00 Peter Hutterer <peter.hutte...@who-t.net>:
> On Fri, Dec 11, 2015 at 10:49:33AM +0100, Andreas Boll wrote:
>> Set TZ=UTC before calling asciidoc to make the embedded dates invariant
>> to timezones in order to make the package build reproducibly.
>
> quick check shows that the date embedded includes a timestamp with seconds
> granularity. So unless your build system forces the exact same time for
> every build, the result is still not reproducible. And if the build system
> forces the time, why can't it force the timezone too?
>
> what am I missing here?
>
> Cheers,
>Peter

From [1] "The date is based in the last modified date of the source
file, but is sensible to the timezone."

In this case the source files are specs/XI2proto.txt and specs/XIproto.txt.
So the timestamps in the generated html files depend only on the build
system's timezone which could be overridden via TZ=UTC.

An alternate solution which could remove the timestamp from the
generated html file has been proposed to asciidoc but unfortunately
upstream hasn't merged that patch so far [2].

Thanks,
Andreas

[1] 
https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc
[2] https://github.com/asciidoc/asciidoc/pull/9


>>
>> Fixes bug:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
>>
>> v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)
>>
>> Suggested-by: Eduard Sanou <dh...@openmailbox.org>
>> Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
>> ---
>>  specs/Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/specs/Makefile.am b/specs/Makefile.am
>> index a83cf40..f2454bc 100644
>> --- a/specs/Makefile.am
>> +++ b/specs/Makefile.am
>> @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
>>  dist_doc_DATA = XI2proto.txt XIproto.txt
>>
>>  %.html: %.txt
>> - $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
>> + $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
>>
>>  CLEANFILES = $(doc_DATA)
>>
>> --
>> 2.1.4
>
___
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 inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

ping

2016-01-13 12:08 GMT+01:00 Andreas Boll <andreas.boll@gmail.com>:
> ping
>
> 2015-12-11 10:49 GMT+01:00 Andreas Boll <andreas.boll@gmail.com>:
>> Set TZ=UTC before calling asciidoc to make the embedded dates invariant
>> to timezones in order to make the package build reproducibly.
>>
>> Fixes bug:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
>>
>> v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)
>>
>> Suggested-by: Eduard Sanou <dh...@openmailbox.org>
>> Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
>> ---
>>  specs/Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/specs/Makefile.am b/specs/Makefile.am
>> index a83cf40..f2454bc 100644
>> --- a/specs/Makefile.am
>> +++ b/specs/Makefile.am
>> @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
>>  dist_doc_DATA = XI2proto.txt XIproto.txt
>>
>>  %.html: %.txt
>> -   $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
>> +   $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
>>
>>  CLEANFILES = $(doc_DATA)
>>
>> --
>> 2.1.4
>>
___
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 xserver] dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa

[Andreas Boll]

I've verified that i915_pci_ids.h and i965_pci_ids.h match with
current mesa master 19ae5de981e014

Reviewed-by: Andreas Boll <andreas.boll@gmail.com>

Thanks,
Andreas

2016-01-27 13:18 GMT+01:00 Timo Aaltonen <tjaal...@ubuntu.com>:
> Adds Skylake, Kabylake and Broxton allowing them to use
> modesetting + glamor with dri2.
>
> Signed-off-by: Timo Aaltonen <timo.aalto...@canonical.com>
> ---
>  hw/xfree86/dri2/pci_ids/i915_pci_ids.h |  4 +--
>  hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 56 
> +++---
>  2 files changed, 54 insertions(+), 6 deletions(-)
>
> diff --git a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h 
> b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
> index 7d51975..1c43c8e 100644
> --- a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
> +++ b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
> @@ -11,5 +11,5 @@ CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME")
>  CHIPSET(0x29B2, Q35_G,"Intel(R) Q35")
>  CHIPSET(0x29C2, G33_G,"Intel(R) G33")
>  CHIPSET(0x29D2, Q33_G,"Intel(R) Q33")
> -CHIPSET(0xA011, IGD_GM,   "Intel(R) IGD")
> -CHIPSET(0xA001, IGD_G,"Intel(R) IGD")
> +CHIPSET(0xA011, PNV_GM,   "Intel(R) Pineview M")
> +CHIPSET(0xA001, PNV_G,"Intel(R) Pineview")
> diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h 
> b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
> index 2e04301..5139e27 100644
> --- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
> +++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
> @@ -109,7 +109,55 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 
> (Broadwell GT3e)")
>  CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
>  CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
>  CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
> -CHIPSET(0x22B0, chv, "Intel(R) Cherryview")
> -CHIPSET(0x22B1, chv, "Intel(R) Cherryview")
> -CHIPSET(0x22B2, chv, "Intel(R) Cherryview")
> -CHIPSET(0x22B3, chv, "Intel(R) Cherryview")
> +CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
> +CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
> +CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
> +CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
> +CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
> +CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
> +CHIPSET(0x1915, skl_gt2, "Intel(R) Skylake GT2f")
> +CHIPSET(0x1916, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
> +CHIPSET(0x1917, skl_gt2, "Intel(R) Skylake GT2f")
> +CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
> +CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
> +CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
> +CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
> +CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
> +CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
> +CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
> +CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
> +CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
> +CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
> +CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
> +CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
> +CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
> +CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
> +CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
> +CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
> +CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
> +CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
> +CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
> +CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
> +CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
> +CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
> +CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
> +CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
> +CHIPSET(0x5926, kbl_gt3, "Intel(R) 

Re: [PATCH inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

ping

2015-12-11 10:49 GMT+01:00 Andreas Boll <andreas.boll@gmail.com>:
> Set TZ=UTC before calling asciidoc to make the embedded dates invariant
> to timezones in order to make the package build reproducibly.
>
> Fixes bug:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
>
> v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)
>
> Suggested-by: Eduard Sanou <dh...@openmailbox.org>
> Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
> ---
>  specs/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/specs/Makefile.am b/specs/Makefile.am
> index a83cf40..f2454bc 100644
> --- a/specs/Makefile.am
> +++ b/specs/Makefile.am
> @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
>  dist_doc_DATA = XI2proto.txt XIproto.txt
>
>  %.html: %.txt
> -   $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
> +   $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
>
>  CLEANFILES = $(doc_DATA)
>
> --
> 2.1.4
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH macros v2] Fix XORG_WITH_XMLTO to work with xmlto >= 0.0.27

[Andreas Boll]

Starting with xmlto version 0.0.27 the return code of
  xmlto --skip-validation txt conftest.xml
is non-zero if conftest.xml is an empty file.

As a consequence the macro XORG_WITH_XMLTO returns
  "xmlto cannot generate text format, this format skipped"
and therefore libraries like libxi, libxdmcp and others won't convert
docbook XML to text format.

This changed behavior was introduced with the following change in xmlto:
  xmlto.in: use correctly exit code from xsltproc
See also: https://fedorahosted.org/xmlto/changeset/77

This patch fixes this by additionally testing xmlto with a non-empty XML
file.

More details can be found at:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613674

Thanks to Peter Pearse, Helmut Grohne and Gaetan Nadon.

v2: To maintain compatibility with older xorg tarballs don't replace
the original test with the empty XML file but instead add a fallback
to additionally test with a non-empty XML file if the original test fails.
Use the alternate solution with  to skip compatibility issues
with different docbook versions.

Cc: Gaetan Nadon <mems...@videotron.ca>
Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
I've successfully tested this patch to build libxi with xmlto 0.0.26, 0.0.27
and 0.0.28.

To test this patch on a platform with only docbook version 5 installed
I've replaced docbook-xml with docbook5-xml. On such a setup the macro
XORG_WITH_XMLTO detects xmlto correctly though it fails later in the build
with:

xmlto: /«PKGBUILDDIR»/build/man/XAllowDeviceEvents.xml does not validate
(status 3)
xmlto: Fix document syntax or use --skip-validation option
I/O error : Attempt to load network entity
http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
/«PKGBUILDDIR»/build/man/XAllowDeviceEvents.xml:2: warning: failed to
load external entity
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd;
D DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd;
   ^
I/O error : Attempt to load network entity
http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
warning: failed to load external entity
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd;
validity error : Could not load the external subset
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd;
Document /«PKGBUILDDIR»/build/man/XAllowDeviceEvents.xml does not
validate

This build failure is expected since docbook version 5 is not backward
compatible to version 4 and XORG_WITH_XMLTO doesn't check for a specific
docbook version.

 xorg-macros.m4.in | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 9b3c503..2ed7837 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -426,13 +426,24 @@ m4_ifval([$1],
 fi])
 
 # Test for the ability of xmlto to generate a text target
+#
+# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
+# following test for empty XML docbook files.
+# For compatibility reasons use the following empty XML docbook file and if
+# it fails try it again with a non-empty XML file.
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
 EOF
 AS_IF([test "$have_xmlto" = yes],
   [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
  [have_xmlto_text=yes],
- [AC_MSG_WARN([xmlto cannot generate text format, this format 
skipped])])])
+ [# Try it again with a non-empty XML file.
+  cat > conftest.xml << "EOF"
+
+EOF
+  AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 
2>&1],
+[have_xmlto_text=yes],
+[AC_MSG_WARN([xmlto cannot generate text format, this 
format skipped])])])])
 rm -f conftest.xml
 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
-- 
2.1.4

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

Re: [PATCH inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

2015-12-11 10:20 GMT+01:00 Uli Schlachter <psyc...@znc.in>:
> Am 10.12.2015 um 21:25 schrieb Andreas Boll:
>> Set TZ=UTC before calling asciidoc to make the embedded dates invariant
>> to timezones in order to make the package build reproducibly.
>>
>> Fixes bug:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981
>>
>> Suggested-by: Eduard Sanou <dh...@openmailbox.org>
>> Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
>> ---
>>  specs/Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/specs/Makefile.am b/specs/Makefile.am
>> index a83cf40..d04f4d0 100644
>> --- a/specs/Makefile.am
>> +++ b/specs/Makefile.am
>> @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
>>  dist_doc_DATA = XI2proto.txt XIproto.txt
>>
>>  %.html: %.txt
>> - $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
>> + TZ=UTC $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
>
> Shouldn't this be $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $
> $(AM_V_GEN) can evaluate to '@echo "  GEN" $@;' which would break the 
> build
> (make wouldn't see the @-prefix and your env var is only passed to echo)
>
Indeed, fixed in v2
We tested this only on verbose builds.

Thanks for the review,
Andreas


>>
>>  CLEANFILES = $(doc_DATA)
>>
>>
>
> Uli
> --
> A normal person is just someone you don't know well enough yet.
>  - Nettie Wiebe
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.

Fixes bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981

v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)

Suggested-by: Eduard Sanou <dh...@openmailbox.org>
Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
 specs/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specs/Makefile.am b/specs/Makefile.am
index a83cf40..f2454bc 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
 dist_doc_DATA = XI2proto.txt XIproto.txt
 
 %.html: %.txt
-   $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
+   $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
 
 CLEANFILES = $(doc_DATA)
 
-- 
2.1.4

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

[PATCH RFC macros] Fix XORG_WITH_XMLTO to work with xmlto >= 0.0.27

[Andreas Boll]

Starting with xmlto version 0.0.27 the return code of
  xmlto --skip-validation txt conftest.xml
is non-zero if conftest.xml is an empty file.

As a consequence the macro XORG_WITH_XMLTO returns
  xmlto cannot generate text format, this format skipped
and therefore libraries like libxi, libxdmcp and others won't convert
docbook XML to text format.

This changed behavior was introduced with the following change in xmlto:
  xmlto.in: use correctly exit code from xsltproc
See also: https://fedorahosted.org/xmlto/changeset/77

Peter Pearse suggested to use a valid docbook XML file.

More details could be found at:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613674

Suggested-by: Peter Pearse <peter.pea...@linaro.org>
Cc: Gaetan Nadon <mems...@videotron.ca>
Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
@Gaetan:
Do you still have a concern on the patch?

> The one thing that bugs me about the patch is that the version of
> docbook may eventually be
> no longer available and this macro must remain backward compatible for
> eternity.

An alternate solution suggested by Helmut Grohne would be to simply add
 into conftest.xml.

 xorg-macros.m4.in | 4 
 1 file changed, 4 insertions(+)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 9b3c503..672560b 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -428,6 +428,10 @@ fi])
 # Test for the ability of xmlto to generate a text target
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
+http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd;>
+
+
 EOF
 AS_IF([test "$have_xmlto" = yes],
   [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
-- 
2.1.4

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

[PATCH cf] Imake.tmpl: Use gzip -n to not save the timestamps

[Andreas Boll]

Change default GzipCmd to `gzip -n` so that packages depending on
xutils-dev (Debian package which contains util/cf) can be built
reproducibly.

As an example xtel can be built reproducible with this patch.

Fixes bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789964

Suggested-by: Dhole <dh...@openmailbox.org>
Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
 Imake.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Imake.tmpl b/Imake.tmpl
index f898bf3..9d02cb6 100644
--- a/Imake.tmpl
+++ b/Imake.tmpl
@@ -1190,7 +1190,7 @@ TCLIBDIR = TclLibDir
 #define CompressCmd compress
 #endif
 #ifndef GzipCmd
-#define GzipCmd gzip
+#define GzipCmd gzip -n
 #endif
 #ifndef CppCmd
 #define CppCmd /LibDirName/cpp
-- 
2.1.4

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

[PATCH inputproto] specs: Set TZ=UTC before calling asciidoc

[Andreas Boll]

Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.

Fixes bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981

Suggested-by: Eduard Sanou <dh...@openmailbox.org>
Signed-off-by: Andreas Boll <andreas.boll@gmail.com>
---
 specs/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specs/Makefile.am b/specs/Makefile.am
index a83cf40..d04f4d0 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
 dist_doc_DATA = XI2proto.txt XIproto.txt
 
 %.html: %.txt
-   $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
+   TZ=UTC $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
 
 CLEANFILES = $(doc_DATA)
 
-- 
2.1.4

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