[libcamera-devel] [RFC v2 4/4] py: update pybind11 wrap to 2.6.0

[Laurent Pinchart]

On Mon, Nov 30, 2020 at 06:08:24PM +0200, Tomi Valkeinen wrote:
> On 30/11/2020 18:03, Laurent Pinchart wrote:
> > Hi Tomi,
> > 
> > Thank you for the patch.
> > 
> > On Fri, Nov 27, 2020 at 03:37:38PM +0200, Tomi Valkeinen wrote:
> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at iki.fi>
> >> ---
> >>  .gitignore                                     |   2 +-
> >>  .../packagecache/pybind11-2.6.0-wrap.zip       | Bin 0 -> 1456 bytes
> >>  subprojects/packagecache/pybind11-2.6.0.zip    | Bin 0 -> 727287 bytes
> >>  subprojects/pybind11.wrap                      |  14 +++++++-------
> >>  4 files changed, 8 insertions(+), 8 deletions(-)
> >>  create mode 100644 subprojects/packagecache/pybind11-2.6.0-wrap.zip
> >>  create mode 100644 subprojects/packagecache/pybind11-2.6.0.zip
> >>
> >> diff --git a/.gitignore b/.gitignore
> >> index 1f9dc7d1..c7d8d2e6 100644
> >> --- a/.gitignore
> >> +++ b/.gitignore
> >> @@ -6,4 +6,4 @@ patches/
> >>  *.patch
> >>  *.pyc
> >>  subprojects/packagecache/
> >> -subprojects/pybind11-2.3.0/
> >> +subprojects/pybind11-2.6.0/
> >> diff --git a/subprojects/packagecache/pybind11-2.6.0-wrap.zip b/subprojects/packagecache/pybind11-2.6.0-wrap.zip
> >> new file mode 100644
> >> index 0000000000000000000000000000000000000000..11b7180225ef39002fb434bb870b323d49004a12
> >> GIT binary patch
> >> literal 1456
> > 
> > [snip]
> >>
> >> diff --git a/subprojects/packagecache/pybind11-2.6.0.zip b/subprojects/packagecache/pybind11-2.6.0.zip
> >> new file mode 100644
> >> index 0000000000000000000000000000000000000000..eac0459fa192fd994e1239e905b977c2712977de
> >> GIT binary patch
> >> literal 727287
> > 
> > [snip]
> > 
> >> diff --git a/subprojects/pybind11.wrap b/subprojects/pybind11.wrap
> >> index a76ddb1b..a5a397a1 100644
> >> --- a/subprojects/pybind11.wrap
> >> +++ b/subprojects/pybind11.wrap
> >> @@ -1,10 +1,10 @@
> >>  [wrap-file]
> >> -directory = pybind11-2.3.0
> >> +directory = pybind11-2.6.0
> >>  
> >> -source_url = https://github.com/pybind/pybind11/archive/v2.3.0.zip
> >> -source_filename = pybind11-2.3.0.zip
> >> -source_hash = 1f844c071d9d98f5bb08458f128baa0aa08a9e5939a6b42276adb1bacd8b483e
> >> +source_url = https://github.com/pybind/pybind11/archive/v2.6.0.zip
> > 
> > This URL exists. Do we need to include the file in
> > subprojects/packagecache/ ?
> 
> Good point. No, we don't, meson will fetch it.
> 
> >> +source_filename = pybind11-2.6.0.zip
> >> +source_hash = c2ed3fc84db08f40a36ce1d03331624ed6977497b35dfed36a1423396928559a
> >>  
> >> -patch_url = https://wrapdb.mesonbuild.com/v1/projects/pybind11/2.3.0/2/get_zip
> >> -patch_filename = pybind11-2.3.0-2-wrap.zip
> >> -patch_hash = f3bed4bfc8961b3b985ff1e63fc6e57c674f35b353f0d42adbc037f9416381fb
> >> +patch_url = https://wrapdb.mesonbuild.com/v1/projects/pybind11/2.6.0/2/get_zip
> > 
> > This one doesn't. The best option will of course be to fix that ;-) With
> > a bit of luck, by the time we get to it, someone will have created a
> > wrap for that version.
> 
> I'm sure they'll accept my patch to upgrade it too =). I just didn't get to it.

https://github.com/mesonbuild/pybind11/pull/6

Maybe you could provide a Tested-by tag ?

-- 
Regards,

Laurent Pinchart