Github messages for voidlinux
 help / color / mirror / Atom feed
From: wangp <wangp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mupdf: add clipboard build option
Date: Wed, 25 Oct 2023 01:59:21 +0200	[thread overview]
Message-ID: <20231024235921.w22byvPuKFZNto05cEHYkFoJJyJqZDycVDglZYjW6-Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39801@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

There is an updated pull request by wangp against master on the void-packages repository

https://github.com/wangp/void-packages mupdf-clipboard
https://github.com/void-linux/void-packages/pull/39801

mupdf: add clipboard build option
This option enables clipboard support in mupdf-gl by building with the vendored copy of freeglut instead of the system copy.

Fixes: #13871

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x84_64-glibc
- I built this PR locally for these architectures:
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

A patch file from https://github.com/void-linux/void-packages/pull/39801.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mupdf-clipboard-39801.patch --]
[-- Type: text/x-diff, Size: 1777 bytes --]

From f19208d8ead83a0c2f9d90952c64cd075303359c Mon Sep 17 00:00:00 2001
From: Peter Wang <novalazy@gmail.com>
Date: Sat, 8 Oct 2022 13:28:15 +1100
Subject: [PATCH] mupdf: add clipboard build option

This option enables clipboard support in mupdf-gl by building with the
vendored copy of freeglut instead of the system copy.

Fixes: #13871
---
 srcpkgs/mupdf/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 0c05d36e41385..acbf60c200b6b 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -16,6 +16,14 @@ homepage="https://mupdf.com"
 distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.lz"
 checksum=6f73f63ef8aa81991dfd023d4426a548827d1d74e0bfcf2a013acad63b651868
 
+build_options="clipboard"
+desc_option_clipboard="Enable clipboard support"
+
+_use_system_libs="USE_SYSTEM_LIBS=yes"
+if [ "$build_option_clipboard" ]; then
+	_use_system_libs+=" USE_SYSTEM_GLUT=no"
+fi
+
 pre_build() {
 	# libmupdf-{threads,pkcs7}.a are required by fbpdf
 	sed 's/INSTALL_LIBS :=/& $(THREAD_LIB) $(PKCS7_LIB)/' -i Makefile
@@ -35,12 +43,12 @@ do_build() {
 		_crosscompile="CROSSCOMPILE=yes"
 	fi
 
-	make ${makejobs} USE_SYSTEM_LIBS=yes CURL_LIBS='-lcurl -lpthread' build=release ${_crosscompile} all
+	make ${makejobs} ${_use_system_libs} CURL_LIBS='-lcurl -lpthread' build=release ${_crosscompile} all
 	make ${makejobs} CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" build=release ${_crosscompile} -C thirdparty/mujs
 }
 
 do_install() {
-	make USE_SYSTEM_LIBS=yes build=release prefix=${DESTDIR}/usr install
+	make ${_use_system_libs} build=release prefix=${DESTDIR}/usr install
 	for f in build/release/libmupdf-*.a; do
 		vinstall $f 644 usr/lib
 	done

  parent reply	other threads:[~2023-10-24 23:59 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-08  3:04 [PR PATCH] " wangp
2022-10-08  3:07 ` [PR PATCH] [Updated] " wangp
2023-01-07  1:58 ` github-actions
2023-01-08  0:09 ` [PR PATCH] [Updated] " wangp
2023-01-08  0:10 ` wangp
2023-04-09  1:52 ` github-actions
2023-04-15  2:26 ` [PR PATCH] [Updated] " wangp
2023-04-15  2:34 ` wangp
2023-07-15  2:07 ` github-actions
2023-07-18  1:24 ` [PR PATCH] [Updated] " wangp
2023-10-17  1:45 ` github-actions
2023-10-24 23:59 ` wangp [this message]
2024-01-23  1:47 ` github-actions
2024-02-07  1:44 ` [PR PATCH] [Closed]: " github-actions

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=20231024235921.w22byvPuKFZNto05cEHYkFoJJyJqZDycVDglZYjW6-Q@z \
    --to=wangp@users.noreply.github.com \
    --cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).