]> git.ipfire.org Git - ipfire.org.git/blobdiff - Makefile.am
projects / ipfire.org.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wiki: Only match usernames when a word starts with @
[ipfire.org.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f382c7506dad4978168f4a52db41940c8c2a80c9..95220c2e3d987f9bf9ce08a86fb04d60e75092c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -262,14 +262,21 @@ templates_fireinfo_modules_DATA = \
 templates_fireinfo_modulesdir = $(templates_fireinfodir)/modules
 
 templates_location_DATA = \
-       src/templates/location/base.html \
-       src/templates/location/download.html \
-       src/templates/location/how-to-use.html \
        src/templates/location/index.html \
-       src/templates/location/lookup.html
+       src/templates/location/install.html \
+       src/templates/location/lookup.html \
+       src/templates/location/report-a-problem.html
 
 templates_locationdir = $(templatesdir)/location
 
+templates_location_how_to_use_DATA = \
+       src/templates/location/how-to-use/cli.html \
+       src/templates/location/how-to-use/dns.html \
+       src/templates/location/how-to-use/index.html \
+       src/templates/location/how-to-use/python.html
+
+templates_location_how_to_usedir = $(templates_locationdir)/how-to-use
+
 templates_lists_DATA = \
        src/templates/lists/index.html
 
@@ -301,6 +308,7 @@ templates_netbootdir = $(templatesdir)/netboot
 
 templates_nopaste_DATA = \
        src/templates/nopaste/create.html \
+       src/templates/nopaste/upload.html \
        src/templates/nopaste/view.html
 
 templates_nopastedir = $(templatesdir)/nopaste
@@ -319,6 +327,7 @@ templates_static_DATA = \
        src/templates/static/about.html \
        src/templates/static/legal.html \
        src/templates/static/help.html \
+       src/templates/static/partners.html \
        src/templates/static/sitemap.html
 
 templates_staticdir = $(templatesdir)/static
@@ -932,25 +941,25 @@ static_flags_4x3_DATA = \
 
 static_flags_4x3dir = $(static_flagsdir)/4x3
 
-static_fonts_DATA = \
-       src/fonts/ofl/prompt/Prompt-BlackItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-Black.ttf \
-       src/fonts/ofl/prompt/Prompt-BoldItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-Bold.ttf \
-       src/fonts/ofl/prompt/Prompt-ExtraBoldItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-ExtraBold.ttf \
-       src/fonts/ofl/prompt/Prompt-ExtraLightItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-ExtraLight.ttf \
-       src/fonts/ofl/prompt/Prompt-Italic.ttf \
-       src/fonts/ofl/prompt/Prompt-LightItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-Light.ttf \
-       src/fonts/ofl/prompt/Prompt-MediumItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-Medium.ttf \
-       src/fonts/ofl/prompt/Prompt-Regular.ttf \
-       src/fonts/ofl/prompt/Prompt-SemiBoldItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-SemiBold.ttf \
-       src/fonts/ofl/prompt/Prompt-ThinItalic.ttf \
-       src/fonts/ofl/prompt/Prompt-Thin.ttf \
+dist_static_fonts_DATA = \
+       src/static/fonts/prompt/Prompt-Black.ttf \
+       src/static/fonts/prompt/Prompt-BlackItalic.ttf \
+       src/static/fonts/prompt/Prompt-Bold.ttf \
+       src/static/fonts/prompt/Prompt-BoldItalic.ttf \
+       src/static/fonts/prompt/Prompt-ExtraBold.ttf \
+       src/static/fonts/prompt/Prompt-ExtraBoldItalic.ttf \
+       src/static/fonts/prompt/Prompt-ExtraLight.ttf \
+       src/static/fonts/prompt/Prompt-ExtraLightItalic.ttf \
+       src/static/fonts/prompt/Prompt-Italic.ttf \
+       src/static/fonts/prompt/Prompt-Light.ttf \
+       src/static/fonts/prompt/Prompt-LightItalic.ttf \
+       src/static/fonts/prompt/Prompt-Medium.ttf \
+       src/static/fonts/prompt/Prompt-MediumItalic.ttf \
+       src/static/fonts/prompt/Prompt-Regular.ttf \
+       src/static/fonts/prompt/Prompt-SemiBold.ttf \
+       src/static/fonts/prompt/Prompt-SemiBoldItalic.ttf \
+       src/static/fonts/prompt/Prompt-Thin.ttf \
+       src/static/fonts/prompt/Prompt-ThinItalic.ttf \
        \
        src/font-awesome/webfonts/fa-brands-400.ttf \
        src/font-awesome/webfonts/fa-brands-400.woff2 \
@@ -964,8 +973,36 @@ static_fonts_DATA = \
        src/payment-font/fonts/paymentfont-webfont.ttf \
        src/payment-font/fonts/paymentfont-webfont.woff
 
+static_fonts_DATA = \
+       src/static/fonts/prompt/Prompt-Black.woff2 \
+       src/static/fonts/prompt/Prompt-BlackItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Bold.woff2 \
+       src/static/fonts/prompt/Prompt-BoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraBold.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraBoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraLight.woff2 \
+       src/static/fonts/prompt/Prompt-ExtraLightItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Italic.woff2 \
+       src/static/fonts/prompt/Prompt-Light.woff2 \
+       src/static/fonts/prompt/Prompt-LightItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Medium.woff2 \
+       src/static/fonts/prompt/Prompt-MediumItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Regular.woff2 \
+       src/static/fonts/prompt/Prompt-SemiBold.woff2 \
+       src/static/fonts/prompt/Prompt-SemiBoldItalic.woff2 \
+       src/static/fonts/prompt/Prompt-Thin.woff2 \
+       src/static/fonts/prompt/Prompt-ThinItalic.woff2
+
 static_fontsdir = $(staticdir)/fonts
 
+EXTRA_DIST += \
+       src/static/fonts/prompt/DESCRIPTION.en_us.html \
+       src/static/fonts/prompt/METADATA.pb \
+       src/static/fonts/prompt/OFL.txt
+
+CLEANFILES += \
+       $(static_fonts_DATA)
+
 static_img_DATA = \
        src/static/img/apple-touch-icon-192x192-precomposed.png \
        src/static/img/apple-touch-icon-180x180-precomposed.png \
@@ -978,8 +1015,10 @@ static_img_DATA = \
        src/static/img/bash-logo.svg \
        src/static/img/debian-logo.svg \
        src/static/img/default-avatar.jpg \
+       src/static/img/fdroid-logo.svg \
        src/static/img/ipfire-tux.png \
        src/static/img/iuse-not-found.png \
+       src/static/img/kyberio-logo.svg \
        src/static/img/lightningwirelabs-logo.svg \
        src/static/img/python-logo.svg \
        src/static/img/tor.svg
@@ -1037,8 +1076,9 @@ CLEANFILES += \
 static_videos_DATA = \
        src/static/videos/firewall.jpg \
        src/static/videos/firewall@1920.av1.mp4 \
-       src/static/videos/firewall@1920.hevc.mp4 \
-       src/static/videos/firewall@1920.h264.mp4
+       src/static/videos/firewall@1920.h265.mp4 \
+       src/static/videos/firewall@1920.h264.mp4 \
+       src/static/videos/firewall@1920.vp9.mp4
 
 static_videosdir = $(staticdir)/videos
 
@@ -1072,8 +1112,8 @@ EXTRA_DIST += \
        src/error-pages/Gemfile \
        src/error-pages/Gemfile.lock \
        src/error-pages/_config.yml \
-       src/error-pages/_includes/main.sass \
        src/error-pages/_layouts/error.html \
+       src/error-pages/assets/main.sass \
        src/error-pages/500.markdown \
        src/error-pages/502.markdown \
        src/error-pages/503.markdown \
@@ -1081,11 +1121,13 @@ EXTRA_DIST += \
 
 .PHONY: error-pages
 error-pages:
-       $(AM_V_GEN)cd src/error-pages && $(JEKYLL) build --quiet --incremental
+       $(AM_V_GEN)cd src/error-pages && JEKYLL_ENV=production \
+               $(JEKYLL) build --quiet --incremental
 
 .PHONY: upload-error-pages
 upload-error-pages: error-pages
-       scp -P 222 src/error-pages/_site/*.http root@fw01.haj.ipfire.org:/etc/haproxy/errors/
+       rsync --verbose --progress --recursive --delete -e "ssh -p 222" --exclude="feed.xml" \
+               src/error-pages/_site/ root@fw01.haj.ipfire.org:/etc/haproxy/errors/
 
 # ------------------------------------------------------------------------------
 
@@ -1157,10 +1199,23 @@ src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(CONVERT) -units PixelsPerInch $< -resize 600x -strip -quality 85 $@
 
+# Fonts
+
+%.woff2: %.ttf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(WOFF2_COMPRESS) $^ >/dev/null
+
 # Video Stuff
 
-FFMPEG += \
-       -loglevel quiet
+# Multi-threading options for faster encoding
+FFMPEG_MT = \
+       -row-mt 1 \
+       -threads $(shell getconf _NPROCESSORS_ONLN) \
+       -tile-columns 2
+
+# Enable to log less
+#FFMPEG += \
+#      -loglevel quiet
 
 # AV1
 src/static/videos/firewall@%.av1.mp4: src/static/videos/firewall.mp4
@@ -1170,27 +1225,32 @@ src/static/videos/firewall@%.av1.mp4: src/static/videos/firewall.mp4
                -map_metadata -1 \
                -an \
                -c:v libsvtav1 \
+               -b:v 0 \
                -crf 31 \
-               -preset 5 \
+               -strict experimental \
+               -preset 3 \
                -pix_fmt yuv420p \
                -movflags +faststart \
-               -vf scale=$(patsubst src/static/videos/firewall@%.av1.mp4,%,$@):-2,fps=25 \
+               -vf scale=$(patsubst src/static/videos/firewall@%.av1.mp4,%,$@):-2:flags=lanczos,fps=25 \
+               $(FFMPEG_MT) \
                $@
 
-# HEVC
-src/static/videos/firewall@%.hevc.mp4: src/static/videos/firewall.mp4
+# H.256
+src/static/videos/firewall@%.h265.mp4: src/static/videos/firewall.mp4
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(FFMPEG) -y \
                -i $^ \
                -map_metadata -1 \
                -an \
                -c:v libx265 \
-               -crf 25 \
+               -b:v 0 \
+               -crf 27 \
                -preset veryslow \
                -pix_fmt yuv420p \
                -movflags +faststart \
                -tag:v hvc1 \
-               -vf scale=$(patsubst src/static/videos/firewall@%.hevc.mp4,%,$@):-2,fps=25 \
+               -vf scale=$(patsubst src/static/videos/firewall@%.h265.mp4,%,$@):-2:flags=lanczos,fps=25 \
+               $(FFMPEG_MT) \
                $@
 
 # H.264
@@ -1201,12 +1261,32 @@ src/static/videos/firewall@%.h264.mp4: src/static/videos/firewall.mp4
                -map_metadata -1 \
                -an \
                -c:v libx264 \
+               -b:v 0 \
                -crf 27 \
                -preset veryslow \
                -profile:v main \
                -pix_fmt yuv420p \
                -movflags +faststart \
-               -vf scale=$(patsubst src/static/videos/firewall@%.h264.mp4,%,$@):-2,fps=25 \
+               -vf scale=$(patsubst src/static/videos/firewall@%.h264.mp4,%,$@):-2:flags=lanczos,fps=25 \
+               $(FFMPEG_MT) \
+               $@
+
+# VP9
+src/static/videos/firewall@%.vp9.mp4: src/static/videos/firewall.mp4
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(FFMPEG) -y \
+               -i $^ \
+               -map_metadata -1 \
+               -an \
+               -c:v libvpx-vp9 \
+               -b:v 0 \
+               -crf 31 \
+               -deadline best \
+               -preset veryslow \
+               -pix_fmt yuv420p \
+               -movflags +faststart \
+               -vf scale=$(patsubst src/static/videos/firewall@%.vp9.mp4,%,$@):-2:flags=lanczos,fps=25 \
+               $(FFMPEG_MT) \
                $@
 
 # Cover image
The website of ipfire.org.