pyglet 2.1.9__tar.gz → 2.1.10__tar.gz

{pyglet-2.1.9 → pyglet-2.1.10}/.github/workflows/unittests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10' ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.10' ]
     name: Python ${{ matrix.python-version }} ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -28,7 +28,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: [ '3.10', '3.11', '3.12' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14']
     name: Python ${{ matrix.python-version }} OSX
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     name: Python ${{ matrix.python-version }} Windows
     steps:
       - uses: actions/checkout@v4

{pyglet-2.1.9 → pyglet-2.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyglet
-Version: 2.1.9
+Version: 2.1.10
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.8

{pyglet-2.1.9 → pyglet-2.1.10}/RELEASE_NOTES

@@ -1,3 +1,19 @@
+pyglet 2.1.10
+
+Changes
+-------
+media: Add support for FFmpeg 8.0 (#1365)
+window: Update default dpi_scaling option to "platform". (#1383)
+window: Convert the Window event queue to a deque. (#1362)
+input.evdev: Do not attempt to reuse Controller instances on re-connect, as naming conflicts can occur.
+
+Bugfixes
+--------
+text: fix typing of Label.__init__'s align argument. (#1361)
+text: Update the passed args for attributed text. (#1379)
+shader: Fixed number of elements for GL_FLOAT_MAT3 (9, not 6) in pyglet.graphics.shader._uniform_setters. (#1364)
+
+
 pyglet 2.1.9
 
 Changes

{pyglet-2.1.9 → pyglet-2.1.10}/examples/dpi_scaled_window.py

@@ -1,7 +1,5 @@
 import pyglet
-
-pyglet.options["debug_gl"] = False
-pyglet.options.dpi_scaling = "scaled"
+pyglet.options.debug_gl = False
 
 window = pyglet.window.Window(800, 600, caption="DPI Test", resizable=True)
 batch = pyglet.graphics.Batch()
@@ -31,8 +29,7 @@ labels = [hello_label, mouse_enter_label, mouse_leave_label, mouse_motion_label,
 dinosaur = pyglet.resource.animation("programming_guide/dinosaur.gif")
 
 sprite = pyglet.sprite.Sprite(dinosaur, x=100, y=140, batch=batch)
-if pyglet.options.dpi_scaling != "real":
-    sprite.scale = window.scale
+sprite.scale = window.scale
 
 
 @window.event
@@ -99,10 +96,9 @@ def on_scale(scale, dpi):
     print("Window Size:", window.get_size())
     print("Window Scale Ratio:", window.scale)
     print("Window Frame Buffer Size:", window.get_framebuffer_size())
-    if pyglet.options.dpi_scaling != "real":
-        for label in labels:
-            label.dpi = dpi
-        sprite.scale = window.scale
+    for label in labels:
+        label.dpi = dpi
+    sprite.scale = window.scale
 
 
 pyglet.app.run()

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/__init__.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '2.1.9'
+version = '2.1.10'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8
@@ -255,8 +255,8 @@ class Options:
 
     .. versionadded:: 2.0.5"""
 
-    dpi_scaling: Literal["real", "scaled", "stretch", "platform"] = "real"
-    """For 'HiDPI' displays, Window behavior can differ between operating systems. Defaults to `'real'`.
+    dpi_scaling: Literal["real", "scaled", "stretch", "platform"] = "platform"
+    """For 'HiDPI' displays, Window behavior can differ between operating systems. Defaults to `'platform'`.
 
     The current options are an attempt to create consistent behavior across all of the operating systems.
 

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/app/cocoa.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import signal
 import time
 

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/graphics/shader.py

@@ -159,7 +159,7 @@ _uniform_setters: dict[int, tuple[GLDataType, GLFunc, GLFunc, int]] = {
     gl.GL_UNSIGNED_INT_SAMPLER_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
 
     gl.GL_FLOAT_MAT2: (gl.GLfloat, gl.glUniformMatrix2fv, gl.glProgramUniformMatrix2fv, 4),
-    gl.GL_FLOAT_MAT3: (gl.GLfloat, gl.glUniformMatrix3fv, gl.glProgramUniformMatrix3fv, 6),
+    gl.GL_FLOAT_MAT3: (gl.GLfloat, gl.glUniformMatrix3fv, gl.glProgramUniformMatrix3fv, 9),
     gl.GL_FLOAT_MAT4: (gl.GLfloat, gl.glUniformMatrix4fv, gl.glProgramUniformMatrix4fv, 16),
 
     # TODO: test/implement these:

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/input/linux/evdev.py

@@ -33,22 +33,24 @@ except ImportError:
         return c.read(fd, buffers, 3072)
 
 
-KeyMaxArray = _c_byte * ((KEY_MAX // 8) + 1)
+KeyMaxArray = _c_byte * (KEY_MAX // 8 + 1)
 
 
-class EvdevButton(Button):
+class _EvdevInfo:
     event_type: int
     event_code: int
 
 
-class EvdevAbsoluteAxis(AbsoluteAxis):
-    event_type: int
-    event_code: int
+class EvdevButton(Button, _EvdevInfo):
+    pass
 
 
-class EvdevRelativeAxis(RelativeAxis):
-    event_type: int
-    event_code: int
+class EvdevAbsoluteAxis(AbsoluteAxis, _EvdevInfo):
+    pass
+
+
+class EvdevRelativeAxis(RelativeAxis, _EvdevInfo):
+    pass
 
 
 # Structures from /linux/blob/master/include/uapi/linux/input.h
@@ -193,7 +195,6 @@ def EVIOCGBIT(fileno, ev, buffer):
 
 
 def EVIOCGABS(fileno, ev, buffer=InputABSInfo()):
-    print("absbuffer instance:", buffer)
     return _IOR_len('E', 0x40 + ev)(fileno, buffer)
 
 
@@ -540,10 +541,9 @@ class EvdevControllerManager(ControllerManager, XlibSelectDevice):
         else:
             return  # No device could be created
 
-        # Reuse existing controller instance if it exists, or create a new one:
-        if controller := self._controllers.get(name, _create_controller(device)):
+        if controller := _create_controller(device):
             self._controllers[name] = controller
-            # Dispatch event in main thread:
+            # Post the event in the main thread:
             self.post_event('on_connect', controller)
 
     def select(self):
@@ -559,6 +559,7 @@ class EvdevControllerManager(ControllerManager, XlibSelectDevice):
 
         for name in disappeared:
             if controller := self._controllers.get(name):
+                del self._controllers[name]
                 self.dispatch_event('on_disconnect', controller)
 
     def get_controllers(self) -> list[Controller]:

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/base.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 import ctypes
 import io
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, BinaryIO, List, Optional, Union
 
-from pyglet.media.exceptions import MediaException, CannotSeekException
-from pyglet.util import next_or_equal_power_of_two
+from pyglet.media.exceptions import CannotSeekException, MediaException
 
 if TYPE_CHECKING:
     from pyglet.image import AbstractImage
@@ -77,7 +79,7 @@ class AudioFormat:
             self.__class__.__name__, self.channels, self.sample_size,
             self.sample_rate)
 
-
+@dataclass
 class VideoFormat:
     """Video details.
 
@@ -98,20 +100,10 @@ class VideoFormat:
 
             .. versionadded:: 1.2
     """
-
-    def __init__(self, width: int, height: int, sample_aspect: float = 1.0) -> None:
-        self.width = width
-        self.height = height
-        self.sample_aspect = sample_aspect
-        self.frame_rate = None
-
-    def __eq__(self, other) -> bool:
-        if isinstance(other, VideoFormat):
-            return (self.width == other.width and
-                    self.height == other.height and
-                    self.sample_aspect == other.sample_aspect and
-                    self.frame_rate == other.frame_rate)
-        return False
+    width: int
+    height: int
+    sample_aspect: float = 0.0
+    frame_rate: float | None = None
 
 
 class AudioData:
@@ -132,14 +124,14 @@ class AudioData:
             `timestamp` and `duration` are unused and will be removed eventually.
     """
 
-    __slots__ = 'data', 'length', 'timestamp', 'duration', 'events', 'pointer'
+    __slots__ = 'data', 'duration', 'events', 'length', 'pointer', 'timestamp'
 
     def __init__(self,
-                 data: Union[bytes, ctypes.Array],
+                 data: bytes | ctypes.Array,
                  length: int,
                  timestamp: float = 0.0,
                  duration: float = 0.0,
-                 events: Optional[List['MediaEvent']] = None) -> None:
+                 events: list[MediaEvent] | None = None) -> None:
 
         if isinstance(data, bytes):
             # bytes are treated specially by ctypes and can be cast to a void pointer, get
@@ -163,6 +155,7 @@ class AudioData:
         self.events = [] if events is None else events
 
 
+@dataclass
 class SourceInfo:
     """Source metadata information.
 
@@ -180,15 +173,14 @@ class SourceInfo:
 
     .. versionadded:: 1.2
     """
-
-    title = ''
-    author = ''
-    copyright = ''
-    comment = ''
-    album = ''
-    year = 0
-    track = 0
-    genre = ''
+    title: str = ''
+    author: str = ''
+    copyright: str = ''
+    comment: str = ''
+    album: str = ''
+    year: int = 0
+    track: int = 0
+    genre: str = ''
 
 
 class Source:
@@ -255,9 +247,8 @@ class Source:
         player.on_player_eos = _on_player_eos
         return player
 
-    def get_animation(self) -> 'Animation':
-        """
-        Import all video frames into memory.
+    def get_animation(self) -> Animation:
+        """Import all video frames into memory.
 
         An empty animation will be returned if the source has no video.
         Otherwise, the animation will contain all unplayed video frames (the

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg.py

@@ -7,6 +7,7 @@ from ctypes import (
     POINTER,
     Array,
     Structure,
+    _Pointer,
     addressof,
     byref,
     c_char_p,
@@ -18,20 +19,20 @@ from ctypes import (
     memmove,
 )
 from dataclasses import dataclass
-from typing import BinaryIO, TYPE_CHECKING, Iterator, Sequence
-
-from _ctypes import _Pointer
+from typing import TYPE_CHECKING, BinaryIO, Iterator, Sequence
 
 import pyglet
 import pyglet.lib
 from pyglet import image
+from pyglet.media.exceptions import MediaFormatException
 from pyglet.util import asbytes, asstr
+
 from . import MediaDecoder
 from .base import AudioData, AudioFormat, SourceInfo, StaticSource, StreamingSource, VideoFormat
 from .ffmpeg_lib import (
     AV_CODEC_ID_VP8,
     AV_CODEC_ID_VP9,
-    FF_INPUT_BUFFER_PADDING_SIZE,
+    AV_INPUT_BUFFER_PADDING_SIZE,
     SWS_FAST_BILINEAR,
     AVPacket,
     SwrContext,
@@ -63,7 +64,6 @@ from .ffmpeg_lib.libavutil import (
     avutil,
 )
 from .ffmpeg_lib.libswresample import swresample, swresample_version
-from ..exceptions import MediaFormatException
 
 if TYPE_CHECKING:
     from .ffmpeg_lib.libavformat import AVStream
@@ -128,7 +128,7 @@ def ffmpeg_get_audio_buffer_size(audio_format):
 
     Buffer size can accommodate 1 sec of audio data.
     """
-    return audio_format.bytes_per_second + FF_INPUT_BUFFER_PADDING_SIZE
+    return audio_format.bytes_per_second + AV_INPUT_BUFFER_PADDING_SIZE
 
 
 def ffmpeg_init():
@@ -489,10 +489,7 @@ def ffmpeg_get_packet_pts(file: FFmpegFile, packet: _Pointer[AVPacket]) -> float
 
 def ffmpeg_get_frame_ts(stream: FFmpegStream) -> float:
     ts = stream.frame.contents.best_effort_timestamp
-    timestamp = avutil.av_rescale_q(ts,
-                                    stream.time_base,
-                                    AV_TIME_BASE_Q)
-    return timestamp
+    return avutil.av_rescale_q(ts, stream.time_base, AV_TIME_BASE_Q)
 
 
 def ffmpeg_init_packet() -> _Pointer[AVPacket]:
@@ -847,7 +844,7 @@ class FFmpegSource(StreamingSource):
         # more packets are in stream.
         return ffmpeg_read(self._file, self._packet)
 
-    def _process_packet(self) -> AudioPacket | VideoPacket:
+    def _process_packet(self) -> AudioPacket | VideoPacket | None:
         """Process the packet that has been just read.
 
         Determines whether it's a video or audio packet and queue it in the
@@ -859,18 +856,18 @@ class FFmpegSource(StreamingSource):
 
         if self._packet.contents.stream_index == self._video_stream_index:
             video_packet = VideoPacket(self._packet, timestamp)
-
             if _debug:
                 print('Created and queued packet %d (%f)' % (video_packet.id, video_packet.timestamp))
 
             self.videoq.append(video_packet)
             return video_packet
 
-        elif self.audio_format and self._packet.contents.stream_index == self._audio_stream_index:
+        if self.audio_format and self._packet.contents.stream_index == self._audio_stream_index:
             audio_packet = AudioPacket(self._packet, timestamp)
 
             self.audioq.append(audio_packet)
             return audio_packet
+        return None
 
     def get_audio_data(self, num_bytes: int, compensation_time: float=0.0) -> AudioData | None:
         data = b''
@@ -1040,9 +1037,8 @@ class FFmpegSource(StreamingSource):
         width = self.video_format.width
         height = self.video_format.height
         pitch = width * 4
-        # https://ffmpeg.org/doxygen/3.3/group__lavc__decoding.html#ga8f5b632a03ce83ac8e025894b1fc307a
-        nbytes = (pitch * height + FF_INPUT_BUFFER_PADDING_SIZE)
-        buffer = (c_uint8 * nbytes)()
+        buf_size = avutil.av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 1)
+        buffer = (c_uint8 * buf_size)()
         try:
             result = self._ffmpeg_decode_video(video_packet.packet, buffer)
         except FFmpegException:
@@ -1070,11 +1066,8 @@ class FFmpegSource(StreamingSource):
         stream = self._video_stream
         rgba_ptrs = (POINTER(c_uint8) * 4)()
         rgba_stride = (c_int * 4)()
-        width = stream.codec_context.contents.width
-        height = stream.codec_context.contents.height
         if stream.type != AVMEDIA_TYPE_VIDEO:
             raise FFmpegException('Trying to decode video on a non-video stream.')
-
         sent_result = avcodec.avcodec_send_packet(
             stream.codec_context,
             packet,
@@ -1097,6 +1090,9 @@ class FFmpegSource(StreamingSource):
             descr = buf.value
             raise FFmpegException(f'Video: Error occurred receiving frame. {descr.decode()}')
 
+        width = stream.frame.contents.width
+        height = stream.frame.contents.height
+
         avutil.av_image_fill_arrays(rgba_ptrs, rgba_stride, data_out,
                                     AV_PIX_FMT_RGBA, width, height, 1)
 
@@ -1141,7 +1137,7 @@ class FFmpegSource(StreamingSource):
             ts = None
 
         if _debug:
-            print('Next video timestamp is', ts)
+            print(f'Next video packet timestamp is: {ts}')
         return ts
 
     def get_next_video_frame(self, skip_empty_frame: bool=True) -> int | None:

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg_lib/compat.py

@@ -18,6 +18,7 @@ release_versions = {
     5: {'avcodec': 59, 'avformat': 59, 'avutil': 57, 'swresample': 4, 'swscale': 6},  # 5.x
     6: {'avcodec': 60, 'avformat': 60, 'avutil': 58, 'swresample': 4, 'swscale': 7},  # 6.x
     7: {'avcodec': 61, 'avformat': 61, 'avutil': 59, 'swresample': 5, 'swscale': 8},  # 7.x
+    8: {'avcodec': 62, 'avformat': 62, 'avutil': 60, 'swresample': 6, 'swscale': 9},  # 8.x
 }
 
 # Removals done per library and version.

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg_lib/libavcodec.py

@@ -1,7 +1,7 @@
 """Wrapper for include/libavcodec/avcodec.h
 """
 
-from ctypes import c_int, c_uint16, c_int64, c_uint32, c_uint64, c_size_t
+from ctypes import c_int, c_uint16, c_int64, c_uint32, c_uint64, c_size_t, c_char
 from ctypes import c_uint8, c_uint, c_float, c_char_p
 from ctypes import c_void_p, POINTER, CFUNCTYPE, Structure
 
@@ -15,8 +15,8 @@ _debug = debug_print('debug_media')
 
 avcodec = pyglet.lib.load_library(
     'avcodec',
-    win32=('avcodec-61', 'avcodec-60', 'avcodec-59', 'avcodec-58'),
-    darwin=('avcodec.61', 'avcodec.60', 'avcodec.59', 'avcodec.58')
+    win32=('avcodec-62', 'avcodec-61', 'avcodec-60', 'avcodec-59', 'avcodec-58'),
+    darwin=('avcodec.62', 'avcodec.61', 'avcodec.60', 'avcodec.59', 'avcodec.58')
 )
 
 avcodec.avcodec_version.restype = c_int
@@ -25,8 +25,8 @@ avcodec_version = avcodec.avcodec_version() >> 16
 
 compat.set_version('avcodec', avcodec_version)
 
-
-FF_INPUT_BUFFER_PADDING_SIZE = 32
+# Since version 4.0 this is 64
+AV_INPUT_BUFFER_PADDING_SIZE = 64
 
 
 class AVPacketSideData(Structure):
@@ -67,7 +67,7 @@ AVPacket_Fields = [
 compat.add_version_changes('avcodec', 58, AVPacket, AVPacket_Fields,
                            removals=('opaque', 'opaque_ref', 'time_base'))
 
-for compat_ver in (59, 60, 61):
+for compat_ver in (59, 60, 61, 62):
     compat.add_version_changes('avcodec', compat_ver, AVPacket, AVPacket_Fields,
                                removals=('convergence_duration',))
 
@@ -118,8 +118,9 @@ for compat_ver in (58, 59, 60):
     compat.add_version_changes('avcodec', compat_ver, AVCodecParameters, AVCodecParameters_Fields,
                                removals=('coded_side_data', 'nb_coded_side_data', 'ch_layout', 'framerate'))
 
-compat.add_version_changes('avcodec', 61, AVCodecParameters, AVCodecParameters_Fields,
-                           removals=('channel_layout', 'channels'))
+for compat_ver in (61, 62):
+    compat.add_version_changes('avcodec', compat_ver, AVCodecParameters, AVCodecParameters_Fields,
+                               removals=('channel_layout', 'channels'))
 
 
 class AVProfile(Structure):
@@ -188,7 +189,7 @@ AVClass = libavutil.AVClass
 AVFrame = libavutil.AVFrame
 AV_NUM_DATA_POINTERS = libavutil.AV_NUM_DATA_POINTERS
 
-# Significant deprecation and re-ordering of the entire structure makes it unmanagable to
+# Significant deprecation and re-ordering of the entire structure makes it unmanageable to
 # track of all the changes via compat module. Re-define the structure and compat the new one going forward.
 if avcodec_version >= 61:
     AVCodecContext_Fields = [
@@ -217,7 +218,7 @@ if avcodec_version >= 61:
         ("framerate", AVRational),
 
         # Video fields
-        ("ticks_per_frame", c_int),  # Deprecated in 61.
+        ("ticks_per_frame", c_int),  # Deprecated in 61. (removed in 62)
         ("delay", c_int),
         ("width", c_int),
         ("height", c_int),
@@ -334,7 +335,7 @@ if avcodec_version >= 61:
                                POINTER(c_int), c_int)),
         ("profile", c_int),
         ("level", c_int),
-        ("properties", c_uint),
+        ("properties", c_uint),  # deprecated in 62
         ("skip_loop_filter", c_int),  # enum AVDiscard
         ("skip_idct", c_int),  # enum AVDiscard
         ("skip_frame", c_int),  # enum AVDiscard
@@ -364,8 +365,11 @@ if avcodec_version >= 61:
         ("nb_decoded_side_data", c_int),
     ]
 
-    compat.add_version_changes('avcodec', 61, AVCodecContext, AVCodecContext_Fields, removals=None)
+    compat.add_version_changes('avcodec', 61, AVCodecContext, AVCodecContext_Fields,
+                               removals=None)
 
+    compat.add_version_changes('avcodec', 62, AVCodecContext, AVCodecContext_Fields,
+                               removals=("ticks_per_frame",))
 else:
     AVCodecContext_Fields = [
         ('av_class', POINTER(AVClass)),
@@ -621,10 +625,10 @@ avcodec.avcodec_find_decoder_by_name.restype = POINTER(AVCodec)
 avcodec.avcodec_find_decoder_by_name.argtypes = [c_char_p]
 
 __all__ = [
-    'avcodec',
-    'FF_INPUT_BUFFER_PADDING_SIZE',
-    'AVPacket',
-    'AVCodecContext',
     'AV_CODEC_ID_VP8',
     'AV_CODEC_ID_VP9',
+    'AV_INPUT_BUFFER_PADDING_SIZE',
+    'AVCodecContext',
+    'AVPacket',
+    'avcodec',
 ]

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg_lib/libavformat.py

@@ -14,8 +14,8 @@ _debug = debug_print('debug_media')
 
 avformat = pyglet.lib.load_library(
     'avformat',
-    win32=('avformat-61', 'avformat-60', 'avformat-59', 'avformat-58'),
-    darwin=('avformat.61', 'avformat.60', 'avformat.59', 'avformat.58')
+    win32=('avformat-62', 'avformat-61', 'avformat-60', 'avformat-59', 'avformat-58'),
+    darwin=('avformat.62', 'avformat.61', 'avformat.60', 'avformat.59', 'avformat.58')
 )
 
 avformat.avformat_version.restype = c_int
@@ -147,7 +147,7 @@ compat.add_version_changes('avformat', 58, AVStream, AVStream_Fields, removals=(
 compat.add_version_changes('avformat', 59, AVStream, AVStream_Fields,
                            removals=('av_class', 'codec', 'recommended_encoder_configuration', 'info'))
 
-for compat_ver in (60, 61):
+for compat_ver in (60, 61, 62):
     compat.add_version_changes('avformat', compat_ver, AVStream, AVStream_Fields,
                                removals=('codec', 'recommended_encoder_configuration', 'info'),
                                repositions=(compat.Reposition("codecpar", "id"),))
@@ -318,8 +318,8 @@ if avformat_version >= 61:
         ('io_close2', CFUNCTYPE(c_int, POINTER(AVFormatContext), POINTER(AVIOContext)))  # Added in 59.
     ]
 
-    compat.add_version_changes('avformat', 61, AVFormatContext, AVFormatContext_Fields, removals=None)
-
+    for compat_ver in (61, 62):
+        compat.add_version_changes('avformat', compat_ver, AVFormatContext, AVFormatContext_Fields, removals=None)
 
 else:
     AVFormatContext_Fields = [
@@ -410,7 +410,7 @@ else:
     compat.add_version_changes('avformat', 58, AVFormatContext, AVFormatContext_Fields,
                                removals=('skip_estimate_duration_from_pts', 'max_probe_packets', 'io_close2'))
 
-    for compat_ver in (59, 60):
+    for compat_ver in (59, 60, 61, 62):
         compat.add_version_changes('avformat', compat_ver, AVFormatContext, AVFormatContext_Fields,
                                    removals=('filename', 'internal'))
 

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg_lib/libavutil.py

@@ -12,8 +12,8 @@ _debug = debug_print('debug_media')
 
 avutil = pyglet.lib.load_library(
     'avutil',
-    win32=('avutil-59', 'avutil-58', 'avutil-57', 'avutil-56'),
-    darwin=('avutil.59', 'avutil.58', 'avutil.57', 'avutil.56')
+    win32=('avutil-60', 'avutil-59', 'avutil-58', 'avutil-57', 'avutil-56'),
+    darwin=('avutil.60', 'avutil.59', 'avutil.58', 'avutil.57', 'avutil.56')
 )
 
 avutil.avutil_version.restype = c_int
@@ -148,9 +148,9 @@ AVFrame_Fields = [
     ('opaque', c_void_p),
     ('error', c_uint64 * AV_NUM_DATA_POINTERS),  # Deprecated. Removed in 57.
     ('repeat_pict', c_int),
-    ('interlaced_frame', c_int),  # deprecated in 59. Targeted for removal. Use AV_FRAME_FLAG_INTERLACED
-    ('top_field_first', c_int),  # deprecated in 59. Targeted for removal. Use AV_FRAME_FLAG_TOP_FIELD_FIRST
-    ('palette_has_changed', c_int),  # deprecated in 59. Targeted for removal.
+    ('interlaced_frame', c_int),  # deprecated in 59. Targeted for removal. Use AV_FRAME_FLAG_INTERLACED (removed in 60)
+    ('top_field_first', c_int),  # deprecated in 59. Targeted for removal. Use AV_FRAME_FLAG_TOP_FIELD_FIRST (removed in 60)
+    ('palette_has_changed', c_int),  # deprecated in 59. Targeted for removal. (removed in 60)
     ('reordered_opaque', c_int64),  # removed in 59.
     ('sample_rate', c_int),
     ('channel_layout', c_uint64),  # removed in 59.
@@ -170,7 +170,7 @@ AVFrame_Fields = [
     ('pkt_duration', c_int64),  # removed in 59?
     ('metadata', POINTER(AVDictionary)),
     ('decode_error_flags', c_int),
-    ('channels', c_int),
+    ('channels', c_int),  # removed in 59.
     ('pkt_size', c_int),  # deprecated in 59.  use AV_CODEC_FLAG_COPY_OPAQUE to pass through arbitrary user data from packets to frames
     ('qscale_table', POINTER(c_int8)),  # Deprecated. Removed in 57.
     ('qstride', c_int),  # Deprecated. Removed in 57.
@@ -198,9 +198,18 @@ for compat_ver in (57, 58):
 compat.add_version_changes('avutil', 59, AVFrame, AVFrame_Fields,
                            removals=('pkt_pts', 'error', 'qscale_table', 'qstride', 'qscale_type', 'qp_table_buf',
                                      'channels', 'channel_layout',
-                                     'coded_picture_number', 'display_picture_number', 'reordered_opaque', 'pkt_duration'
+                                     'coded_picture_number', 'display_picture_number', 'reordered_opaque',
+                                     'pkt_duration',
                                      ))
 
+compat.add_version_changes('avutil', 60, AVFrame, AVFrame_Fields,
+                           removals=('pkt_pts', 'error', 'qscale_table', 'qstride', 'qscale_type', 'qp_table_buf',
+                                     'channels', 'channel_layout',
+                                     'coded_picture_number', 'display_picture_number', 'reordered_opaque',
+                                     'pkt_duration',
+                                     'interlaced_frame', 'top_field_first', 'palette_has_changed', 'pkt_pos',
+                                     'pkt_size',
+                                     ))
 
 AV_NOPTS_VALUE = -0x8000000000000000
 AV_TIME_BASE = 1000000
@@ -250,6 +259,12 @@ avutil.av_get_bytes_per_sample.argtypes = [c_int]
 avutil.av_strerror.restype = c_int
 avutil.av_strerror.argtypes = [c_int, c_char_p, c_size_t]
 
+avutil.av_get_pix_fmt_name.restype = c_char_p
+avutil.av_get_pix_fmt_name.argtypes = [c_int]
+
+avutil.av_image_get_buffer_size.restype = c_int
+avutil.av_image_get_buffer_size.argtypes = [c_int, c_int, c_int, c_int]
+
 avutil.av_image_fill_arrays.restype = c_int
 avutil.av_image_fill_arrays.argtypes = [POINTER(c_uint8) * 4, c_int * 4,
                                         POINTER(c_uint8), c_int, c_int, c_int, c_int]

{pyglet-2.1.9 → pyglet-2.1.10}/pyglet/media/codecs/ffmpeg_lib/libswresample.py

@@ -13,8 +13,8 @@ _debug = debug_print('debug_media')
 
 swresample = pyglet.lib.load_library(
     'swresample',
-    win32=('swresample-5', 'swresample-4', 'swresample-3'),
-    darwin=('swresample.5', 'swresample.4', 'swresample.3')
+    win32=('swresample-6', 'swresample-5', 'swresample-4', 'swresample-3'),
+    darwin=('swresample.6', 'swresample.5', 'swresample.4', 'swresample.3')
 )
 
 swresample.swresample_version.restype = c_int