nodejs/nodejs-electron
SHA256
8
0
Fork 2
forked from pool/nodejs-electron
Code Pull Requests 2 Activity

- Fedora 38+: allow using fixed ffmpeg-libs with electron

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=112
This commit is contained in:
dziobian
2023-11-15 20:58:58 +00:00
committed by Git OBS Bridge
parent e0033247b8
commit fd457c8222
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nodejs-electron.changes
+5
View File
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 15 20:57:49 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
- Fedora 38+: allow using fixed ffmpeg-libs with electron
-------------------------------------------------------------------
Sat Nov 11 21:53:38 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
nodejs-electron.spec
+16 -4
View File
@@ -211,6 +211,19 @@ BuildArch: i686
%define PYVER 311
%endif
%if 0%{?fedora} >= 40
%define AVFORMAT_VER 6.0.1
%define RPMFUSION_VER 6.1-3
%endif
%if 0%{?fedora} >= 38 && 0%{?fedora} < 40
%define AVFORMAT_VER 6.0.1
%define RPMFUSION_VER 6.0.1-2
%endif
%if 0%{?fedora} >= 37 && 0%{?fedora} < 38
%define AVFORMAT_VER 5.1.4
%define RPMFUSION_VER 5.1.4-2
%endif
# We always ship the following bundled libraries as part of Electron despite a system version being available in either openSUSE or Fedora:
# Name | Path in tarball | Reason
# -------------+-----------------------------------+---------------------------------------
@@ -561,7 +574,7 @@ BuildRequires: pkgconfig(icu-i18n) >= 71
%endif
BuildRequires: pkgconfig(jsoncpp)
%if 0%{?fedora}
Recommends: libavcodec-freeworld%{_isa}
Recommends: (ffmpeg-libs%{_isa} or libavcodec-freeworld%{_isa})
%endif
%if %{with ffmpeg_5}
BuildRequires: pkgconfig(libavcodec) >= 59
@@ -569,9 +582,8 @@ BuildRequires: pkgconfig(libavformat) >= 59
BuildRequires: pkgconfig(libavutil) >= 57
%if 0%{?fedora} >= 38
#requires av_stream_get_first_dts, see rhbz#2240127
BuildRequires: libavformat-free-devel >= 6.0.1
Conflicts: ffmpeg-libs%{_isa}
Requires: libavformat-free%{_isa} >= 6.0.1
BuildRequires: libavformat-free-devel >= %AVFORMAT_VER
Requires: (ffmpeg-libs%{_isa} >= %RPMFUSION_VER or libavformat-free%{_isa} >= %AVFORMAT_VER)
%endif
%else
BuildRequires: pkgconfig(libavcodec)