[ffmpeg] Update to 7.0
by Leigh Scott
commit 994ebf9da6930ed28c3a1daa6cdcb9fdc070bf80
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 19 15:30:14 2024 +0100
Update to 7.0
ffmpeg-chromium.patch | 18 +++----
ffmpeg-gcc14.patch | 131 --------------------------------------------------
ffmpeg.spec | 20 +++++---
rf-gcc14.patch | 60 -----------------------
sources | 4 +-
vulkan_fix.patch | 114 -------------------------------------------
6 files changed, 23 insertions(+), 324 deletions(-)
---
diff --git a/ffmpeg-chromium.patch b/ffmpeg-chromium.patch
index 2160609..2f5877c 100644
--- a/ffmpeg-chromium.patch
+++ b/ffmpeg-chromium.patch
@@ -12,35 +12,35 @@ diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1916aa2dc5..e6682849fa 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
-@@ -1019,6 +1019,10 @@ attribute_deprecated
- int64_t av_stream_get_end_pts(const AVStream *st);
- #endif
-
+@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
+
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st);
+// Chromium: We use the internal field first_dts ^^^
+
#define AV_PROGRAM_RUNNING 1
-
+
/**
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cf4d68bff9..7d750abf88 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
-@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+@@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
}
-
+
+// Chromium: We use the internal field first_dts vvv
+int64_t av_stream_get_first_dts(const AVStream *st)
+{
-+ return cffstream(st)->first_dts;
++ return cffstream(st)->first_dts;
+}
+// Chromium: We use the internal field first_dts ^^^
+
/* an arbitrarily chosen "sane" max packet size -- 50M */
#define SANE_CHUNK_SIZE (50000000)
-
+
--
2.41.0
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c0f111c..c7848a5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -97,8 +97,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 6.1.1
-Release: 8%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Version: 7.0
+Release: 1%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -110,9 +110,6 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
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/fef22c87ada4517...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -142,13 +139,14 @@ BuildRequires: lame-devel >= 3.98.3
%{!?_without_ladspa:BuildRequires: ladspa-devel}
%{!?_without_aom:BuildRequires: libaom-devel}
%{!?_without_dav1d:BuildRequires: libdav1d-devel}
+BuildRequires: libdvdnav-devel
+BuildRequires: libdvdread-devel
%{!?_without_ass:BuildRequires: libass-devel}
%{!?_without_bluray:BuildRequires: libbluray-devel}
%{?_with_bs2b:BuildRequires: libbs2b-devel}
%{?_with_caca:BuildRequires: libcaca-devel}
%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel}
%{?_with_chromaprint:BuildRequires: libchromaprint-devel}
-%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
%{!?_without_lensfun:BuildRequires: lensfun-devel}
%if 0%{?_with_ieee1394}
BuildRequires: libavc1394-devel
@@ -202,6 +200,7 @@ BuildRequires: openjpeg2-devel
%{!?_without_opus:BuildRequires: opus-devel >= 1.1.3}
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
+BuildRequires: qrencode-devel
%{?_with_rav1e:BuildRequires: pkgconfig(rav1e)}
%{!?_without_rubberband:BuildRequires: rubberband-devel}
%{!?_without_tools:BuildRequires: SDL2-devel}
@@ -218,7 +217,7 @@ BuildRequires: texinfo
%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6}
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_vidstab:BuildRequires: vid.stab-devel}
-%{!?_without_vulkan:BuildRequires: pkgconfig(shaderc) pkgconfig(vulkan) >= 1.3.255}
+%{!?_without_vulkan:BuildRequires: pkgconfig(shaderc) pkgconfig(vulkan) >= 1.3.277}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
%{!?_without_xvid:BuildRequires: xvidcore-devel}
@@ -308,7 +307,6 @@ Freeworld libavcodec to complement the distro counterparts
%{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
%{?_with_chromaprint:--enable-chromaprint} \\\
- %{!?_with_crystalhd:--disable-crystalhd} \\\
--enable-fontconfig \\\
%{!?_without_frei0r:--enable-frei0r} \\\
--enable-gcrypt \\\
@@ -327,6 +325,8 @@ Freeworld libavcodec to complement the distro counterparts
%{!?_without_cdio:--enable-libcdio} \\\
%{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\
--enable-libdrm \\\
+ --enable-libdvdnav \\\
+ --enable-libdvdread \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\
%{?_with_flite:--enable-libflite} \\\
@@ -361,6 +361,7 @@ Freeworld libavcodec to complement the distro counterparts
%{?_with_rav1e:--enable-librav1e} \\\
%{?_with_rtmp:--enable-librtmp} \\\
%{!?_without_rubberband:--enable-librubberband} \\\
+ --enable-libqrencode \\\
%{?_with_smb:--enable-libsmbclient --enable-version3} \\\
%{?_with_snappy:--enable-libsnappy} \\\
--enable-libsoxr \\\
@@ -531,6 +532,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Fri Apr 19 2024 Leigh Scott <leigh123linux(a)gmail.com> - 7.0-1
+- Update to 7.0
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-8
- Rebuild for new x265 version
diff --git a/sources b/sources
index 49d5a3a..52c2ac7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ffmpeg-6.1.1.tar.xz) = fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
-SHA512 (ffmpeg-6.1.1.tar.xz.asc) = 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
+SHA512 (ffmpeg-7.0.tar.xz.asc) = 951c313545e58b11a1ba98f2b35749049f80b307ffee63edd2e0f73e9c663600646d1ec2e0953149b999edbfa679e6eb146b4f0d251688e009e3ad6bf9db4a14
+SHA512 (ffmpeg-7.0.tar.xz) = f693027b9c142c3757b76b2fe1c09bdafa4bf2580e691b20306bc6621080005173d068122668e80f52bd46dba3ab04a32f0608d709c8e6fd1c73387b4d4881f7
7 months, 1 week
[zerotier-one] Revert "Update to 1.4.0"
by Leigh Scott
commit 3f874c9d47768bd36d91791cd2a01e491bbd16af
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 19 13:01:20 2024 +0100
Revert "Update to 1.4.0"
This reverts commit 57ae86d43d32acbbeb0731af57aa79e196ebca80.
sources | 3 +-
zerotier-one.spec | 58 +++++++++++++++++++++++++--------------
zerotier-use-vendor-archive.patch | 17 ++++++++++++
3 files changed, 57 insertions(+), 21 deletions(-)
---
diff --git a/sources b/sources
index cb8daf8..8e117ce 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (zerotier-one-1.4.0.tar.gz) = ff6e8afb5cbac1f0a89d4b34c2b388b394595f8eec7b4a5e4424825ebc158e99a7d2776c04ef58af284480e7c95b2dd8b5fc90a5a0b85336727904750e8ad791
+SHA512 (zerotier-one-1.12.2.tar.gz) = 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73
+SHA512 (vendor-1.12.2.tar.xz) = 359d86b532d1fb25edbf9a6d0a58f56b15c10aa0ea5c9f2d17b1f093cec87a07092fb92321bb0ed967011415d161e458117511e4c7f4f83e5d718253c8a91618
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 7a13e1d..4928279 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -5,16 +5,15 @@
%endif
Name: zerotier-one
-Version: 1.4.0
-Release: 1%{?dist}
+Version: 1.12.2
+Release: 3%{?dist}
Summary: Smart Ethernet Switch for Earth
+# Boost: README.md
#
-# GPLv3+: attic/
-# controller/
+# ASL: controller/
# debian/copyright
# include/
-# java/
# node/
# one.cpp
# osdep/
@@ -22,35 +21,43 @@ Summary: Smart Ethernet Switch for Earth
# selftest.cpp
# service/
# version.h
-# COPYING
-# LICENSE.txt
-# README.md
+#
+# ASL 2.0: LICENSE.txt
#
# BSD: ext/libnatpmp/
# ext/miniupnpc/
#
+# Boost: COPYING
#
# MIT ext/cpp-httplib/
# ext/http-parser/
# ext/json/LICENSE.MIT
# ext/librabbitmq/
#
+# GPLv3+: attic/
+# ext/libnatpmp/
+# java/
-License: BSD and GPLv3+ and MIT
+License: BSL and Boost and ASL and ASL 2.0 and MIT
URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
-Source1: zerotier-one-sysusers
+# make with command: 'cd zeroidc && cargo vendor' and tar.xz vendor directory
+Source1: vendor-%{version}.tar.xz
+Source2: zerotier-one-sysusers
+
+# for use vendor directory for build
+Patch0: zerotier-use-vendor-archive.patch
+BuildRequires: cargo
BuildRequires: clang
-BuildRequires: libnatpmp-devel
-BuildRequires: miniupnpc-devel
+BuildRequires: openssl-devel openssl
BuildRequires: systemd-rpm-macros
Provides: bundled(http-parser)
Provides: bundled(json) = 3.10.2
Provides: bundled(salsa2012)
-Requires: iproute
+Requires: openssl
Requires: /sbin/nologin
%{?systemd_requires}
%{?sysusers_requires_compat}
@@ -82,16 +89,30 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of
# rm -rf ext/http-parser
# rm -rf ext/json
+sed \
+ -e 's/RUSTFLAGS=/RUSTFLAGS?=/' \
+ -e 's/cargo build $(RUSTFLAGS)/cargo build --release/' \
+ -i make-linux.mk
+
+
+pushd zeroidc
+tar -xf %{SOURCE1}
+popd
+
%build
-%make_build STRIP=%{_bindir}/true
+%make_build \
+ ZT_USE_MINIUPNPC=1 \
+ STRIP=%{_bindir}/true \
+ one
+
%install
%make_install
install -D -m0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
-install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
+install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%pre
-%sysusers_create_compat %{SOURCE1}
+%sysusers_create_compat %{SOURCE2}
%post
%systemd_post %{name}.service
@@ -104,7 +125,7 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
%files
-%license COPYING LICENSE.GPL-2 LICENSE.GPL-3 LICENSE.txt
+%license COPYING
%doc AUTHORS.md README.md RELEASE-NOTES.md OFFICIAL-RELEASE-STEPS.md
%{_mandir}/man{1,8}/*.{1,8}*
%{_sbindir}/zerotier-*
@@ -114,9 +135,6 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
%changelog
-* Fri Apr 19 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.4.0-1
-- Update to 1.4.0
-
* Sun Apr 07 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.12.2-3
- Rebuild against standard openssl
diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch
new file mode 100644
index 0000000..ae2794d
--- /dev/null
+++ b/zerotier-use-vendor-archive.patch
@@ -0,0 +1,17 @@
+--- a/zeroidc/.cargo/config.toml
++++ b/zeroidc/.cargo/config.toml
+@@ -9,3 +9,14 @@ rustflags = ["-C", "target-feature=+crt-
+
+ [target.i686-pc-windows-msvc]
+ rustflags = ["-C", "target-feature=+crt-static"]
++
++[source.crates-io]
++replace-with = "vendored-sources"
++
++[source."git+https://github.com/glimberg/rust-jwt"]
++git = "https://github.com/glimberg/rust-jwt"
++replace-with = "vendored-sources"
++
++[source.vendored-sources]
++directory = "vendor"
++
7 months, 1 week
[zerotier-one/f40] Update to 1.4.0
by Leigh Scott
Summary of changes:
57ae86d... Update to 1.4.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 months, 1 week
[zerotier-one] Update to 1.4.0
by Leigh Scott
commit 57ae86d43d32acbbeb0731af57aa79e196ebca80
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 19 12:31:36 2024 +0100
Update to 1.4.0
sources | 3 +-
zerotier-one.spec | 58 ++++++++++++++-------------------------
zerotier-use-vendor-archive.patch | 17 ------------
3 files changed, 21 insertions(+), 57 deletions(-)
---
diff --git a/sources b/sources
index 8e117ce..cb8daf8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (zerotier-one-1.12.2.tar.gz) = 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73
-SHA512 (vendor-1.12.2.tar.xz) = 359d86b532d1fb25edbf9a6d0a58f56b15c10aa0ea5c9f2d17b1f093cec87a07092fb92321bb0ed967011415d161e458117511e4c7f4f83e5d718253c8a91618
+SHA512 (zerotier-one-1.4.0.tar.gz) = ff6e8afb5cbac1f0a89d4b34c2b388b394595f8eec7b4a5e4424825ebc158e99a7d2776c04ef58af284480e7c95b2dd8b5fc90a5a0b85336727904750e8ad791
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 4928279..7a13e1d 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -5,15 +5,16 @@
%endif
Name: zerotier-one
-Version: 1.12.2
-Release: 3%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: Smart Ethernet Switch for Earth
-# Boost: README.md
#
-# ASL: controller/
+# GPLv3+: attic/
+# controller/
# debian/copyright
# include/
+# java/
# node/
# one.cpp
# osdep/
@@ -21,43 +22,35 @@ Summary: Smart Ethernet Switch for Earth
# selftest.cpp
# service/
# version.h
-#
-# ASL 2.0: LICENSE.txt
+# COPYING
+# LICENSE.txt
+# README.md
#
# BSD: ext/libnatpmp/
# ext/miniupnpc/
#
-# Boost: COPYING
#
# MIT ext/cpp-httplib/
# ext/http-parser/
# ext/json/LICENSE.MIT
# ext/librabbitmq/
#
-# GPLv3+: attic/
-# ext/libnatpmp/
-# java/
-License: BSL and Boost and ASL and ASL 2.0 and MIT
+License: BSD and GPLv3+ and MIT
URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
-# make with command: 'cd zeroidc && cargo vendor' and tar.xz vendor directory
-Source1: vendor-%{version}.tar.xz
-Source2: zerotier-one-sysusers
-
-# for use vendor directory for build
-Patch0: zerotier-use-vendor-archive.patch
+Source1: zerotier-one-sysusers
-BuildRequires: cargo
BuildRequires: clang
-BuildRequires: openssl-devel openssl
+BuildRequires: libnatpmp-devel
+BuildRequires: miniupnpc-devel
BuildRequires: systemd-rpm-macros
Provides: bundled(http-parser)
Provides: bundled(json) = 3.10.2
Provides: bundled(salsa2012)
-Requires: openssl
+Requires: iproute
Requires: /sbin/nologin
%{?systemd_requires}
%{?sysusers_requires_compat}
@@ -89,30 +82,16 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of
# rm -rf ext/http-parser
# rm -rf ext/json
-sed \
- -e 's/RUSTFLAGS=/RUSTFLAGS?=/' \
- -e 's/cargo build $(RUSTFLAGS)/cargo build --release/' \
- -i make-linux.mk
-
-
-pushd zeroidc
-tar -xf %{SOURCE1}
-popd
-
%build
-%make_build \
- ZT_USE_MINIUPNPC=1 \
- STRIP=%{_bindir}/true \
- one
-
+%make_build STRIP=%{_bindir}/true
%install
%make_install
install -D -m0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
-install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
+install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
%pre
-%sysusers_create_compat %{SOURCE2}
+%sysusers_create_compat %{SOURCE1}
%post
%systemd_post %{name}.service
@@ -125,7 +104,7 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%files
-%license COPYING
+%license COPYING LICENSE.GPL-2 LICENSE.GPL-3 LICENSE.txt
%doc AUTHORS.md README.md RELEASE-NOTES.md OFFICIAL-RELEASE-STEPS.md
%{_mandir}/man{1,8}/*.{1,8}*
%{_sbindir}/zerotier-*
@@ -135,6 +114,9 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%changelog
+* Fri Apr 19 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.4.0-1
+- Update to 1.4.0
+
* Sun Apr 07 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.12.2-3
- Rebuild against standard openssl
7 months, 1 week
[intel-ipu6-kmod/f39: 8/8] Merge remote-tracking branch 'origin/master' into f39
by smallorange
commit 6aceb422cba9d5e6446384c437b6dfb669287149
Merge: 577ee8c 35b1d4f
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Fri Apr 19 16:51:12 2024 +0800
Merge remote-tracking branch 'origin/master' into f39
.gitignore | 1 +
intel-ipu6-kmod.spec | 15 +++----
sources | 2 +-
vsc-44.patch | 124 ---------------------------------------------------
4 files changed, 9 insertions(+), 133 deletions(-)
---
diff --cc intel-ipu6-kmod.spec
index 5afedbf,cf960e1..6337899
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@@ -16,7 -16,7 +16,7 @@@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.0
- Release: 11.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
-Release: 13.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
++Release: 12.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel
@@@ -109,7 -104,11 +104,11 @@@ don
%changelog
-* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-13.20240226gitfb4c170
++* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-12.20240226gitfb4c170
+ - Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+ - ivsc: Update mei_dev.h for kernel >= 6.8
+
-* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-12.20240226gitfb4c170
+* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-11.20240226gitfb4c170
- Fix for kernel >= 6.7
- Fix and improve ipu6_isys probe()
- Skip ljca driver when the system runs the kernel >= 6.7
7 months, 1 week
[intel-ipu6-kmod/f40] Update ivsc to commit a6dccbb
by smallorange
commit 7d7307a4979ef797de231d23c58e6f0954fdae63
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Fri Apr 19 14:24:35 2024 +0800
Update ivsc to commit a6dccbb
- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
- Resolved ivsc: "Update mei_dev.h for kernel >= 6.8"
.gitignore | 1 +
intel-ipu6-kmod.spec | 15 +++----
sources | 2 +-
vsc-44.patch | 124 ---------------------------------------------------
4 files changed, 9 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38e131b..a5e3def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/ivsc-driver-e8ea8b8.tar.gz
/ipu6-drivers-fb4c170.tar.gz
/ivsc-driver-73a044d.tar.gz
+/ivsc-driver-a6dccbb.tar.gz
diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec
index ece4bee..cf960e1 100644
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@ -7,8 +7,8 @@
%global ipu6_commitdate 20240226
%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global ivsc_commit 73a044d9633212fac54ea96cdd882ff5ab40573e
-%global ivsc_commitdate 20231109
+%global ivsc_commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+%global ivsc_commitdate 20240416
%global ivsc_shortcommit %(c=%{ivsc_commit}; echo ${c:0:7})
%global prjname intel-ipu6
@@ -16,7 +16,7 @@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.0
-Release: 12.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
+Release: 13.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel
@@ -34,8 +34,6 @@ Patch13: 4.patch
Patch14: 5.patch
Patch15: 6.patch
Patch16: 0001-Skip-ljca-modules-for-the-kernel-6.7.patch
-# https://github.com/intel/ivsc-driver/pull/44
-Patch17: vsc-44.patch
BuildRequires: gcc
BuildRequires: elfutils-libelf-devel
@@ -71,9 +69,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil
%patch 16 -p1
)
-(cd ivsc-driver-%{ivsc_commit}
-%patch 17 -p1
-)
cp -Rp ivsc-driver-%{ivsc_commit}/backport-include ipu6-drivers-%{ipu6_commit}/
cp -Rp ivsc-driver-%{ivsc_commit}/drivers ipu6-drivers-%{ipu6_commit}/
@@ -109,6 +104,10 @@ done
%changelog
+* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-13.20240226gitfb4c170
+- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+- ivsc: Update mei_dev.h for kernel >= 6.8
+
* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-12.20240226gitfb4c170
- Fix for kernel >= 6.7
- Fix and improve ipu6_isys probe()
diff --git a/sources b/sources
index 333b367..ccd6367 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (ipu6-drivers-fb4c170.tar.gz) = 1722fb07428844303f5b8f6694691f19db90651119db5cd90e665019101c3b6c46e82232a9bf87abaf2c982ce01bf7a672d584b03eab5c9810bf74840e02f055
-SHA512 (ivsc-driver-73a044d.tar.gz) = b43b51fb7a08fc619333796eb76098173da1919ba0f008d46900269b01e076baa203c714abbb677825d1070905f1cca0a124a02dedc023e9ac2ecf72b62cdf71
+SHA512 (ivsc-driver-a6dccbb.tar.gz) = 10e0c4c24d9f7e3ffb99aa36808663fec3b6a020b22c1625da2548c5939ee0ae532a0f7e48ed5701b67233bb430e0dce65ea64870b253d83ba586ff427d35551
7 months, 1 week
[intel-ipu6-kmod] Update ivsc to commit a6dccbb
by smallorange
commit 35b1d4f9271f350c1867129183383746d30c4923
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Fri Apr 19 14:24:35 2024 +0800
Update ivsc to commit a6dccbb
- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
- Resolved ivsc: "Update mei_dev.h for kernel >= 6.8"
.gitignore | 1 +
intel-ipu6-kmod.spec | 15 +++----
sources | 2 +-
vsc-44.patch | 124 ---------------------------------------------------
4 files changed, 9 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38e131b..a5e3def 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/ivsc-driver-e8ea8b8.tar.gz
/ipu6-drivers-fb4c170.tar.gz
/ivsc-driver-73a044d.tar.gz
+/ivsc-driver-a6dccbb.tar.gz
diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec
index ece4bee..cf960e1 100644
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@ -7,8 +7,8 @@
%global ipu6_commitdate 20240226
%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global ivsc_commit 73a044d9633212fac54ea96cdd882ff5ab40573e
-%global ivsc_commitdate 20231109
+%global ivsc_commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+%global ivsc_commitdate 20240416
%global ivsc_shortcommit %(c=%{ivsc_commit}; echo ${c:0:7})
%global prjname intel-ipu6
@@ -16,7 +16,7 @@
Name: %{prjname}-kmod
Summary: Kernel module (kmod) for %{prjname}
Version: 0.0
-Release: 12.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
+Release: 13.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist}
License: GPLv2+
URL: https://github.com/intel
@@ -34,8 +34,6 @@ Patch13: 4.patch
Patch14: 5.patch
Patch15: 6.patch
Patch16: 0001-Skip-ljca-modules-for-the-kernel-6.7.patch
-# https://github.com/intel/ivsc-driver/pull/44
-Patch17: vsc-44.patch
BuildRequires: gcc
BuildRequires: elfutils-libelf-devel
@@ -71,9 +69,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil
%patch 16 -p1
)
-(cd ivsc-driver-%{ivsc_commit}
-%patch 17 -p1
-)
cp -Rp ivsc-driver-%{ivsc_commit}/backport-include ipu6-drivers-%{ipu6_commit}/
cp -Rp ivsc-driver-%{ivsc_commit}/drivers ipu6-drivers-%{ipu6_commit}/
@@ -109,6 +104,10 @@ done
%changelog
+* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-13.20240226gitfb4c170
+- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
+- ivsc: Update mei_dev.h for kernel >= 6.8
+
* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-12.20240226gitfb4c170
- Fix for kernel >= 6.7
- Fix and improve ipu6_isys probe()
diff --git a/sources b/sources
index 333b367..ccd6367 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (ipu6-drivers-fb4c170.tar.gz) = 1722fb07428844303f5b8f6694691f19db90651119db5cd90e665019101c3b6c46e82232a9bf87abaf2c982ce01bf7a672d584b03eab5c9810bf74840e02f055
-SHA512 (ivsc-driver-73a044d.tar.gz) = b43b51fb7a08fc619333796eb76098173da1919ba0f008d46900269b01e076baa203c714abbb677825d1070905f1cca0a124a02dedc023e9ac2ecf72b62cdf71
+SHA512 (ivsc-driver-a6dccbb.tar.gz) = 10e0c4c24d9f7e3ffb99aa36808663fec3b6a020b22c1625da2548c5939ee0ae532a0f7e48ed5701b67233bb430e0dce65ea64870b253d83ba586ff427d35551
7 months, 1 week
[intel-ipu6-kmod] evert "Update ivsc to commit a6dccbb"
by smallorange
commit 2c1245e20ca8798649f3a36a85e7b44fe44088b1
Author: Kate Hsuan <hpa(a)redhat.com>
Date: Fri Apr 19 15:37:30 2024 +0800
evert "Update ivsc to commit a6dccbb"
This reverts commit 53545f8d30ede021147ba6083ce5c910ecf27cf4.
.gitignore | 1 -
intel-ipu6-kmod.spec | 13 +++---
sources | 2 +-
vsc-44.patch | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 132 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5e3def..38e131b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@
/ivsc-driver-e8ea8b8.tar.gz
/ipu6-drivers-fb4c170.tar.gz
/ivsc-driver-73a044d.tar.gz
-/ivsc-driver-a6dccbb.tar.gz
diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec
index b3651ea..ece4bee 100644
--- a/intel-ipu6-kmod.spec
+++ b/intel-ipu6-kmod.spec
@@ -7,8 +7,8 @@
%global ipu6_commitdate 20240226
%global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7})
-%global ivsc_commit a6dccbbf5a955489d20d996234b6ebb481183ed7
-%global ivsc_commitdate 20240416
+%global ivsc_commit 73a044d9633212fac54ea96cdd882ff5ab40573e
+%global ivsc_commitdate 20231109
%global ivsc_shortcommit %(c=%{ivsc_commit}; echo ${c:0:7})
%global prjname intel-ipu6
@@ -34,6 +34,8 @@ Patch13: 4.patch
Patch14: 5.patch
Patch15: 6.patch
Patch16: 0001-Skip-ljca-modules-for-the-kernel-6.7.patch
+# https://github.com/intel/ivsc-driver/pull/44
+Patch17: vsc-44.patch
BuildRequires: gcc
BuildRequires: elfutils-libelf-devel
@@ -69,6 +71,9 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil
%patch 16 -p1
)
+(cd ivsc-driver-%{ivsc_commit}
+%patch 17 -p1
+)
cp -Rp ivsc-driver-%{ivsc_commit}/backport-include ipu6-drivers-%{ipu6_commit}/
cp -Rp ivsc-driver-%{ivsc_commit}/drivers ipu6-drivers-%{ipu6_commit}/
@@ -104,10 +109,6 @@ done
%changelog
-* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm> - 0.0-13.20240226gitfb4c170
-- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7
-- ivsc: Update mei_dev.h for kernel >= 6.8
-
* Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-12.20240226gitfb4c170
- Fix for kernel >= 6.7
- Fix and improve ipu6_isys probe()
diff --git a/sources b/sources
index ccd6367..333b367 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (ipu6-drivers-fb4c170.tar.gz) = 1722fb07428844303f5b8f6694691f19db90651119db5cd90e665019101c3b6c46e82232a9bf87abaf2c982ce01bf7a672d584b03eab5c9810bf74840e02f055
-SHA512 (ivsc-driver-a6dccbb.tar.gz) = 10e0c4c24d9f7e3ffb99aa36808663fec3b6a020b22c1625da2548c5939ee0ae532a0f7e48ed5701b67233bb430e0dce65ea64870b253d83ba586ff427d35551
+SHA512 (ivsc-driver-73a044d.tar.gz) = b43b51fb7a08fc619333796eb76098173da1919ba0f008d46900269b01e076baa203c714abbb677825d1070905f1cca0a124a02dedc023e9ac2ecf72b62cdf71
diff --git a/vsc-44.patch b/vsc-44.patch
new file mode 100644
index 0000000..79d7591
--- /dev/null
+++ b/vsc-44.patch
@@ -0,0 +1,124 @@
+From 368285d0401703c2243b2c122e2d80c49cb2ae83 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Tue, 5 Mar 2024 21:44:24 +0100
+Subject: [PATCH 1/2] ljca: s/strlcpy/strcpy/
+
+kernels >= 6.8 no longer have strlcpy use strscpy instead,
+strscpy has been available since at least kernel 4.8 .
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ drivers/mfd/ljca.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mfd/ljca.c b/drivers/mfd/ljca.c
+index 9a416d3..ec03417 100644
+--- a/drivers/mfd/ljca.c
++++ b/drivers/mfd/ljca.c
+@@ -221,7 +221,7 @@ static int try_match_acpi_hid(struct acpi_device *child, char **hids, int hids_n
+ int i;
+
+ for (i = 0; i < hids_num; i++) {
+- strlcpy(ids[0].id, hids[i], sizeof(ids[0].id));
++ strscpy(ids[0].id, hids[i], sizeof(ids[0].id));
+ if (!acpi_match_device_ids(child, ids))
+ return i;
+ }
+
+From 0e1aa89783c7c17dcf8dbe184a286eb787f783d0 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Tue, 5 Mar 2024 21:46:20 +0100
+Subject: [PATCH 2/2] ljca: Fix 6.8 compiler warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+1. Fix compiler warnings from the newly enabled (in 6.8) -Wmissing-prototypes
+warning option.
+
+2. Fix following warning caused by changes in struct spi_device:
+drivers/spi/spi-ljca.c:216:39: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘u8 *’ {aka ‘unsigned char *’} [-Wformat=]
+ 216 | dev_dbg(&ljca_spi->pdev->dev, "cs %d\n", spi->chip_select);
+Rather then adding a ifdef on the kernel version for this just
+drop the dev_dbg().
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ drivers/gpio/gpio-ljca.c | 4 ++--
+ drivers/mfd/ljca.c | 2 +-
+ drivers/misc/ivsc/mei_ace.c | 6 +++---
+ drivers/spi/spi-ljca.c | 4 ----
+ 4 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/gpio/gpio-ljca.c b/drivers/gpio/gpio-ljca.c
+index 0041d26..bea39b6 100644
+--- a/drivers/gpio/gpio-ljca.c
++++ b/drivers/gpio/gpio-ljca.c
+@@ -253,8 +253,8 @@ static void ljca_gpio_async(struct work_struct *work)
+ }
+ }
+
+-void ljca_gpio_event_cb(struct platform_device *pdev, u8 cmd,
+- const void *evt_data, int len)
++static void ljca_gpio_event_cb(struct platform_device *pdev, u8 cmd,
++ const void *evt_data, int len)
+ {
+ const struct gpio_packet *packet = evt_data;
+ struct ljca_gpio_dev *ljca_gpio = platform_get_drvdata(pdev);
+diff --git a/drivers/mfd/ljca.c b/drivers/mfd/ljca.c
+index ec03417..2de6faa 100644
+--- a/drivers/mfd/ljca.c
++++ b/drivers/mfd/ljca.c
+@@ -320,7 +320,7 @@ static bool ljca_validate(void *data, u32 data_len)
+ return (header->len + sizeof(*header) == data_len);
+ }
+
+-void ljca_dump(struct ljca_dev *ljca, void *buf, int len)
++static void ljca_dump(struct ljca_dev *ljca, void *buf, int len)
+ {
+ int i;
+ u8 tmp[256] = { 0 };
+diff --git a/drivers/misc/ivsc/mei_ace.c b/drivers/misc/ivsc/mei_ace.c
+index 025fd7d..415a8e4 100644
+--- a/drivers/misc/ivsc/mei_ace.c
++++ b/drivers/misc/ivsc/mei_ace.c
+@@ -311,21 +311,21 @@ static int set_camera_ownership(struct mei_ace *ace,
+ return ret;
+ }
+
+-int ipu_own_camera(void *ace, struct camera_status *status)
++static int ipu_own_camera(void *ace, struct camera_status *status)
+ {
+ struct mei_ace *p_ace = (struct mei_ace *)ace;
+
+ return set_camera_ownership(p_ace, IPU_OWN_CAMERA, status);
+ }
+
+-int ace_own_camera(void *ace, struct camera_status *status)
++static int ace_own_camera(void *ace, struct camera_status *status)
+ {
+ struct mei_ace *p_ace = (struct mei_ace *)ace;
+
+ return set_camera_ownership(p_ace, ACE_OWN_CAMERA, status);
+ }
+
+-int get_camera_status(void *ace, struct camera_status *status)
++static int get_camera_status(void *ace, struct camera_status *status)
+ {
+ int ret;
+ struct ace_cmd cmd;
+diff --git a/drivers/spi/spi-ljca.c b/drivers/spi/spi-ljca.c
+index adcd00f..f11556d 100644
+--- a/drivers/spi/spi-ljca.c
++++ b/drivers/spi/spi-ljca.c
+@@ -210,10 +210,6 @@ static int ljca_spi_transfer(struct ljca_spi_dev *ljca_spi, const u8 *tx_data,
+ static int ljca_spi_prepare_message(struct spi_master *master,
+ struct spi_message *message)
+ {
+- struct ljca_spi_dev *ljca_spi = spi_master_get_devdata(master);
+- struct spi_device *spi = message->spi;
+-
+- dev_dbg(&ljca_spi->pdev->dev, "cs %d\n", spi->chip_select);
+ return 0;
+ }
+
7 months, 1 week