public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Neal Gompa <ngompa@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/obs-studio] epel9-next: Ensure ffmpeg-free and OpenH264 are expressed as dependencies
Date: Mon, 20 Jul 2026 19:39:31 GMT	[thread overview]
Message-ID: <178457637190.1.17603999341654447955.rpms-obs-studio-8a37c7d4190b@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/obs-studio
Branch : epel9-next
Commit : 8a37c7d4190bd9c4e9b92378958742c941c2a4f2
Author : Neal Gompa <ngompa@fedoraproject.org>
Date   : 2023-04-20T06:39:11-04:00
Stats  : +15/-2 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/obs-studio/c/8a37c7d4190bd9c4e9b92378958742c941c2a4f2?branch=epel9-next

Log:
Ensure ffmpeg-free and OpenH264 are expressed as dependencies

---
diff --git a/obs-studio.spec b/obs-studio.spec
index 62416d3..2477a2b 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -10,6 +10,12 @@
 # x264 is not in Fedora
 %bcond_with x264
 
+%if "%{__isa_bits}" == "64"
+%global lib64_suffix ()(64bit)
+%endif
+%global openh264_soversion 7
+
+
 %global obswebsocket_version 5.2.2
 
 #global commit ad859a3f66daac0d30eebcc9b07b0c2004fb6040
@@ -18,7 +24,7 @@
 
 Name:           obs-studio
 Version:        29.1.0~beta4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Broadcaster Software Studio
 
 # OBS itself is GPL-2.0-or-later, while various plugin dependencies are of various other licenses
@@ -108,7 +114,11 @@ BuildRequires:  x264-devel
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # Ensure that we have the full ffmpeg suite installed
-Requires:       /usr/bin/ffmpeg
+Requires:       ffmpeg-free
+# We dlopen() openh264, so weak-depend on it...
+## Note, we can do this because openh264 is provided in a default-enabled
+## third party repository provided by Cisco.
+Recommends:     libopenh264.so.%{openh264_soversion}%{?lib64_suffix}
 %if %{with x264}
 Requires:       x264
 %endif
@@ -287,6 +297,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 
 
 %changelog
+* Thu Apr 20 2023 Neal Gompa <ngompa@fedoraproject.org> - 29.1.0~beta4-2
+- Ensure ffmpeg-free and OpenH264 are expressed as dependencies
+
 * Tue Apr 18 2023 Neal Gompa <ngompa@fedoraproject.org> - 29.1.0~beta4-1
 - Initial build for Fedora
 

                 reply	other threads:[~2026-07-20 19:39 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=178457637190.1.17603999341654447955.rpms-obs-studio-8a37c7d4190b@fedoraproject.org \
    --to=ngompa@fedoraproject.org \
    --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