Skip to content

Commit

Permalink
www/nginx-devel: third-party modules management (+)
Browse files Browse the repository at this point in the history
Change GH location for the third-party video-thumbextractor module.
The size of the new distro is much bigger just because it contains
many tests.

PR:	277155
  • Loading branch information
osokin committed Feb 24, 2024
1 parent 0a73972 commit bc75b72
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.25.4
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
Expand Down
3 changes: 2 additions & 1 deletion www/nginx-devel/Makefile.extmod
Expand Up @@ -186,8 +186,9 @@ HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libavutil.so:multimedia/ffmpeg \
libswscale.so:multimedia/ffmpeg
HTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg
HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= Novetta:nginx-video-thumbextractor-module:28861f2:vte
HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module:e81f850:vte
HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte
HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config

HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip
HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip
Expand Down
6 changes: 3 additions & 3 deletions www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
TIMESTAMP = 1708010805
TIMESTAMP = 1708552086
SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
SIZE (nginx-1.25.4.tar.gz) = 1236273
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
Expand Down Expand Up @@ -83,8 +83,8 @@ SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e
SIZE (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 10433
SHA256 (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = e4a533dfa214ea28122301aeebbb1a38e1d1972edb7ee9bc72271c14f2693005
SIZE (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = 120676
SHA256 (Novetta-nginx-video-thumbextractor-module-28861f2_GH0.tar.gz) = 04656da527d9e64cbdf1bf475a93193fa60324ffea160d05d4cc53c864943bc1
SIZE (Novetta-nginx-video-thumbextractor-module-28861f2_GH0.tar.gz) = 34447
SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb
SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072
SHA256 (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 4fe63be3b842882494152e586f0b87e73f51bfbfd801b78f033c71a011cba789
SIZE (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 29559
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
Expand Down
@@ -0,0 +1,25 @@
--- ../nginx-video-thumbextractor-module-e81f850/config.orig 2024-02-22 08:49:55.972829000 -0500
+++ ../nginx-video-thumbextractor-module-e81f850/config 2024-02-22 08:50:05.036983000 -0500
@@ -1,9 +1,14 @@
ngx_addon_name=ngx_http_video_thumbextractor_module
-ngx_feature_libs="-lavformat -lavcodec -lavutil -lavfilter -lswscale -lswresample -lpostproc -ljpeg"
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-CORE_INCS="$CORE_INCS \
- $ngx_addon_dir/src \
- $ngx_addon_dir/include"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
- ${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c"
-CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+ngx_module_libs="-lavformat -lavcodec -lavutil -lavfilter -lswscale -lswresample -lpostproc -ljpeg"
+ngx_module_incs="$ngx_addon_dir/include $ngx_addon_dir/src"
+
+if test -n "$ngx_module_link"; then
+ ngx_module_type=HTTP
+ ngx_module_name=$ngx_addon_name
+ ngx_module_srcs="${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c"
+ . auto/module
+else
+ HTTP_MODULES="$HTTP_MODULES $ngx_addon_name"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+ ${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c"
+fi

0 comments on commit bc75b72

Please sign in to comment.