From 67c2b20f959fc7c359d3c6722c1c7270ddfb7a7f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 20 Jun 2025 17:19:06 -0400 Subject: [PATCH 1/3] Update to 2.5.1 for F42 --- container.yaml | 40 ++++++++++++++++++++-------------------- update.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 20 deletions(-) create mode 100755 update.sh diff --git a/container.yaml b/container.yaml index 35a3014..287ab21 100644 --- a/container.yaml +++ b/container.yaml @@ -2,34 +2,34 @@ flatpak: id: org.fedoraproject.Platform.openh264 build-extension: true runtime: org.fedoraproject.Platform - runtime-version: f41 + runtime-version: f42 sdk: org.fedoraproject.Sdk name: openh264 component: openh264-flatpak - branch: f41 + branch: f42 packages: - - noopenh264 - # for cleanup-commands (part of runtime) - - coreutils-single + - noopenh264 + # for cleanup-commands (part of runtime) + - coreutils-single extra-data: - - filename: openh264-2.4.1-2.fc41.aarch64.rpm - url: https://codecs.fedoraproject.org/openh264/41/aarch64/os/Packages/o/openh264-2.4.1-2.fc41.aarch64.rpm - sha256: bf8617eaca86dd1cc6fc61cfa3d08da09b0cbd6f6a3318174d58c33b479bd512 - size: 393795 + - filename: openh264-2.5.1-1.fc42.aarch64.rpm + url: https://codecs.fedoraproject.org/openh264/42/aarch64/Packages/o/openh264-2.5.1-1.fc42.aarch64.rpm + sha256: 1ce57ac0724e5751281f5edf5de5e172b7fb309f5673813bbb8afd15bf32729b + size: 389543 only-arches: - - aarch64 - - filename: openh264-2.4.1-2.fc41.ppc64le.rpm - url: https://codecs.fedoraproject.org/openh264/41/ppc64le/os/Packages/o/openh264-2.4.1-2.fc41.ppc64le.rpm - sha256: a585ddfaccb3fdc336e532978002273b8c71132092a189f1496a80c841fd92ac - size: 425361 + - aarch64 + - filename: openh264-2.5.1-1.fc42.ppc64le.rpm + url: https://codecs.fedoraproject.org/openh264/42/ppc64le/Packages/o/openh264-2.5.1-1.fc42.ppc64le.rpm + sha256: c55a4dbecccbbaf3b02723afb87a89b7cd551f16d679bc6f6af5ddffe01636a2 + size: 439645 only-arches: - - ppc64le - - filename: openh264-2.4.1-2.fc41.x86_64.rpm - url: https://codecs.fedoraproject.org/openh264/41/x86_64/os/Packages/o/openh264-2.4.1-2.fc41.x86_64.rpm - sha256: afe17383b2d009aa671332ff9f5ef0a94bd756e086efa6a60c3fe073a7289cd1 - size: 430302 + - ppc64le + - filename: openh264-2.5.1-1.fc42.x86_64.rpm + url: https://codecs.fedoraproject.org/openh264/42/x86_64/Packages/o/openh264-2.5.1-1.fc42.x86_64.rpm + sha256: 223f3a74835cb4e1aca37161814c14083be862cccfe01bf5c58138704ceb2801 + size: 433204 only-arches: - - x86_64 + - x86_64 cleanup-commands: | mkdir -p /app/bin echo -e "#!/bin/sh\nbsdtar --strip-components=3 -xf *.rpm\nrm -f *.rpm" > /app/bin/apply_extra diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..7c875e4 --- /dev/null +++ b/update.sh @@ -0,0 +1,28 @@ +#! /bin/sh + +set -eu + +fc=42 +vr=$1 +n=0 + +for arch in aarch64 ppc64le x86_64 +do + f=openh264-${vr}.fc${fc}.${arch}.rpm + url=https://codecs.fedoraproject.org/openh264/${fc}/${arch}/Packages/o/${f} + + [ -f $f ] || wget $url + sha256=$(sha256sum $f | cut -d' ' -f1) + size=$(du -sb $f | cut -f1) + + URL="$url" SHA256="$sha256" SIZE="$size" \ + yq -I 4 -i " + .flatpak.extra-data[${n}].url = strenv(URL) | + .flatpak.extra-data[${n}].sha256 = strenv(SHA256) | + .flatpak.extra-data[${n}].size = env(SIZE)" \ + container.yaml + + let n+=1 +done + +#flatpak-module build-container-local --install From 31cac2f8b12d915b7c2e3aa7a2919caf239388c1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 6 Aug 2025 22:51:38 -0400 Subject: [PATCH 2/3] Use Codecs namespace --- container.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index 287ab21..e253271 100644 --- a/container.yaml +++ b/container.yaml @@ -1,5 +1,5 @@ flatpak: - id: org.fedoraproject.Platform.openh264 + id: org.fedoraproject.Platform.Codecs.openh264 build-extension: true runtime: org.fedoraproject.Platform runtime-version: f42 @@ -32,5 +32,6 @@ flatpak: - x86_64 cleanup-commands: | mkdir -p /app/bin + ln -s extra /app/lib echo -e "#!/bin/sh\nbsdtar --strip-components=3 -xf *.rpm\nrm -f *.rpm" > /app/bin/apply_extra chmod +x /app/bin/apply_extra From d3c73a7313d68896acb826b477ebe918756a9ee5 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 6 Aug 2025 23:43:30 -0400 Subject: [PATCH 3/3] Use flatpak-app-config --- container.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.yaml b/container.yaml index e253271..c59919c 100644 --- a/container.yaml +++ b/container.yaml @@ -8,7 +8,7 @@ flatpak: component: openh264-flatpak branch: f42 packages: - - noopenh264 + - openh264-flatpak-config # for cleanup-commands (part of runtime) - coreutils-single extra-data: