Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vapoursynth for openSUSE:Factory
checked in at 2023-10-13 23:15:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vapoursynth (Old)
and /work/SRC/openSUSE:Factory/.vapoursynth.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vapoursynth"
Fri Oct 13 23:15:51 2023 rev:22 rq:1117690 version:64
Changes:
--------
--- /work/SRC/openSUSE:Factory/vapoursynth/vapoursynth.changes 2023-09-28
00:27:00.543951139 +0200
+++ /work/SRC/openSUSE:Factory/.vapoursynth.new.20540/vapoursynth.changes
2023-10-13 23:16:46.515609028 +0200
@@ -1,0 +2,7 @@
+Thu Oct 12 07:48:58 UTC 2023 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix build on Leap 15.x
+- Add patch to revert for Leap 15.x only:
+ * ac62a4d2a54bacccd09b97453bffe759c01f18ef.patch
+
+-------------------------------------------------------------------
New:
----
ac62a4d2a54bacccd09b97453bffe759c01f18ef.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vapoursynth.spec ++++++
--- /var/tmp/diff_new_pack.uBtXgC/_old 2023-10-13 23:16:46.987626819 +0200
+++ /var/tmp/diff_new_pack.uBtXgC/_new 2023-10-13 23:16:46.987626819 +0200
@@ -27,6 +27,8 @@
# PATCH-FIX-OPENSUSE vapoursynth-version.patch -- makes sure that we have
# some sort of version for othervise unversioned .so files
Patch0: vapoursynth-version.patch
+# Patch to revert for Leap 15.x builds
+Patch1: ac62a4d2a54bacccd09b97453bffe759c01f18ef.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -50,8 +52,9 @@
Obsoletes: plugin-vinverse
Obsoletes: plugin-vivtc
%if 0%{?suse_version} <= 1500
-BuildRequires: gcc11-PIE
-BuildRequires: gcc11-c++
+BuildRequires: gcc12
+BuildRequires: gcc12-PIE
+BuildRequires: gcc12-c++
BuildRequires: python3-Cython
%else
BuildRequires: gcc-c++
@@ -107,14 +110,21 @@
%prep
%setup -q -n %{name}-R%{version}
%patch0 -p1
+%if 0%{?suse_version} <= 1500
+%patch1 -p1 -R
+%endif
%build
%if 0%{?suse_version} <= 1500
-export CC="gcc-11"
-export CXX="g++-11"
+export CC="gcc-12"
+export CXX="g++-12"
%endif
autoreconf -fiv
+%if 0%{?suse_version} <= 1500
+# Woraround for old autoconf
+sed -z -i
"s|PACKAGE_URL='http://www.vapoursynth.com/\n'|PACKAGE_URL='http://www.vapoursynth.com/'|"
configure
+%endif
%configure \
--disable-static
%make_build
++++++ ac62a4d2a54bacccd09b97453bffe759c01f18ef.patch ++++++
>From ac62a4d2a54bacccd09b97453bffe759c01f18ef Mon Sep 17 00:00:00 2001
From: Fredrik Mellbin <fredrik.mell...@gmail.com>
Date: Tue, 15 Aug 2023 22:23:51 +0200
Subject: [PATCH] Sprinkle noexept instead of using the compatibility option to
avoid warnings in cython 3
---
src/cython/vapoursynth.pxd | 1 -
src/cython/vapoursynth.pyx | 14 +++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/cython/vapoursynth.pxd b/src/cython/vapoursynth.pxd
index ee273d8d..73fd0535 100644
--- a/src/cython/vapoursynth.pxd
+++ b/src/cython/vapoursynth.pxd
@@ -18,7 +18,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
#cython: language_level=3
-#cython: legacy_implicit_noexcept=True
from libc.stdint cimport uint8_t, uint32_t, int64_t, uint64_t, uintptr_t
from libc.stddef cimport ptrdiff_t
diff --git a/src/cython/vapoursynth.pyx b/src/cython/vapoursynth.pyx
index 34e2b8be..4cadcd8e 100644
--- a/src/cython/vapoursynth.pyx
+++ b/src/cython/vapoursynth.pyx
@@ -198,12 +198,12 @@ cdef void _unset_logger(EnvironmentData env):
env.log = NULL
-cdef void __stdcall _logCb(int msgType, const char *msg, void *userData) nogil:
+cdef void __stdcall _logCb(int msgType, const char *msg, void *userData)
noexcept nogil:
with gil:
message = msg.decode("utf-8")
(<object>userData)(MessageType(msgType), message)
-cdef void __stdcall _logFree(void* userData) nogil:
+cdef void __stdcall _logFree(void* userData) noexcept nogil:
with gil:
Py_DECREF(<object>userData)
@@ -776,7 +776,7 @@ cdef FramePtr createFramePtr(const VSFrame *f, const VSAPI
*funcs):
return instance
-cdef void __stdcall frameDoneCallback(void *data, const VSFrame *f, int n,
VSNode *node, const char *errormsg) nogil:
+cdef void __stdcall frameDoneCallback(void *data, const VSFrame *f, int n,
VSNode *node, const char *errormsg) noexcept nogil:
with gil:
result = error = None
d = <CallbackData>data
@@ -2428,11 +2428,11 @@ cdef LogHandle createLogHandle(object handler_func):
instance.handle = NULL
return instance
-cdef void __stdcall log_handler_wrapper(int msgType, const char *msg, void
*userData) nogil:
+cdef void __stdcall log_handler_wrapper(int msgType, const char *msg, void
*userData) noexcept nogil:
with gil:
(<LogHandle>userData).handler_func(MessageType(msgType),
msg.decode('utf-8'))
-cdef void __stdcall log_handler_free(void *userData) nogil:
+cdef void __stdcall log_handler_free(void *userData) noexcept nogil:
with gil:
Py_DECREF(<LogHandle>userData)
@@ -2936,14 +2936,14 @@ class PythonVSScriptLoggingBridge(logging.Handler):
core.log_message(mt, message)
-cdef void __stdcall freeFunc(void *pobj) nogil:
+cdef void __stdcall freeFunc(void *pobj) noexcept nogil:
with gil:
fobj = <FuncData>pobj
Py_DECREF(fobj)
fobj = None
-cdef void __stdcall publicFunction(const VSMap *inm, VSMap *outm, void
*userData, VSCore *core, const VSAPI *vsapi) nogil:
+cdef void __stdcall publicFunction(const VSMap *inm, VSMap *outm, void
*userData, VSCore *core, const VSAPI *vsapi) noexcept nogil:
with gil:
d = <FuncData>userData
try:
