[arch-commits] Commit in llpp/repos (4 files)
Date: Thursday, October 17, 2019 @ 15:10:14 Author: grazzolini Revision: 516465 archrelease: copy trunk to community-staging-x86_64 Added: llpp/repos/community-staging-x86_64/ llpp/repos/community-staging-x86_64/GNUmakefile (from rev 516464, llpp/trunk/GNUmakefile) llpp/repos/community-staging-x86_64/PKGBUILD (from rev 516464, llpp/trunk/PKGBUILD) llpp/repos/community-staging-x86_64/no-quit-on-escape.patch (from rev 516464, llpp/trunk/no-quit-on-escape.patch) -+ GNUmakefile | 95 ++ PKGBUILD| 74 +++ no-quit-on-escape.patch | 34 3 files changed, 203 insertions(+) Copied: llpp/repos/community-staging-x86_64/GNUmakefile (from rev 516464, llpp/trunk/GNUmakefile) === --- community-staging-x86_64/GNUmakefile(rev 0) +++ community-staging-x86_64/GNUmakefile2019-10-17 15:10:14 UTC (rev 516465) @@ -0,0 +1,95 @@ +MAKEFLAGS := -r + +VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null) +ifeq ($(VERSION),) +VERSION = 31 +endif + +# paths +PREFIX ?= /usr/local +bindir ?= $(PREFIX)/bin +datarootdir ?= $(PREFIX)/share +mandir ?= $(datarootdir)/man + +# includes and libs +PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib +override CPPFLAGS += -D_GNU_SOURCE -DFFP +override CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) +LDLIBS := -lpthread -lmupdf -lmupdf-third -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS)) + +# ocaml +override OCAMLFLAGS += -g -w +a -safe-string + +# Some source files are stored in an OS-specific directory here. +# Divert them to the main srcdir. +ifeq ($(shell uname -s),Linux) +VPATH := wsi/x11 +else +VPATH := wsi/cocoa # Darwin +endif + +# Ensure main.cmx is last in this list: +OCAML_OBJ := utils.cmx wsi.cmx confstruct.cmx parser.cmx config.cmx ffi.cmx glutils.cmx keys.cmx utf8syms.cmx listview.cmx help.cmx main.cmx +C_OBJ := cutils.o keysym2ucs.o link.o xlib.o version.o +MODULES := unix.cmxa str.cmxa lablgl.cmxa +SRCMANS = $(wildcard adoc/*.adoc) +MANS = $(SRCMANS:.adoc=.1) + +OCAMLC := ocamlopt +COMPILE.ocaml = $(OCAMLC) $(OCAMLFLAGS) -c +LINK.ocaml = $(OCAMLC) $(OCAMLFLAGS) + +all: llpp $(MANS) + +# dependency ordering +main.cmx: private OCAMLFLAGS += -thread -I +lablGL +main.cmx: main.cmi utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx help.cmx +config.cmx: wsi.cmx confstruct.cmx parser.cmx +confstruct.cmx: wsi.cmx +parser.cmx: utils.cmx +wsi.cmx: keys.cmx utils.cmx +listview.cmx: private OCAMLFLAGS += -I +lablGL +listview.cmx: utf8syms.cmx glutils.cmx +glutils.cmx: private OCAMLFLAGS += -I +lablGL +glutils.cmx: ffi.cmx +ffi.cmx: config.cmx +help.cmx: help.cmi utils.cmx ffi.cmx config.cmx +help.cmi: config.cmx + +link.o: glfont.c +version.o: private CPPFLAGS += -DLLPP_VERSION=$(VERSION) + +# ordinary targets +llpp: private OCAMLFLAGS += -I +lablGL +llpp: $(OCAML_OBJ) $(C_OBJ) + $(LINK.ocaml) $(OUTPUT_OPTION) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MODULES) $(OCAML_OBJ) + +confstruct.ml: genconfstr.sh + sh $< > $@ + +# pattern rules +%.o: %.c + $(COMPILE.ocaml) $(OUTPUT_OPTION) -cc '$(CC)' -ccopt '$(CFLAGS) $(CPPFLAGS)' $< + +%.cmx: %.ml + $(COMPILE.ocaml) $(OUTPUT_OPTION) $< + +%.cmi: %.mli + $(COMPILE.ocaml) $(OUTPUT_OPTION) $< + +%.1: %.adoc adoc/asciidoc.conf + a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $< + +# special targets +clean: + $(RM) llpp confstruct.ml $(C_OBJ) $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml) + +install: + install -Dm755 llpp "$(DESTDIR)$(bindir)"/llpp + install -Dm644 -t "$(DESTDIR)$(mandir)"/man1 $(MANS) + install -Dm755 misc/llppac "$(DESTDIR)$(bindir)"/llppac + install -Dm755 misc/llpp.inotify "$(DESTDIR)$(bindir)"/llpp.inotify + install -Dm755 misc/llpphtml "$(DESTDIR)$(bindir)"/llpphtml + install -Dm644 misc/llpp.desktop "$(DESTDIR)$(datarootdir)"/applications/llpp.desktop + +.PHONY: all clean install Copied: llpp/repos/community-staging-x86_64/PKGBUILD (from rev 516464, llpp/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-10-17 15:10:14 UTC (rev 516465) @@ -0,0 +1,74 @@ +# Maintainer: Eli Schwartz +# Contributor: earnestly + +pkgname=llpp +pkgver=31 +# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit. +_commit=77dd95ff11449f57f2ea002223bb282256270fa8 # tags/v31 +pkgrel=1 +pkgdesc='opengl accelerated pdf viewer based on mupdf' +arch=('x86_64') +url="https://github.com/moosotc/${pkgname}"; +license=('GPL3') +depends
[arch-commits] Commit in llpp/repos (4 files)
Date: Thursday, May 3, 2018 @ 21:35:35 Author: eschwartz Revision: 318897 archrelease: copy trunk to community-x86_64 Added: llpp/repos/community-x86_64/ llpp/repos/community-x86_64/Makefile (from rev 318896, llpp/trunk/Makefile) llpp/repos/community-x86_64/PKGBUILD (from rev 318896, llpp/trunk/PKGBUILD) llpp/repos/community-x86_64/no-quit-on-escape.patch (from rev 318896, llpp/trunk/no-quit-on-escape.patch) -+ Makefile| 86 ++ PKGBUILD| 68 no-quit-on-escape.patch | 33 + 3 files changed, 187 insertions(+) Copied: llpp/repos/community-x86_64/Makefile (from rev 318896, llpp/trunk/Makefile) === --- community-x86_64/Makefile (rev 0) +++ community-x86_64/Makefile 2018-05-03 21:35:35 UTC (rev 318897) @@ -0,0 +1,86 @@ +VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null) +ifeq "${VERSION}" "" +VERSION = 26b +endif + +# paths +PREFIX ?= /usr/local + +# includes and libs +INCS = -I/usr/include -I/usr/include/freetype2 -include ft2build.h +LIBS = -L/usr/lib -lX11 -lpthread -lmupdf -lmupdfthird -ljbig2dec -lcrypto \ + -lz -lopenjp2 -ljpeg -lfreetype -lharfbuzz + +CPPFLAGS += -D_GNU_SOURCE -DFFP +CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow ${INCS} ${CPPFLAGS} +LDFLAGS += -g ${LIBS} + +# ocaml +CAMLOPT = ocamlopt +CAMLFLAGS = -g -w +a -safe-string -I +lablGL + +VPATH = wsi/x11 + +SRC = utils.ml keys.ml wsi.ml parser.ml config.ml main.ml +OBJ = help.cmx ${SRC:.ml=.cmx} +MOD = unix.cmxa str.cmxa lablgl.cmxa +SRCMANS = $(wildcard man/*.man) +MANS = ${SRCMANS:.man=.1} + +DISTFILES := Makefile ${SRC} link.c glfont.c keysym2ucs.c wsi.mli +DISTFILES += mkhelp.sh KEYS README BUILDING +DISTFILES += misc/ man/ + +all: llpp ${MANS} + +llpp: ${OBJ} link.o + ${CAMLOPT} -o $@ ${CAMLFLAGS} link.o -cclib '${LDFLAGS}' ${MOD} ${OBJ} + +main.cmx: main.ml utils.cmx config.cmx + ${CAMLOPT} -c -o $@ ${CAMLFLAGS} -thread $^ + +wsi.cmx: wsi.cmi utils.cmx keys.cmx + +wsi.cmi: utils.cmx + +help.ml: mkhelp.sh KEYS + sh mkhelp.sh KEYS ${VERSION} > $@ + +config.cmx: wsi.cmi parser.cmx utils.cmx help.cmx + +parser.cmx: utils.cmx + +link.o: glfont.c keysym2ucs.c + +.SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly + +.c.o: + ${CAMLOPT} -c -o $@ ${CAMLFLAGS} -cc ${CC} -ccopt '${CFLAGS}' $< + +.ml.cmx: + ${CAMLOPT} -c -o $@ ${CAMLFLAGS} $< + +.mli.cmi: + ${CAMLOPT} -c -o $@ ${CAMLFLAGS} $< + +%.1: %.man man/asciidoc.conf + a2x -d manpage -f manpage --asciidoc-opts="-f man/asciidoc.conf --out-file=$@.xml" $< + +.PHONY: all clean dist install + +clean: + ${RM} llpp link.o help.ml ${OBJ} ${OBJ:.cmx=.cmi} ${OBJ:.cmx=.o} ${MANS} ${MANS:.1=.xml} + +dist: clean + mkdir llpp-${VERSION} + cp -r ${DISTFILES} llpp-${VERSION} + tar czf llpp-${VERSION}.tar.gz llpp-${VERSION} + rm -rf llpp-${VERSION} + +install: + install -Dm755 llpp ${DESTDIR}${PREFIX}/bin/llpp + install -Dm644 -t ${DESTDIR}${PREFIX}/share/man/man1 man/*.1 + install -Dm755 misc/llppac ${DESTDIR}${PREFIX}/bin/llppac + install -Dm755 misc/llpphtml ${DESTDIR}${PREFIX}/bin/llpphtml + install -Dm644 misc/llpp.desktop ${DESTDIR}${PREFIX}/share/applications/llpp.desktop + install -Dm644 README ${DESTDIR}${PREFIX}/share/licenses/llpp/README Copied: llpp/repos/community-x86_64/PKGBUILD (from rev 318896, llpp/trunk/PKGBUILD) === --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2018-05-03 21:35:35 UTC (rev 318897) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Eli Schwartz +# Contributor: earnestly + +pkgname=llpp +pkgver=27 +_commit=87faa123127cc0746c28531874af7aaef1feb574 +pkgrel=1 +pkgdesc='opengl accelerated pdf viewer based on mupdf' +arch=('x86_64') +url="https://github.com/moosotc/${pkgname}"; +license=('GPL') +depends=('glu' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2' 'desktop-file-utils') +optdepends=('djvulibre: llppac djvu conversion' +'ghostscript: llppac ps, dvi, and djvu conversion' +'princexml: llppac html conversion' +'unoconv: llppac office conversion' +'librsvg: llppac svg conversion' +'imagemagick: llppac image conversion' +'llpp-gc: clean nonextant history items') +makedepends=('git' 'asciidoc' 'ocaml' 'ocaml-lablgl' 'libmupdf' 'camlp4') + +# llpp seems to go through build systems like fasion, holomorph has provided a +# very nice Makefile for building this software which has served well for +# months. It was contributed, or offered, to the author malc, but he concluded +# that make was bad and needed constant effort to prevent "bitrot" as +# justification for using a terrible shel