diff --git a/build.py b/build.py index ab5abcd02d9e4b0d5de8268ab9e4a18548913b48..a4f21f53b8a92989bf301d04c3f8978759ba068c 100755 --- a/build.py +++ b/build.py @@ -44,7 +44,7 @@ APT_BASED_DISTROS = [ ] DNF_BASED_DISTROS = [ - 'fedora', 'rhel', + 'fedora', 'rhel', 'almalinux', ] PACMAN_BASED_DISTROS = [ diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile index 62068f28847923ea6e83539fe35c7d10deeaaf88..4bdae9300ebdbd1d121579baa5a3d23ce2bae139 100644 --- a/extras/packaging/gnu-linux/Makefile +++ b/extras/packaging/gnu-linux/Makefile @@ -170,6 +170,7 @@ DISTRIBUTIONS := \ ubuntu_23.04 \ fedora_37 \ fedora_38 \ + alma_9 \ opensuse-leap_15.4 \ snap diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 b/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 new file mode 100644 index 0000000000000000000000000000000000000000..b91bc11839925cb58debb29dcc6b884cd2552616 --- /dev/null +++ b/extras/packaging/gnu-linux/docker/Dockerfile_alma_9 @@ -0,0 +1,105 @@ +FROM almalinux:9 +RUN dnf clean all +RUN dnf update -y +RUN dnf install -y epel-release +RUN dnf install -y 'dnf-command(config-manager)' +RUN dnf config-manager --set-enabled crb +RUN dnf config-manager --set-enabled appstream +RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \ + dnf install -y mock +RUN yum install -y wget && \ + wget https://repo.almalinux.org/almalinux/9/devel/x86_64/os/Packages/uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \ + yum localinstall -y uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \ + rm -f uuid-c++-devel-1.6.2-55.el9.x86_64.rpm +RUN yum install -y xorg-x11-xauth +RUN dnf install -y \ + git \ + rpm-build \ + tar \ + make \ + autoconf \ + automake \ + nasm \ + speexdsp-devel \ + pulseaudio-libs-devel \ + libcanberra-devel \ + libcurl-devel \ + libtool \ + mesa-libgbm-devel \ + mesa-dri-drivers \ + dbus-devel \ + expat-devel \ + pcre-devel \ + yaml-cpp-devel \ + libXext-devel \ + libXfixes-devel \ + yasm \ + speex-devel \ + gsm-devel \ + chrpath \ + check \ + astyle \ + gettext-devel \ + gcc-c++ \ + which \ + alsa-lib-devel \ + systemd-devel \ + libuuid-devel \ + uuid-devel \ + gnutls-devel \ + nettle-devel \ + opus-devel \ + patch \ + jsoncpp-devel \ + libnatpmp-devel \ + webkitgtk4-devel \ + cryptopp-devel \ + libva-devel \ + libvdpau-devel \ + msgpack-devel \ + NetworkManager-libnm-devel \ + openssl-devel \ + clutter-devel \ + clutter-gtk-devel \ + libappindicator-gtk3-devel \ + libnotify-devel \ + libupnp-devel \ + qrencode-devel \ + libargon2-devel \ + libsndfile-devel \ + libdrm \ + gperf \ + bison \ + clang \ + clang-devel \ + llvm-devel \ + nodejs \ + flex \ + gstreamer1 gstreamer1-devel \ + gstreamer1-plugins-base-devel \ + gstreamer1-plugins-good \ + gstreamer1-plugins-bad-free-devel \ + nss-devel \ + libxcb* \ + libxkb* \ + libX11-devel \ + vulkan-devel \ + libXrender-devel \ + xcb-util-* \ + xz \ + xkeyboard-config \ + libnotify \ + wget \ + libstdc++-static \ + sqlite-devel \ + perl-generators \ + perl-English \ + libxshmfence-devel \ + ninja-build \ + clang \ + cmake \ + fmt-devel \ + python3-html5lib \ + cups-devel +ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh +CMD ["/opt/build-package-rpm.sh"] \ No newline at end of file diff --git a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh index a7019e6c2cd25f151a48f927beb80fcae587002c..0f7dc5f5d7fa29f4f8cfac232131f59dcac3b1d6 100755 --- a/extras/packaging/gnu-linux/scripts/build-package-rpm.sh +++ b/extras/packaging/gnu-linux/scripts/build-package-rpm.sh @@ -117,6 +117,8 @@ if [ ! -f "${RPM_PATH}" ]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}" elif [[ "${DISTRIBUTION}" == "fedora_38" ]]; then cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}" + elif [[ "${DISTRIBUTION}" == "alma_9" ]]; then + cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.al9.x86_64.rpm "${RPM_PATH}" else cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}" fi diff --git a/extras/packaging/gnu-linux/scripts/deploy-packages.sh b/extras/packaging/gnu-linux/scripts/deploy-packages.sh index 0459a5fc4df053edc3dc9c3fafdc87696c838251..73669716f80373cdac137b5ee9bae2cb7b0efcbc 100755 --- a/extras/packaging/gnu-linux/scripts/deploy-packages.sh +++ b/extras/packaging/gnu-linux/scripts/deploy-packages.sh @@ -272,7 +272,7 @@ function package() { if [[ $DISTRIBUTION =~ debian|ubuntu|raspbian|guix-deb-pack ]]; then package_deb - elif [[ $DISTRIBUTION =~ fedora|rhel|opensuse|guix-rpm-pack ]]; then + elif [[ $DISTRIBUTION =~ alma|fedora|rhel|opensuse|guix-rpm-pack ]]; then package_rpm elif [[ $DISTRIBUTION =~ snap ]]; then package_snap diff --git a/extras/scripts/install.sh b/extras/scripts/install.sh index 1ca7038812d7c1cad42e91d04594f9101ec1a599..7de37cc2947a215a92519922f2a9f85de644fcfa 100755 --- a/extras/scripts/install.sh +++ b/extras/scripts/install.sh @@ -125,6 +125,8 @@ else if [[ "$OSTYPE" != "darwin"* ]]; then CONFIGURE_FLAGS+=" --disable-shared" fi + else + CONFIGURE_FLAGS+=" --without-dbus" fi BUILD_TYPE="Release"