[mesa-freeworld] Update to 23.2.1
by Thorsten Leemhuis
commit 3d9e42c6c484b7c1d0e08bf3c0a46d5b0097b270
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Sat Sep 30 06:14:12 2023 +0200
Update to 23.2.1
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a8bf031..9a372c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/mesa-23.1.5.tar.xz
/mesa-23.2.0-rc2.tar.xz
/mesa-23.2.0-rc3.tar.xz
+/mesa-23.2.1.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 0991721..aa8be68 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -64,7 +64,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 23.2.0-rc3
+%global ver 23.2.1
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT
@@ -316,7 +316,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
-* Fri Aug 11 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.2.0~rc3.1
+* Sat Sep 30 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.2.1-1
+- Update to 23.2.1
+
+* Wed Sep 6 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.2.0~rc3.1
- Update to 23.2.0-rc3
- sync a few spec file bits with Fedora's mesa package
diff --git a/sources b/sources
index 6669a4b..d92ac33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-23.2.0-rc3.tar.xz) = e6b3588f0d469cb42b2cf4df39bbde755f72ebec9a056da0add188dd419c4e342b131d6b551933868705d14b4cd5f707d91ae592ec01a9fb6c1413aa08a183a7
+SHA512 (mesa-23.2.1.tar.xz) = 927af0885a4815d330de384232deadf3dce7e2e2024738f138a344cbc4adce22888a9e335317f1d75965a5e691c9638949105f18c9b6ef43839fb594c6b474b5
1 year, 1 month
[ffmpeg] Update changelog
by Nicolas Chauvet
commit 3da7d6a52a3d126d7e0ed33adb089a8fc9be84cc
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Fri Sep 29 16:26:07 2023 +0200
Update changelog
ffmpeg.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 479e5d7..b5f46af 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.0
-Release: 16%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 17%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -533,6 +533,10 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Fri Sep 29 2023 Nicolas Chauvet <nchauvet(a)linagora.com> - 6.0-17
+- Rebuild for libplacebo
+- Backport upstream patch to fix assembly with binutils 2.41 - rathann
+
* Fri Jul 28 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 6.0-16
- rebuilt
1 year, 1 month
[ffmpeg] Apply fedora patch
by Nicolas Chauvet
commit a42dce043e6506b87b5e46b09e534c2a12749267
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Fri Sep 29 16:25:11 2023 +0200
Apply fedora patch
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index abed3db..479e5d7 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -124,6 +124,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
Patch0: 0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
Patch1: 0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
+Patch2: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
1 year, 1 month
[ffmpeg] Backport as in fedora
by Nicolas Chauvet
commit 404e77c345e6e62ed91b8b78ed6762d27d1de514
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Fri Sep 29 16:24:11 2023 +0200
Backport as in fedora
...-mathops-clip-constants-used-with-shift-i.patch | 76 ++++++++++++++++++++++
1 file changed, 76 insertions(+)
---
diff --git a/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
new file mode 100644
index 0000000..f47e827
--- /dev/null
+++ b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
@@ -0,0 +1,76 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi(a)remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <jamrial(a)gmail.com>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+ int rt, dummy;
++ if (__builtin_constant_p(shift))
+ __asm__ (
+ "imull %3 \n\t"
+ "shrdl %4, %%edx, %%eax \n\t"
+ :"=a"(rt), "=d"(dummy)
+- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++ :"a"(a), "rm"(b), "i"(shift & 0x1F)
+ );
++ else
++ __asm__ (
++ "imull %3 \n\t"
++ "shrdl %4, %%edx, %%eax \n\t"
++ :"=a"(rt), "=d"(dummy)
++ :"a"(a), "rm"(b), "c"((uint8_t)shift)
++ );
+ return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("sarl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("sarl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++ if (__builtin_constant_p(s))
+ __asm__ ("shrl %1, %0\n\t"
+ : "+r" (a)
+- : "ic" ((uint8_t)(-s))
++ : "i" (-s & 0x1F)
+ );
++ else
++ __asm__ ("shrl %1, %0\n\t"
++ : "+r" (a)
++ : "c" ((uint8_t)(-s))
++ );
+ return a;
+ }
+
+--
+2.41.0
+
1 year, 1 month
[tg_owt] Fix libyuv bundle version.
by Vasiliy Glazov
commit f2025c3f49f1ba605d406b146b8d174505fc200d
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Fri Sep 29 15:00:56 2023 +0300
Fix libyuv bundle version.
tg_owt.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 2492927..74cb208 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -98,7 +98,7 @@ Provides: bundled(fft) = 0~git
Provides: bundled(g711) = 1.1~git
Provides: bundled(g722) = 1.14~git
Provides: bundled(libsrtp) = 2.5.0~git%{shortcommit4}
-Provides: bundled(libyuv) = 1866~git%{shortcommit1}
+Provides: bundled(libyuv) = 1872~git%{shortcommit1}
Provides: bundled(ooura) = 0~git
Provides: bundled(openh264) = 1.10.0~git6f26bce
Provides: bundled(pffft) = 0~git483453d
1 year, 1 month
[intel-media-driver] Update to 23.3.4
by Nicolas Chauvet
commit 4fa2c74d0792dcde20a0c0bd1b306b70110a0553
Author: Nicolas Chauvet <nchauvet(a)linagora.com>
Date: Fri Sep 29 10:18:01 2023 +0200
Update to 23.3.4
intel-media-driver.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 798d61b..94e619a 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,8 +1,8 @@
#global pre .pre8
Name: intel-media-driver
-Version: 23.2.4
-Release: 2%{?dist}
+Version: 23.3.4
+Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -97,6 +97,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Fri Sep 29 2023 Nicolas Chauvet <nchauvet(a)linagora.com> - 23.3.4-1
+- Update to 23.3.4
+
* Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 23.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index bac2904..cac46d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-23.2.4.tar.gz) = b02a50d5820cf22999c39ab2ff559c444682576018f2cb9aa669014f5c1fd07b01737fab706ec100929d3493a8b9e25bba7bcbae2af304d51c93b667af2884db
+SHA512 (intel-media-23.3.4.tar.gz) = 305ba7d94a7b2b8ac1000776c48e5654b8e42da414785851e5872db55d2125c6ef5acfe349746d7fd332b11a34ffe9a7be2a2c46bb1e91d5aedb445eb764ecfa
1 year, 1 month
[kodi] Fix mariadb BuildRequires (RFBZ#6771)
by Michael Cronenworth
commit b4cd37c7e472c3461336c5700471489bbedfebdc
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu Sep 28 11:45:17 2023 -0500
Fix mariadb BuildRequires (RFBZ#6771)
kodi.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 1199e95..109e9f0 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -39,7 +39,7 @@
Name: kodi
Version: 20.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -189,7 +189,7 @@ BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lirc-devel
BuildRequires: lzo-devel
-BuildRequires: mariadb-devel
+BuildRequires: mariadb-connector-c-devel
BuildRequires: mesa-libEGL-devel
BuildRequires: mesa-libGLES-devel
BuildRequires: mesa-libgbm-devel
@@ -436,6 +436,9 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
%changelog
+* Thu Sep 28 2023 Michael Cronenworth <mike(a)cchtml.com> - 20.2-5
+- Update mariadb BR (RFBZ#6771)
+
* Fri Aug 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 20.2-4
- Rebuild for new libplist
1 year, 1 month
[zoneminder] buildrequire mariadb-connector-c-devel for all but el7
by Andrew Bauer
commit 07778bc8ed7d9f903c375f23cc637f369cf54194
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Thu Sep 28 09:42:41 2023 -0500
buildrequire mariadb-connector-c-devel for all but el7
zoneminder.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index d5a8619..f34e925 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -28,8 +28,10 @@
%global cmake_build %{cmake3_build}
%global cmake_install %{cmake3_install}
%global cmake_pkg_name cmake3
+%global mariadevel mariadb-devel
%else
%global cmake_pkg_name cmake
+%global mariadevel mariadb-connector-c-devel
%endif
# The default for everything but el7 these days
@@ -37,7 +39,7 @@
Name: zoneminder
Version: 1.36.33
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jQuery is under the MIT license: https://jquery.org/license/
@@ -58,7 +60,7 @@ Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.t
%{?rhel:BuildRequires: epel-rpm-macros}
BuildRequires: systemd-devel
-BuildRequires: mariadb-devel
+BuildRequires: %{mariadevel}
BuildRequires: perl-podlators
BuildRequires: polkit-devel
BuildRequires: %{cmake_pkg_name}
@@ -431,6 +433,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
+* Thu Sep 28 2023 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.33-5
+- buildrequire mariadb-connector-c-devel for all but el7
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.36.33-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 1 month
