Intermediate changes

commit_hash:28750b74281710ec1ab5bdc2403c8ab24bdd164b

Author: robot-piglet

contrib/libs/libjpeg-turbo/.yandex_meta/__init__.py

@@ -56,9 +56,8 @@ def list_simd_sources(arch):
 
         amd64 = {s for s in m.SRCS if s.startswith("simd/")}
         i386 = list_simd_sources("i386")
-        arm32 = list_simd_sources("arm/aarch32")
-        arm32_neon = list_simd_sources("arm")
-        arm64 = list_simd_sources("arm/aarch64")
+        arm32 = list_simd_sources("arm/aarch32") + list_simd_sources("arm")
+        arm64 = list_simd_sources("arm/aarch64") + list_simd_sources("arm")
 
         # This file contains the older GNU Assembler implementation of the Neon SIMD
         # extensions for certain algorithms.
@@ -73,23 +72,16 @@ def list_simd_sources(arch):
                     ("ARCH_I386 AND NOT OS_ANDROID", Linkable(SRCS=i386)),
                     ("ARCH_X86_64", Linkable(SRCS=amd64)),
                     (
-                        "ARCH_ARM7_NEON AND NOT MSVC",
+                        "ARCH_ARM7",
                         Linkable(
-                            SRCS=arm32 + arm32_neon,
+                            SRCS=arm32,
                             ADDINCL=[f"{self.arcdir}/simd/arm"],
                         ),
                     ),
                     (
-                        "ARCH_ARM7 AND NOT MSVC",
+                        "ARCH_ARM64",
                         Linkable(
-                            SRCS=arm32 + arm32_neon,
-                            ADDINCL=[f"{self.arcdir}/simd/arm"],
-                        ),
-                    ),
-                    (
-                        "ARCH_ARM64 AND NOT MSVC",
-                        Linkable(
-                            SRCS=arm32_neon + arm64,
+                            SRCS=arm64,
                             ADDINCL=[f"{self.arcdir}/simd/arm"],
                         ),
                     ),

contrib/libs/libjpeg-turbo/jconfigint-android.h

@@ -10,14 +10,6 @@
 #   include "jconfigint-wasm32.h"
 #elif defined(__wasm64__)
 #   include "jconfigint-wasm64.h"
-#elif defined(__ANDROID__)
-#   include "jconfigint-android.h"
-#elif defined(__IOS__)
-#   include "jconfigint-ios.h"
-#elif defined(__APPLE__)
-#   include "jconfigint-osx.h"
-#elif defined(_MSC_VER)
-#   include "jconfigint-win.h"
 #else
 #   include "jconfigint-linux.h"
 #endif

contrib/libs/libjpeg-turbo/jconfigint-ios.h

@@ -123,7 +123,7 @@ ELSEIF (ARCH_X86_64)
         simd/x86_64/jsimd.c
         simd/x86_64/jsimdcpu.asm
     )
-ELSEIF (ARCH_ARM7_NEON AND NOT MSVC)
+ELSEIF (ARCH_ARM7)
     ADDINCL(
         contrib/libs/libjpeg-turbo/simd/arm
     )
@@ -145,29 +145,7 @@ ELSEIF (ARCH_ARM7_NEON AND NOT MSVC)
         simd/arm/jidctred-neon.c
         simd/arm/jquanti-neon.c
     )
-ELSEIF (ARCH_ARM7 AND NOT MSVC)
-    ADDINCL(
-        contrib/libs/libjpeg-turbo/simd/arm
-    )
-    SRCS(
-        simd/arm/aarch32/jchuff-neon.c
-        simd/arm/aarch32/jsimd.c
-        simd/arm/aarch32/jsimd_neon.S
-        simd/arm/jccolor-neon.c
-        simd/arm/jcgray-neon.c
-        simd/arm/jcphuff-neon.c
-        simd/arm/jcsample-neon.c
-        simd/arm/jdcolor-neon.c
-        simd/arm/jdmerge-neon.c
-        simd/arm/jdsample-neon.c
-        simd/arm/jfdctfst-neon.c
-        simd/arm/jfdctint-neon.c
-        simd/arm/jidctfst-neon.c
-        simd/arm/jidctint-neon.c
-        simd/arm/jidctred-neon.c
-        simd/arm/jquanti-neon.c
-    )
-ELSEIF (ARCH_ARM64 AND NOT MSVC)
+ELSEIF (ARCH_ARM64)
     ADDINCL(
         contrib/libs/libjpeg-turbo/simd/arm
     )

contrib/libs/libjpeg-turbo/jconfigint-osx.h

@@ -25,5 +25,6 @@ pkgs: attrs: with pkgs; rec {
 
   cmakeFlags = [
     "-Dlzma=ON"
+    "-Dlibdeflate=OFF"
   ];
 }

contrib/libs/libjpeg-turbo/jconfigint-win.h

@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 LIBRARY()
 
@@ -36,6 +36,7 @@ NO_UTIL()
 
 CFLAGS(
     -DALLOW_TIFF_NON_EXT_ALLOC_FUNCTIONS
+    -DHAVE_JPEGTURBO_DUAL_MODE_8_12
     -DTIFF_DO_NOT_USE_NON_EXT_ALLOC_FUNCTIONS
 )
 

contrib/libs/libjpeg-turbo/jconfigint.h

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: Twisted
-Version: 24.11.0
+Version: 25.5.0
 Summary: An asynchronous networking framework written in Python
 Project-URL: Changelog, https://github.com/twisted/twisted/blob/HEAD/NEWS.rst
 Project-URL: Documentation, https://docs.twisted.org/
@@ -11,6 +11,7 @@ Project-URL: Funding-PSF, https://psfmember.org/civicrm/contribute/transact/?res
 Project-URL: Funding-GitHub, https://github.com/sponsors/twisted
 Author-email: Twisted Matrix Community <twisted@python.org>
 License: MIT License
+License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
@@ -42,6 +43,7 @@ Requires-Dist: pyopenssl>=21.0.0; extra == 'all-non-platform'
 Requires-Dist: pyserial>=3.0; extra == 'all-non-platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'all-non-platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'all-non-platform'
+Requires-Dist: wsproto; extra == 'all-non-platform'
 Provides-Extra: all_non_platform
 Requires-Dist: appdirs>=1.4.0; extra == 'all_non_platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'all_non_platform'
@@ -57,6 +59,7 @@ Requires-Dist: pyopenssl>=21.0.0; extra == 'all_non_platform'
 Requires-Dist: pyserial>=3.0; extra == 'all_non_platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'all_non_platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'all_non_platform'
+Requires-Dist: wsproto; extra == 'all_non_platform'
 Provides-Extra: conch
 Requires-Dist: appdirs>=1.4.0; extra == 'conch'
 Requires-Dist: bcrypt>=3.1.3; extra == 'conch'
@@ -66,7 +69,7 @@ Requires-Dist: coverage~=7.5; extra == 'dev'
 Requires-Dist: cython-test-exception-raiser<2,>=1.0.2; extra == 'dev'
 Requires-Dist: httpx[http2]>=0.27; extra == 'dev'
 Requires-Dist: hypothesis>=6.56; extra == 'dev'
-Requires-Dist: pydoctor~=23.9.0; extra == 'dev'
+Requires-Dist: pydoctor~=24.11.1; extra == 'dev'
 Requires-Dist: pyflakes~=2.2; extra == 'dev'
 Requires-Dist: pyhamcrest>=2; extra == 'dev'
 Requires-Dist: python-subunit~=1.4; extra == 'dev'
@@ -75,12 +78,12 @@ Requires-Dist: sphinx<7,>=6; extra == 'dev'
 Requires-Dist: towncrier~=23.6; extra == 'dev'
 Requires-Dist: twistedchecker~=0.7; extra == 'dev'
 Provides-Extra: dev-release
-Requires-Dist: pydoctor~=23.9.0; extra == 'dev-release'
+Requires-Dist: pydoctor~=24.11.1; extra == 'dev-release'
 Requires-Dist: sphinx-rtd-theme~=1.3; extra == 'dev-release'
 Requires-Dist: sphinx<7,>=6; extra == 'dev-release'
 Requires-Dist: towncrier~=23.6; extra == 'dev-release'
 Provides-Extra: dev_release
-Requires-Dist: pydoctor~=23.9.0; extra == 'dev_release'
+Requires-Dist: pydoctor~=24.11.1; extra == 'dev_release'
 Requires-Dist: sphinx-rtd-theme~=1.3; extra == 'dev_release'
 Requires-Dist: sphinx<7,>=6; extra == 'dev_release'
 Requires-Dist: towncrier~=23.6; extra == 'dev_release'
@@ -100,6 +103,7 @@ Requires-Dist: pyopenssl>=21.0.0; extra == 'gtk-platform'
 Requires-Dist: pyserial>=3.0; extra == 'gtk-platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'gtk-platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'gtk-platform'
+Requires-Dist: wsproto; extra == 'gtk-platform'
 Provides-Extra: gtk_platform
 Requires-Dist: appdirs>=1.4.0; extra == 'gtk_platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'gtk_platform'
@@ -116,6 +120,7 @@ Requires-Dist: pyopenssl>=21.0.0; extra == 'gtk_platform'
 Requires-Dist: pyserial>=3.0; extra == 'gtk_platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'gtk_platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'gtk_platform'
+Requires-Dist: wsproto; extra == 'gtk_platform'
 Provides-Extra: http2
 Requires-Dist: h2<5.0,>=3.2; extra == 'http2'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'http2'
@@ -130,13 +135,17 @@ Requires-Dist: hypothesis>=6.56; extra == 'macos-platform'
 Requires-Dist: idna>=2.4; extra == 'macos-platform'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'macos-platform'
 Requires-Dist: pyhamcrest>=2; extra == 'macos-platform'
-Requires-Dist: pyobjc-core; extra == 'macos-platform'
-Requires-Dist: pyobjc-framework-cfnetwork; extra == 'macos-platform'
-Requires-Dist: pyobjc-framework-cocoa; extra == 'macos-platform'
+Requires-Dist: pyobjc-core; (python_version >= '3.9') and extra == 'macos-platform'
+Requires-Dist: pyobjc-core<11; (python_version < '3.9') and extra == 'macos-platform'
+Requires-Dist: pyobjc-framework-cfnetwork; (python_version >= '3.9') and extra == 'macos-platform'
+Requires-Dist: pyobjc-framework-cfnetwork<11; (python_version < '3.9') and extra == 'macos-platform'
+Requires-Dist: pyobjc-framework-cocoa; (python_version >= '3.9') and extra == 'macos-platform'
+Requires-Dist: pyobjc-framework-cocoa<11; (python_version < '3.9') and extra == 'macos-platform'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'macos-platform'
 Requires-Dist: pyserial>=3.0; extra == 'macos-platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'macos-platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'macos-platform'
+Requires-Dist: wsproto; extra == 'macos-platform'
 Provides-Extra: macos_platform
 Requires-Dist: appdirs>=1.4.0; extra == 'macos_platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'macos_platform'
@@ -148,13 +157,17 @@ Requires-Dist: hypothesis>=6.56; extra == 'macos_platform'
 Requires-Dist: idna>=2.4; extra == 'macos_platform'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'macos_platform'
 Requires-Dist: pyhamcrest>=2; extra == 'macos_platform'
-Requires-Dist: pyobjc-core; extra == 'macos_platform'
-Requires-Dist: pyobjc-framework-cfnetwork; extra == 'macos_platform'
-Requires-Dist: pyobjc-framework-cocoa; extra == 'macos_platform'
+Requires-Dist: pyobjc-core; (python_version >= '3.9') and extra == 'macos_platform'
+Requires-Dist: pyobjc-core<11; (python_version < '3.9') and extra == 'macos_platform'
+Requires-Dist: pyobjc-framework-cfnetwork; (python_version >= '3.9') and extra == 'macos_platform'
+Requires-Dist: pyobjc-framework-cfnetwork<11; (python_version < '3.9') and extra == 'macos_platform'
+Requires-Dist: pyobjc-framework-cocoa; (python_version >= '3.9') and extra == 'macos_platform'
+Requires-Dist: pyobjc-framework-cocoa<11; (python_version < '3.9') and extra == 'macos_platform'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'macos_platform'
 Requires-Dist: pyserial>=3.0; extra == 'macos_platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'macos_platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'macos_platform'
+Requires-Dist: wsproto; extra == 'macos_platform'
 Provides-Extra: mypy
 Requires-Dist: appdirs>=1.4.0; extra == 'mypy'
 Requires-Dist: bcrypt>=3.1.3; extra == 'mypy'
@@ -168,7 +181,7 @@ Requires-Dist: idna>=2.4; extra == 'mypy'
 Requires-Dist: mypy-zope==1.0.6; extra == 'mypy'
 Requires-Dist: mypy==1.10.1; extra == 'mypy'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'mypy'
-Requires-Dist: pydoctor~=23.9.0; extra == 'mypy'
+Requires-Dist: pydoctor~=24.11.1; extra == 'mypy'
 Requires-Dist: pyflakes~=2.2; extra == 'mypy'
 Requires-Dist: pyhamcrest>=2; extra == 'mypy'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'mypy'
@@ -182,6 +195,7 @@ Requires-Dist: towncrier~=23.6; extra == 'mypy'
 Requires-Dist: twistedchecker~=0.7; extra == 'mypy'
 Requires-Dist: types-pyopenssl; extra == 'mypy'
 Requires-Dist: types-setuptools; extra == 'mypy'
+Requires-Dist: wsproto; extra == 'mypy'
 Provides-Extra: osx-platform
 Requires-Dist: appdirs>=1.4.0; extra == 'osx-platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'osx-platform'
@@ -193,13 +207,17 @@ Requires-Dist: hypothesis>=6.56; extra == 'osx-platform'
 Requires-Dist: idna>=2.4; extra == 'osx-platform'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'osx-platform'
 Requires-Dist: pyhamcrest>=2; extra == 'osx-platform'
-Requires-Dist: pyobjc-core; extra == 'osx-platform'
-Requires-Dist: pyobjc-framework-cfnetwork; extra == 'osx-platform'
-Requires-Dist: pyobjc-framework-cocoa; extra == 'osx-platform'
+Requires-Dist: pyobjc-core; (python_version >= '3.9') and extra == 'osx-platform'
+Requires-Dist: pyobjc-core<11; (python_version < '3.9') and extra == 'osx-platform'
+Requires-Dist: pyobjc-framework-cfnetwork; (python_version >= '3.9') and extra == 'osx-platform'
+Requires-Dist: pyobjc-framework-cfnetwork<11; (python_version < '3.9') and extra == 'osx-platform'
+Requires-Dist: pyobjc-framework-cocoa; (python_version >= '3.9') and extra == 'osx-platform'
+Requires-Dist: pyobjc-framework-cocoa<11; (python_version < '3.9') and extra == 'osx-platform'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'osx-platform'
 Requires-Dist: pyserial>=3.0; extra == 'osx-platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'osx-platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'osx-platform'
+Requires-Dist: wsproto; extra == 'osx-platform'
 Provides-Extra: osx_platform
 Requires-Dist: appdirs>=1.4.0; extra == 'osx_platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'osx_platform'
@@ -211,13 +229,17 @@ Requires-Dist: hypothesis>=6.56; extra == 'osx_platform'
 Requires-Dist: idna>=2.4; extra == 'osx_platform'
 Requires-Dist: priority<2.0,>=1.1.0; extra == 'osx_platform'
 Requires-Dist: pyhamcrest>=2; extra == 'osx_platform'
-Requires-Dist: pyobjc-core; extra == 'osx_platform'
-Requires-Dist: pyobjc-framework-cfnetwork; extra == 'osx_platform'
-Requires-Dist: pyobjc-framework-cocoa; extra == 'osx_platform'
+Requires-Dist: pyobjc-core; (python_version >= '3.9') and extra == 'osx_platform'
+Requires-Dist: pyobjc-core<11; (python_version < '3.9') and extra == 'osx_platform'
+Requires-Dist: pyobjc-framework-cfnetwork; (python_version >= '3.9') and extra == 'osx_platform'
+Requires-Dist: pyobjc-framework-cfnetwork<11; (python_version < '3.9') and extra == 'osx_platform'
+Requires-Dist: pyobjc-framework-cocoa; (python_version >= '3.9') and extra == 'osx_platform'
+Requires-Dist: pyobjc-framework-cocoa<11; (python_version < '3.9') and extra == 'osx_platform'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'osx_platform'
 Requires-Dist: pyserial>=3.0; extra == 'osx_platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'osx_platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'osx_platform'
+Requires-Dist: wsproto; extra == 'osx_platform'
 Provides-Extra: serial
 Requires-Dist: pyserial>=3.0; extra == 'serial'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'serial'
@@ -230,6 +252,8 @@ Provides-Extra: tls
 Requires-Dist: idna>=2.4; extra == 'tls'
 Requires-Dist: pyopenssl>=21.0.0; extra == 'tls'
 Requires-Dist: service-identity>=18.1.0; extra == 'tls'
+Provides-Extra: websocket
+Requires-Dist: wsproto; extra == 'websocket'
 Provides-Extra: windows-platform
 Requires-Dist: appdirs>=1.4.0; extra == 'windows-platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'windows-platform'
@@ -247,6 +271,7 @@ Requires-Dist: pywin32!=226; extra == 'windows-platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'windows-platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'windows-platform'
 Requires-Dist: twisted-iocpsupport>=1.0.2; extra == 'windows-platform'
+Requires-Dist: wsproto; extra == 'windows-platform'
 Provides-Extra: windows_platform
 Requires-Dist: appdirs>=1.4.0; extra == 'windows_platform'
 Requires-Dist: bcrypt>=3.1.3; extra == 'windows_platform'
@@ -264,6 +289,7 @@ Requires-Dist: pywin32!=226; extra == 'windows_platform'
 Requires-Dist: pywin32!=226; (platform_system == 'Windows') and extra == 'windows_platform'
 Requires-Dist: service-identity>=18.1.0; extra == 'windows_platform'
 Requires-Dist: twisted-iocpsupport>=1.0.2; extra == 'windows_platform'
+Requires-Dist: wsproto; extra == 'windows_platform'
 Description-Content-Type: text/x-rst
 
 Twisted
@@ -367,7 +393,7 @@ Or, for speed, use pre-commit directly::
 Copyright
 ---------
 
-All of the code in this distribution is Copyright (c) 2001-2024 Twisted Matrix Laboratories.
+All of the code in this distribution is Copyright (c) 2001-2025 Twisted Matrix Laboratories.
 
 Twisted is made available under the MIT license.
 The included `LICENSE <https://github.com/twisted/twisted/blob/trunk/LICENSE>`_ file describes this in detail.