diff options
Diffstat (limited to 'www/freenginx-devel/files')
| -rw-r--r-- | www/freenginx-devel/files/extra-patch-nginx-thumbextractor-module-config | 2 | ||||
| -rw-r--r-- | www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/www/freenginx-devel/files/extra-patch-nginx-thumbextractor-module-config b/www/freenginx-devel/files/extra-patch-nginx-thumbextractor-module-config index 6324fd9fcc52..12c7906a0422 100644 --- a/www/freenginx-devel/files/extra-patch-nginx-thumbextractor-module-config +++ b/www/freenginx-devel/files/extra-patch-nginx-thumbextractor-module-config @@ -10,7 +10,7 @@ -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_libs="-lavformat -lavcodec -lavutil -lavfilter -lswscale -lswresample -ljpeg" +ngx_module_incs="$ngx_addon_dir/include $ngx_addon_dir/src" + +if test -n "$ngx_module_link"; then diff --git a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp deleted file mode 100644 index 0024171deaec..000000000000 --- a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- ../nginx-otel-3a655df/src/ngx_otel_module.cpp.orig 2024-12-19 17:07:23.000000000 -0500 -+++ ../nginx-otel-3a655df/src/ngx_otel_module.cpp 2025-10-31 11:50:12.604868000 -0400 -@@ -512,7 +512,11 @@ - try { - BatchExporter::SpanInfo info{ - getSpanName(r), ctx->current, ctx->parent.spanId, -+#if defined freenginx -+ (toNanoSec(now->sec, now->msec) - ((ngx_current_msec - r->start_time) * 1000000)), -+#else - toNanoSec(r->start_sec, r->start_msec), -+#endif - toNanoSec(now->sec, now->msec)}; - - bool ok = gExporter->add(info, [r](BatchExporter::Span& span) { |