From 3ae659174680b9630d580749d188c775e0a37a9e Mon Sep 17 00:00:00 2001 From: i0ntempest Date: Sun, 25 Jan 2026 21:35:27 +0800 Subject: [PATCH] jpeg-quantsmooth: 1.20260122 --- graphics/jpeg-quantsmooth/Portfile | 15 +++---- .../files/patch-Makefile.patch | 40 ------------------- .../files/patch-dynamic.patch | 10 ++--- 3 files changed, 11 insertions(+), 54 deletions(-) delete mode 100644 graphics/jpeg-quantsmooth/files/patch-Makefile.patch diff --git a/graphics/jpeg-quantsmooth/Portfile b/graphics/jpeg-quantsmooth/Portfile index e45fc0250f5..64731ef4a03 100644 --- a/graphics/jpeg-quantsmooth/Portfile +++ b/graphics/jpeg-quantsmooth/Portfile @@ -4,9 +4,8 @@ PortSystem 1.0 PortGroup github 1.0 PortGroup makefile 1.0 -github.setup ilyakurdyukov jpeg-quantsmooth 1.20240129 -# Change github.tarball_from to 'releases' or 'archive' next update -github.tarball_from tarball +github.setup ilyakurdyukov jpeg-quantsmooth 1.20260122 +github.tarball_from archive revision 0 categories graphics license LGPL-2.1 @@ -17,9 +16,9 @@ long_description ${name} or jpegqs tries to recover the lost precision of DCT a quantization table from a JPEG image. The result is saved as a JPEG image with\ quantization set to 1 (like a JPEG saved at 100% quality). -checksums rmd160 13c5a1902982c248816916485e2e870c0991119d \ - sha256 d000a34609f6ea9d524d2853eebccd4c28874903040b06bc9fca0e2a6ad35549 \ - size 74249 +checksums rmd160 ccfb027de3f14b310174a4ae0b85326de8831af3 \ + sha256 7dcbaa7d994511a03dba845aa218a25f9c8e70c0bcb0800ff61ae3d92dd50c3d \ + size 78756 compiler.openmp_version \ 4.5 @@ -30,9 +29,6 @@ depends_lib-append port:libjpeg-turbo patchfiles-append patch-dynamic.patch -# See: https://github.com/ilyakurdyukov/jpeg-quantsmooth/pull/31 -patchfiles-append patch-Makefile.patch - post-patch { reinplace "s|LDFLAGS :=|LDFLAGS ?=|g" Makefile reinplace "s|CFLAGS :=|CFLAGS ?=|g" Makefile @@ -59,6 +55,7 @@ destroot { } variant extensions description {Compile for Intel CPU vector extensions (SSE2, AVX2, AVX512)} { + # Also supports RISC-V and Loongarch now but irrelevant on macOS if {${configure.build_arch} in [list arm64 ppc ppc64]} { known_fail yes pre-fetch { diff --git a/graphics/jpeg-quantsmooth/files/patch-Makefile.patch b/graphics/jpeg-quantsmooth/files/patch-Makefile.patch deleted file mode 100644 index 84558a74cb0..00000000000 --- a/graphics/jpeg-quantsmooth/files/patch-Makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Makefile b/Makefile -index 97c9461..cbc7c4e 100644 ---- Makefile -+++ Makefile -@@ -25,10 +25,10 @@ SIMDOBJ := jpegqs_base.o jpegqs_sse2.o jpegqs_avx2.o jpegqs_avx512.o - else ifeq ($(SIMD),none) - SIMDFLG := -DNO_SIMD - else ifeq ($(SIMD),native) --ifneq (,$(filter arm% aarch64,$(ARCH))) --SIMDFLG := -mcpu=native -+ifneq (,$(filter arm% aarch64 ppc% Power\ Macintosh,$(ARCH))) -+SIMDFLG := -mcpu=native -mtune=native - else --SIMDFLG := -march=native -+SIMDFLG := -march=native -mtune=native - endif - else ifeq ($(SIMD),avx512) - SIMDFLG := $(SIMD_AVX512) -@@ -49,14 +49,20 @@ CFLAGS := -Wall -O2 - ifneq (,$(filter e2k,$(ARCH))) - CFLAGS := $(filter-out -O2,$(CFLAGS)) -O3 - endif -+OMPLINK := - ifeq ($(OS),Darwin) - LDFLAGS := -Wl,-dead_strip - ifeq ($(LIBMINIOMP),) --LDFLAGS += -lomp -+ifneq (,$(filter gcc%,$(notdir $(CC)))) -+OMPLINK := -lgomp -+else -+OMPLINK := -lomp -+endif - endif - else - LDFLAGS := -Wl,--gc-sections -s - endif -+LDFLAGS += $(OMPLINK) - - CFLAGS_LIB := $(CFLAGS) $(MFLAGS) $(SIMDFLG) - CFLAGS_APP := $(CFLAGS_LIB) -Wextra -pedantic $(MTOPTS) diff --git a/graphics/jpeg-quantsmooth/files/patch-dynamic.patch b/graphics/jpeg-quantsmooth/files/patch-dynamic.patch index c171eae2c7c..a73494a1042 100644 --- a/graphics/jpeg-quantsmooth/files/patch-dynamic.patch +++ b/graphics/jpeg-quantsmooth/files/patch-dynamic.patch @@ -1,6 +1,6 @@ --- Makefile.orig 2024-01-30 00:08:25 +++ Makefile 2024-12-13 19:19:32 -@@ -68,7 +68,7 @@ +@@ -89,7 +89,7 @@ app: $(APPNAME) all: app lib @@ -9,12 +9,12 @@ WGET_CMD = @echo "run make with WGET_CMD=wget to allow file downloads" ; echo "DISABLED:" wget -@@ -163,9 +163,13 @@ +@@ -186,9 +186,13 @@ ifeq ($(SIMD),select) - lib$(APPNAME).a: libjpegqs_base.o libjpegqs_sse2.o libjpegqs_avx2.o libjpegqs_avx512.o -+lib$(APPNAME).dylib: libjpegqs_base.o libjpegqs_sse2.o libjpegqs_avx2.o libjpegqs_avx512.o -+ $(CC) $(CFLAGS_APP) -fPIC -shared $(JPEGLIB2) $(SIMDOBJ) $(LDFLAGS) -o $@ libjpegqs_base.o libjpegqs_sse2.o libjpegqs_avx2.o libjpegqs_avx512.o + lib$(APPNAME).a: $(SIMDOBJ:%=lib%) ++lib$(APPNAME).dylib: $(SIMDOBJ:%=lib%) ++ $(CC) $(CFLAGS_APP) -fPIC -shared $(JPEGLIB2) $(SIMDOBJ) $(LDFLAGS) -o $@ $(SIMDOBJ:%=lib%) endif lib$(APPNAME).a: libjpegqs.o $(AR) -rsc $@ $^