public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
To: git-commits@fedoraproject.org
Subject: [rpms/aom] epel9: drop aom_static from installed .cmake files
Date: Tue, 22 Sep 2026 22:04:38 GMT	[thread overview]
Message-ID: <179011467851.1.14843214237383669143.rpms-aom-279adea7c898@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/aom
            Branch : epel9
            Commit : 279adea7c8981d096b7d710222208cb025f39d80
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2026-09-22T22:37:36+01:00
            Stats  : +16/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/aom/c/279adea7c8981d096b7d710222208cb025f39d80?branch=epel9

            Log:
            drop aom_static from installed .cmake files

We don't ship it anyway, and it breaks AOM detection using cmake.

- libaom-devel: add explicit dependency on main package for aomdec
  binary expected by cmake files

(cherry picked from commit 2f8edd40b3eb7e3202f53a58d4cec15ca4b90577)

---
diff --git a/aom-nostatic.patch b/aom-nostatic.patch
new file mode 100644
index 0000000..acd6941
--- /dev/null
+++ b/aom-nostatic.patch
@@ -0,0 +1,12 @@
+diff -up aom-3.13.1/build/cmake/aom_install.cmake.orig aom-3.13.1/build/cmake/aom_install.cmake
+--- aom-3.13.1/build/cmake/aom_install.cmake.orig	2025-09-07 16:11:27.789000000 +0200
++++ aom-3.13.1/build/cmake/aom_install.cmake	2025-12-30 21:08:54.594005985 +0100
+@@ -79,7 +79,7 @@ macro(setup_aom_install_targets)
+     endif()
+ 
+     if(BUILD_SHARED_LIBS)
+-      set(AOM_INSTALL_LIBS aom aom_static)
++      set(AOM_INSTALL_LIBS aom)
+     else()
+       set(AOM_INSTALL_LIBS aom)
+     endif()

diff --git a/aom.spec b/aom.spec
index 3fbcb06..75544c6 100644
--- a/aom.spec
+++ b/aom.spec
@@ -22,6 +22,8 @@ URL:        http://aomedia.org/
 Source:     https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # https://aomedia.issues.chromium.org/issues/448994065
 Patch:      0001-cmake-fix-nasm-detection-w-3.0.patch
+# Building static library breaks .cmake files if we don't ship it, so drop it
+Patch:      aom-nostatic.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
@@ -67,6 +69,8 @@ video format.
 
 %package -n libaom-devel
 Summary:        Development files for aom
+# cmake files assume /usr/bin/aomdec is present
+Requires:       aom%{?_isa} = %{version}-%{release}
 Requires:       libaom%{?_isa} = %{version}-%{release}
 
 %description -n libaom-devel
@@ -108,7 +112,6 @@ sed -i "s@GENERATE_LATEX         = YES@GENERATE_LATEX         = NO@" libs.doxy_t
 
 %install
 %cmake3_install
-rm -rvf %{buildroot}%{_libdir}/libaom.a
 
 %files
 %doc AUTHORS CHANGELOG README.md

                 reply	other threads:[~2026-09-22 22:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179011467851.1.14843214237383669143.rpms-aom-279adea7c898@fedoraproject.org \
    --to=dominik@greysector.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox