From 9d3081fa78753b2cabffdc71d157a56acf04ece5 Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Mon, 9 Dec 2024 15:48:50 +0100
Subject: [PATCH] make: improve Linux distro dtection code, and add specific
 dependendcies for Ubunutu 24.04

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 Makefile | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 6469ea5b..53d23926 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ RPMS=cmake curl wget git gtk2-devel libpng-devel libjpeg-devel libtiff-devel tbb
 DEBS=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev libharfbuzz-dev libfreetype6-dev
 DEBS_BOOKWORM=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbbmalloc2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libharfbuzz-dev libfreetype6-dev
 DEBS_UBUNTU_JAMMY=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-dev libharfbuzz-dev libfreetype6-dev
+DEBS_UBUNTU_NUMBAT=unzip wget build-essential cmake curl git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-dev libharfbuzz-dev libfreetype-dev
 JETSON=build-essential cmake git unzip pkg-config libjpeg-dev libpng-dev libtiff-dev libavcodec-dev libavformat-dev libswscale-dev libgtk2.0-dev libcanberra-gtk* libxvidcore-dev libx264-dev libgtk-3-dev libtbb2 libtbb-dev libdc1394-22-dev libv4l-dev v4l-utils libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libavresample-dev libvorbis-dev libxine2-dev libfaac-dev libmp3lame-dev libtheora-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenblas-dev libatlas-base-dev libblas-dev liblapack-dev libeigen3-dev gfortran libhdf5-dev protobuf-compiler libprotobuf-dev libgoogle-glog-dev libgflags-dev
 
 explain:
@@ -30,21 +31,22 @@ explain:
 distro_deps=
 ifneq ($(shell which dnf 2>/dev/null),)
 	distro_deps=deps_fedora
-else
+endif
+ifneq ($(shell which yum 2>/dev/null),)
+	distro_deps=deps_rh_centos
+endif
 ifneq ($(shell which apt-get 2>/dev/null),)
 ifneq ($(shell cat /etc/os-release 2>/dev/null | grep "Jammy Jellyfish"),)
 	distro_deps=deps_ubuntu_jammy
-else
-ifneq ($(shell cat /etc/debian_version 2>/dev/null | grep "12."),)
-	distro_deps=deps_debian_bookworm
-else
-	distro_deps=deps_debian
 endif
+ifneq ($(shell cat /etc/os-release 2>/dev/null | grep "Noble Numbat"),)
+	distro_deps=deps_ubuntu_numbat
 endif
-else
-ifneq ($(shell which yum 2>/dev/null),)
-	distro_deps=deps_rh_centos
+ifneq ($(shell cat /etc/debian_version 2>/dev/null | grep "11."),)
+	distro_deps=deps_debian_bullseye
 endif
+ifneq ($(shell cat /etc/debian_version 2>/dev/null | grep "12."),)
+	distro_deps=deps_debian_bookworm
 endif
 endif
 
@@ -61,14 +63,18 @@ deps_debian_bookworm:
 	sudo apt-get -y update
 	sudo apt-get -y install $(DEBS_BOOKWORM)
 
-deps_debian:
+deps_debian_bullseye:
 	sudo apt-get -y update
-	sudo apt-get -y install $(DEBS)
+	sudo apt-get -y install $(DEBS_BULLSEYE)
 
 deps_ubuntu_jammy:
 	sudo apt-get -y update
 	sudo apt-get -y install $(DEBS_UBUNTU_JAMMY)
 
+deps_ubuntu_numbat:
+	sudo apt-get -y update
+	sudo apt-get -y install $(DEBS_UBUNTU_NUMBAT)
+
 deps_jetson:
 	sudo sh -c "echo '/usr/local/cuda/lib64' >> /etc/ld.so.conf.d/nvidia-tegra.conf"
 	sudo ldconfig