commit: 7e51c0aae90d1611ff7674963a0e3989e6124e5d Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Fri Apr 28 09:33:04 2017 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Fri Apr 28 09:33:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e51c0aa
app-text/mupdf: Version bump (bug 616652), make mupdf-gl default if available (bug 616654), thanks Massimo Burcheri. Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-text/mupdf/Manifest | 1 + app-text/mupdf/files/mupdf-1.11-CFLAGS.patch | 10 ++ .../mupdf/files/mupdf-1.11-openssl-curl-x11.patch | 37 +++++ app-text/mupdf/files/mupdf-1.11-system-glfw.patch | 11 ++ app-text/mupdf/mupdf-1.11.ebuild | 151 +++++++++++++++++++++ 5 files changed, 210 insertions(+) diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest index 006624c52d7..a18278adef1 100644 --- a/app-text/mupdf/Manifest +++ b/app-text/mupdf/Manifest @@ -1 +1,2 @@ DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec WHIRLPOOL f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb +DIST mupdf-1.11-source.tar.gz 40156070 SHA256 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 WHIRLPOOL 91ee829b7b39b31c21cda324925e70a52139515c9cd2ef6fb3d903493c96af22d2c2bf19017dfc6d58842c8ebd7896faef34b73d94822977f10300c916fe1352 diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch new file mode 100644 index 00000000000..2ffd326e5e4 --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch @@ -0,0 +1,10 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -23,7 +23,6 @@ + endif + + ifeq "$(build)" "debug" +-CFLAGS += -pipe -g + LDFLAGS += -g + else ifeq "$(build)" "release" + CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch new file mode 100644 index 00000000000..91fd9f6485d --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch @@ -0,0 +1,37 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -116,12 +116,17 @@ + SYS_PTHREAD_CFLAGS := + SYS_PTHREAD_LIBS := -lpthread + ++WANT_OPENSSL ?= yes ++ifeq "$(WANT_OPENSSL)" "yes" + ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" + HAVE_LIBCRYPTO := yes + SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) + SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif ++endif + ++WANT_CURL ?= yes ++ifeq "$(WANT_CURL)" "yes" + ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" + HAVE_CURL := yes + SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) +@@ -133,12 +138,16 @@ + endif + endif + SYS_CURL_DEPS += -lpthread -lrt ++endif + ++WANT_X!! ?= yes ++ifeq "$(WANT_X11)" "yes" + ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" + HAVE_X11 := yes + SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext) + SYS_X11_LIBS := $(shell pkg-config --libs x11 xext) + endif ++endif + + ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes" + SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch new file mode 100644 index 00000000000..90189f9400b --- /dev/null +++ b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch @@ -0,0 +1,11 @@ +--- mupdf-1.11-source/Makerules ++++ mupdf-1.11-source/Makerules +@@ -158,6 +158,8 @@ + SYS_JBIG2DEC_LIBS := -ljbig2dec + SYS_LIBJPEG_LIBS := -ljpeg + SYS_ZLIB_LIBS := -lz ++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl) ++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl) + + endif + diff --git a/app-text/mupdf/mupdf-1.11.ebuild b/app-text/mupdf/mupdf-1.11.ebuild new file mode 100644 index 00000000000..0369b675c19 --- /dev/null +++ b/app-text/mupdf/mupdf-1.11.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +HOMEPAGE="http://mupdf.com/"; +SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz"; + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla" + +LIB_DEPEND=" + !libressl? ( dev-libs/openssl:0[static-libs?] ) + libressl? ( dev-libs/libressl[static-libs?] ) + javascript? ( >=dev-lang/mujs-0_p20160504 ) + media-libs/freetype:2[static-libs?] + media-libs/harfbuzz[static-libs?] + media-libs/jbig2dec[static-libs?] + media-libs/libpng:0[static-libs?] + >=media-libs/openjpeg-2.1:2[static-libs?] + net-misc/curl[static-libs?] + virtual/jpeg[static-libs?] + X? ( x11-libs/libX11[static-libs?] + x11-libs/libXext[static-libs?] ) + opengl? ( >=media-libs/glfw-3 )" +RDEPEND="${LIB_DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig + static-libs? ( ${LIB_DEPEND} ) + static? ( ${LIB_DEPEND//?} + app-arch/bzip2[static-libs] + x11-libs/libXau[static-libs] + x11-libs/libXdmcp[static-libs] + x11-libs/libxcb[static-libs] )" + +REQUIRED_USE="opengl? ( X !static !static-libs )" + +S=${WORKDIR}/${P}-source + +PATCHES=( + "${FILESDIR}"/${PN}-1.11-CFLAGS.patch + "${FILESDIR}"/${PN}-1.9a-debug-build.patch + "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch + "${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch + "${FILESDIR}"/${PN}-1.11-system-glfw.patch +) + +src_prepare() { + default + use hppa && append-cflags -ffunction-sections + + rm -rf thirdparty || die + + if has_version ">=media-libs/openjpeg-2.1:2" ; then + # Remove a switch, which prevents using shared libraries for openjpeg2. + # See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html + sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c + fi + + use javascript || \ + sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \ + -i include/mupdf/fitz/config.h + + sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ + -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ + -i platform/debian/${PN}.pc || die + + use vanilla || eapply \ + "${FILESDIR}"/${PN}-1.3-zoom-2.patch + + sed -e "1iOS = Linux" \ + -e "1iCC = $(tc-getCC)" \ + -e "1iLD = $(tc-getCC)" \ + -e "1iAR = $(tc-getAR)" \ + -e "1iverbose = yes" \ + -e "1ibuild = debug" \ + -e "1iprefix = ${ED}usr" \ + -e "1ilibdir = ${ED}usr/$(get_libdir)" \ + -e "1idocdir = ${ED}usr/share/doc/${PF}" \ + -e "1iWANT_X11 = $(usex X)" \ + -e "1iWANT_OPENSSL = $(usex openssl)" \ + -e "1iWANT_CURL = $(usex curl)" \ + -e "1iHAVE_MUJS = $(usex javascript)" \ + -e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \ + -e "1iMUJS_CFLAGS =" \ + -e "1iHAVE_GLFW = $(usex opengl yes no)" \ + -i Makerules || die + + if use static-libs || use static ; then + cp -a "${S}" "${S}"-static || die + #add missing Libs.private for xcb and freetype + sed -e 's:\(pkg-config --libs\):\1 --static:' \ + -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \ + -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \ + -i "${S}"-static/Makerules || die + fi + + my_soname=libmupdf.so.${PV} + my_soname_js_none=libmupdf-js-none.so.${PV} + sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ + -e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \ + -e "\$a\$(MUPDF_JS_NONE_LIB):" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ + -e "/install/s: COPYING : :" \ + -i Makefile || die +} + +src_compile() { + emake XCFLAGS="-fpic" + use static-libs && \ + emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a + use static && \ + emake -C "${S}"-static XLIBS="-static" +} + +src_install() { + if use X ; then + domenu platform/debian/${PN}.desktop + doicon platform/debian/${PN}.xpm + else + rm docs/man/${PN}.1 + fi + + emake install + dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so + + use static-libs && \ + dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a + if use static ; then + dobin "${S}"-static/build/debug/mu{tool,draw} + use X && dobin "${S}"-static/build/debug/${PN}-x11 + fi + if use X ; then + if use opengl ; then + dosym ${PN}-gl /usr/bin/${PN} + einfo "mupdf symlink points to mupdf-gl (bug 616654)" + else + dosym ${PN}-x11 /usr/bin/${PN} + fi + fi + insinto /usr/$(get_libdir)/pkgconfig + doins platform/debian/${PN}.pc + + dodoc README docs/*.{txt,c} +}
