[arch-commits] Commit in gst-python/trunk (2 files)

[Jan Steffens]

    Date: Friday, December 3, 2021 @ 22:17:32
  Author: heftig
Revision: 430672

Add patch for Python 3.10

Added:
  gst-python/trunk/0001-python-Avoid-treating-float-as-int.patch
Modified:
  gst-python/trunk/PKGBUILD

-----------------------------------------------+
 0001-python-Avoid-treating-float-as-int.patch |   86 ++++++++++++++++++++++++
 PKGBUILD                                      |    7 +
 2 files changed, 91 insertions(+), 2 deletions(-)

Added: 0001-python-Avoid-treating-float-as-int.patch
===================================================================
--- 0001-python-Avoid-treating-float-as-int.patch	                        (rev 0)
+++ 0001-python-Avoid-treating-float-as-int.patch	2021-12-03 22:17:32 UTC (rev 430672)
@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thibault Saunier <tsaunier at igalia.com>
+Date: Tue, 16 Nov 2021 23:36:10 -0300
+Subject: [PATCH] python: Avoid treating float as int
+
+Since python 3.10 implicit conversion to integers using `__int__` as
+been completely removed (was deprecated behavior in 3.9) so we need
+to cleanly handle it now.
+
+See https://gitlab.gnome.org/GNOME/pitivi/-/issues/2589
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1358>
+---
+ .../gst-python/gi/overrides/gstmodule.c       | 54 ++++++++++++++++---
+ 1 file changed, 47 insertions(+), 7 deletions(-)
+
+diff --git a/subprojects/gst-python/gi/overrides/gstmodule.c b/subprojects/gst-python/gi/overrides/gstmodule.c
+index 167a1c27539a..2308eb7dcde6 100644
+--- a/subprojects/gst-python/gi/overrides/gstmodule.c
++++ b/subprojects/gst-python/gi/overrides/gstmodule.c
+@@ -104,18 +104,58 @@ gi_gst_fraction_from_value (const GValue * value)
+ static int
+ gi_gst_fraction_to_value (GValue * value, PyObject * object)
+ {
+-  PyObject *numerator, *denominator;
++  glong numerator, denominator;
++  PyObject *numerator_obj, *denominator_obj, *is_integer;
+ 
+-  numerator = PyObject_GetAttrString (object, "num");
+-  if (numerator == NULL)
++  numerator_obj = PyObject_GetAttrString (object, "num");
++  if (numerator_obj == NULL)
+     goto fail;
+ 
+-  denominator = PyObject_GetAttrString (object, "denom");
+-  if (denominator == NULL)
++  is_integer = PyObject_CallMethod (numerator_obj, "is_integer", NULL);
++  if (is_integer != Py_True) {
++    PyErr_Format (PyExc_TypeError,
++        "numerator %f is not an integer.", PyFloat_AsDouble (numerator_obj));
++    Py_DECREF (is_integer);
++    goto fail;
++  }
++  Py_DECREF (is_integer);
++
++  numerator = PyFloat_AsDouble (numerator_obj);
++  if (numerator < -G_MAXINT || numerator > G_MAXINT) {
++    PyErr_Format (PyExc_ValueError,
++        "numerator %" G_GINT64_FORMAT " is out of bound. [-%d - %d]",
++        numerator, G_MAXINT, G_MAXINT);
++    goto fail;
++  }
++
++  denominator_obj = PyObject_GetAttrString (object, "denom");
++  if (denominator_obj == NULL)
+     goto fail;
+ 
+-  gst_value_set_fraction (value,
+-      PyLong_AsLong (numerator), PyLong_AsLong (denominator));
++  is_integer = PyObject_CallMethod (denominator_obj, "is_integer", NULL);
++  if (is_integer != Py_True) {
++    PyErr_Format (PyExc_TypeError,
++        "denominator %f is not an integer.",
++        PyFloat_AsDouble (denominator_obj));
++    Py_DECREF (is_integer);
++    goto fail;
++  }
++  Py_DECREF (is_integer);
++
++  denominator = PyFloat_AsDouble (denominator_obj);
++  if (denominator == 0) {
++    PyErr_SetString (PyExc_ValueError, "denominator is 0.");
++    goto fail;
++  }
++
++  if (denominator < -G_MAXINT || denominator > G_MAXINT) {
++    PyErr_Format (PyExc_ValueError,
++        "denominator %" G_GINT64_FORMAT " is out of bound. [-%d - %d]",
++        denominator, G_MAXINT, G_MAXINT);
++    goto fail;
++  }
++
++  gst_value_set_fraction (value, numerator, denominator);
+ 
+   return 0;
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-03 22:12:25 UTC (rev 430671)
+++ PKGBUILD	2021-12-03 22:17:32 UTC (rev 430672)
@@ -12,8 +12,10 @@
 depends=(python-gobject gst-plugins-base-libs)
 makedepends=(git meson)
 _commit=3d75c6b1eefc1a4190f58ac8d4610535f1acca3f  # tags/1.18.5^0
-source=("git+https://gitlab.freedesktop.org/gstreamer/gst-python.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/gstreamer/gst-python.git#commit=$_commit"
+        0001-python-Avoid-treating-float-as-int.patch)
+sha256sums=('SKIP'
+            '62f301faddb4c713bd21b2da95daec9b73b903da168d7c9649550a0678a1ff77')
 
 pkgver() {
   cd $pkgname
@@ -22,6 +24,7 @@
 
 prepare() {
   cd $pkgname
+  patch -Np3 -i ../0001-python-Avoid-treating-float-as-int.patch
 }
 
 build() {