LibrePlanet2022: images: switch to jpg to shring it from 126MiB to 97MiB

The big blue button instance used for the conference seems to have a
limit of 30MiB for the file sizes, so we need to make it fit not to have
to split the file in many small parts.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

12 files changed, 136 insertions, 58 deletions

diff --git a/LibrePlanet2022/Makefile b/LibrePlanet2022/Makefile
index b59926d..654fd40 100644
--- a/LibrePlanet2022/Makefile
+++ b/LibrePlanet2022/Makefile
@@ -2,71 +2,149 @@ TEXFLAGS ?= -halt-on-error -output-format pdf -output-directory output
 TITLE = Struggle_for_independence
 
 .PHONY: all clean medias archive
+
+###############
+# Phony rules #
+###############
 all: output/$(TITLE).pdf
 
+archive:
+	git archive --format=tar --prefix=LibrePlanet2022/ HEAD -o LibrePlanet2022.tar
+
+clean:
+	rm -rf output
+
+################
+# Main targets #
+################
 output:
 	mkdir output
 
 output/$(TITLE).pdf: \
 	Struggle_for_independence.tex \
 	output \
-	output/android.png \
-	output/android_logo.png \
-	output/anti_drm_protest.png \
-	output/framework.png \
-	output/freedo.png \
-	output/i9300_left.png \
-	output/linux.png \
-	output/n900.png \
-	output/replicant_logo_alpha.png \
-	output/tablets.png \
-	output/wifi.png
+	output/4-freedoms.jpg \
+	output/android.jpg \
+	output/android_logo.jpg \
+	output/anti_drm_protest.jpg \
+	output/anti_smartphones.jpg \
+	output/crespo.jpg \
+	output/electronic_waste.jpg \
+	output/framework.jpg \
+	output/freedo.jpg \
+	output/gta04.jpg \
+	output/googlag.jpg \
+	output/i9100.jpg \
+	output/i9300.jpg \
+	output/i9300_left.jpg \
+	output/linux.jpg \
+	output/maguro.jpg \
+	output/motorola_a780.jpg \
+	output/n5100.jpg \
+	output/n7000.jpg \
+	output/n7100.jpg \
+	output/n900.jpg \
+	output/p3100.jpg \
+	output/p5100.jpg \
+	output/phist.jpg \
+	output/raised_fist.jpg \
+	output/replicant_logo.jpg \
+	output/smart_phones_shop.jpg \
+	output/tablets.jpg \
+	output/we_can_do_it.jpg \
+	output/wifi.jpg \
+	output/worker.jpg
 	pdflatex $(TEXFLAGS) '\providecommand\locale{en}\input{$(TITLE).tex}'
 	pdflatex $(TEXFLAGS) '\providecommand\locale{en}\input{$(TITLE).tex}'
+	du -hs $@
 
-output/android_logo.png: images/Android_Robot_Cleaner_2014-2019.svg output
+##############################
+# Automatic depdencies rules #
+##############################
+output/%.jpg: dot/%.dot
+	mkdir -p output
+	dot -T jpg $< > $@
+
+output/%.jpg: images/%.jpg output
 	convert $< $@
 
-output/anti_drm_protest.png: images/anti_drm_protest.jpg output
-	convert $< -crop 50%x0%+1440+0 $@
+output/%.jpg: images/%.png output
+	convert $< $@
 
-output/freedo.png: images/Freedo_improved.svg output
+output/%.jpg: images/%.svg output
 	convert $< $@
 
-output/i9300_hardware.png: ../common/images/i9300_hardware.svg output
+#################################
+# Images with specific settings #
+#################################
+output/anti_drm_protest.jpg: images/anti_drm_protest.jpg output
+	convert $< -crop 50%x0%+1440+0 $@
+
+output/i9300_hardware.jpg: ../common/images/i9300_hardware.svg output
 	convert $< $@
 
-output/i9300_left.png: output/i9300_hardware.png output
+output/i9300_left.jpg: output/i9300_hardware.jpg output
 	convert $< -crop 50%x0%+0+0 $@
 
-output/n900.png: images/N900_xterm.JPG images/Nokia_N900-6.jpg
+output/n900.jpg: images/N900_xterm.JPG images/Nokia_N900-6.jpg
 	mkdir -p output
 	convert -append -gravity center $? $@
 
-output/replicant_logo_alpha.png: ../external_resources/vendor_replicant_artwork/replicant_logo_alpha.png output
+output/replicant_logo.jpg: ../external_resources/vendor_replicant_artwork/replicant_logo_white.png output
 	convert $< $@
 
-output/tablets.png: \
+output/tablets.jpg: \
 	../external_resources/replicant_website/images/supported-devices/p3100.png \
 	../external_resources/replicant_website/images/supported-devices/p5100.png
 	mkdir -p output
 	convert -append $? $@
 
-output/wifi.png: \
+output/wifi.jpg: \
 	images/tehnoetic-n150-mini-wifi-adapter-back-500x500.png \
 	images/tet-otg-side-500x500.jpg \
 	images/Wifi.png
 	mkdir -p output
 	convert -append -gravity center $? $@
 
-output/%.png: dot/%.dot output
-	dot -T png $< > $@
+#############################
+# Official devices pictures #
+#############################
+output/crespo.jpg: \
+	../external_resources/replicant_website/images/supported-devices/crespo.png
+	convert $? $@
 
-clean:
-	rm -rf output
+output/gta04.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/gta04.png
+	convert $? $@
 
-output/%.png: dot/%.dot
-	mkdir -p output
-	dot -T png $< > $@
-archive:
-	git archive --format=tar --prefix=LibrePlanet2022/ HEAD -o LibrePlanet2022.tar
+output/i9100.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/i9100.png
+	convert $? $@
+
+output/i9300.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/i9300.png
+	convert $? $@
+
+output/maguro.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/maguro.png
+	convert $? $@
+
+output/n5100.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/n5100.png
+	convert $? $@
+
+output/n7000.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/n7000.png
+	convert $? $@
+
+output/n7100.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/n7100.png
+	convert $? $@
+
+output/p3100.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/p3100.png
+	convert $? $@
+
+output/p5100.jpg: \
+	 ../external_resources/replicant_website/images/supported-devices/p5100.png
+	convert $? $@
diff --git a/LibrePlanet2022/Struggle_for_independence.tex b/LibrePlanet2022/Struggle_for_independence.tex
index 5f713ec..8528ea8 100644
--- a/LibrePlanet2022/Struggle_for_independence.tex
+++ b/LibrePlanet2022/Struggle_for_independence.tex
@@ -15,7 +15,7 @@
   basicstyle=\scriptsize\color{green},
 }
 
-\newcommand{\devicepicture}[1]{../external_resources/replicant_website/images/supported-devices/#1.png}
+\newcommand{\devicepicture}[1]{output/#1.jpg}
 
 \newcommand{\includedevicepicture}[1]{
   {\includegraphics[width=.2\textwidth]{\devicepicture{#1}}}
@@ -103,7 +103,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{images/electronic_waste.jpg}{right}{
+  \inlinepicture{output/electronic_waste.jpg}{right}{
     \center{Main issues with smartphones}
     \begin{itemize}
     \item Making smartphones destroys people (bad work conditions) and the
@@ -118,7 +118,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{images/anti_smartphones.jpg}{right}{
+  \inlinepicture{output/anti_smartphones.jpg}{right}{
     \center{Solution:}
     \\
     Not use smartphones at all \\
@@ -127,7 +127,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{images/Phist.jpg}{right}{
+  \inlinepicture{output/phist.jpg}{right}{
     \center{Doesn't work?}
     \begin{itemize}
     \item At least 2.7 billion people still using it,
@@ -166,7 +166,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{images/4-freedoms.png}{right}{
+  \inlinepicture{output/4-freedoms.jpg}{right}{
     \center{Free software to advance in the right direction}
     \begin{itemize}
     \item Making (smartphones and tablet) hardware work with free
@@ -177,7 +177,7 @@
 
 \begin{frame}
   \center{Other ways to help:}
-  \inlinepicture{output/anti_drm_protest.png}{right}{
+  \inlinepicture{output/anti_drm_protest.jpg}{right}{
     Political pressure:
     \begin{itemize}
     \item Practical right to repair, devices that last longer
@@ -204,7 +204,7 @@
 
 \begin{frame}
   \center{Have clear demands and attainable goal: First steps}
-  \inlinepicture{images/Raised_fist.jpg}{right}{
+  \inlinepicture{output/raised_fist.jpg}{right}{
     \begin{itemize}
     \item 100\% free sofware on the main CPU
     \item 100\% free sofware distribution(s)
@@ -225,7 +225,7 @@
 
 \begin{frame}
   \center{How to achieve that?}
-  \inlinepicture{images/We_Can_Do_It!_NARA_535413_-_Restoration_2.jpg}{right}{
+  \inlinepicture{output/we_can_do_it.jpg}{right}{
   \begin{itemize}
   \item $\rightarrow$ Lot of work by many people over many years.
   \item $\rightarrow$ Not shipping nonfree firmwares or any nonfree software.
@@ -306,7 +306,7 @@
 \subsection{Replicant}
 
 \begin{frame}
-  \inlinepicture{output/replicant_logo_alpha.png}{right}{
+  \inlinepicture{output/replicant_logo.jpg}{right}{
     \center{Replicant:}
     \begin{itemize}
     \item Fully free Android distribution approved by the FSF
@@ -356,7 +356,7 @@
 
 \begin{frame}
   \center{Best (and lot of) effort:}
-  \inlinepicture{images/African_American_worker_Richmond_Shipyards.jpg}{right}{
+  \inlinepicture{output/worker.jpg}{right}{
     \begin{itemize}
     \item Display working and graphics fast enough
     \item Sound working
@@ -386,7 +386,7 @@
 
 \begin{frame}
   \center{A very short introduction on hardware:}
-  \inlinepicture{output/i9300_hardware.png}{top}{
+  \inlinepicture{output/i9300_hardware.jpg}{top}{
     \begin{itemize}
     \item System on a chip
     \item Smartphones and the modem
@@ -427,7 +427,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/tablets.png}{right}{
+  \inlinepicture{output/tablets.jpg}{right}{
     \center{Devices without modems?}
     \begin{itemize}
     \item Some tablets don't have any modem
@@ -437,7 +437,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/Wifi.png}{right}{
+  \inlinepicture{output/Wifi.jpg}{right}{
     \center{WiFi: No free firmwares for chip used in mobile devices}
     \begin{itemize}
     \item ath9k compatible adapters consume too much power,
@@ -453,7 +453,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/i9300_left.png}{right}{
+  \inlinepicture{output/i9300_left.jpg}{right}{
     \center{Additional issues:}
     \begin{itemize}
     \item Nonfree bootloader
@@ -470,7 +470,7 @@
 \subsection{Android architecture}
 
 \begin{frame}
-  \inlinepicture{images/smart_phones_shop.jpg}{right}{
+  \inlinepicture{output/smart_phones_shop.jpg}{right}{
     \center{Android architecture}
     \begin{itemize}
     \item Goals: time to market
@@ -486,7 +486,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/framework.png}{right}{
+  \inlinepicture{output/framework.jpg}{right}{
     \center{How it's done?}
     \begin{itemize}
     \item Breaking Kernel API and ABI
@@ -502,7 +502,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/n900.png}{right}{
+  \inlinepicture{output/n900.jpg}{right}{
     \center{Not Android specific}
     \begin{itemize}
     \item N900
@@ -526,20 +526,20 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/android.png}{bottom}{
+  \inlinepicture{output/android.jpg}{bottom}{
     \center{Android}
   }
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/linux.png}{bottom}{
+  \inlinepicture{output/linux.jpg}{bottom}{
     \center{Device kernels}
   }
 \end{frame}
 
 \begin{frame}
   \center{Ugly vendor code is good as we depend it for freedom}
-  \inlinepicture{output/freedo.png}{right}{
+  \inlinepicture{output/freedo.jpg}{right}{
     \begin{itemize}
     \item Having the source code under free software licenses, even if the code
       quality is bad is crucial for freedom:
@@ -560,7 +560,7 @@
 
 \begin{frame}
   \center{Why Android?}
-  \inlinepicture{output/android_logo.png}{right}{
+  \inlinepicture{output/android_logo.jpg}{right}{
     \begin{itemize}
     \item GUI and applications adapted to big fingers
     \item $\rightarrow$ run on devices that:
@@ -575,7 +575,7 @@
 
 \begin{frame}
   \center{Issues with Android?}
-  \inlinepicture{images/IMG_20180428_200243.jpg}{right}{
+  \inlinepicture{output/googlag.jpg}{right}{
     \begin{itemize}
     \item Part of the GNU/Linux architecture is light years away:
       package management and build system, graphics, audio, etc
@@ -604,7 +604,7 @@
 %% \end{frame}
 
 \begin{frame}
-  \inlinepicture{images/motorola_a780.jpg}{right}{
+  \inlinepicture{output/motorola_a780.jpg}{right}{
   \center{There is a long tradition of porting GNU/Linux on smartphones and
     mobile devices}
   }
@@ -777,7 +777,7 @@
 \end{frame}
 
 \begin{frame}
-  \inlinepicture{output/i9300_left.png}{right}{
+  \inlinepicture{output/i9300_left.jpg}{right}{
     \center{Sounds too good to be true?}
     \begin{itemize}
     \item The modem controlled everything: booting, RAM
@@ -948,7 +948,7 @@
 \begin{frame}
   \center{Power management in smartphones and Android (wakelocks / opportunistic
     suspend)}
-  \inlinepicture{output/i9300_hardware.png}{top}{
+  \inlinepicture{output/i9300_hardware.jpg}{top}{
   }
 \end{frame}
 
diff --git a/LibrePlanet2022/dot/android.dot b/LibrePlanet2022/dot/android.dot
index 7c4f84d..a2f2d22 100644
--- a/LibrePlanet2022/dot/android.dot
+++ b/LibrePlanet2022/dot/android.dot
@@ -1,5 +1,5 @@
 digraph "" {
-	bgcolor="#ffffff00" # Transparent background
+	# bgcolor="#ffffff00" # Transparent background
 	"AOSP" -> "Samsung Android" ;
 	"Google Play" -> "Samsung Android" ;
 	"AOSP" -> "LineageOS" -> "Replicant 6.0";
diff --git a/LibrePlanet2022/dot/framework.dot b/LibrePlanet2022/dot/framework.dot
index 5a2541c..c1cab54 100644
--- a/LibrePlanet2022/dot/framework.dot
+++ b/LibrePlanet2022/dot/framework.dot
@@ -1,4 +1,4 @@
 digraph "" {
-	bgcolor="#ffffff00" # Transparent background
+	# bgcolor="#ffffff00" # Transparent background
 	"Android applications" -> "Android framework" -> "HALs" -> "(modified) kernel";
 }
diff --git a/LibrePlanet2022/dot/linux.dot b/LibrePlanet2022/dot/linux.dot
index 1398ca8..8907ac7 100644
--- a/LibrePlanet2022/dot/linux.dot
+++ b/LibrePlanet2022/dot/linux.dot
@@ -1,5 +1,5 @@
 digraph "" {
-	bgcolor="#ffffff00" # Transparent background
+	# bgcolor="#ffffff00" # Transparent background
 	"OLD_DEVICE_KERNEL" [label="Device kernel"];
 	"NEW_DEVICE_KERNEL" [label="Device kernel"];
 	"Linux" -> "vendor_kernel_replicant" ;
diff --git a/LibrePlanet2022/images/Android_Robot_Cleaner_2014-2019.svg b/LibrePlanet2022/images/android_logo.svg
index 4edab85..4edab85 100644
--- a/LibrePlanet2022/images/Android_Robot_Cleaner_2014-2019.svg
+++ b/LibrePlanet2022/images/android_logo.svg
diff --git a/LibrePlanet2022/images/Freedo_improved.svg b/LibrePlanet2022/images/freedo.svg
index 0b39281..0b39281 100644
--- a/LibrePlanet2022/images/Freedo_improved.svg
+++ b/LibrePlanet2022/images/freedo.svg
diff --git a/LibrePlanet2022/images/IMG_20180428_200243.jpg b/LibrePlanet2022/images/googlag.jpg
index f7748c2..f7748c2 100644
--- a/LibrePlanet2022/images/IMG_20180428_200243.jpg
+++ b/LibrePlanet2022/images/googlag.jpg
diff --git a/LibrePlanet2022/images/Phist.jpg b/LibrePlanet2022/images/phist.jpg
index a04b41a..a04b41a 100644
--- a/LibrePlanet2022/images/Phist.jpg
+++ b/LibrePlanet2022/images/phist.jpg
diff --git a/LibrePlanet2022/images/Raised_fist.jpg b/LibrePlanet2022/images/raised_fist.jpg
index 83c9735..83c9735 100644
--- a/LibrePlanet2022/images/Raised_fist.jpg
+++ b/LibrePlanet2022/images/raised_fist.jpg
diff --git a/LibrePlanet2022/images/We_Can_Do_It!_NARA_535413_-_Restoration_2.jpg b/LibrePlanet2022/images/we_can_do_it.jpg
index b641c7b..b641c7b 100644
--- a/LibrePlanet2022/images/We_Can_Do_It!_NARA_535413_-_Restoration_2.jpg
+++ b/LibrePlanet2022/images/we_can_do_it.jpg
diff --git a/LibrePlanet2022/images/African_American_worker_Richmond_Shipyards.jpg b/LibrePlanet2022/images/worker.jpg
index 9293799..9293799 100644
--- a/LibrePlanet2022/images/African_American_worker_Richmond_Shipyards.jpg
+++ b/LibrePlanet2022/images/worker.jpg