| 1 |
xmw 14/08/25 15:25:09 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: llpp-20_p20140818.ebuild |
| 5 |
Log: |
| 6 |
Version bump, prepare for upcoming USE=egl |
| 7 |
|
| 8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 app-text/llpp/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/metadata.xml?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/metadata.xml,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- metadata.xml 16 Nov 2011 00:22:02 -0000 1.3 |
| 24 |
+++ metadata.xml 25 Aug 2014 15:25:09 -0000 1.4 |
| 25 |
@@ -5,5 +5,8 @@ |
| 26 |
<email>xmw@g.o</email> |
| 27 |
<name>Michael Weber</name> |
| 28 |
</maintainer> |
| 29 |
+<use> |
| 30 |
+<flag name="egl">build with EGL support</flag> |
| 31 |
+</use> |
| 32 |
</pkgmetadata> |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.61 app-text/llpp/ChangeLog |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.61&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?rev=1.61&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/ChangeLog?r1=1.60&r2=1.61 |
| 42 |
|
| 43 |
Index: ChangeLog |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v |
| 46 |
retrieving revision 1.60 |
| 47 |
retrieving revision 1.61 |
| 48 |
diff -u -r1.60 -r1.61 |
| 49 |
--- ChangeLog 21 Jul 2014 23:08:55 -0000 1.60 |
| 50 |
+++ ChangeLog 25 Aug 2014 15:25:09 -0000 1.61 |
| 51 |
@@ -1,6 +1,12 @@ |
| 52 |
# ChangeLog for app-text/llpp |
| 53 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.60 2014/07/21 23:08:55 xmw Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.61 2014/08/25 15:25:09 xmw Exp $ |
| 56 |
+ |
| 57 |
+*llpp-20_p20140818 (25 Aug 2014) |
| 58 |
+ |
| 59 |
+ 25 Aug 2014; Michael Weber <xmw@g.o> +files/llpp-20-WM_CLASS.patch, |
| 60 |
+ +llpp-20_p20140818.ebuild, metadata.xml: |
| 61 |
+ Version bump, prepare for upcoming USE=egl |
| 62 |
|
| 63 |
*llpp-19 (21 Jul 2014) |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 app-text/llpp/llpp-20_p20140818.ebuild |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: llpp-20_p20140818.ebuild |
| 74 |
=================================================================== |
| 75 |
# Copyright 1999-2014 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-20_p20140818.ebuild,v 1.1 2014/08/25 15:25:09 xmw Exp $ |
| 78 |
|
| 79 |
EAPI=5 |
| 80 |
|
| 81 |
inherit eutils multilib toolchain-funcs vcs-snapshot |
| 82 |
|
| 83 |
DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)" |
| 84 |
HOMEPAGE="http://repo.or.cz/w/llpp.git" |
| 85 |
SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz" |
| 86 |
|
| 87 |
LICENSE="GPL-3" |
| 88 |
SLOT="0" |
| 89 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 90 |
IUSE="+ocamlopt static" |
| 91 |
#IUSE="egl +ocamlopt static" |
| 92 |
|
| 93 |
LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs] |
| 94 |
media-libs/openjpeg:2[static-libs] |
| 95 |
media-libs/fontconfig:1.0[static-libs] |
| 96 |
media-libs/freetype:2[static-libs] |
| 97 |
media-libs/jbig2dec[static-libs] |
| 98 |
sys-libs/zlib[static-libs] |
| 99 |
virtual/jpeg:0[static-libs] |
| 100 |
x11-libs/libX11[static-libs]" |
| 101 |
# egl? ( media-libs/mesa[static-libs] ) |
| 102 |
RDEPEND="x11-misc/xsel |
| 103 |
!static? ( ${LIB_DEPEND//\[static-libs]} )" |
| 104 |
DEPEND="${RDEPEND} |
| 105 |
static? ( ${LIB_DEPEND} |
| 106 |
app-arch/bzip2[static-libs] |
| 107 |
media-libs/libXcm[static-libs] |
| 108 |
x11-libs/libXau[static-libs] |
| 109 |
x11-libs/libXdmcp[static-libs] |
| 110 |
x11-libs/libXmu[static-libs] ) |
| 111 |
dev-lang/ocaml[ocamlopt?] |
| 112 |
dev-ml/lablgl[glut,ocamlopt?]" |
| 113 |
|
| 114 |
RESTRICT="!ocamlopt? ( strip )" |
| 115 |
|
| 116 |
src_prepare() { |
| 117 |
epatch "${FILESDIR}"/${PN}-20-WM_CLASS.patch |
| 118 |
} |
| 119 |
|
| 120 |
src_compile() { |
| 121 |
local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt) |
| 122 |
local cmo=$(usex ocamlopt cmx cmo) |
| 123 |
local cma=$(usex ocamlopt cmxa cma) |
| 124 |
local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG" |
| 125 |
#if use egl ; then |
| 126 |
# ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)" |
| 127 |
# local egl="egl" |
| 128 |
#fi |
| 129 |
if use static ; then |
| 130 |
local cclib="" |
| 131 |
local slib="" |
| 132 |
local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') ) |
| 133 |
ewarn ${spath} |
| 134 |
for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do |
| 135 |
case ${slib} in |
| 136 |
-lm|-ldl|-lpthread) |
| 137 |
einfo "${slib}: shared" |
| 138 |
cclib+="${slib} " ;; |
| 139 |
*) |
| 140 |
local ccnew=$(find ${spath} -name "lib${slib/-l}.a") |
| 141 |
einfo "${slib}: use ${ccnew}" |
| 142 |
cclib+="${ccnew} " ;; |
| 143 |
esac |
| 144 |
done |
| 145 |
else |
| 146 |
local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread" |
| 147 |
fi |
| 148 |
|
| 149 |
verbose() { echo "$@" >&2 ; "$@" || die ; } |
| 150 |
verbose ocaml str.cma keystoml.ml < KEYS > help.ml |
| 151 |
verbose printf 'let version ="%s";;\n' ${PV} >> help.ml |
| 152 |
verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c |
| 153 |
verbose ${ocaml} -c -o bo.${cmo} le/bo.ml |
| 154 |
verbose ${ocaml} -c -o help.${cmo} help.ml |
| 155 |
verbose ${ocaml} -c -o utils.${cmo} utils.ml |
| 156 |
verbose ${ocaml} -c -o wsi.cmi wsi.mli |
| 157 |
verbose ${ocaml} -c -o wsi.${cmo} wsi.ml |
| 158 |
verbose ${ocaml} -c -o parser.${cmo} parser.ml |
| 159 |
verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml |
| 160 |
verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL main.ml |
| 161 |
verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\ |
| 162 |
str.${cma} unix.${cma} lablgl.${cma} link.o \ |
| 163 |
-cclib "${cclib}" \ |
| 164 |
bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo} |
| 165 |
} |
| 166 |
|
| 167 |
src_install() { |
| 168 |
dobin ${PN} misc/${PN}ac |
| 169 |
dodoc KEYS README Thanks fixme |
| 170 |
} |
Archives