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

Collapse All | Expand All

(-)Makefile (-2 / +8 lines)
Lines 1141-1151 Link Here
1141
.endif
1141
.endif
1142
1142
1143
.if ${PORT_OPTIONS:MBROTLI}
1143
.if ${PORT_OPTIONS:MBROTLI}
1144
NGINX_BROTLI_VERSION=	12529813
1144
NGINX_BROTLI_VERSION=	 9891a98
1145
LIB_DEPENDS+=	libbrotlicommon.so:archivers/brotli
1145
LIB_DEPENDS+=	libbrotlicommon.so:archivers/brotli
1146
GH_ACCOUNT+=	google:brotli
1146
GH_ACCOUNT+=	eustas:brotli
1147
GH_PROJECT+=	ngx_brotli:brotli
1147
GH_PROJECT+=	ngx_brotli:brotli
1148
GH_TAGNAME+=	${NGINX_BROTLI_VERSION}:brotli
1148
GH_TAGNAME+=	${NGINX_BROTLI_VERSION}:brotli
1149
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-brotli_config
1149
.if ${PORT_OPTIONS:MDSO}
1150
.if ${PORT_OPTIONS:MDSO}
1150
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_brotli}
1151
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_brotli}
1151
.else
1152
.else
Lines 1269-1274 Link Here
1269
		's!%%PREFIX%%!${LOCALBASE}!g' \
1270
		's!%%PREFIX%%!${LOCALBASE}!g' \
1270
		${WRKSRC_nginx_tarantool}/config
1271
		${WRKSRC_nginx_tarantool}/config
1271
.endif
1272
.endif
1273
.if ${PORT_OPTIONS:MBROTLI}
1274
	@${REINPLACE_CMD} -E \
1275
		's!^brotli=.*!brotli="${LOCALBASE}"!' \
1276
		${WRKSRC_brotli}/config
1277
.endif
1272
1278
1273
pre-configure:
1279
pre-configure:
1274
.if ${PORT_OPTIONS:MMODSECURITY}
1280
.if ${PORT_OPTIONS:MMODSECURITY}
(-)distinfo (-2 / +2 lines)
Lines 123-130 Link Here
123
SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
123
SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124
124
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
124
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
125
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
125
SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280
126
SHA256 (google-ngx_brotli-12529813_GH0.tar.gz) = 788b25c4a3285b34d06e48a469fd0d0cb52d43b43edccd2935e22802dcfd2d69
126
SHA256 (eustas-ngx_brotli-9891a98_GH0.tar.gz) = 7706bf0b2be34573b1895398470b785078bb19f96f2e4e27a28a2ba526c98f1e
127
SIZE (google-ngx_brotli-12529813_GH0.tar.gz) = 10448
127
SIZE (eustas-ngx_brotli-9891a98_GH0.tar.gz) = 10491
128
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
128
SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
129
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
129
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
130
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
130
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
(-)files/extra-patch-brotli_config (+72 lines)
Line 0 Link Here
1
--- ../ngx_brotli-9891a98/config.orig	2017-11-28 11:00:45.000000000 +0100
2
+++ ../ngx_brotli-9891a98/config	2017-11-30 21:05:56.300023000 +0100
3
@@ -74,64 +74,11 @@ fi
4
 ngx_module_type=HTTP_FILTER
5
 ngx_module_name=ngx_http_brotli_filter_module
6
 ngx_module_incs="$brotli/include"
7
-ngx_module_deps="$brotli/common/constants.h \
8
-                 $brotli/common/dictionary.h \
9
-                 $brotli/common/version.h \
10
-                 $brotli/enc/backward_references.h \
11
-                 $brotli/enc/backward_references_inc.h \
12
-                 $brotli/enc/bit_cost.h \
13
-                 $brotli/enc/bit_cost_inc.h \
14
-                 $brotli/enc/block_encoder_inc.h \
15
-                 $brotli/enc/block_splitter.h \
16
-                 $brotli/enc/block_splitter_inc.h \
17
-                 $brotli/enc/brotli_bit_stream.h \
18
-                 $brotli/enc/cluster.h \
19
-                 $brotli/enc/cluster_inc.h \
20
-                 $brotli/enc/command.h \
21
-                 $brotli/enc/compress_fragment.h \
22
-                 $brotli/enc/compress_fragment_two_pass.h \
23
-                 $brotli/enc/context.h \
24
-                 $brotli/enc/dictionary_hash.h \
25
-                 $brotli/enc/entropy_encode.h \
26
-                 $brotli/enc/entropy_encode_static.h \
27
-                 $brotli/enc/fast_log.h \
28
-                 $brotli/enc/find_match_length.h \
29
-                 $brotli/enc/hash_forgetful_chain_inc.h \
30
-                 $brotli/enc/hash.h \
31
-                 $brotli/enc/hash_longest_match_inc.h \
32
-                 $brotli/enc/hash_longest_match_quickly_inc.h \
33
-                 $brotli/enc/histogram.h \
34
-                 $brotli/enc/histogram_inc.h \
35
-                 $brotli/enc/literal_cost.h \
36
-                 $brotli/enc/memory.h \
37
-                 $brotli/enc/metablock.h \
38
-                 $brotli/enc/metablock_inc.h \
39
-                 $brotli/enc/port.h \
40
-                 $brotli/enc/prefix.h \
41
-                 $brotli/enc/quality.h \
42
-                 $brotli/enc/ringbuffer.h \
43
-                 $brotli/enc/static_dict.h \
44
-                 $brotli/enc/static_dict_lut.h \
45
-                 $brotli/enc/utf8_util.h \
46
-                 $brotli/enc/write_bits.h"
47
-ngx_module_srcs="$brotli/common/dictionary.c \
48
-                 $brotli/enc/backward_references.c \
49
-                 $brotli/enc/bit_cost.c \
50
-                 $brotli/enc/block_splitter.c \
51
-                 $brotli/enc/brotli_bit_stream.c \
52
-                 $brotli/enc/cluster.c \
53
-                 $brotli/enc/compress_fragment.c \
54
-                 $brotli/enc/compress_fragment_two_pass.c \
55
-                 $brotli/enc/encode.c \
56
-                 $brotli/enc/entropy_encode.c \
57
-                 $brotli/enc/histogram.c \
58
-                 $brotli/enc/literal_cost.c \
59
-                 $brotli/enc/memory.c \
60
-                 $brotli/enc/metablock.c \
61
-                 $brotli/enc/static_dict.c \
62
-                 $brotli/enc/utf8_util.c \
63
-                 $ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
64
-ngx_module_libs="-lm"
65
+ngx_module_deps="$ngx_module_incs/brotli/encode.h \
66
+                 $ngx_module_incs/brotli/port.h \
67
+                 $ngx_module_incs/brotli/types.h"
68
+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
69
+ngx_module_libs="-lbrotlienc -lm"
70
 ngx_module_order="$ngx_module_name \
71
                   ngx_pagespeed \
72
                   ngx_http_postpone_filter_module \

Return to bug 224000