[ffmpeg/f40] Backport hevecdec fix
by Leigh Scott
commit 983b0809b4a0f58c878357d0a0ff0aec8c5077c4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:43:52 2024 +0100
Backport hevecdec fix
backport_hevecdec_fix.patch | 24 ++++++++++++++++++++++++
ffmpeg.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/backport_hevecdec_fix.patch b/backport_hevecdec_fix.patch
new file mode 100644
index 0000000..e931320
--- /dev/null
+++ b/backport_hevecdec_fix.patch
@@ -0,0 +1,24 @@
+From: Anton Khirnov <anton(a)khirnov.net>
+Date: Fri, 23 Feb 2024 08:06:46 +0000 (+0100)
+Subject: lavc/hevcdec: pass an actual codec context to ff_h2645_sei_to_frame()
+X-Git-Tag: n7.0~451
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d9f1b321cf58a855...
+
+lavc/hevcdec: pass an actual codec context to ff_h2645_sei_to_frame()
+
+Needed by following commit.
+---
+
+diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
+index b5311ae510..17c6a9212f 100644
+--- a/libavcodec/hevcdec.c
++++ b/libavcodec/hevcdec.c
+@@ -2778,7 +2778,7 @@ static int set_side_data(HEVCContext *s)
+ s->sei.common.content_light.present--;
+ }
+
+- ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, NULL,
++ ret = ff_h2645_sei_to_frame(out, &s->sei.common, AV_CODEC_ID_HEVC, s->avctx,
+ &s->ps.sps->vui.common,
+ s->ps.sps->bit_depth, s->ps.sps->bit_depth_chroma,
+ s->ref->poc /* no poc_offset in HEVC */);
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 82fc208..989b2ae 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -112,6 +112,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
Patch0: ffmpeg-chromium.patch
Patch1: https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
Patch2: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d46153...
+Patch3: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d9f1b321cf58a85...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -530,6 +531,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Fri Aug 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-2
+- Backport hevecdec fix
+
* Sat Aug 03 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-1
- Update to 6.1.2
1 month
[xorg-x11-drv-nvidia/f39: 2/2] Merge branch 'f40' into f39
by Leigh Scott
commit 2deecf2b21127ba24bc962fa48899617c7737d4b
Merge: 6a39fe0 bab21ea
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:24:10 2024 +0100
Merge branch 'f40' into f39
sources | 4 ++--
xorg-x11-drv-nvidia.spec | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
---
1 month
[xorg-x11-drv-nvidia/f40] Revert "Update to 550.107.02 release"
by Leigh Scott
commit bab21ea5a0fc98b886bb64978b1f82f449e7109a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:23:39 2024 +0100
Revert "Update to 550.107.02 release"
This reverts commit 424c9ebe773f3b02b7b4ff0f3e118de6a781f3f4.
sources | 4 ++--
xorg-x11-drv-nvidia.spec | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index 6de7fd2..53e76f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (NVIDIA-Linux-x86_64-550.107.02.run) = da0a15f87a4e6562f9a5e087a76b92de873db4849c8fdbf57d7dfe9d524e55dfbd578aef38d8818b9cb712a905a31fd0b97e399c74613943810545c92cf30f9d
-SHA512 (NVIDIA-Linux-aarch64-550.107.02.run) = a62d5d13089dbc98c022cb3bdf00999d79da7ae370c6e84405ca9e32034f19fcea65ac74845323223f1a8b8f1443e506c60704ba56e6f5add04b2a007d2d443c
+SHA512 (NVIDIA-Linux-x86_64-555.58.02.run) = 7a8c84c15d87d2cf5f6261b12d3d683e0a7a1847d7c5461b3995f78b8dd862272fd11be07018593a8d5ef5d8274040f15b9e6fe92e9212dcd7a97be668852433
+SHA512 (NVIDIA-Linux-aarch64-555.58.02.run) = 9c4d78ec381bb6163c6591309a9a40f1dfdb5f3d6b983e1728c17383c5f0871bf3879b32f93c7892d33577a9dacf2dcb1d14639bcc4ca510104f33cb54e83df0
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ec033c5..8896ed1 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 550.107.02
+Version: 555.58.02
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -611,9 +611,6 @@ fi ||:
%endif
%changelog
-* Fri Aug 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.107.02-1
-- Update to 550.107.02 release
-
* Mon Jul 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:555.58.02-1
- Update to 555.58.02
1 month
[xorg-x11-drv-nvidia/f39: 3/3] Merge branch 'f40' into f39
by Leigh Scott
commit 6a39fe0c4dcc5f1af64d594f2da432d61a5ead31
Merge: 9040a5f 424c9eb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:13:39 2024 +0100
Merge branch 'f40' into f39
sources | 4 ++--
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
1 month
[xorg-x11-drv-nvidia/f40] Update to 550.107.02 release
by Leigh Scott
commit 424c9ebe773f3b02b7b4ff0f3e118de6a781f3f4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:12:54 2024 +0100
Update to 550.107.02 release
sources | 4 ++--
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 53e76f1..6de7fd2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (NVIDIA-Linux-x86_64-555.58.02.run) = 7a8c84c15d87d2cf5f6261b12d3d683e0a7a1847d7c5461b3995f78b8dd862272fd11be07018593a8d5ef5d8274040f15b9e6fe92e9212dcd7a97be668852433
-SHA512 (NVIDIA-Linux-aarch64-555.58.02.run) = 9c4d78ec381bb6163c6591309a9a40f1dfdb5f3d6b983e1728c17383c5f0871bf3879b32f93c7892d33577a9dacf2dcb1d14639bcc4ca510104f33cb54e83df0
+SHA512 (NVIDIA-Linux-x86_64-550.107.02.run) = da0a15f87a4e6562f9a5e087a76b92de873db4849c8fdbf57d7dfe9d524e55dfbd578aef38d8818b9cb712a905a31fd0b97e399c74613943810545c92cf30f9d
+SHA512 (NVIDIA-Linux-aarch64-550.107.02.run) = a62d5d13089dbc98c022cb3bdf00999d79da7ae370c6e84405ca9e32034f19fcea65ac74845323223f1a8b8f1443e506c60704ba56e6f5add04b2a007d2d443c
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 8896ed1..ec033c5 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -21,7 +21,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 555.58.02
+Version: 550.107.02
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -611,6 +611,9 @@ fi ||:
%endif
%changelog
+* Fri Aug 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.107.02-1
+- Update to 550.107.02 release
+
* Mon Jul 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:555.58.02-1
- Update to 555.58.02
1 month
[rpmfusion-nonfree-release/f41] Switch to branch layout
by Leigh Scott
commit 39bedcd2ee1213435e5b686bf900e51d6177519e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 15 16:04:37 2024 +0100
Switch to branch layout
rpmfusion-nonfree-rawhide.repo | 2 +-
rpmfusion-nonfree-release.spec | 7 +++++--
rpmfusion-nonfree-updates-testing.repo | 2 +-
rpmfusion-nonfree.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-nonfree-rawhide.repo b/rpmfusion-nonfree-rawhide.repo
index 391cb3e..adb2f06 100644
--- a/rpmfusion-nonfree-rawhide.repo
+++ b/rpmfusion-nonfree-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-rawhi...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 009fe3e..ad0b09d 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,10 +1,10 @@
#global _repo free
%global _repo nonfree
-%global israwhide 1
+%global israwhide 0
Name: rpmfusion-%{_repo}-release
Version: 41
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Thu Aug 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 41-0.2
+- Switch to branch layout
+
* Wed Feb 14 2024 Leigh Scott <leigh123linux(a)gmail.com> - 41-0.1
- Bump for 41
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 90ba1c0..36e4d55 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 5f73f00..239b8fb 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
1 month
[rpmfusion-free-release/f41] Switch to branch layout
by Leigh Scott
commit d9b284a6e3817f9cd631573a86281a42059944b9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 15 16:01:11 2024 +0100
Switch to branch layout
rpmfusion-free-rawhide.repo | 2 +-
rpmfusion-free-release.spec | 7 +++++--
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-free-rawhide.repo b/rpmfusion-free-rawhide.repo
index 5946aab..5a02334 100644
--- a/rpmfusion-free-rawhide.repo
+++ b/rpmfusion-free-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-rawhide&...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 9583292..04ed75b 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,10 +1,10 @@
%global _repo free
#global _repo nonfree
-%global israwhide 1
+%global israwhide 0
Name: rpmfusion-%{_repo}-release
Version: 41
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Thu Aug 15 2024 Leigh Scott <leigh123linux(a)gmail.com> - 41-0.2
+- Switch to branch layout
+
* Wed Feb 14 2024 Leigh Scott <leigh123linux(a)gmail.com> - 41-0.1
- Bump for 41
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 9c39b34..54112fd 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 21ed42a..4f1611f 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
1 month
[rpmfusion-nonfree-release] fix
by Leigh Scott
commit 3cfe584a983bc05e7e1d89a15468ac93bcc7a5c2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 15 15:49:00 2024 +0100
fix
rpmfusion-nonfree-release.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index beb33b4..d91a1ff 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{_repo}-release
Version: 42
-Release: 0.1%{?dist}
+Release: 0.1
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
1 month