pyglet 2.1.10__tar.gz → 2.1.11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyglet
-Version: 2.1.10
+Version: 2.1.11
 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.10 → pyglet-2.1.11}/RELEASE_NOTES

@@ -1,3 +1,17 @@
+pyglet 2.1.11
+
+Changes
+-------
+shader: Add some missing Uniform type definitions that were missed for less common types. #1380
+ffmpeg: Remove some missing attributes (libavformat version loading) that have been removed in FFMpeg 8.0.
+
+Bugfixes
+--------
+media.ffmpeg: Fix source padding issue for some sources. #1386
+window.win32: Fix memory address issues when queuing events during Windows OS window creation. #1382
+font.dwrite: Fix bug in font_files indixing (use first object, not font_fact index).
+
+
 pyglet 2.1.10
 
 Changes

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

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '2.1.10'
+version = '2.1.11'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8

{pyglet-2.1.10 → pyglet-2.1.11}/pyglet/font/dwrite/__init__.py

@@ -646,7 +646,7 @@ def _get_font_file(font_face: IDWriteFontFace) -> IDWriteFontFile:
     font_files = (IDWriteFontFile * file_ct.value)()
     font_face.GetFiles(byref(file_ct), font_files)
 
-    return font_files[font_face.GetIndex()]
+    return font_files[0]
 
 def _get_font_ref(font_file: IDWriteFontFile, release_file: bool=True) -> tuple[c_void_p, int]:
     """Get a unique font reference for the font face.

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

@@ -174,16 +174,37 @@ _uniform_setters: dict[int, tuple[GLDataType, GLFunc, GLFunc, int]] = {
     gl.GL_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
-
     gl.GL_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
     gl.GL_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+
+    gl.GL_INT_IMAGE_1D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+
+    gl.GL_UNSIGNED_INT_IMAGE_1D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_3D: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_RECT: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_CUBE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_BUFFER: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_1D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
+    gl.GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY: (gl.GLint, gl.glUniform1iv, gl.glProgramUniform1iv, 1),
 }
 
 _attribute_types: dict[int, tuple[int, str]] = {

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

@@ -1037,7 +1037,7 @@ class FFmpegSource(StreamingSource):
         width = self.video_format.width
         height = self.video_format.height
         pitch = width * 4
-        buf_size = avutil.av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 1)
+        buf_size = avutil.av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 1) + AV_INPUT_BUFFER_PADDING_SIZE
         buffer = (c_uint8 * buf_size)()
         try:
             result = self._ffmpeg_decode_video(video_packet.packet, buffer)

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

@@ -132,8 +132,8 @@ AVStream_Fields = [
         ('metadata', POINTER(AVDictionary)),
         ('avg_frame_rate', AVRational),
         ('attached_pic', AVPacket),
-        ('side_data', POINTER(AVPacketSideData)),
-        ('nb_side_data', c_int),
+        ('side_data', POINTER(AVPacketSideData)),  # Deprecated in 60. Removed in 62.
+        ('nb_side_data', c_int),  # Deprecated in 60. Removed in 62.
         ('event_flags', c_int),
         ('r_frame_rate', AVRational),
         ('recommended_encoder_configuration', c_char_p),  # Deprecated. Removed in 59.
@@ -147,11 +147,16 @@ 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, 62):
+for compat_ver in (60, 61):
     compat.add_version_changes('avformat', compat_ver, AVStream, AVStream_Fields,
                                removals=('codec', 'recommended_encoder_configuration', 'info'),
                                repositions=(compat.Reposition("codecpar", "id"),))
 
+compat.add_version_changes('avformat', 62, AVStream, AVStream_Fields,
+                           removals=('codec', 'recommended_encoder_configuration', 'info', 'side_data',
+                                     'nb_side_data'),
+                           repositions=(compat.Reposition("codecpar", "id"),))
+
 
 class AVProgram(Structure):
     pass

{pyglet-2.1.10 → pyglet-2.1.11}/pyglet/window/win32/__init__.py

@@ -106,6 +106,16 @@ Win32EventHandler = _PlatformEventHandler
 ViewEventHandler = _ViewEventHandler
 
 
+# Some events should not be queued, especially those with pointers or structures.
+# Data is only guaranteed to be available for the duration of the initial function call.
+_priority_events = [
+    constants.WM_GETMINMAXINFO,
+    constants.WM_GETDPISCALEDSIZE,
+    constants.WM_DPICHANGED,
+    constants.WM_INPUT,
+]
+
+
 class Win32Window(BaseWindow):
     _window_class = None
     _hwnd = None
@@ -427,8 +437,6 @@ class Win32Window(BaseWindow):
         if state:
             _user32.SetLayeredWindowAttributes(self._hwnd, color_ref.value, alpha.value, flags.value)
 
-
-
     def set_location(self, x: int, y: int) -> None:
         x, y = self._client_to_window_pos(x, y)
         _user32.SetWindowPos(self._hwnd, 0, x, y, 0, 0,
@@ -859,7 +867,7 @@ class Win32Window(BaseWindow):
             event_handler = event_handlers.get(msg)
             result = None
             if event_handler:
-                if self._allow_dispatch_event or not self._enable_event_queue:
+                if self._allow_dispatch_event or not self._enable_event_queue or msg in _priority_events:
                     result = event_handler(msg, wParam, lParam)
                 else:
                     result = 0