Hello community, here is the log from the commit of package python-PyOgg for openSUSE:Factory checked in at 2020-01-15 16:18:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyOgg (Old) and /work/SRC/openSUSE:Factory/.python-PyOgg.new.30080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyOgg" Wed Jan 15 16:18:25 2020 rev:6 rq:764648 version:0.6.12a1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyOgg/python-PyOgg.changes 2019-09-25 08:41:19.086280152 +0200 +++ /work/SRC/openSUSE:Factory/.python-PyOgg.new.30080/python-PyOgg.changes 2020-01-15 16:46:21.977218951 +0100 @@ -1,0 +2,6 @@ +Wed Jan 15 12:18:50 UTC 2020 - Marketa Calabkova <mcalabk...@suse.com> + +- update to 0.6.12a1 + * Fixed library loader + +------------------------------------------------------------------- Old: ---- PyOgg-0.6.11a1.tar.gz New: ---- PyOgg-0.6.12a1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyOgg.spec ++++++ --- /var/tmp/diff_new_pack.6pFBGH/_old 2020-01-15 16:46:22.381219175 +0100 +++ /var/tmp/diff_new_pack.6pFBGH/_new 2020-01-15 16:46:22.385219178 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-PyOgg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-PyOgg -Version: 0.6.11a1 +Version: 0.6.12a1 Release: 0 Summary: Python bindings for Xiphorg's Ogg Vorbis, Opus and FLAC License: BSD-3-Clause ++++++ PyOgg-0.6.11a1.tar.gz -> PyOgg-0.6.12a1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyOgg-0.6.11a1/PKG-INFO new/PyOgg-0.6.12a1/PKG-INFO --- old/PyOgg-0.6.11a1/PKG-INFO 2019-08-11 11:14:11.000000000 +0200 +++ new/PyOgg-0.6.12a1/PKG-INFO 2019-12-19 19:04:25.735978800 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyOgg -Version: 0.6.11a1 +Version: 0.6.12a1 Summary: Xiph.org's Ogg Vorbis, Opus and FLAC for Python Home-page: https://github.com/Zuzu-Typ/PyOgg Author: Zuzu_Typ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyOgg-0.6.11a1/PyOgg.egg-info/PKG-INFO new/PyOgg-0.6.12a1/PyOgg.egg-info/PKG-INFO --- old/PyOgg-0.6.11a1/PyOgg.egg-info/PKG-INFO 2019-08-11 11:14:11.000000000 +0200 +++ new/PyOgg-0.6.12a1/PyOgg.egg-info/PKG-INFO 2019-12-19 19:04:25.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyOgg -Version: 0.6.11a1 +Version: 0.6.12a1 Summary: Xiph.org's Ogg Vorbis, Opus and FLAC for Python Home-page: https://github.com/Zuzu-Typ/PyOgg Author: Zuzu_Typ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyOgg-0.6.11a1/pyogg/__init__.py new/PyOgg-0.6.12a1/pyogg/__init__.py --- old/PyOgg-0.6.11a1/pyogg/__init__.py 2019-08-11 11:08:09.000000000 +0200 +++ new/PyOgg-0.6.12a1/pyogg/__init__.py 2019-12-19 18:58:36.000000000 +0100 @@ -47,15 +47,11 @@ bitstream = ctypes.c_int() bitstream_pointer = ctypes.pointer(bitstream) - while True: - new_bytes = vorbis.libvorbisfile.ov_read(ctypes.byref(vf), buffer_, 4096, 0, 2, 1, bitstream_pointer) - - array_ = ctypes.cast(buffer_, ctypes.POINTER(ctypes.c_char*4096)).contents - - self.buffer_array.append(array_.raw[:new_bytes]) + new_bytes = 1 - if new_bytes == 0: - break + while new_bytes: + new_bytes = vorbis.libvorbisfile.ov_read(ctypes.byref(vf), buffer_, 4096, 0, 2, 1, bitstream_pointer) + self.buffer_array.append(array.raw[:new_bytes]) self.buffer = b"".join(self.buffer_array) @@ -76,9 +72,9 @@ self.frequency = info.contents.rate - array = (ctypes.c_char*(PYOGG_STREAM_BUFFER_SIZE*self.channels))() + self.array = (ctypes.c_char*(PYOGG_STREAM_BUFFER_SIZE*self.channels))() - self.buffer_ = ctypes.cast(ctypes.pointer(array), ctypes.c_char_p) + self.buffer_ = ctypes.cast(ctypes.pointer(self.array), ctypes.c_char_p) self.bitstream = ctypes.c_int() self.bitstream_pointer = ctypes.pointer(self.bitstream) @@ -101,19 +97,16 @@ return None buffer = [] total_bytes_written = 0 + + new_bytes = 1 - while True: + while new_bytes and total_bytes_written < PYOGG_STREAM_BUFFER_SIZE*self.channels: new_bytes = vorbis.ov_read(ctypes.byref(self.vf), self.buffer_, PYOGG_STREAM_BUFFER_SIZE*self.channels - total_bytes_written, 0, 2, 1, self.bitstream_pointer) - array_ = ctypes.cast(self.buffer_, ctypes.POINTER(ctypes.c_char*(PYOGG_STREAM_BUFFER_SIZE*self.channels))).contents - - buffer.append(array_.raw[:new_bytes]) + buffer.append(self.array.raw[:new_bytes]) total_bytes_written += new_bytes - if new_bytes == 0 or total_bytes_written >= PYOGG_STREAM_BUFFER_SIZE*self.channels: - break - out_buffer = b"".join(buffer) if total_bytes_written == 0: @@ -136,7 +129,7 @@ -if (PYOGG_OGG_AVAIL and PYOGG_OPUS_AVAIL and PYOGG_OPUS_FILE_AVAIL): +if (PYOGG_OPUS_AVAIL and PYOGG_OPUS_FILE_AVAIL): class OpusFile: def __init__(self, path): error = ctypes.c_int() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyOgg-0.6.11a1/pyogg/ogg.py new/PyOgg-0.6.12a1/pyogg/ogg.py --- old/PyOgg-0.6.11a1/pyogg/ogg.py 2019-01-14 16:35:52.000000000 +0100 +++ new/PyOgg-0.6.12a1/pyogg/ogg.py 2019-12-19 18:58:36.000000000 +0100 @@ -49,6 +49,11 @@ for x in "0123456789._- ":name=name.replace(x,"") return name +if sys.version_info.major > 2: + to_char_p = lambda s: s.encode('utf-8') +else: + to_char_p = lambda s: s + __here = os.getcwd() libogg = None @@ -66,10 +71,6 @@ PYOGG_OGG_AVAIL = False if PYOGG_OGG_AVAIL: - if sys.version_info.major > 2: - to_char_p = lambda s: s.encode('utf-8') - else: - to_char_p = lambda s: s # ctypes c_ubyte_p = POINTER(c_ubyte) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PyOgg-0.6.11a1/setup.py new/PyOgg-0.6.12a1/setup.py --- old/PyOgg-0.6.11a1/setup.py 2019-08-11 11:09:40.000000000 +0200 +++ new/PyOgg-0.6.12a1/setup.py 2019-12-19 19:02:02.000000000 +0100 @@ -28,7 +28,7 @@ # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='0.6.11a1', + version='0.6.12a1', description='Xiph.org\'s Ogg Vorbis, Opus and FLAC for Python',