From nobody Sat Feb 24 15:46:58 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Thrpp2Smvz5B29r; Sat, 24 Feb 2024 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Thrpp1t53z4T2F; Sat, 24 Feb 2024 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708789618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=InEgpeYfEhYvFs8NFhec7g7+iW1cl/Om2wkNbRMUIrI=; b=bSOkDBwvIbrfdwFCnoeewIbVqPpxZvosRUPemAAutKN8OJo6R9wZ2f+tM6cPdCE3xRIe0J +ZJLE16RCAYT0dWSIr7k3UI8WIu8KXQSABwee+LmXTZc8H7okQ5r2m1qaa4NsDlhxNB869 ro3yAyal+ojN2E/0/+Ag4/3Py3/dARTVwfmznSfNWZdCbEQsLRtNTxYGnoD+EZCNBTy1l7 CCcHZFFX534udKeNldkxYKdFlIEV6CQiRrlriDUEh+gTUzXv8dZHCeQiFvAbfdf8/LJtzc sOjUUwTwub3pI+hAaiZwW7DLv6Cw8B+F7VpAEa0snmYqGTEy6zhCnFfZ/wkvKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708789618; a=rsa-sha256; cv=none; b=k1Xbq6kha2zL28I9KdNeqdM2RmUZDa/U3hwHvROsLh4XWKvPiIlEzIdjYeX2t5e1EA2ohA RfQpy8UNe/BOGlN10i1s7rYbgvc5piTAc4SGAJj00jiErYwLWmN05AKjzJSvSUhN4ZNJAR hKkblZGYvQtEU9WQrVeHM75mWgENjWEB9uyMDNN//mN3rEy0zcdfSYNYjWrM33oWJCZDCp 7O0PdzKq6IZzZjSu62Esy5CZ+rg/fgjU1dtGJaaUnBkZ0LiteZL0VSGYEO5gwKd8+FLtBt rrOxaEoEVWJFbFFbpF9/7CGqGDwGKdrJGkMAw/1Hpi3Y6pqlIqllNy/7MtlQng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708789618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=InEgpeYfEhYvFs8NFhec7g7+iW1cl/Om2wkNbRMUIrI=; b=ZJIkW28QP9N+SyB0auZADG75IXiSr8AL+OtIJekZPWbsqPtiJoXYwKjsnyXDGU+G9/BDOe QGp1wIP6W7adfzodZjcwBBgr/Xscme70GNZGwngPndTBkn0xbc+Xv0UZ5JQ3Y5ozoyngS2 7BBddQfXqFbMb4m7k1qj1xRypNKd1LpXfELtqzgVEh3xrfSxZ3Uk8zUJ6N60aXI5+zo5gh sjwmOaWviCpXQ5YACgdZ8qS3fbFDzuxo1GkvRdXkaHUCFF0Ta4O6e7/Or5ayZ+tsAezG/T O8wzoVbGn7eEo74kyRGQ4yuctia4Gn3GKh6ZgvowblOdlnIBkzATqHUFHgo9QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Thrpp0v5Dz157V; Sat, 24 Feb 2024 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OFkwR7039820; Sat, 24 Feb 2024 15:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OFkw9H039817; Sat, 24 Feb 2024 15:46:58 GMT (envelope-from git) Date: Sat, 24 Feb 2024 15:46:58 GMT Message-Id: <202402241546.41OFkw9H039817@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: bc75b721dc71 - main - www/nginx-devel: third-party modules management (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc75b721dc71ff7dd17432dce0b82d2393ea82a6 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc75b721dc71ff7dd17432dce0b82d2393ea82a6 commit bc75b721dc71ff7dd17432dce0b82d2393ea82a6 Author: Sergey A. Osokin AuthorDate: 2024-02-24 15:44:28 +0000 Commit: Sergey A. Osokin CommitDate: 2024-02-24 15:46:49 +0000 www/nginx-devel: third-party modules management (+) 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 --- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 3 ++- www/nginx-devel/distinfo | 6 +++--- .../extra-patch-nginx-thumbextractor-module-config | 25 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 7e0e00314516..7536af77bc49 100644 --- a/www/nginx-devel/Makefile +++ b/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 diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 5f9cb8974ef4..f98fe1e8c522 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -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 diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index e0b0444c37c0..e1b6b9779c53 100644 --- a/www/nginx-devel/distinfo +++ b/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 @@ -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 diff --git a/www/nginx-devel/files/extra-patch-nginx-thumbextractor-module-config b/www/nginx-devel/files/extra-patch-nginx-thumbextractor-module-config new file mode 100644 index 000000000000..6324fd9fcc52 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-thumbextractor-module-config @@ -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