<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b1195fabb32088e63288aca09fe91813c4e23623">https://github.com/macports/macports-ports/commit/b1195fabb32088e63288aca09fe91813c4e23623</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b1195fabb32088e63288aca09fe91813c4e23623
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Sep 17 07:39:48 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libquirc: update to 1.2
</span>---
graphics/libquirc/Portfile | 40 ++++++++++++---------
graphics/libquirc/files/patch-quirc.diff | 61 ++++++++++++++++++--------------
2 files changed, 59 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libquirc/Portfile b/graphics/libquirc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fad6e63271d..a119c01e50c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libquirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libquirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dlbeer quirc 1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dlbeer quirc 1.2 v
</span> name lib${github.project}
revision 0
categories graphics math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description QR codes are a type of high-density matrix \
</span> barcodes, and quirc is a library for extracting \
and decoding them from images.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 45edf684de85d504631d3ea5b315b07ee8919895 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 33cf10f6f567f07583014f2c8596915f890a78cd2d40f7d4ecaa380fa0d12f4a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38608
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1520b02c9c153c3eff845fd5fb3317695e215204 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 39295a364c933bc701a7c93acf86d35a297d253570ccf3c556c2dfe44ea485c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42927
</span>
depends_build-append \
port:gmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,29 +34,37 @@ post-patch {
</span> ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant full description {Full quirc installation.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cpath-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${workpath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/gmake
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant full description {Full quirc installation.} {
</span> post-patch {
xinstall -d ${workpath}/include
# https://raw.githubusercontent.com/openbsd/src/master/sys/sys/videoio.h
xinstall -m 0644 ${filespath}/videoio.h ${workpath}/include
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cpath-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/SDL \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${workpath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/SDL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if { [variant_isset "full"] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append BUILD_QUIRC=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_QUIRC=ON
</span>
destroot.post_args-append \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libquirc/files/patch-quirc.diff b/graphics/libquirc/files/patch-quirc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 195fdbf025f..d77fbf8adf9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libquirc/files/patch-quirc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libquirc/files/patch-quirc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +1,58 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -NaurdwB ./Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./Makefile 2022-09-02 20:09:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./Makefile 2022-09-05 13:10:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,12 +14,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2023-03-22 03:09:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2023-09-16 13:51:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,12 +14,22 @@
</span> # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
CC ?= gcc
-PREFIX ?= /usr/local
+PREFIX ?= @PREFIX@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +# Turn off SDL support with dylib-only builds
+ifdef BUILD_QUIRC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_CFLAGS != pkg-config --cflags sdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_LIBS != pkg-config --libs sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_CFLAGS := $(shell pkg-config --cflags sdl 2>&1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_LIBS = $(shell pkg-config --libs sdl)
</span> +else
+ SDL_CFLAGS ?=
+ SDL_LIBS ?=
+endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_VERSION = 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_VERSION = 1.2
</span>
+LINKERLIBFLAGS = -dynamiclib -headerpad_max_install_names \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -current_version $(LIB_VERSION) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -compatibility_version $(LIB_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -current_version $(LIB_VERSION) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -compatibility_version $(LIB_VERSION)
</span> +
CFLAGS ?= -O3 -Wall -fPIC
QUIRC_CFLAGS = -Ilib $(CFLAGS) $(SDL_CFLAGS)
LIB_OBJ = \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,45 +45,45 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demo/dthash.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demo/demoutil.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: all v4l sdl opencv install uninstall clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: libquirc.so qrtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: libquirc.dylib qrtest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--all: libquirc.so qrtest inspect quirc-demo quirc-scanner
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: libquirc.dylib qrtest inspect quirc-demo quirc-scanner
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v4l: quirc-scanner
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qrtest: tests/dbgutil.o tests/qrtest.o libquirc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,30 +63,30 @@
</span> $(CC) -o $@ tests/dbgutil.o tests/qrtest.o libquirc.a $(LDFLAGS) -lm -ljpeg -lpng
inspect: tests/dbgutil.o tests/inspect.o libquirc.a
- $(CC) -o $@ tests/dbgutil.o tests/inspect.o libquirc.a $(LDFLAGS) -lm -ljpeg -lpng $(SDL_LIBS) -lSDL_gfx
+ $(CC) -o $@ tests/dbgutil.o tests/inspect.o libquirc.a $(LDFLAGS) -lm -ljpeg -lpng $(SDL_LIBS) -lSDL -lSDL_gfx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- quirc-demo: $(DEMO_OBJ) demo/demo.o libquirc.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -o $@ $(DEMO_OBJ) demo/demo.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL_gfx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ $(DEMO_OBJ) demo/demo.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL -lSDL_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inspect-opencv: tests/dbgutil.o tests/inspect_opencv.o libquirc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -o $@ tests/dbgutil.o tests/inspect_opencv.o libquirc.a $(LDFLAGS) -lm -ljpeg -lpng $(OPENCV_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quirc-demo: $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/demo.o libquirc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/demo.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/demo.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL -lSDL_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quirc-demo-opencv: $(DEMO_UTIL_OBJ) demo/demo_opencv.o libquirc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -o $@ $(DEMO_UTIL_OBJ) demo/demo_opencv.o libquirc.a $(LDFLAGS) -lm $(OPENCV_LIBS)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- quirc-scanner: $(DEMO_OBJ) demo/scanner.o libquirc.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -o $@ $(DEMO_OBJ) demo/scanner.o libquirc.a $(LDFLAGS) -lm -ljpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $@ $(DEMO_OBJ) demo/scanner.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL -lSDL_gfx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quirc-scanner: $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/scanner.o libquirc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/scanner.o libquirc.a $(LDFLAGS) -lm -ljpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/scanner.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL -lSDL_gfx
</span>
libquirc.a: $(LIB_OBJ)
rm -f $@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +71,9 @@ diff -NaurdwB ./Makefile
</span>
.c.o:
$(CC) $(QUIRC_CFLAGS) -o $@ -c $<
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,18 +95,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .cxx.o:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(QUIRC_CXXFLAGS) -o $@ -c $<
</span>
-install: libquirc.a libquirc.so.$(LIB_VERSION) quirc-demo quirc-scanner
- install -o root -g root -m 0644 lib/quirc.h $(DESTDIR)$(PREFIX)/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +85,7 @@ diff -NaurdwB ./Makefile
</span> + install -o @MACPORTSUSER@ -g @MACPORTSUSER@ -m 0755 libquirc.$(LIB_VERSION).dylib \
$(DESTDIR)$(PREFIX)/lib
- install -o root -g root -m 0755 quirc-demo $(DESTDIR)$(PREFIX)/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- # install -o root -g root -m 0755 quirc-demo-opencv $(DESTDIR)$(PREFIX)/bin
</span> - install -o root -g root -m 0755 quirc-scanner $(DESTDIR)$(PREFIX)/bin
+ install -o @MACPORTSUSER@ -g @MACPORTSUSER@ -m 0755 quirc-demo $(DESTDIR)$(PREFIX)/bin
+ install -o @MACPORTSUSER@ -g @MACPORTSUSER@ -m 0755 quirc-scanner $(DESTDIR)$(PREFIX)/bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,8 +96,8 @@ diff -NaurdwB ./Makefile
</span> + rm -f $(DESTDIR)$(PREFIX)/lib/libquirc.$(LIB_VERSION).dylib
rm -f $(DESTDIR)$(PREFIX)/lib/libquirc.a
rm -f $(DESTDIR)$(PREFIX)/bin/quirc-demo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(DESTDIR)$(PREFIX)/bin/quirc-scanner
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(DESTDIR)$(PREFIX)/bin/quirc-demo-opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,7 +115,7 @@
</span> rm -f */*.o
rm -f */*.lo
rm -f libquirc.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,8 +105,7 @@ diff -NaurdwB ./Makefile
</span> + rm -f libquirc.$(LIB_VERSION).dylib
rm -f qrtest
rm -f inspect
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f quirc-demo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -NaurdwB ./demo/camera.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f inspect-opencv
</span> --- ./demo/camera.c 2022-09-05 08:15:57.000000000 -0400
+++ ./demo/camera.c 2022-09-05 08:23:51.000000000 -0400
@@ -25,6 +25,8 @@
</pre><pre style='margin:0'>
</pre>