Attachment #179674 for bug #216823





PORTNAME=	llpp
PORTVERSION=	25
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	http://repo.or.cz/llpp.git/snapshot/
DISTNAME=	v${PORTVERSION}

COMMENT=	PDF pager

# llpp itself is in the public domain, but it bundles lablGL which
# uses a BSD 3-clause license
LICENSE=	PUBLIC_DOMAIN BSD3CLAUSE
LICENSE=	PUBLIC_DOMAIN BSD3CLAUSE AGPLv3
LICENSE_COMB=	multi
LICENSE_NAME_PUBLIC_DOMAIN=	Public Domain
LICENSE_FILE_PUBLIC_DOMAIN=	${WRKSRC}/README
LICENSE_PERMS_PUBLIC_DOMAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS=	gsed:textproc/gsed
		${LOCALBASE}/lib/libmupdf_pic.a:graphics/mupdf
LIB_DEPENDS=	libcurl.so:ftp/curl \
		libfreetype.so:print/freetype2 \
		libharfbuzz.so:print/harfbuzz \
		libjbig2dec.so:graphics/jbig2dec \
		libmupdf.so:graphics/mupdf \
		libopenjp2.so:graphics/openjpeg
RUN_DEPENDS=	xsel:x11/xsel-conrad


Lines 35-38 Link Here

(-)graphics/llpp/files/patch-build.sh (-1 / +1 lines)
35	$comp -c $mloptgl -I $builddir -o $builddir/main$osu $srcdir/main.ml	35	$comp -c $mloptgl -I $builddir -o $builddir/main$osu $srcdir/main.ml
36	$comp -c $mlopt -I $builddir -o $builddir/wsi$osu $srcdir/wsi.ml	36	$comp -c $mlopt -I $builddir -o $builddir/wsi$osu $srcdir/wsi.ml
37	-$comp -g $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-lGL -lX11 -lmupdf -lmupdfthird -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o"	37	-$comp -g $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-lGL -lX11 -lmupdf -lmupdfthird -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o"
38	+$comp $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-L${LOCALBASE}/lib -lGL -lX11 -lmupdf_pic -lmupdfthird_pic -lharfbuzz -lz -lfreetype -ljpeg -ljbig2dec -lopenjp2 -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o"	38	+$comp $lfl -I lablGL -o $builddir/llpp unix$asu str$asu $builddir/help$osu $builddir/lablGL/raw$osu $builddir/utils$osu $builddir/parser$osu $builddir/lablGL/glMisc$osu $builddir/wsi$osu $builddir/lablGL/gl$osu $builddir/lablGL/glMat$osu $builddir/lablGL/glFunc$osu $builddir/lablGL/glClear$osu $builddir/lablGL/glPix$osu $builddir/lablGL/glTex$osu $builddir/lablGL/glDraw$osu $builddir/config$osu $builddir/lablGL/glArray$osu $builddir/main$osu $builddir/link.o -cclib "-L${LOCALBASE}/lib -lGL -lX11 -lmupdf -lmupdfthird -lharfbuzz -lz -lfreetype -ljpeg -ljbig2dec -lopenjp2 -lpthread -L$srcdir/mupdf/build/native -lcrypto $builddir/lablGL/ml_gl.o $builddir/lablGL/ml_glarray.o $builddir/lablGL/ml_raw.o"




Fix brightness increase key

Upstream commit: 35113fbe37a385e8a886288a86cf970ac85e742e

--- main.ml.orig	2017-02-01 01:49:58 UTC
+++ main.ml
@@ -5057,7 +5057,7 @@ let viewkeyboard key mask =
 
   | Ascii ('['|']' as c) ->
      conf.colorscale <-
-       bound (conf.colorscale +. (if c = '>' then 0.1 else -0.1)) 0.0 1.0;
+       bound (conf.colorscale +. (if c = ']' then 0.1 else -0.1)) 0.0 1.0;
      G.postRedisplay "brightness";
 
   | Ascii 'c' when state.mode = View ->





PORTNAME=	mupdf
PORTVERSION=	1.10a
PORTREVISION=	1
DISTVERSIONSUFFIX=	-source
PORTEPOCH=	1
CATEGORIES=	graphics

		libjbig2dec.so:graphics/jbig2dec \
		libopenjp2.so:graphics/openjpeg

CFLAGS+=	-I${WRKSRC}/include/mupdf -fPIC
LIBS+=		-L${LOCALBASE}/lib
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes
USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
USE_XORG=	x11 xcursor xext xinerama xrandr
USE_GL=		gl
USE_LDCONFIG=	yes

CPE_VENDOR=	artifex


	 	${WRKSRC}/thirdparty/openjpeg \
	 	${WRKSRC}/thirdparty/zlib

post-build:
	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
		${MAKEFILE} ${MAKE_ARGS} OUT=build/pic XCFLAGS=-fpic libs)

post-install:
	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdf.a \
		${STAGEDIR}${PREFIX}/lib/libmupdf_pic.a
	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdfthird.a \
		${STAGEDIR}${PREFIX}/lib/libmupdfthird_pic.a
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf

.include <bsd.port.mk>




$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
--- Makefile.orig	2016-11-28 13:34:04 UTC
+++ Makefile
@@ -152,14 +152,17 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL)
 
 # --- Library ---
 
-MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdfthird.a
+MUPDF_LIB = libmupdf.so
+THIRD_LIB = libmupdfthird.so
 
 MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
 THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
 
 $(MUPDF_LIB) : $(MUPDF_OBJ)
+	$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
+
 $(THIRD_LIB) : $(THIRD_OBJ)
+	$(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
 
 INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
 

Lines 80-89 Link Here

(-)graphics/mupdf/pkg-plist (-4 / +2 lines)
80	include/mupdf/pdf/widget.h	80	include/mupdf/pdf/widget.h
81	include/mupdf/pdf/xref.h	81	include/mupdf/pdf/xref.h
82	include/mupdf/svg.h	82	include/mupdf/svg.h
83	lib/libmupdf.a	83	lib/libmupdf.so
84	lib/libmupdfthird.a	84	lib/libmupdfthird.so
85	lib/libmupdfthird_pic.a
86	lib/libmupdf_pic.a
87	man/man1/mupdf.1.gz	85	man/man1/mupdf.1.gz
88	man/man1/mutool.1.gz	86	man/man1/mutool.1.gz
89	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	87	%%PORTDOCS%%%%DOCSDIR%%/CHANGES





PORTNAME=	zathura-pdf-mupdf
PORTVERSION=	0.3.1
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
		http://www.madpilot.net/~mad/pwmt.org/

LICENSE=	ZLIB
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	zathura:graphics/zathura
		mupdf>=1.8,1:graphics/mupdf
RUN_DEPENDS=	zathura:graphics/zathura
LIB_DEPENDS=	libjbig2dec.so:graphics/jbig2dec \
		libfreetype.so:print/freetype2 \
		libgirara-gtk3.so:x11-toolkits/girara \
		libharfbuzz.so:print/harfbuzz \
		libmupdf.so:graphics/mupdf \
		libopenjp2.so:graphics/openjpeg

PLIST_FILES=	lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop

MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
		OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
USES=		compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30


Return to bug 216823

Lines 3-8 Link Here

(-)graphics/llpp/Makefile (-5 / +5 lines)
3		3
4	PORTNAME= llpp	4	PORTNAME= llpp
5	PORTVERSION= 25	5	PORTVERSION= 25
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7	MASTER_SITES= http://repo.or.cz/llpp.git/snapshot/	8	MASTER_SITES= http://repo.or.cz/llpp.git/snapshot/
8	DISTNAME= v${PORTVERSION}	9	DISTNAME= v${PORTVERSION}
Lines 12-31 Link Here
12	COMMENT= PDF pager	13	COMMENT= PDF pager
13		14
14	# llpp itself is in the public domain, but it bundles lablGL which	15	# llpp itself is in the public domain, but it bundles lablGL which
15	# uses a BSD 3-clause license and statically links to mupdf which is	16	# uses a BSD 3-clause license
16	# AGPLv3 licensed.	17	LICENSE= PUBLIC_DOMAIN BSD3CLAUSE
17	LICENSE= PUBLIC_DOMAIN BSD3CLAUSE AGPLv3
18	LICENSE_COMB= multi	18	LICENSE_COMB= multi
19	LICENSE_NAME_PUBLIC_DOMAIN= Public Domain	19	LICENSE_NAME_PUBLIC_DOMAIN= Public Domain
20	LICENSE_FILE_PUBLIC_DOMAIN= ${WRKSRC}/README	20	LICENSE_FILE_PUBLIC_DOMAIN= ${WRKSRC}/README
21	LICENSE_PERMS_PUBLIC_DOMAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	21	LICENSE_PERMS_PUBLIC_DOMAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
22		22
23	BUILD_DEPENDS= gsed:textproc/gsed \	23	BUILD_DEPENDS= gsed:textproc/gsed
24	${LOCALBASE}/lib/libmupdf_pic.a:graphics/mupdf
25	LIB_DEPENDS= libcurl.so:ftp/curl \	24	LIB_DEPENDS= libcurl.so:ftp/curl \
26	libfreetype.so:print/freetype2 \	25	libfreetype.so:print/freetype2 \
27	libharfbuzz.so:print/harfbuzz \	26	libharfbuzz.so:print/harfbuzz \
28	libjbig2dec.so:graphics/jbig2dec \	27	libjbig2dec.so:graphics/jbig2dec \
		28	libmupdf.so:graphics/mupdf \
29	libopenjp2.so:graphics/openjpeg	29	libopenjp2.so:graphics/openjpeg
30	RUN_DEPENDS= xsel:x11/xsel-conrad	30	RUN_DEPENDS= xsel:x11/xsel-conrad
31		31

Line 0 Link Here

(-)graphics/llpp/files/patch-main.ml (+15 lines)
	1	Fix brightness increase key
	2
	3	Upstream commit: 35113fbe37a385e8a886288a86cf970ac85e742e
	4
	5	--- main.ml.orig 2017-02-01 01:49:58 UTC
	6	+++ main.ml
	7	@@ -5057,7 +5057,7 @@ let viewkeyboard key mask =
	8
	9	\| Ascii ('['\|']' as c) ->
	10	conf.colorscale <-
	11	- bound (conf.colorscale +. (if c = '>' then 0.1 else -0.1)) 0.0 1.0;
	12	+ bound (conf.colorscale +. (if c = ']' then 0.1 else -0.1)) 0.0 1.0;
	13	G.postRedisplay "brightness";
	14
	15	\| Ascii 'c' when state.mode = View ->

Lines 3-8 Link Here

(-)graphics/mupdf/Makefile (-9 / +3 lines)
3		3
4	PORTNAME= mupdf	4	PORTNAME= mupdf
5	PORTVERSION= 1.10a	5	PORTVERSION= 1.10a
		6	PORTREVISION= 1
6	DISTVERSIONSUFFIX= -source	7	DISTVERSIONSUFFIX= -source
7	PORTEPOCH= 1	8	PORTEPOCH= 1
8	CATEGORIES= graphics	9	CATEGORIES= graphics
Lines 21-32 Link Here
21	libjbig2dec.so:graphics/jbig2dec \	22	libjbig2dec.so:graphics/jbig2dec \
22	libopenjp2.so:graphics/openjpeg	23	libopenjp2.so:graphics/openjpeg
23		24
24	CFLAGS+= -I${WRKSRC}/include/mupdf	25	CFLAGS+= -I${WRKSRC}/include/mupdf -fPIC
25	LIBS+= -L${LOCALBASE}/lib	26	LIBS+= -L${LOCALBASE}/lib
26	MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes	27	MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes
27	USES= cpe compiler:c++11-lang gmake jpeg pkgconfig	28	USES= cpe compiler:c++11-lang gmake jpeg pkgconfig
28	USE_XORG= x11 xcursor xext xinerama xrandr	29	USE_XORG= x11 xcursor xext xinerama xrandr
29	USE_GL= gl	30	USE_GL= gl
		31	USE_LDCONFIG= yes
30		32
31	CPE_VENDOR= artifex	33	CPE_VENDOR= artifex
32		34
Lines 53-67 Link Here
53	${WRKSRC}/thirdparty/openjpeg \	55	${WRKSRC}/thirdparty/openjpeg \
54	${WRKSRC}/thirdparty/zlib	56	${WRKSRC}/thirdparty/zlib
55		57
56	post-build:
57	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
58	${MAKEFILE} ${MAKE_ARGS} OUT=build/pic XCFLAGS=-fpic libs)
59
60	post-install:	58	post-install:
61	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdf.a \
62	${STAGEDIR}${PREFIX}/lib/libmupdf_pic.a
63	${INSTALL_DATA} ${WRKSRC}/build/pic/libmupdfthird.a \
64	${STAGEDIR}${PREFIX}/lib/libmupdfthird_pic.a
65	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf	59	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
66		60
67	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/mupdf/files/patch-Makefile (+23 lines)
	1	$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
	2	--- Makefile.orig 2016-11-28 13:34:04 UTC
	3	+++ Makefile
	4	@@ -152,14 +152,17 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL)
	5
	6	# --- Library ---
	7
	8	-MUPDF_LIB = $(OUT)/libmupdf.a
	9	-THIRD_LIB = $(OUT)/libmupdfthird.a
	10	+MUPDF_LIB = libmupdf.so
	11	+THIRD_LIB = libmupdfthird.so
	12
	13	MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
	14	THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
	15
	16	$(MUPDF_LIB) : $(MUPDF_OBJ)
	17	+ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
	18	+
	19	$(THIRD_LIB) : $(THIRD_OBJ)
	20	+ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS)
	21
	22	INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
	23

Lines 3-8 Link Here

(-)graphics/zathura-pdf-mupdf/Makefile (-6 / +6 lines)
3		3
4	PORTNAME= zathura-pdf-mupdf	4	PORTNAME= zathura-pdf-mupdf
5	PORTVERSION= 0.3.1	5	PORTVERSION= 0.3.1
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7	MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \	8	MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
8	http://www.madpilot.net/~mad/pwmt.org/	9	http://www.madpilot.net/~mad/pwmt.org/
Lines 13-31 Link Here
13	LICENSE= ZLIB	14	LICENSE= ZLIB
14	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
15		16
16	BUILD_DEPENDS= zathura:graphics/zathura \	17	BUILD_DEPENDS= zathura:graphics/zathura
17	mupdf>=1.8,1:graphics/mupdf
18	RUN_DEPENDS= zathura:graphics/zathura	18	RUN_DEPENDS= zathura:graphics/zathura
19	LIB_DEPENDS= libjbig2dec.so:graphics/jbig2dec \	19	LIB_DEPENDS= libjbig2dec.so:graphics/jbig2dec \
20	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
		21	libgirara-gtk3.so:x11-toolkits/girara \
21	libharfbuzz.so:print/harfbuzz \	22	libharfbuzz.so:print/harfbuzz \
22	libopenjp2.so:graphics/openjpeg \	23	libmupdf.so:graphics/mupdf \
23	libgirara-gtk3.so:x11-toolkits/girara	24	libopenjp2.so:graphics/openjpeg
24		25
25	PLIST_FILES= lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop	26	PLIST_FILES= lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop
26		27
27	MAKE_ARGS= MUPDF_LIB="-lmupdf_pic -lmupdfthird_pic" OPENSSL_INC=-I${OPENSSLINC} \	28	MAKE_ARGS= OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
28	OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
29	USES= compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl	29	USES= compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl
30	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30	30	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
31		31