View | Details | Raw Unified | Return to bug 254451 | Differences between
and this patch

Collapse All | Expand All

(-)b/graphics/mupdf/Makefile (-3 / +6 lines)
Lines 22-29 LIB_DEPENDS= libcurl.so:ftp/curl \ Link Here
22
		libopenjp2.so:graphics/openjpeg
22
		libopenjp2.so:graphics/openjpeg
23
23
24
USES=		cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg
24
USES=		cpe compiler:c++11-lang gl gmake jpeg pkgconfig xorg
25
USE_XORG=	x11 xcursor xext xinerama xrandr
25
USE_XORG=	ice x11 xcursor xext xi xinerama xrandr
26
USE_GL=		gl glut
26
USE_GL=		gl glu
27
USE_LDCONFIG=	yes
27
USE_LDCONFIG=	yes
28
28
29
CPE_VENDOR=	artifex
29
CPE_VENDOR=	artifex
Lines 33-39 CFLAGS+= `pkg-config --cflags libopenjp2` Link Here
33
LDFLAGS+=	`pkg-config --libs libjpeg libopenjp2` -ljbig2dec
33
LDFLAGS+=	`pkg-config --libs libjpeg libopenjp2` -ljbig2dec
34
34
35
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
35
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
36
		XCFLAGS+="-I${WRKSRC}/include/mupdf -fPIC" \
36
		XCFLAGS+="-I${WRKSRC}/include/mupdf -I${WRKSRC}/thirdparty/freeglut/include -fPIC" \
37
		XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \
37
		XLIBS+="-L${LOCALBASE}/lib -L${WRKSRC}/build/release" \
38
		SOVERSION=${DISTVERSION}
38
		SOVERSION=${DISTVERSION}
39
ALL_TARGET=	all extra-libs
39
ALL_TARGET=	all extra-libs
Lines 52-57 PLIST_SUB= SOVERSION=${PORTVERSION} Link Here
52
52
53
post-patch:
53
post-patch:
54
	@${REINPLACE_CMD} -e 's/-pipe -O2//' -e 's/-ldl//' ${WRKSRC}/Makerules
54
	@${REINPLACE_CMD} -e 's/-pipe -O2//' -e 's/-ldl//' ${WRKSRC}/Makerules
55
	@(cd ${WRKSRC}/thirdparty/freeglut/src && \
56
		${REINPLACE_CMD} -E 's/defined *\( *__FreeBSD(_kernel)?__ *\)/0/g' \
57
		fg_internal.h fg_joystick.c x11/fg_internal_x11.h x11/fg_joystick_x11.c)
55
58
56
post-install:
59
post-install:
57
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \
60
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 \
(-)b/graphics/mupdf/files/patch-Makerules (-1 / +1 lines)
Lines 61-67 Link Here
61
+  SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
61
+  SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
62
+  # glut
62
+  # glut
63
+  HAVE_GLUT := yes
63
+  HAVE_GLUT := yes
64
+  USE_SYSTEM_GLUT := yes
64
+  USE_SYSTEM_GLUT := no
65
+  SYS_GLUT_CFLAGS :=
65
+  SYS_GLUT_CFLAGS :=
66
+  SYS_GLUT_LIBS := -lglut -lGL
66
+  SYS_GLUT_LIBS := -lglut -lGL
67
+  # harfbuzz
67
+  # harfbuzz
(-)b/graphics/mupdf/files/patch-Makethird (-1 / +19 lines)
Added Link Here
0
- 
1
--- Makethird.orig	2020-11-21 14:51:06 UTC
2
+++ Makethird
3
@@ -436,6 +436,7 @@ GLUT_OBJ := $(GLUT_SRC:%.c=$(OUT)/%.o)
4
 
5
 LOCAL_GLUT_CFLAGS += -Ithirdparty/freeglut/include
6
 LOCAL_GLUT_CFLAGS += -Ithirdparty/freeglut/src
7
+LOCAL_GLUT_CFLAGS += $(shell pkgconf --cflags gl)
8
 LOCAL_GLUT_CFLAGS += -DHAVE_UNISTD_H -DHAVE_STDINT_H -DHAVE_X11_EXTENSIONS_XRANDR_H
9
 LOCAL_GLUT_CFLAGS += -Wno-sign-compare
10
 
11
@@ -447,7 +448,7 @@ $(OUT)/thirdparty/freeglut/%.o: thirdpar
12
 	$(CC_CMD) $(LIB_CFLAGS) $(LOCAL_GLUT_CFLAGS)
13
 
14
 GLUT_CFLAGS := -Ithirdparty/freeglut/include
15
-GLUT_LIBS := -lGL -lX11 -lXrandr
16
+GLUT_LIBS := $(shell pkgconf --libs gl) -lX11 -lXrandr
17
 
18
 endif
19
 

Return to bug 254451