public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/python-pillow-jxl-plugin] f44: Update to 1.3.5
Date: Mon, 29 Jun 2026 13:04:50 GMT	[thread overview]
Message-ID: <178273829083.1.15733446821275651958.rpms-python-pillow-jxl-plugin-9b729f11176e@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/python-pillow-jxl-plugin
Branch : f44
Commit : 9b729f11176ebcef28578ae84354c349568ce15e
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-20T22:14:47+01:00
Stats  : +55/-19 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/python-pillow-jxl-plugin/c/9b729f11176ebcef28578ae84354c349568ce15e?branch=f44

Log:
Update to 1.3.5

---
diff --git a/.gitignore b/.gitignore
index a1b36f9..3c4372c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /pillow_jxl_plugin-1.3.2.tar.gz
 /pillow_jxl_plugin-1.3.3.tar.gz
 /pillow_jxl_plugin-1.3.4.tar.gz
+/pillow-jpegxl-plugin-1.3.5.tar.gz

diff --git a/0001-Update-jpegxl-rs-dependency-from-0.11.2-to-0.12.0.patch b/0001-Update-jpegxl-rs-dependency-from-0.11.2-to-0.12.0.patch
index 75b3f5f..74c8634 100644
--- a/0001-Update-jpegxl-rs-dependency-from-0.11.2-to-0.12.0.patch
+++ b/0001-Update-jpegxl-rs-dependency-from-0.11.2-to-0.12.0.patch
@@ -1,7 +1,7 @@
-From edb9128db86da0fb74d341e40ceb27f009f6a6da Mon Sep 17 00:00:00 2001
+From 169bd063f65779ff39dacf75f67e345932ed7f6e Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Tue, 17 Mar 2026 23:23:07 +0100
-Subject: [PATCH 1/2] Update jpegxl-rs dependency from 0.11.2 to 0.12.0
+Subject: [PATCH 1/3] Update jpegxl-rs dependency from 0.11.2 to 0.12.0
 
 Backport from upstream commit:
 https://github.com/Isotr0py/pillow-jpegxl-plugin/commit/0ecab6b
@@ -11,20 +11,20 @@ https://github.com/Isotr0py/pillow-jpegxl-plugin/commit/0ecab6b
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index d96dab8..e39d868 100644
+index 82fb871..f5c73fd 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
  
  [dependencies]
- pyo3 = { version="0.25.1", features = ["extension-module"] }
+ pyo3 = { version="0.26.0", features = ["extension-module", "generate-import-lib"] }
 -jpegxl-rs = { version="0.11.2", default-features = false }
 +jpegxl-rs = { version="0.12.0", default-features = false }
  
  [features]
  # Enables parallel processing support by enabling the "rayon" feature of jpeg-decoder.
 diff --git a/src/encode.rs b/src/encode.rs
-index defa0e8..d2c6a82 100644
+index e869ba7..52d8728 100644
 --- a/src/encode.rs
 +++ b/src/encode.rs
 @@ -131,8 +131,8 @@ impl Encoder {
@@ -39,5 +39,5 @@ index defa0e8..d2c6a82 100644
          };
          encoder.speed = match self.effort {
 -- 
-2.53.0
+2.54.0
 

diff --git a/0002-Unconditionally-dynamically-link-libjxl.patch b/0002-Unconditionally-dynamically-link-libjxl.patch
index 2a8ee01..c73f383 100644
--- a/0002-Unconditionally-dynamically-link-libjxl.patch
+++ b/0002-Unconditionally-dynamically-link-libjxl.patch
@@ -1,7 +1,7 @@
-From 59558aa6a55b9be6c5a0adeb5f1f6ee44cf60957 Mon Sep 17 00:00:00 2001
+From 26fa60b88b7ac5fff4617ae72e97293ebba812f2 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Sat, 22 Mar 2025 13:30:36 +0100
-Subject: [PATCH 2/2] Unconditionally dynamically link libjxl
+Subject: [PATCH 2/3] Unconditionally dynamically link libjxl
 
 ---
  Cargo.toml     |  4 +---
@@ -10,18 +10,18 @@ Subject: [PATCH 2/2] Unconditionally dynamically link libjxl
  3 files changed, 3 insertions(+), 55 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index e39d868..02e8f8c 100644
+index f5c73fd..9bf18ea 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -2,7 +2,6 @@
  name = "pillow-jxl-plugin"
- version = "1.3.4"
+ version = "1.3.5"
  edition = "2021"
 -build = "build.rs"
  
  # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
  [lib]
-@@ -14,6 +13,5 @@ pyo3 = { version="0.25.1", features = ["extension-module"] }
+@@ -14,6 +13,5 @@ pyo3 = { version="0.26.0", features = ["extension-module", "generate-import-lib"
  jpegxl-rs = { version="0.12.0", default-features = false }
  
  [features]
@@ -91,7 +91,7 @@ index e8f0895..4eddb1f 100644
 -    }
  }
 diff --git a/pyproject.toml b/pyproject.toml
-index a76ac34..f64afba 100644
+index 11dc6fa..dd9e8bc 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -31,4 +31,4 @@ dev = ["numpy", "pytest", "pyexiv2"]
@@ -101,5 +101,5 @@ index a76ac34..f64afba 100644
 -features = ["pyo3/extension-module", "vendored"]
 +features = ["pyo3/extension-module"]
 -- 
-2.53.0
+2.54.0
 

diff --git a/0003-Downstream-only-patch-out-the-generate-import-lib-fe.patch b/0003-Downstream-only-patch-out-the-generate-import-lib-fe.patch
new file mode 100644
index 0000000..00c946b
--- /dev/null
+++ b/0003-Downstream-only-patch-out-the-generate-import-lib-fe.patch
@@ -0,0 +1,31 @@
+From 783bdb081d29def40d7dd73627cd4567ddd4fb37 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sat, 20 Jun 2026 22:02:36 +0100
+Subject: [PATCH 3/3] Downstream-only: patch out the generate-import-lib
+ feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is only relevant on Windows, and depends on the corresponding pyo3
+feature – which is not packaged for that reason.
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 9bf18ea..333a227 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -9,7 +9,7 @@ name = "pillow_jxl"
+ crate-type = ["cdylib"]
+ 
+ [dependencies]
+-pyo3 = { version="0.26.0", features = ["extension-module", "generate-import-lib"] }
++pyo3 = { version="0.26.0", features = ["extension-module"] }
+ jpegxl-rs = { version="0.12.0", default-features = false }
+ 
+ [features]
+-- 
+2.54.0
+

diff --git a/python-pillow-jxl-plugin.spec b/python-pillow-jxl-plugin.spec
index 0cc2faf..76e934d 100644
--- a/python-pillow-jxl-plugin.spec
+++ b/python-pillow-jxl-plugin.spec
@@ -1,7 +1,5 @@
-%global pypi_name pillow_jxl_plugin
-
 Name:           python-pillow-jxl-plugin
-Version:        1.3.4
+Version:        1.3.5
 Release:        %autorelease
 Summary:        Pillow plugin for JPEG-XL
 # GPL-3.0-or-later for code
@@ -17,7 +15,7 @@ License:        GPL-3.0-or-later AND MIT AND (Apache-2.0 OR MIT) AND (BSD-2-Clau
 # LICENSE.dependencies contains a full license breakdown
 
 URL:            https://github.com/Isotr0py/pillow-jpegxl-plugin
-Source:         %{pypi_source %{pypi_name}}
+Source:         %{url}/archive/v%{version}/pillow-jpegxl-plugin-%{version}.tar.gz
 
 # upstream commit to update jpegxl-rs dependency from 0.11 to 0.12:
 # https://github.com/Isotr0py/pillow-jpegxl-plugin/commit/0ecab6b
@@ -26,6 +24,12 @@ Patch:          0001-Update-jpegxl-rs-dependency-from-0.11.2-to-0.12.0.patch
 # drop custom build system that is unnecessary and only breaks stuff
 Patch:          0002-Unconditionally-dynamically-link-libjxl.patch
 
+# Downstream-only: patch out the generate-import-lib feature
+#
+# It is only relevant on Windows, and depends on the corresponding pyo3
+# feature – which is not packaged for that reason.
+Patch:          0003-Downstream-only-patch-out-the-generate-import-lib-fe.patch
+
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  python3-devel
 BuildRequires:  jpegxl-devel
@@ -42,7 +46,7 @@ Summary:        Pillow plugin for JPEG-XL
 %description -n python3-pillow-jxl-plugin %{_description}
 
 %prep
-%autosetup -n %{pypi_name}-%{version} -p1
+%autosetup -n pillow-jpegxl-plugin-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires

diff --git a/sources b/sources
index 7bed67b..6b63dd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pillow_jxl_plugin-1.3.4.tar.gz) = 9aaf3457ef07d0d0467f5d54770c8cb5df46357a3fcf6c6c33d702ec07aeca2f17d952647726ab91cde039d34e6478de609fb73ec669d72abe083c1ecc4a9f40
+SHA512 (pillow-jpegxl-plugin-1.3.5.tar.gz) = 96cd759800b45d00b586e0b6f804f9fd600b31f63ff7030f928b62cb6b68e132348706bde0de28f0fab666c27f2c49e3694385f6edb6ce1fb557ea59bc4d31a9

                 reply	other threads:[~2026-06-29 13:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178273829083.1.15733446821275651958.rpms-python-pillow-jxl-plugin-9b729f11176e@fedoraproject.org \
    --to=code@musicinmybrain.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox