sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (81981337b2675348cdde0b63a4b92aa6db6bee78)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (81981337b2675348cdde0b63a4b92aa6db6bee78)
Date: Wed, 22 Mar 2023 18:59:38 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

doc/mupdf/BUILD | 2 -
doc/mupdf/DEPENDS | 24 +++++++++---------
doc/mupdf/HISTORY | 6 ++++
doc/mupdf/INSTALL | 2 -
doc/mupdf/patches-1.16/pkcs7.patch | 29 ----------------------
doc/mupdf/patches-1.16/shared_libs.patch | 40
-------------------------------
doc/mupdf/patches-1.21/pkcs7.patch | 29 ++++++++++++++++++++++
doc/mupdf/patches-1.21/shared_libs.patch | 24 ++++++++++++++++++
8 files changed, 73 insertions(+), 83 deletions(-)

New commits:
commit 81981337b2675348cdde0b63a4b92aa6db6bee78
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/mupdf: refactored the old patches, added parallelism to
building/installing, X11/OPENGL client is optional now

diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index 62b08f6..44603e8 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1 +1 @@
-CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes USE_SYSTEM_LIBS=yes
+CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes USE_SYSTEM_LIBS=yes shared=yes -j"${MAKE_NJOBS:-1}"
diff --git a/doc/mupdf/DEPENDS b/doc/mupdf/DEPENDS
index abaca7e..03f4a53 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -4,10 +4,19 @@ depends freetype2 &&
depends harfbuzz &&
depends jbig2dec &&
depends zlib &&
-depends libxext &&
-depends libx11 &&
depends gumbo-parser &&

+optional_depends libx11 "HAVE_X11=yes" "HAVE_X11=no HAVE_GLUT=no" \
+ "to build X11 client" &&
+if is_depends_enabled "${SPELL}" "libx11"; then
+ depends libxext &&
+
+ optional_depends GLUT "HAVE_GLUT=yes" "" "for OpenGL-based viewer" &&
+ if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} GLUT); then
+ depends OPENGL
+ fi
+fi &&
+
optional_depends SSL \
"HAVE_OPENSSL=yes" \
"HAVE_OPENSSL=no" \
@@ -16,13 +25,4 @@ optional_depends SSL \
optional_depends curl \
"HAVE_CURL=yes" \
"HAVE_CURL=no" \
- "for progressive loading support" &&
-
-optional_depends GLUT \
- "HAVE_GLUT=yes" \
- "HAVE_GLUT=no" \
- "for OpenGL-based viewer" &&
-
-if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} GLUT); then
- depends OPENGL
-fi
+ "for progressive loading support"
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index adb57b0..176f41a 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,9 @@
+2023-03-22 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, INSTALL: build shared libraries only, added parallelism
+ * DEPENDS: libx11, libxext and GLUT are optional now
+ * patches-1.16/*: removed
+ * patches-1.21/*: added
+
2022-12-23 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.21.1

diff --git a/doc/mupdf/INSTALL b/doc/mupdf/INSTALL
index 08b80f5..3a76359 100755
--- a/doc/mupdf/INSTALL
+++ b/doc/mupdf/INSTALL
@@ -1 +1 @@
-make build=release prefix="$INSTAL_ROOT/usr" ${OPTS} USE_SYSTEM_LIBS=yes
install
+make build=release prefix="$INSTAL_ROOT/usr" ${OPTS} USE_SYSTEM_LIBS=yes
shared=yes -j"${MAKE_NJOBS:-1}" install
diff --git a/doc/mupdf/patches-1.16/pkcs7.patch
b/doc/mupdf/patches-1.16/pkcs7.patch
deleted file mode 100644
index 342da08..0000000
--- a/doc/mupdf/patches-1.16/pkcs7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/source/helpers/pkcs7/pkcs7-openssl.c
b/source/helpers/pkcs7/pkcs7-openssl.c
---- a/source/helpers/pkcs7/pkcs7-openssl.c
-+++ b/source/helpers/pkcs7/pkcs7-openssl.c
-@@ -517,11 +517,12 @@
- {
- EVP_PKEY *pkey = NULL;
- X509 *x509 = NULL;
-+ STACK_OF(PKCS12_SAFEBAG) *bags;
- switch (M_PKCS12_bag_type(bag))
- {
- case NID_keyBag:
- {
-- const PKCS8_PRIV_KEY_INFO *p8 =
PKCS12_SAFEBAG_get0_p8inf(bag);
-+ const PKCS8_PRIV_KEY_INFO *p8 =
PKCS12_decrypt_skey(bag, pw, (int)strlen(pw));
- pkey = EVP_PKCS82PKEY(p8);
- }
- break;
-@@ -543,7 +544,10 @@
- break;
-
- case NID_safeContentsBag:
-- add_from_bags(pX509, pPkey, PKCS12_SAFEBAG_get0_safes(bag),
pw);
-+ bags = sk_PKCS12_SAFEBAG_new_null();
-+ sk_PKCS12_SAFEBAG_push(bags, bag);
-+ add_from_bags(pX509, pPkey, bags, pw);
-+ sk_PKCS12_SAFEBAG_free(bags);
- break;
- }
-
diff --git a/doc/mupdf/patches-1.16/shared_libs.patch
b/doc/mupdf/patches-1.16/shared_libs.patch
deleted file mode 100644
index 4905964..0000000
--- a/doc/mupdf/patches-1.16/shared_libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -20,8 +20,8 @@
- # Do not specify CFLAGS or LIBS on the make invocation line - specify
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude
--LIBS += $(XLIBS) -lm
-+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
-+LIBS += $(XLIBS) $(THIRD_LIBS) -lm
-
- ifneq ($(threading),no)
- ifeq ($(HAVE_PTHREAD),yes)
-@@ -190,17 +190,20 @@
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdf-third.so
-+THREAD_LIB = $(OUT)/libmupdf-threads.so
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
-+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
- $(THIRD_LIB) : $(THIRD_OBJ)
-+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so
-Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+ $(LINK_CMD) -pthread -shared -Wl,-soname -Wl,libmupdf-threads.so
-Wl,--no-undefined
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
-
- # --- Main tools and viewers ---
-
diff --git a/doc/mupdf/patches-1.21/pkcs7.patch
b/doc/mupdf/patches-1.21/pkcs7.patch
new file mode 100644
index 0000000..342da08
--- /dev/null
+++ b/doc/mupdf/patches-1.21/pkcs7.patch
@@ -0,0 +1,29 @@
+diff --git a/source/helpers/pkcs7/pkcs7-openssl.c
b/source/helpers/pkcs7/pkcs7-openssl.c
+--- a/source/helpers/pkcs7/pkcs7-openssl.c
++++ b/source/helpers/pkcs7/pkcs7-openssl.c
+@@ -517,11 +517,12 @@
+ {
+ EVP_PKEY *pkey = NULL;
+ X509 *x509 = NULL;
++ STACK_OF(PKCS12_SAFEBAG) *bags;
+ switch (M_PKCS12_bag_type(bag))
+ {
+ case NID_keyBag:
+ {
+- const PKCS8_PRIV_KEY_INFO *p8 =
PKCS12_SAFEBAG_get0_p8inf(bag);
++ const PKCS8_PRIV_KEY_INFO *p8 =
PKCS12_decrypt_skey(bag, pw, (int)strlen(pw));
+ pkey = EVP_PKCS82PKEY(p8);
+ }
+ break;
+@@ -543,7 +544,10 @@
+ break;
+
+ case NID_safeContentsBag:
+- add_from_bags(pX509, pPkey, PKCS12_SAFEBAG_get0_safes(bag),
pw);
++ bags = sk_PKCS12_SAFEBAG_new_null();
++ sk_PKCS12_SAFEBAG_push(bags, bag);
++ add_from_bags(pX509, pPkey, bags, pw);
++ sk_PKCS12_SAFEBAG_free(bags);
+ break;
+ }
+
diff --git a/doc/mupdf/patches-1.21/shared_libs.patch
b/doc/mupdf/patches-1.21/shared_libs.patch
new file mode 100644
index 0000000..cfac6dd
--- /dev/null
+++ b/doc/mupdf/patches-1.21/shared_libs.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 557f28e..7edc4ae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -277,13 +277,15 @@ MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
+ LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB_IMPORT)
+ else
+-LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB)
++LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
$(PKCS7_LIB)
+ endif
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+-THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
++THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.$(SO)
++LIBS_TO_INSTALL_IN_LIB += $(THIRD_GLUT_LIB)
+ endif
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
++THIRD_LIB = $(OUT)/libmupdf-third.$(SO)
++THREAD_LIB = $(OUT)/libmupdf-threads.$(SO)
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.$(SO)
+
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (81981337b2675348cdde0b63a4b92aa6db6bee78), Pavel Vinogradov, 03/22/2023