xmw 14/08/25 15:25:09 Modified: metadata.xml ChangeLog Added: llpp-20_p20140818.ebuild Log: Version bump, prepare for upcoming USE=egl (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.4 app-text/llpp/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 16 Nov 2011 00:22:02 -0000 1.3 +++ metadata.xml 25 Aug 2014 15:25:09 -0000 1.4 @@ -5,5 +5,8 @@ <email>[email protected]</email> <name>Michael Weber</name> </maintainer> +<use> +<flag name="egl">build with EGL support</flag> +</use> </pkgmetadata> 1.61 app-text/llpp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.61&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.61&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?r1=1.60&r2=1.61 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 21 Jul 2014 23:08:55 -0000 1.60 +++ ChangeLog 25 Aug 2014 15:25:09 -0000 1.61 @@ -1,6 +1,12 @@ # ChangeLog for app-text/llpp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.60 2014/07/21 23:08:55 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.61 2014/08/25 15:25:09 xmw Exp $ + +*llpp-20_p20140818 (25 Aug 2014) + + 25 Aug 2014; Michael Weber <[email protected]> +files/llpp-20-WM_CLASS.patch, + +llpp-20_p20140818.ebuild, metadata.xml: + Version bump, prepare for upcoming USE=egl *llpp-19 (21 Jul 2014) 1.1 app-text/llpp/llpp-20_p20140818.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild?rev=1.1&content-type=text/plain Index: llpp-20_p20140818.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.1 2014/08/25 15:25:09 xmw Exp $ EAPI=5 inherit eutils multilib toolchain-funcs vcs-snapshot DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)" HOMEPAGE="http://repo.or.cz/w/llpp.git"; SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="+ocamlopt static" #IUSE="egl +ocamlopt static" LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs]" # egl? ( media-libs/mesa[static-libs] ) RDEPEND="x11-misc/xsel !static? ( ${LIB_DEPEND//\[static-libs]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) dev-lang/ocaml[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]" RESTRICT="!ocamlopt? ( strip )" src_prepare() { epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch } src_compile() { local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt) local cmo=$(usex ocamlopt cmx cmo) local cma=$(usex ocamlopt cmxa cma) local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG" #if use egl ; then # ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)" # local egl="egl" #fi if use static ; then local cclib="" local slib="" local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') ) ewarn ${spath} for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do case ${slib} in -lm|-ldl|-lpthread) einfo "${slib}: shared" cclib+="${slib} " ;; *) local ccnew=$(find ${spath} -name "lib${slib/-l}.a") einfo "${slib}: use ${ccnew}" cclib+="${ccnew} " ;; esac done else local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread" fi verbose() { echo "$@" >&2 ; "$@" || die ; } verbose ocaml str.cma keystoml.ml < KEYS > help.ml verbose printf 'let version ="%s";;\n' ${PV} >> help.ml verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c verbose ${ocaml} -c -o bo.${cmo} le/bo.ml verbose ${ocaml} -c -o help.${cmo} help.ml verbose ${ocaml} -c -o utils.${cmo} utils.ml verbose ${ocaml} -c -o wsi.cmi wsi.mli verbose ${ocaml} -c -o wsi.${cmo} wsi.ml verbose ${ocaml} -c -o parser.${cmo} parser.ml verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\ str.${cma} unix.${cma} lablgl.${cma} link.o \ -cclib "${cclib}" \ bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo} } src_install() { dobin ${PN} misc/${PN}ac dodoc KEYS README Thanks fixme }
