SHA256
1
0
forked from pool/aubio

Accepting request 1098912 from home:edogawa

- Add waflib_deprecated.patch (fixes TW compilation)

OBS-URL: https://build.opensuse.org/request/show/1098912
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/aubio?expand=0&rev=47
This commit is contained in:
Takashi Iwai 2023-07-21 07:05:37 +00:00 committed by Git OBS Bridge
parent c0e179435b
commit fff10bbf66
3 changed files with 39 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jul 16 09:16:44 UTC 2023 - Edgar Aichinger <edogawa@aon.at>
- Add waflib_deprecated.patch (fixes TW compilation)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 4 11:19:21 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org> Thu May 4 11:19:21 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -31,6 +31,7 @@ Source1: http://aubio.org/pub/%{name}-%{version}.tar.bz2.asc
Patch0: cdfe9ce.patch Patch0: cdfe9ce.patch
# PATCH-FIX-UPSTREAM https://github.com/aubio/aubio/commit/8a05420.patch -- [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec > 59, thx @berolinux (closes gh-353) # PATCH-FIX-UPSTREAM https://github.com/aubio/aubio/commit/8a05420.patch -- [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec > 59, thx @berolinux (closes gh-353)
Patch1: 8a05420.patch Patch1: 8a05420.patch
Patch2: waflib_deprecated.patch
Source99: baselibs.conf Source99: baselibs.conf
BuildRequires: alsa-devel BuildRequires: alsa-devel

33
waflib_deprecated.patch Normal file
View File

@ -0,0 +1,33 @@
diff -up aubio-0.4.9/waflib/ConfigSet.py.orig aubio-0.4.9/waflib/ConfigSet.py
--- aubio-0.4.9/waflib/ConfigSet.py.orig 2018-06-27 07:22:05.000000000 +0200
+++ aubio-0.4.9/waflib/ConfigSet.py 2023-07-16 11:06:44.043113728 +0200
@@ -146,7 +146,7 @@ class ConfigSet(object):
Utils.writef(filename,''.join(buf))
def load(self,filename):
tbl=self.table
- code=Utils.readf(filename,m='rU')
+ code=Utils.readf(filename,m='r')
for m in re_imp.finditer(code):
g=m.group
tbl[g(2)]=eval(g(3))
diff -up aubio-0.4.9/waflib/Context.py.orig aubio-0.4.9/waflib/Context.py
--- aubio-0.4.9/waflib/Context.py.orig 2018-12-23 12:11:54.000000000 +0100
+++ aubio-0.4.9/waflib/Context.py 2023-07-16 11:06:01.349160975 +0200
@@ -106,7 +106,7 @@ class Context(ctx):
cache[node]=True
self.pre_recurse(node)
try:
- function_code=node.read('rU',encoding)
+ function_code=node.read('r',encoding)
exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
finally:
self.post_recurse(node)
@@ -346,7 +346,7 @@ def load_module(path,encoding=None):
pass
module=imp.new_module(WSCRIPT_FILE)
try:
- code=Utils.readf(path,m='rU',encoding=encoding)
+ code=Utils.readf(path,m='r',encoding=encoding)
except EnvironmentError:
raise Errors.WafError('Could not read the file %r'%path)
module_dir=os.path.dirname(path)