From 180e1e26ab033a85d831745f8312b4ea754d4c61 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 4 Dec 2025 11:22:00 -0800 Subject: [PATCH] fix(openh264): Track Bodhi, let Makefile handle the Mozilla libs (#7918) (#8048) * fix(openh264): Track Bodhi, let Makefile handle the Mozilla libs * fix: Oops * fix: It is embarrassing how I can never spell THIS SPECIFIC WORD (cherry picked from commit 83cd26edd040b4c52d1fa9e26c259657d3999499) Co-authored-by: Gilver --- anda/lib/openh264/anda.hcl | 1 + anda/lib/openh264/openh264.spec | 15 ++------------- anda/lib/openh264/update.rhai | 7 +++---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl index dda2722801..3e636c1ecc 100644 --- a/anda/lib/openh264/anda.hcl +++ b/anda/lib/openh264/anda.hcl @@ -6,5 +6,6 @@ project pkg { labels { subrepo = "multimedia" mock = 1 + updbranch = 1 } } diff --git a/anda/lib/openh264/openh264.spec b/anda/lib/openh264/openh264.spec index 7676802e08..7cde715fbe 100644 --- a/anda/lib/openh264/openh264.spec +++ b/anda/lib/openh264/openh264.spec @@ -1,11 +1,3 @@ -# To get the commit: -# git clone https://github.com/cisco/openh264.git -# cd openh264 -# rm -rf gmp-api; make gmp-bootstrap; cd gmp-api -# git rev-parse HEAD -%global commit1 1f5a2f07a565a9465c14d3a8b12f3202f83c775e -%global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) - # Makefile expects V=Yes instead of V=1: %global _make_verbose V=Yes @@ -18,9 +10,9 @@ License: BSD URL: https://www.openh264.org/ Source0: https://github.com/cisco/%{name}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz -Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz BuildRequires: gcc-c++ +BuildRequires: git-core BuildRequires: make BuildRequires: nasm @@ -53,10 +45,6 @@ The mozilla-openh264 package contains a H.264 codec plugin for Mozilla browsers. %prep %autosetup -# Extract gmp-api archive -tar -xf %{S:1} -mv gmp-api-%{commit1} gmp-api - %build sed -i \ -e 's@PREFIX=/usr/local@PREFIX=%{_prefix}@g' \ @@ -65,6 +53,7 @@ sed -i \ -e 's@CFLAGS_OPT=-O3@CFLAGS_OPT=%{optflags}@g' \ -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' \ Makefile +%{__make} gmp-bootstrap %make_build %make_build plugin diff --git a/anda/lib/openh264/update.rhai b/anda/lib/openh264/update.rhai index 49357985c5..dd404b15d4 100644 --- a/anda/lib/openh264/update.rhai +++ b/anda/lib/openh264/update.rhai @@ -1,4 +1,3 @@ -rpm.global("commit1", gh_commit("mozilla/gmp-api")); -let h264 = gh("cisco/openh264"); -h264.crop(1); -rpm.version(h264); +import "andax/bump_extras.rhai" as bump; + +rpm.version(bump::bodhi("openh264", bump::as_bodhi_ver(labels.branch)));