From b900a12e5fa8b0f958ad48125f9f699fab5c82c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Mekina?= Date: Sun, 1 Jun 2025 17:43:11 +0200 Subject: [PATCH] add photos --- .gitignore | 1 + Makefile | 45 ++++++++++++++++++++++++++++++++++++---- pages/cz/downloads.html | 28 +++++++++++++++++++++++++ pages/cz/index.html | 2 +- pages/en/downloads.html | 28 +++++++++++++++++++++++++ photos/people/.gitignore | 2 ++ photos/talk/.gitignore | 2 ++ 7 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 photos/people/.gitignore create mode 100644 photos/talk/.gitignore diff --git a/.gitignore b/.gitignore index 1f106fd..51b9b44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dst/ +/tmp diff --git a/Makefile b/Makefile index cca0f79..db6a6c6 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,8 @@ PAGES := index.html 404.html javascript.html contact.html downloads.html SHARED_FILES := stallman.webp stallman_2024.webp favicon.ico \ poster_cz.webp poster_en.webp poster_cz.jpg poster_en.jpg \ word_cloud_cz.png word_cloud_en.png background.jpg \ - moon.svg sun.svg narrow_light.svg narrow_dark.svg wide_light.svg wide_dark.svg lang_cz.svg lang_en.svg \ - styles.css icons.css \ - countdown.js theme.js lang.js + moon.svg sun.svg narrow_light.svg narrow_dark.svg wide_light.svg wide_dark.svg \ + lang_cz.svg lang_en.svg styles.css icons.css countdown.js theme.js lang.js STATIC_ASSETS := jetbrains_mono.woff2 poster_cz.png poster_en.png SEARCH_REPLACE := lib/search_and_replace/target/release/search_and_replace COMPONENTS := head.html header.html nav.html footer.html @@ -13,11 +12,13 @@ COMPONENTS := head.html header.html nav.html footer.html build: $(PAGES:%=dst/cz/%) $(PAGES:%=dst/en/%) $(SHARED_FILES:%=dst/%) $(STATIC_ASSETS:%=dst/%) .PHONY: pack -pack: dst/libre_liberec.tar.gz +pack: dst/libre_liberec.tar.gz dst/photos_talk.tar.gz dst/photos_people.tar.gz dst/photos_talk.zip \ + dst/photos_people.zip .PHONY: clean clean: rm -rf dst + rm -rf tmp $(SEARCH_REPLACE): $(shell find lib/search_and_replace/src) cd lib/search_and_replace && cargo build --release @@ -90,3 +91,39 @@ dst/%.woff2: fonts/%.woff2 dst/libre_liberec.tar.gz: $(PAGES:%=dst/cz/%) $(PAGES:%=dst/en/%) $(SHARED_FILES:%=dst/%) tar --transform='s,^dst/,libre_liberec/,' -czvf $@ $^ --owner=0 --group=0 + +tmp/.anchor: + ln -sf "$$(mktemp -d)" tmp + touch tmp/.anchor + +tmp/photos_%.jpg: photos/%.* tmp/.anchor + @mkdir -p $(@D) + magick $< -quality 85 -strip $@ + +dst/photos_talk.tar.gz: \ + $(foreach t, $(shell ls photos/talk), tmp/photos_talk/$(t)) + @mkdir -p $(@D) + rm -f $@ + tar --transform='s,^tmp/,,' -czvf $@ \ + $$(echo $^ | tr ' ' '\n' | sort) --owner=0 --group=0 + +dst/photos_talk.zip: \ + $(foreach t, $(shell ls photos/talk), tmp/photos_talk/$(t)) + @mkdir -p $(@D) + rm -f $@ + cd tmp && zip -r photos_talk.zip photos_talk + mv tmp/photos_talk.zip $@ + +dst/photos_people.tar.gz: \ + $(foreach t, $(shell ls photos/people), tmp/photos_people/$(t)) + @mkdir -p $(@D) + rm -f $@ + tar --transform='s,^tmp/,,' -czvf $@ \ + $$(echo $^ | tr ' ' '\n' | sort) --owner=0 --group=0 + +dst/photos_people.zip: \ + $(foreach t, $(shell ls photos/talk), tmp/photos_talk/$(t)) + @mkdir -p $(@D) + rm -f $@ + cd tmp && zip -r photos_people.zip photos_people + mv tmp/photos_people.zip $@ diff --git a/pages/cz/downloads.html b/pages/cz/downloads.html index facfa2b..00cd815 100644 --- a/pages/cz/downloads.html +++ b/pages/cz/downloads.html @@ -15,6 +15,34 @@ Všechny obrázky ke stažení podléhají licenci Creative Commons Attribution-ShareAlike 4.0 International.

+

Video z akce

+ + + +

+ Záznam z akce (.mkv - 2 GB) +

+ +

Fotografie z akce

+ +

+ Archiv fotografií z akce (.tar.gz - 33 MB) +

+ +

+ Archiv fotografií lidí s Richardem Stallmanem (.tar.gz - 19.7 MB) +

+ +

+ Archiv fotografií z akce (.zip - 33 MB) +

+ +

+ Archiv fotografií lidí s Richardem Stallmanem (.zip - 19.7 MB) +

+

Plakát v češtině

diff --git a/pages/cz/index.html b/pages/cz/index.html index 7412839..19dd2bf 100644 --- a/pages/cz/index.html +++ b/pages/cz/index.html @@ -15,7 +15,7 @@

- Nahrávku přednášky si můžete zobrazit zde. + Nahrávku přednášky si můžete zobrazit zde.

Kdo je Richard Stallman?

diff --git a/pages/en/downloads.html b/pages/en/downloads.html index ac4c7de..b5e2a33 100644 --- a/pages/en/downloads.html +++ b/pages/en/downloads.html @@ -15,6 +15,34 @@ All images for download are licensed under the Creative Commons Attribution-ShareAlike 4.0 International license.

+

Video of the event

+ + + +

+ Recording of the talk (.mkv - 2 GB) +

+ +

Photos from the event

+ +

+ Archive with photos from the talk (.tar.gz - 33 MB) +

+ +

+ Archive with photos of people with Richard Stallman (.tar.gz - 19.7 MB) +

+ +

+ Archive with photos from the talk (.zip - 33 MB) +

+ +

+ Archive with photos of people with Richard Stallman (.zip - 19.7 MB) +

+

Poster in English

diff --git a/photos/people/.gitignore b/photos/people/.gitignore new file mode 100644 index 0000000..a68d087 --- /dev/null +++ b/photos/people/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore diff --git a/photos/talk/.gitignore b/photos/talk/.gitignore new file mode 100644 index 0000000..a68d087 --- /dev/null +++ b/photos/talk/.gitignore @@ -0,0 +1,2 @@ +/* +!/.gitignore