tapp-text/mupdf: Update to 1.10a - parlay - yet another gentoo overlay HTML git clone https://git.parazyd.org/parlay DIR Log DIR Files DIR Refs DIR README --- DIR commit c4f94c6afbc5e1a1fc8a964c40e2703c8b2f03a0 DIR parent 10a29fc6b8b625da5c7a9d70172278699ced225d HTML Author: parazyd <parazyd@dyne.org> Date: Fri, 16 Dec 2016 16:15:10 +0100 app-text/mupdf: Update to 1.10a Diffstat: M app-text/mupdf/Manifest | 2 +- M app-text/mupdf/files/mupdf-1.5-ope… | 4 ++-- A app-text/mupdf/mupdf-1.10a.ebuild | 147 +++++++++++++++++++++++++++++++ D app-text/mupdf/mupdf-1.9a-r99.ebui… | 147 ------------------------------- 4 files changed, 150 insertions(+), 150 deletions(-) --- DIR diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest t@@ -1 +1 @@ -DIST mupdf-1.9a.tar.gz 13282205 SHA256 2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140 WHIRLPOOL b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9 +DIST mupdf-1.10a.tar.gz 13282205 SHA256 2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140 WHIRLPOOL b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9 DIR diff --git a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch t@@ -1,5 +1,5 @@ ---- mupdf-1.9a-source/source/fitz/load-jpx.c.orig -+++ mupdf-1.9a-source/source/fitz/load-jpx.c +--- mupdf-1.10a-source/source/fitz/load-jpx.c.orig ++++ mupdf-1.10a-source/source/fitz/load-jpx.c @@ -1,15 +1,7 @@ #include "mupdf/fitz.h" DIR diff --git a/app-text/mupdf/mupdf-1.10a.ebuild b/app-text/mupdf/mupdf-1.10a.ebuild t@@ -0,0 +1,147 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot + +DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" +HOMEPAGE="http://mupdf.com/" +SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=027860688eafc89ca3d57937a77a43a9bb96f590;sf=tgz -> ${P}.tar.gz" + +LICENSE="AGPL-3" +MY_SOVER=1.10 +SLOT="0/${MY_SOVER}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="X vanilla +curl libressl opengl +openssl static static-libs" + +LIB_DEPEND=" + !libressl? ( dev-libs/openssl:0[static-libs?] ) + libressl? ( dev-libs/libressl[static-libs?] ) + >=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[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 )" + +src_prepare() { + use hppa && append-cflags -ffunction-sections + + rm -rf thirdparty || die + + epatch \ + "${FILESDIR}"/${PN}-1.9a-CFLAGS.patch \ + "${FILESDIR}"/${PN}-1.9a-debug-build.patch \ + "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ + "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ + "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \ + "${FILESDIR}"/${PN}-1.9a-no-thirdlibs.patch \ + "${FILESDIR}"/${PN}-1.8-system-glfw.patch \ + "${FILESDIR}"/${PN}-1.9a-CVE-2016-6265.patch \ + "${FILESDIR}"/${PN}-1.9a-CVE-2016-6525.patch + + + if has_version ">=media-libs/openjpeg-2.1:2" ; then + epatch \ + "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch + fi + +# sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ +# -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ +# -i platform/debian/${PN}.pc || die + + use vanilla || epatch \ + "${FILESDIR}"/${PN}-1.3-zoom-2.patch + +# http://bugs.ghostscript.com/show_bug.cgi?id=693467 +# sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ +# -i platform/debian/${PN}.desktop || die + + 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 "1iHAVE_X11 = $(usex X)" \ + -e "1iWANT_OPENSSL = $(usex openssl)" \ + -e "1iWANT_CURL = $(usex curl)" \ + -e "1iHAVE_MUJS = yes" \ + -e "1iMUJS_LIBS = -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.${MY_SOVER} + my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} + 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 + use X && dosym ${PN}-x11 /usr/bin/${PN} + + insinto /usr/$(get_libdir)/pkgconfig + #doins platform/debian/${PN}.pc + + dodoc README docs/*.{txt,c} +} DIR diff --git a/app-text/mupdf/mupdf-1.9a-r99.ebuild b/app-text/mupdf/mupdf-1.9a-r99.ebuild t@@ -1,147 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot - -DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C" -HOMEPAGE="http://mupdf.com/" -SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=027860688eafc89ca3d57937a77a43a9bb96f590;sf=tgz -> ${P}.tar.gz" - -LICENSE="AGPL-3" -MY_SOVER=1.9 -SLOT="0/${MY_SOVER}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="X vanilla +curl libressl opengl +openssl static static-libs" - -LIB_DEPEND=" - !libressl? ( dev-libs/openssl:0[static-libs?] ) - libressl? ( dev-libs/libressl[static-libs?] ) - >=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[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 )" - -src_prepare() { - use hppa && append-cflags -ffunction-sections - - rm -rf thirdparty || die - - epatch \ - "${FILESDIR}"/${PN}-1.9a-CFLAGS.patch \ - "${FILESDIR}"/${PN}-1.9a-debug-build.patch \ - "${FILESDIR}"/${PN}-1.5-old-debian-files.patch \ - "${FILESDIR}"/${PN}-1.3-pkg-config.patch \ - "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \ - "${FILESDIR}"/${PN}-1.9a-no-thirdlibs.patch \ - "${FILESDIR}"/${PN}-1.8-system-glfw.patch \ - "${FILESDIR}"/${PN}-1.9a-CVE-2016-6265.patch \ - "${FILESDIR}"/${PN}-1.9a-CVE-2016-6525.patch - - - if has_version ">=media-libs/openjpeg-2.1:2" ; then - epatch \ - "${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch - fi - - sed -e "/^libdir=/s:/lib:/$(get_libdir):" \ - -e "/^prefix=/s:=.*:=${EROOT}/usr:" \ - -i platform/debian/${PN}.pc || die - - use vanilla || epatch \ - "${FILESDIR}"/${PN}-1.3-zoom-2.patch - - #http://bugs.ghostscript.com/show_bug.cgi?id=693467 - sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \ - -i platform/debian/${PN}.desktop || die - - 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 "1iHAVE_X11 = $(usex X)" \ - -e "1iWANT_OPENSSL = $(usex openssl)" \ - -e "1iWANT_CURL = $(usex curl)" \ - -e "1iHAVE_MUJS = yes" \ - -e "1iMUJS_LIBS = -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.${MY_SOVER} - my_soname_js_none=libmupdf-js-none.so.${MY_SOVER} - 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 - use X && dosym ${PN}-x11 /usr/bin/${PN} - - insinto /usr/$(get_libdir)/pkgconfig - doins platform/debian/${PN}.pc - - dodoc README docs/*.{txt,c} -}