One RPM per Fedora release, 43 and 44, each with its own LibRaw (12.16)
This commit is contained in:
1 parent
1904144511
commit
c2d4637c34
7 files changed
+31
-16
No files matched your search
@@ -1,12 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
# Builds and tests the app in one distribution's own container.
|
||||
set -euo pipefail
|
||||
distro=${1:?"usage: distro-check.sh arch|fedora|nixos|resolute"}
|
||||
distro=${1:?"usage: distro-check.sh arch|fedora|fedora44|nixos|resolute"}
|
||||
here=$(cd "$(dirname "$0")" && pwd)
|
||||
repo=$(cd "$here/.." && pwd)
|
||||
# Ubuntu 26.04 is the dev image on another base.
|
||||
if [ "$distro" = resolute ]; then
|
||||
docker build -t omaphoto-resolute --build-arg BASE=ubuntu:26.04 -f "$repo/Dockerfile.dev" "$here"
|
||||
elif [ "$distro" = fedora44 ]; then
|
||||
docker build -t omaphoto-fedora44 --build-arg RELEASE=44 "$here/distro/fedora"
|
||||
else
|
||||
docker build -t "omaphoto-$distro" "$here/distro/$distro"
|
||||
fi
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
# Fedora 43, the oldest still supported; HEVC from RPM Fusion.
|
||||
FROM fedora:43
|
||||
RUN dnf install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-43.noarch.rpm \
|
||||
# A supported Fedora, 43 unless named; HEVC from RPM Fusion.
|
||||
ARG RELEASE=43
|
||||
FROM fedora:${RELEASE}
|
||||
ARG RELEASE
|
||||
RUN dnf install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${RELEASE}.noarch.rpm \
|
||||
&& dnf install -y gcc-c++ cmake ninja-build pkgconf qt6-qtbase-devel qt6-qtsvg-devel qt6-qtimageformats libheif-devel LibRaw-devel libheif-freeworld \
|
||||
fontconfig-devel dejavu-sans-fonts dejavu-serif-fonts dejavu-sans-mono-fonts curl rpm-build file \
|
||||
&& dnf clean all
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
#!/usr/bin/env bash
|
||||
# Installs OmaPhoto's latest RPM on Fedora.
|
||||
# Installs OmaPhoto's latest RPM on Fedora 43 or 44.
|
||||
set -euo pipefail
|
||||
base=https://github.com/ZacharyZhang-NY/OmaPhoto/releases/latest/download
|
||||
package=omaphoto.x86_64.rpm
|
||||
. /etc/os-release
|
||||
release=
|
||||
case " ${ID:-} ${ID_LIKE:-} " in
|
||||
*" fedora "*) ;;
|
||||
*" fedora "*) release=${VERSION_ID:-} ;;
|
||||
esac
|
||||
# Each RPM names its release's LibRaw.
|
||||
case "$release" in
|
||||
43 | 44) ;;
|
||||
*)
|
||||
echo "This script is for Fedora; this system is ${PRETTY_NAME:-unknown}." >&2
|
||||
echo "This script is for Fedora 43 or 44; this system is ${PRETTY_NAME:-unknown}." >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
package=omaphoto-fc${release}.x86_64.rpm
|
||||
if [ "$(uname -m)" != x86_64 ]; then
|
||||
echo "OmaPhoto's packages are built for x86_64 alone." >&2
|
||||
exit 1
|
||||
|
||||
Reference in new issue
Block a user