diff --git a/mingw-w64-mupdf/002-makerules-fix-gl-libraries.patch b/mingw-w64-mupdf/002-makerules-fix-gl-libraries.patch new file mode 100644 index 0000000000..88552e6384 --- /dev/null +++ b/mingw-w64-mupdf/002-makerules-fix-gl-libraries.patch @@ -0,0 +1,11 @@ +--- a/Makerules ++++ b/Makerules +@@ -224,7 +224,7 @@ + HAVE_GLUT := yes + ifeq ($(HAVE_GLUT),yes) + SYS_GLUT_CFLAGS := +- SYS_GLUT_LIBS := -lglut -lGL ++ SYS_GLUT_LIBS := -lfreeglut -lopengl32 + endif + + HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) diff --git a/mingw-w64-mupdf/PKGBUILD b/mingw-w64-mupdf/PKGBUILD index 12df2a20b0..69ea8f83f1 100644 --- a/mingw-w64-mupdf/PKGBUILD +++ b/mingw-w64-mupdf/PKGBUILD @@ -8,10 +8,11 @@ pkgbase=mingw-w64-${_realname} pkgname=( "${MINGW_PACKAGE_PREFIX}-${_realname}-libmupdf" "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf" + "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-gl" "${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf-tools" ) pkgver=1.22.1 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight PDF and XPS viewer (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -28,13 +29,16 @@ depends=( ) makedepends=( "${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-freeglut" ) source=("https://mupdf.com/downloads/archive/${_realname}-${pkgver}-source.tar.gz" "001-Makerules.patch" + "002-makerules-fix-gl-libraries.patch" ) noextract=("${_realname}-${pkgver}-source.tar.gz") sha256sums=('d62f3c0e456ebbc42e71f5a47f0f8cd12cec2bf0a8d72b79e35fa35a6538b25a' - '889f2bf59e15394b55f32330f75e37c7ff322d99dd5a1d71a92a9d108ac4d1a3') + '889f2bf59e15394b55f32330f75e37c7ff322d99dd5a1d71a92a9d108ac4d1a3' + '21f9b1b91b2dd4c6e38ed81df714b9a6ff6462d06d586dce703c23a8d57ae21e') prepare() { tar -xf "${_realname}-${pkgver}-source.tar.gz" || true @@ -44,13 +48,14 @@ prepare() { # remove bundled packages, we want our system libraries rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} - patch --forward --strip=1 --input="${srcdir}/001-Makerules.patch" + patch -p1 -i "${srcdir}/001-Makerules.patch" + patch -p1 -i "${srcdir}/002-makerules-fix-gl-libraries.patch" } build() { cd "${_realname}-${pkgver}-source" - make USE_SYSTEM_LIBS=yes HAVE_GLUT=no HAVE_WIN32=yes WINDRES=windres prefix=${MINGW_PREFIX} \ + make USE_SYSTEM_LIBS=yes HAVE_GLUT=yes HAVE_WIN32=yes WINDRES=windres prefix=${MINGW_PREFIX} \ DESTDIR=install build=release libs apps install } @@ -76,6 +81,21 @@ package_mupdf() { cp -r install${MINGW_PREFIX}/share/doc/mupdf "${pkgdir}${MINGW_PREFIX}/share/doc/" } +package_mupdf-gl() { + pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend (mingw-w64)' + depends+=("${MINGW_PACKAGE_PREFIX}-freeglut") + conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf") + provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-mupdf=${pkgver}") + + cd "${_realname}-${pkgver}-source" + + install -D -m0755 install${MINGW_PREFIX}/bin/mupdf-gl "${pkgdir}${MINGW_PREFIX}/bin/mupdf.exe" + install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/mupdf" README COPYING CHANGES + install -D -m0644 -t "${pkgdir}${MINGW_PREFIX}/share/man/man1" install${MINGW_PREFIX}/share/man/man1/mupdf.1* + install -d -m0755 "${pkdir}${MINGW_PREFIX}/share/doc" + cp -r install${MINGW_PREFIX}/share/doc/mupdf "${pkgdir}${MINGW_PREFIX}/share/doc/" +} + package_mupdf-tools() { pkgdesc='Tools for Lightweight PDF and XPS viewer (mingw-w64)'