graphics/qr-code-generator: Update to 1.8.0
This commit is contained in:
parent
313788cb9a
commit
7c1533ccde
|
@ -1,5 +1,5 @@
|
||||||
PORTNAME= qr-code-generator
|
PORTNAME= qr-code-generator
|
||||||
PORTVERSION= 1.6.0
|
PORTVERSION= 1.8.0
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
CATEGORIES= graphics
|
CATEGORIES= graphics
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ USE_LDCONFIG= yes
|
||||||
USE_GITHUB= yes
|
USE_GITHUB= yes
|
||||||
GH_ACCOUNT= nayuki
|
GH_ACCOUNT= nayuki
|
||||||
GH_PROJECT= QR-Code-generator
|
GH_PROJECT= QR-Code-generator
|
||||||
GH_TAGNAME= 67c6246
|
|
||||||
|
|
||||||
PLIST_SUB= VERSION=${PORTVERSION}
|
PLIST_SUB= VERSION=${PORTVERSION}
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ post-patch:
|
||||||
${CP} ${FILESDIR}/Makefile ${WRKSRC}
|
${CP} ${FILESDIR}/Makefile ${WRKSRC}
|
||||||
${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/c/Makefile
|
${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/c/Makefile
|
||||||
${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/cpp/Makefile
|
${REINPLACE_CMD} -e 's,$$(DESTDIR)/usr,${STAGEDIR}${PREFIX},' ${WRKSRC}/cpp/Makefile
|
||||||
|
${REINPLACE_CMD} -e 's,%%VERSION%%,${PORTVERSION},' ${WRKSRC}/c/Makefile
|
||||||
|
${REINPLACE_CMD} -e 's,%%VERSION%%,${PORTVERSION},' ${WRKSRC}/cpp/Makefile
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqrcodegen.so.${PORTVERSION}
|
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqrcodegen.so.${PORTVERSION}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1583603728
|
TIMESTAMP = 1673860287
|
||||||
SHA256 (nayuki-QR-Code-generator-v1.6.0-67c6246_GH0.tar.gz) = a9b83deee76bbe35770bf36a669494358dfe1d8aec3b2e6f9e216c9e830457ac
|
SHA256 (nayuki-QR-Code-generator-v1.8.0_GH0.tar.gz) = 2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60
|
||||||
SIZE (nayuki-QR-Code-generator-v1.6.0-67c6246_GH0.tar.gz) = 136401
|
SIZE (nayuki-QR-Code-generator-v1.8.0_GH0.tar.gz) = 193288
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
--- c/Makefile.orig 2019-10-14 00:20:16 UTC
|
--- c/Makefile.orig 2023-01-16 09:13:33 UTC
|
||||||
+++ c/Makefile
|
+++ c/Makefile
|
||||||
@@ -29,11 +29,13 @@
|
@@ -29,11 +29,13 @@
|
||||||
# - CFLAGS: Any extra user-specified compiler flags (can be blank).
|
# - CFLAGS: Any extra user-specified compiler flags (can be blank).
|
||||||
|
@ -12,12 +12,11 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
||||||
|
|
||||||
+# Version information
|
+# Version information
|
||||||
+VERSION = 1.6.0
|
+VERSION = %%VERSION%%
|
||||||
|
|
||||||
# ---- Controlling make ----
|
# ---- Controlling make ----
|
||||||
|
|
||||||
@@ -51,18 +53,45 @@ CFLAGS += -std=c99 -O
|
@@ -52,17 +54,44 @@ CFLAGS += -std=c99 -O
|
||||||
# ---- Targets to build ----
|
|
||||||
|
|
||||||
LIB = qrcodegen
|
LIB = qrcodegen
|
||||||
-LIBFILE = lib$(LIB).a
|
-LIBFILE = lib$(LIB).a
|
||||||
|
@ -28,7 +27,7 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
+REAL_NAME = $(LIBFILE).$(VERSION)
|
+REAL_NAME = $(LIBFILE).$(VERSION)
|
||||||
+HEADERS = qrcodegen.h
|
+HEADERS = qrcodegen.h
|
||||||
LIBOBJ = qrcodegen.o
|
LIBOBJ = qrcodegen.o
|
||||||
MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker
|
MAINS = qrcodegen-demo qrcodegen-test
|
||||||
|
|
||||||
+# define paths to install
|
+# define paths to install
|
||||||
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
||||||
|
@ -64,9 +63,9 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
+
|
+
|
||||||
# Executable files
|
# Executable files
|
||||||
%: %.o $(LIBFILE)
|
%: %.o $(LIBFILE)
|
||||||
$(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
|
||||||
@@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
|
@@ -72,12 +101,15 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c)
|
||||||
$(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^
|
$(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^
|
||||||
|
|
||||||
# The library
|
# The library
|
||||||
-$(LIBFILE): $(LIBOBJ)
|
-$(LIBFILE): $(LIBOBJ)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
--- cpp/Makefile.orig 2019-10-14 00:20:16 UTC
|
--- cpp/Makefile.orig 2023-01-16 09:17:10 UTC
|
||||||
+++ cpp/Makefile
|
+++ cpp/Makefile
|
||||||
@@ -29,11 +29,13 @@
|
@@ -29,12 +29,14 @@
|
||||||
# - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
|
# - CXXFLAGS: Any extra user-specified compiler flags (can be blank).
|
||||||
|
|
||||||
# Recommended compiler flags:
|
# Recommended compiler flags:
|
||||||
|
@ -11,31 +11,30 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
# Extra flags for diagnostics:
|
# Extra flags for diagnostics:
|
||||||
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address
|
||||||
|
|
||||||
|
-
|
||||||
+# Version information
|
+# Version information
|
||||||
+VERSION = 1.6.0
|
+VERSION = %%VERSION%%
|
||||||
|
+
|
||||||
# ---- Controlling make ----
|
# ---- Controlling make ----
|
||||||
|
|
||||||
@@ -50,30 +52,61 @@ CXXFLAGS += -std=c++11 -O
|
# Clear default suffix rules
|
||||||
|
@@ -51,29 +53,59 @@ CXXFLAGS += -std=c++11 -O
|
||||||
# ---- Targets to build ----
|
# ---- Targets to build ----
|
||||||
|
|
||||||
-LIB = qrcodegen
|
LIB = qrcodegencpp
|
||||||
-LIBFILE = lib$(LIB).a
|
-LIBFILE = lib$(LIB).a
|
||||||
+LIB = qrcodegencpp
|
|
||||||
+ARFILE = lib$(LIB).a
|
+ARFILE = lib$(LIB).a
|
||||||
+LIBFILE = lib$(LIB).so
|
+LIBFILE = lib$(LIB).so
|
||||||
+# Bump the soname number when the ABI changes and gets incompatible
|
+# Bump the soname number when the ABI changes and gets incompatible
|
||||||
+SO_NAME = $(LIBFILE).1
|
+SO_NAME = $(LIBFILE).1
|
||||||
+REAL_NAME = $(LIBFILE).$(VERSION)
|
+REAL_NAME = $(LIBFILE).$(VERSION)
|
||||||
+HEADERS = BitBuffer.hpp QrCode.hpp QrSegment.hpp
|
+HEADERS = qrcodegen.hpp
|
||||||
LIBOBJ = BitBuffer.o QrCode.o QrSegment.o
|
LIBOBJ = qrcodegen.o
|
||||||
MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker
|
MAINS = QrCodeGeneratorDemo
|
||||||
|
|
||||||
+# define paths to install
|
+# define paths to install
|
||||||
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen
|
||||||
+LIBDIR ?= $(DESTDIR)/usr/lib
|
+LIBDIR ?= $(DESTDIR)/usr/lib
|
||||||
+
|
|
||||||
+
|
+
|
||||||
# Build all binaries
|
# Build all binaries
|
||||||
-all: $(LIBFILE) $(MAINS)
|
-all: $(LIBFILE) $(MAINS)
|
||||||
|
@ -67,7 +66,7 @@ Based on https://github.com/nayuki/QR-Code-generator/pull/72
|
||||||
+
|
+
|
||||||
# Executable files
|
# Executable files
|
||||||
%: %.o $(LIBFILE)
|
%: %.o $(LIBFILE)
|
||||||
$(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB)
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB)
|
||||||
|
|
||||||
# The library
|
# The library
|
||||||
-$(LIBFILE): $(LIBOBJ)
|
-$(LIBFILE): $(LIBOBJ)
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
include/qrcodegen/BitBuffer.hpp
|
|
||||||
include/qrcodegen/QrCode.hpp
|
|
||||||
include/qrcodegen/QrSegment.hpp
|
|
||||||
include/qrcodegen/qrcodegen.h
|
include/qrcodegen/qrcodegen.h
|
||||||
|
include/qrcodegen/qrcodegen.hpp
|
||||||
lib/libqrcodegen.a
|
lib/libqrcodegen.a
|
||||||
lib/libqrcodegen.so
|
lib/libqrcodegen.so
|
||||||
lib/libqrcodegen.so.1
|
lib/libqrcodegen.so.1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user