graphics/py-simplejpeg: update 1.8.0 → 1.9.0

4 files changed, 45 insertions, 40 deletions

diff --git a/graphics/py-simplejpeg/Makefile b/graphics/py-simplejpeg/Makefile
index 20956fc2f4b6..f07dbaa5e040 100644
--- a/graphics/py-simplejpeg/Makefile
+++ b/graphics/py-simplejpeg/Makefile
@@ -1,9 +1,13 @@
 PORTNAME=	simplejpeg
-DISTVERSION=	1.8.0
-PORTREVISION=	2
+DISTVERSION=	1.9.0
 CATEGORIES=	graphics python
-MASTER_SITES=	PYPI
+JPEG_VERSION=	3.1.2
+MASTER_SITES=	PYPI :simplejpeg \
+		https://codeload.github.com/libjpeg-turbo/libjpeg-turbo/tar.gz/${JPEG_VERSION}?dummy=/:libjpeg
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:simplejpeg \
+		libjpeg-turbo-${JPEG_VERSION}.tar.gz:libjpeg
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple package for fast JPEG encoding and decoding
@@ -12,22 +16,27 @@ WWW=		https://gitlab.com/jfolz/simplejpeg
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR} \
+BUILD_DEPENDS=	nasm:devel/nasm \
+		${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=2.0.0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		cmake:indirect python
 USE_PYTHON=	autoplist cython pep517 pytest
 
-TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_ENV=	${MAKE_ENV} \
+		PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
+		PYTEST_ADDOPTS="-p no:black -p no:ruff -p no:mypy -p no:flake8 -p no:cov"
 TEST_WRKSRC=	${WRKSRC}/test
 
 post-extract: # force cythonization because pre-cythonized _jpeg.c fails to compile
+	@${MKDIR} ${WRKSRC}/lib
+	@${CP} ${DISTDIR}/libjpeg-turbo-${JPEG_VERSION}.tar.gz ${WRKSRC}/lib/
 	@${RM} ${WRKSRC}/simplejpeg/_jpeg.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/simplejpeg/_jpeg${PYTHON_TAG}.so
 
-# tests as of 1.8.0: 61 passed in 10.57s
+# tests as of 1.9.0: 70 passed in 5.98s
 
 .include <bsd.port.mk>
diff --git a/graphics/py-simplejpeg/distinfo b/graphics/py-simplejpeg/distinfo
index ddaa3c1b4d0d..1ca9dfe52610 100644
--- a/graphics/py-simplejpeg/distinfo
+++ b/graphics/py-simplejpeg/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1739083532
-SHA256 (simplejpeg-1.8.0.tar.gz) = 43f78b0e7304a24751e14c429a8179a06623167e161e34ed7456dca9b36832cd
-SIZE (simplejpeg-1.8.0.tar.gz) = 5482647
+TIMESTAMP = 1785775991
+SHA256 (simplejpeg-1.9.0.tar.gz) = 5ac7d9489eeb812c2e7ea5c283994a29d9fefdfe5ed7b86c09d485e0dd366689
+SIZE (simplejpeg-1.9.0.tar.gz) = 3965764
+SHA256 (libjpeg-turbo-3.1.2.tar.gz) = 560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6
+SIZE (libjpeg-turbo-3.1.2.tar.gz) = 2512033
diff --git a/graphics/py-simplejpeg/files/patch-pyproject.toml b/graphics/py-simplejpeg/files/patch-pyproject.toml
index e7c68ace4d4d..e3adad4e162e 100644
--- a/graphics/py-simplejpeg/files/patch-pyproject.toml
+++ b/graphics/py-simplejpeg/files/patch-pyproject.toml
@@ -1,17 +1,25 @@
---- pyproject.toml.orig	2025-02-08 13:37:27 UTC
+-- Lower the build-system version requirements and fix the PEP 621 license
+-- field so that simplejpeg builds with the versions available in FreeBSD Ports.
+--- pyproject.toml.orig	2025-10-10 10:46:58 UTC
 +++ pyproject.toml
-@@ -29,11 +29,10 @@ requires = [
+@@ -7,7 +7,7 @@ requires-python = ">=3.9"
+     "Intended Audience :: Science/Research",
+ ]
+ requires-python = ">=3.9"
+-license = "MIT"
++license = {text = "MIT"}
+ authors = [{ name = "Joachim Folz", email = "joachim.folz@dfki.de" }]
+ keywords = [
+     "the",
+@@ -28,9 +28,9 @@ requires = [
  
  [build-system]
  requires = [
--    "setuptools>=74.1.1",
-+    "setuptools",
+-    "setuptools>=77.0.0",
++    "setuptools>=63.1.0",
      "wheel",
--    "cmake>=3.6.3",
--    "cython~=3.0.0",
--    "numpy>=2.0.0",
+-    "cython~=3.1.0",
 +    "cython>=3.1.0",
-+    "numpy",
+     "numpy>=2.0.0",
  ]
- build-backend = "setuptools.build_meta"
- 
+ backend-path = ["custom_build_backend"]
diff --git a/graphics/py-simplejpeg/files/patch-setup.py b/graphics/py-simplejpeg/files/patch-setup.py
index 6b25aa003388..24a1f07ac2ee 100644
--- a/graphics/py-simplejpeg/files/patch-setup.py
+++ b/graphics/py-simplejpeg/files/patch-setup.py
@@ -1,14 +1,9 @@
---- setup.py.orig	2024-09-17 09:48:31 UTC
+-- Add FreeBSD to the platforms recognized by the build script so that the
+-- bundled libjpeg-turbo is built with CMake and the correct static library
+-- name is selected.
+--- setup.py.orig	2025-10-10 10:46:58 UTC
 +++ setup.py
-@@ -8,7 +8,6 @@ import subprocess
- import sysconfig
- import subprocess
- 
--from cmake import CMAKE_BIN_DIR
- from setuptools import setup
- from setuptools import find_packages
- from setuptools import Extension
-@@ -82,7 +81,7 @@ def make_type():
+@@ -112,7 +112,7 @@ def make_type():
  
  
  def make_type():
@@ -17,16 +12,7 @@
          return 'Unix Makefiles'
      elif OS == 'windows':
          return 'NMake Makefiles'
-@@ -152,7 +151,7 @@ class cmake_build_ext(build_ext):
-         os.chdir(build_dir)
-         config = 'Debug' if self.debug else 'Release'
-         env = dict(os.environ, **(env or {}))
--        cmake = pt.join(CMAKE_BIN_DIR, 'cmake')
-+        cmake = 'cmake'
-         subprocess.check_call([
-             cmake,
-             '-G' + make_type(), '-Wno-dev',
-@@ -172,7 +171,7 @@ def _staticlib():
+@@ -196,7 +196,7 @@ def _staticlib():
  
  
  def _staticlib():