From eff3b9128fcfe7a62c1469ff2224cc9934ca7692f44ae17fb5cb5fa2c9ccbc37 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 18 Jun 2018 02:01:43 +0000 Subject: [PATCH] Accepting request 617323 from home:mimi_vx:branches:X11:XOrg - add mako_4_radv.patch - fixes Mako detection for RADV/intel - add mako_4_radv.patch - fixes Mako detection for RADV/intel OBS-URL: https://build.opensuse.org/request/show/617323 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=752 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 2 ++ Mesa.changes | 5 +++++ Mesa.spec | 2 ++ mako_4_radv.patch | 15 +++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 mako_4_radv.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 2395b19..155f1f9 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 17 17:57:44 UTC 2018 - mimi.vx@gmail.com + +- add mako_4_radv.patch - fixes Mako detection for RADV/intel + ------------------------------------------------------------------- Sun Jun 17 11:11:53 UTC 2018 - mimi.vx@gmail.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 1f51783..c3f439d 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -139,6 +139,7 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch +Patch48: mako_4_radv.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -748,6 +749,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch43 -p1 %patch44 -p1 %patch47 -p1 +%patch48 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/Mesa.changes b/Mesa.changes index 2395b19..155f1f9 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 17 17:57:44 UTC 2018 - mimi.vx@gmail.com + +- add mako_4_radv.patch - fixes Mako detection for RADV/intel + ------------------------------------------------------------------- Sun Jun 17 11:11:53 UTC 2018 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 971c579..998af94 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -138,6 +138,7 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch +Patch48: mako_4_radv.patch BuildRequires: autoconf >= 2.60 BuildRequires: automake @@ -747,6 +748,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch43 -p1 %patch44 -p1 %patch47 -p1 +%patch48 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # disabling libglvnd build; ugly ... diff --git a/mako_4_radv.patch b/mako_4_radv.patch new file mode 100644 index 0000000..ac37124 --- /dev/null +++ b/mako_4_radv.patch @@ -0,0 +1,15 @@ +Index: mesa-18.1.2/m4/ax_check_python_mako_module.m4 +=================================================================== +--- mesa-18.1.2.orig/m4/ax_check_python_mako_module.m4 ++++ mesa-18.1.2/m4/ax_check_python_mako_module.m4 +@@ -48,8 +48,8 @@ try: + except ImportError as err: + sys.exit(err) + else: +- ver_req = map(int, '$1'.split('.')) +- ver_act = map(int, mako.__version__.split('.')) ++ ver_req = list(map(int, '$1'.split('.'))) ++ ver_act = list(map(int, mako.__version__.split('.'))) + sys.exit(int(ver_req > ver_act)) + " | $PYTHON2 - +