March 2024 - rpmfusion-commits

by Martin Gansser

Summary of changes: 0de0e6e... Update to 3.4.13 (*) (*) This commit already existed in another branch; no separate mail sent

8 months, 1 week

1
0
0 / 0

[vdr-markad/f40] Update to 3.4.13

by Martin Gansser

Summary of changes: 0de0e6e... Update to 3.4.13 (*) (*) This commit already existed in another branch; no separate mail sent

8 months, 1 week

1
0
0 / 0

[vdr-markad] Update to 3.4.13

by Martin Gansser

commit 0de0e6e4dc544c70e2e1ac018552072bc837f509 Author: Martin Gansser <mgansser(a)online.de> Date: Sat Mar 16 17:44:34 2024 +0100 Update to 3.4.13 .gitignore | 1 + sources | 2 +- vdr-markad.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index aadd1db..a09e43c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2 /vdr-markad-3.4.10.tar.gz /vdr-markad-3.4.11.tar.gz /vdr-markad-3.4.12.tar.gz +/vdr-markad-3.4.13.tar.gz diff --git a/sources b/sources index 3a51b1e..b9c09ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-markad-3.4.12.tar.gz) = 5e0dbfa152e50e201cf83de2394bececc8c16fe643c417c1769bc2fc1f5d0f038f8ce4409a68adfa3f5f6bddbece09ae16fd7b28b74eea1490ba68b6eba13e44 +SHA512 (vdr-markad-3.4.13.tar.gz) = 80a32df6162837c93817b3e18f4ad49e75a54cf39e4fa9184549f491522c3ebde91c020a6eeb61f5dd477c87aaa41cf618e82974140b5b54ac0c2a0ac8bcdd20 diff --git a/vdr-markad.spec b/vdr-markad.spec index baad28a..4a388ec 100644 --- a/vdr-markad.spec +++ b/vdr-markad.spec @@ -5,7 +5,7 @@ %endif Name: vdr-markad -Version: 3.4.12 +Version: 3.4.13 Release: 1%{?dist} Summary: Advanced commercial detection for VDR License: GPLv2+ @@ -72,6 +72,9 @@ fi %doc html %changelog +* Sat Mar 16 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.4.13-1 +- Update to 3.4.13 + * Mon Mar 11 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.4.12-1 - Update to 3.4.12

8 months, 1 week

1
0
0 / 0

[ipu6-camera-hal/f40] Update to the latest commit

by smallorange

Summary of changes: 842cefd... Update to the latest commit (*) (*) This commit already existed in another branch; no separate mail sent

8 months, 1 week

1
0
0 / 0

[ipu6-camera-hal] Update to the latest commit

by smallorange

commit 842cefd6ccc90269e81dd2b83081812c05c1f76a Author: Kate Hsuan <hpa(a)redhat.com> Date: Sat Mar 16 20:41:22 2024 +0800 Update to the latest commit Update to the commit da2e2821244f21b95bcb37a1271bf73360c4669e .gitignore | 1 + ...Patch-lib-path-to-align-fedora-path-usage.patch | 25 ++++++++++++ 60-intel-ipu6.rules | 18 +++++---- ipu6-camera-hal.spec | 47 +++++++++++++++++----- sources | 2 +- 5 files changed, 74 insertions(+), 19 deletions(-) --- diff --git a/.gitignore b/.gitignore index 871b735..b20861b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ipu6-camera-hal-cc0b859.tar.gz /ipu6-camera-hal-884b81a.tar.gz +/ipu6-camera-hal-da2e282.tar.gz diff --git a/0001-Patch-lib-path-to-align-fedora-path-usage.patch b/0001-Patch-lib-path-to-align-fedora-path-usage.patch new file mode 100644 index 0000000..4ce1f07 --- /dev/null +++ b/0001-Patch-lib-path-to-align-fedora-path-usage.patch @@ -0,0 +1,25 @@ +From 50bfe3c1d2d2d357b518e5951244dd244b03ad78 Mon Sep 17 00:00:00 2001 +From: Kate Hsuan <hpa(a)redhat.com> +Date: Fri, 15 Mar 2024 14:09:39 +0800 +Subject: [PATCH] Patch lib path to align fedora path usage + +--- + src/hal/hal_adaptor/HalAdaptor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hal/hal_adaptor/HalAdaptor.cpp b/src/hal/hal_adaptor/HalAdaptor.cpp +index e14418a..17e9697 100644 +--- a/src/hal/hal_adaptor/HalAdaptor.cpp ++++ b/src/hal/hal_adaptor/HalAdaptor.cpp +@@ -62,7 +62,7 @@ static void load_camera_hal_library() { + CheckAndLogError((strlen(pciID) == 0), VOID_VALUE, "%s, Failed to read PCI id. %d", __func__, + ret); + +- std::string libName = "/usr/lib/"; ++ std::string libName = "/usr/lib64/"; + if (strstr(pciID, "0xa75d") != nullptr /* RPL */ || + strstr(pciID, "0x462e") != nullptr /* ADLN */ || + strstr(pciID, "0x465d") != nullptr /* ADLP */) { +-- +2.44.0 + diff --git a/60-intel-ipu6.rules b/60-intel-ipu6.rules index 123a415..566d81a 100644 --- a/60-intel-ipu6.rules +++ b/60-intel-ipu6.rules @@ -1,21 +1,23 @@ # Tiger Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", GOTO="ipu6" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", GOTO="ipu6_tgl" # Alder Lake-N -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", GOTO="ipu6ep" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", GOTO="ipu6_adl" # Alder Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", GOTO="ipu6ep" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", GOTO="ipu6_adl" # Raptor Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", GOTO="ipu6ep" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", GOTO="ipu6_adl" GOTO="ipu6_end" -LABEL="ipu6" -RUN+="/bin/ln -sf /usr/lib64/ipu6/libcamhal.so /run/libcamhal.so" +LABEL="ipu6_tgl" +RUN+="/bin/ln -sf /usr/lib64/ipu_tgl/libcamhal.so /run/libcamhal.so" +RUN+="/bin/ln -sf /usr/lib64/ipu_tgl/libhal_adaptor.so /run/libhal_adaptor.so" RUN+="/bin/ln -sf /usr/share/defaults/etc/ipu6/v4l2-relayd /run/v4l2-relayd" GOTO="ipu6_end" -LABEL="ipu6ep" -RUN+="/bin/ln -sf /usr/lib64/ipu6ep/libcamhal.so /run/libcamhal.so" +LABEL="ipu6_adl" +RUN+="/bin/ln -sf /usr/lib64/ipu_adl/libcamhal.so /run/libcamhal.so" +RUN+="/bin/ln -sf /usr/lib64/ipu_adl/libhal_adaptor.so /run/libhal_adaptor.so" RUN+="/bin/ln -sf /usr/share/defaults/etc/ipu6ep/v4l2-relayd /run/v4l2-relayd" GOTO="ipu6_end" diff --git a/ipu6-camera-hal.spec b/ipu6-camera-hal.spec index 8cdc94e..cbc23c8 100644 --- a/ipu6-camera-hal.spec +++ b/ipu6-camera-hal.spec @@ -1,5 +1,5 @@ -%global commit 884b81aae0ea19a974eb8ccdaeef93038136bdd4 -%global commitdate 20230208 +%global commit da2e2821244f21b95bcb37a1271bf73360c4669e +%global commitdate 20240226 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # We want to specify multiple separate build-dirs for the different variants @@ -19,6 +19,7 @@ Source3: v4l2-relayd-tgl Source4: intel_ipu6_isys.conf # Patches +Patch01: 0001-Patch-lib-path-to-align-fedora-path-usage.patch BuildRequires: systemd-rpm-macros BuildRequires: ipu6-camera-bins-devel @@ -47,40 +48,58 @@ This provides the necessary header files for IPU6 HAL development. %build -for i in ipu6 ipu6ep; do +for i in ipu_tgl ipu_adl ipu_mtl; do export PKG_CONFIG_PATH=%{_libdir}/$i/pkgconfig/ export LDFLAGS="$RPM_LD_FLAGS -Wl,-rpath=%{_libdir}/$i" sed -i.orig "s|/usr/share/defaults/etc/camera/|/usr/share/defaults/etc/$i/|g" \ src/platformdata/PlatformData.h mkdir $i && pushd $i - %cmake -DCMAKE_BUILD_TYPE=Release -DIPU_VER=$i \ - -DENABLE_VIRTUAL_IPU_PIPE=OFF -DUSE_PG_LITE_PIPE=ON \ - -DUSE_STATIC_GRAPH=OFF .. + if [ $i = "ipu_tgl" ]; then + IPU_VERSION=ipu6 + elif [ $i = "ipu_adl" ]; then + IPU_VERSION=ipu6ep + elif [ $i = "ipu_mtl" ]; then + IPU_VERSION=ipu6epmtl + else + IPU_VERSION=ipu + fi + %cmake -DCMAKE_BUILD_TYPE=Release -DIPU_VER=$IPU_VERSION \ + -DBUILD_CAMHAL_TESTS=OFF -DUSE_PG_LITE_PIPE=ON .. %make_build popd + + mkdir $i"_adaptor" && pushd $i"_adaptor" + %cmake ../src/hal/hal_adaptor + popd mv src/platformdata/PlatformData.h.orig src/platformdata/PlatformData.h done %install -for i in ipu6 ipu6ep; do +for i in ipu_tgl ipu_adl ipu_mtl; do pushd $i %make_install mkdir %{buildroot}%{_libdir}/$i - mv %{buildroot}%{_libdir}/libcamhal.so %{buildroot}%{_libdir}/$i/ + mv %{buildroot}%{_usr}/lib/libcamhal.so %{buildroot}%{_libdir}/$i/ mv %{buildroot}%{_datadir}/defaults/etc/camera %{buildroot}%{_datadir}/defaults/etc/$i popd + pushd $i"_adaptor" + %make_install + mv %{buildroot}%{_usr}/lib64/libhal_adaptor.so %{buildroot}%{_libdir}/$i/ + popd done # We don't want static libs -rm %{buildroot}%{_libdir}/libcamhal.a +rm %{buildroot}%{_usr}/lib/libcamhal.a # symbolic link + udev is used to resolve the library name conflict. ln -sf %{_rundir}/libcamhal.so %{buildroot}%{_libdir}/libcamhal.so +ln -sf %{_rundir}/libhal_adaptor.so %{buildroot}%{_libdir}/libhal_adaptor.so install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_udevrulesdir}/60-intel-ipu6.rules # Make sure libcamhal.so can be found when building code on systems without an IPU6 -sed -i -e "s|}/lib64|}/lib64/ipu6|" %{buildroot}%{_libdir}/pkgconfig/libcamhal.pc +sed -i -e "s|\${prefix}/lib|\${prefix}/lib64/ipu_tgl|g" %{buildroot}%{_libdir}/pkgconfig/libcamhal.pc +sed -i -e "s|\${prefix}/lib|\${prefix}/lib64/ipu_tgl|g" %{buildroot}%{_libdir}/pkgconfig/hal_adaptor.pc # v4l2-relayd configuration examples install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/defaults/etc/ipu6ep/v4l2-relayd @@ -102,7 +121,9 @@ fi %files %license LICENSE %{_libdir}/*/libcamhal.so +%{_libdir}/*/libhal_adaptor.so %{_libdir}/libcamhal.so +%{_libdir}/libhal_adaptor.so %{_datadir}/defaults/etc/* %{_modprobedir}/intel_ipu6_isys.conf %{_udevrulesdir}/60-intel-ipu6.rules @@ -110,10 +131,16 @@ fi %files devel %{_includedir}/libcamhal +%{_includedir}/hal_adaptor %{_libdir}/pkgconfig/libcamhal.pc +%{_libdir}/pkgconfig/hal_adaptor.pc %changelog +* Tue Mar 12 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-17.20230208git884b81a +- Update to the latest upstream commit +- Include a new library hal_adaptor.so + * Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.0-17.20230208git884b81a - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 4fefb52..2a613c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipu6-camera-hal-884b81a.tar.gz) = 71e47dde184f92de4140f140e18863996012b83f122a5e00936bfebab45c968b3f30fd64425e4ae56369083ef9ffb8d127d81abbf08063d22f8bede56057fa99 +SHA512 (ipu6-camera-hal-da2e282.tar.gz) = d6d61db6b88989ad44da930bb7953eb0d63629797680e987975453a2aea6f2664cac043c0ff91e8f8af544cebabc2bf9d8e3e43fb14a1d523d03e9cfa501e9bd

8 months, 1 week

1
0
0 / 0

[ipu6-camera-bins/f38] Update to the latest upstream commit

by smallorange

commit c0f31462b8e3536c5646ba582b35383575e5341a Author: Kate Hsuan <hpa(a)redhat.com> Date: Fri Mar 15 15:37:37 2024 +0800 Update to the latest upstream commit Update to commit af5ba0cb4a763569ac7514635013e9d870040bcf .gitignore | 1 + ipu6-camera-bins.spec | 68 ++++++++++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 42 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index b53bcf6..a47e7df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ipu6-camera-bins-4694ba7.tar.gz /ipu6-camera-bins-276859f.tar.gz +/ipu6-camera-bins-af5ba0c.tar.gz diff --git a/ipu6-camera-bins.spec b/ipu6-camera-bins.spec index 92c1bbf..85334b5 100644 --- a/ipu6-camera-bins.spec +++ b/ipu6-camera-bins.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global commit 276859fc6de83918a32727d676985ec40f31af2b -%global commitdate 20230208 +%global commit af5ba0cb4a763569ac7514635013e9d870040bcf +%global commitdate 20231027 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: ipu6-camera-bins Summary: Binary library for Intel IPU6 Version: 0.0 -Release: 7.%{commitdate}git%{shortcommit}%{?dist} +Release: 8.%{commitdate}git%{shortcommit}%{?dist} License: Proprietary Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}... @@ -48,37 +48,39 @@ This provides the necessary header files for IPU6 development. %prep %setup -q -n %{name}-%{commit} -for i in ipu6 ipu6ep; do - chrpath --delete $i/lib/*.so +for i in ipu_tgl ipu_adl ipu_mtl; do + chrpath --delete lib/$i/*.so done %build # Nothing to build %install -for i in ipu6 ipu6ep; do - mkdir -p %{buildroot}%{_includedir}/$i +mkdir -p %{buildroot}%{_includedir} +for i in ipu_tgl ipu_adl ipu_mtl; do mkdir -p %{buildroot}%{_libdir}/$i - cp -pr $i/include/* %{buildroot}%{_includedir}/$i/ - cp -pr $i/lib/lib* $i/lib/pkgconfig %{buildroot}%{_libdir}/$i + cp -pr include/$i %{buildroot}%{_includedir} + cp -pr lib/$i/lib* lib/$i/pkgconfig %{buildroot}%{_libdir}/$i patchelf --set-rpath %{_libdir}/$i %{buildroot}%{_libdir}/$i/*.so sed -i \ - -e "s|libdir=/usr/lib|libdir=%{_libdir}|g" \ - -e "s|libdir}|libdir}/$i|g" \ - -e "s|includedir}|includedir}/$i|g" \ + -e "s|libdir=\${prefix}/lib/$i|libdir=%{_libdir}/$i|g" \ %{buildroot}%{_libdir}/$i/pkgconfig/*.pc done # IPU6 firmwares -install -p -D -m 0644 ipu6/lib/firmware/intel/ipu6_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6_fw.bin -install -p -D -m 0644 ipu6ep/lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6ep_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6ep_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6epadln_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6epadln_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6epmtl_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6epmtl_fw.bin %files %license LICENSE -%dir %{_libdir}/ipu6 -%dir %{_libdir}/ipu6ep -%{_libdir}/ipu6/*.so* -%{_libdir}/ipu6ep/*.so* +%dir %{_libdir}/ipu_tgl +%dir %{_libdir}/ipu_adl +%dir %{_libdir}/ipu_mtl +%{_libdir}/ipu_tgl/*.so* +%{_libdir}/ipu_adl/*.so* +%{_libdir}/ipu_mtl/*.so* %files firmware %license LICENSE @@ -86,21 +88,31 @@ install -p -D -m 0644 ipu6ep/lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/l %dir /usr/lib/firmware/intel /usr/lib/firmware/intel/ipu6_fw.bin /usr/lib/firmware/intel/ipu6ep_fw.bin +/usr/lib/firmware/intel/ipu6epadln_fw.bin +/usr/lib/firmware/intel/ipu6epmtl_fw.bin %files devel -%dir %{_includedir}/ipu6 -%dir %{_includedir}/ipu6ep -%dir %{_libdir}/ipu6/pkgconfig -%dir %{_libdir}/ipu6ep/pkgconfig -%{_includedir}/ipu6/* -%{_includedir}/ipu6ep/* -%{_libdir}/ipu6/pkgconfig/* -%{_libdir}/ipu6ep/pkgconfig/* -%{_libdir}/ipu6/*.a -%{_libdir}/ipu6ep/*.a +%dir %{_includedir}/ipu_tgl +%dir %{_includedir}/ipu_adl +%dir %{_includedir}/ipu_mtl +%dir %{_libdir}/ipu_tgl/pkgconfig +%dir %{_libdir}/ipu_adl/pkgconfig +%dir %{_libdir}/ipu_mtl/pkgconfig +%{_includedir}/ipu_tgl/* +%{_includedir}/ipu_adl/* +%{_includedir}/ipu_mtl/* +%{_libdir}/ipu_tgl/pkgconfig/* +%{_libdir}/ipu_adl/pkgconfig/* +%{_libdir}/ipu_mtl/pkgconfig/* +%{_libdir}/ipu_tgl/*.a +%{_libdir}/ipu_adl/*.a +%{_libdir}/ipu_mtl/*.a %changelog +* Fri Mar 08 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-8.220231027gitaf5ba0c +- Update to the latest upstream commit + * Tue Aug 08 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-7.20230208git276859f - Updated to commit 276859fc6de83918a32727d676985ec40f31af2b diff --git a/sources b/sources index bf257ce..40c229f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipu6-camera-bins-276859f.tar.gz) = 22afee090c68b92d504fc6643fefd12cc8a1554562e0a14694d30e57d5a86e68249bef7b81ed45544ddc3a7bf80d88044bcf7e4d9d0e8b7d6d695e0cce07e3f0 +SHA512 (ipu6-camera-bins-af5ba0c.tar.gz) = 3bc29a31388e599840e2b8af799a085ea19d33a613cd4487d75e34ca9050c56d1becdf24e368aa671ed32e063ecb751f6f7e75e72326fa059588a181d3c1823b

8 months, 1 week

1
0
0 / 0

[VirtualBox-kmod/f40] Fix build with Linux 6.8 (patch from openSUSE:Factory/virtualbox)

by Sérgio M. Basto

Summary of changes: ec542ee... Fix build with Linux 6.8 (patch from openSUSE:Factory/virtu (*) (*) This commit already existed in another branch; no separate mail sent

8 months, 1 week

1
0
0 / 0

[VirtualBox-kmod] Fix build with Linux 6.8 (patch from openSUSE:Factory/virtualbox)

by Sérgio M. Basto

commit ec542ee008a05aea3825118326673808edd0d4a3 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Mar 16 00:21:42 2024 +0000 Fix build with Linux 6.8 (patch from openSUSE:Factory/virtualbox) VirtualBox-kmod.spec | 7 ++++- kernel-6.8.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index e86d062..f7f4bff 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -40,7 +40,7 @@ Name: VirtualBox-kmod Version: 7.0.14 -Release: 3%{?dist} +Release: 4%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -49,6 +49,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt Patch1: fix_7.0.6_locking_problems.patch +Patch2: kernel-6.8.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time elfutils-libelf-devel gcc @@ -71,6 +72,7 @@ Kernel module for VirtualBox tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} %patch -P 1 -p1 +%patch -P 2 -p1 popd # error out if there was something wrong with kmodtool @@ -133,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) [ $MODS = $DIRS ] || [ $MODS = 0 ] %changelog +* Sat Mar 16 2024 Sérgio Basto <sergio(a)serjux.com> - 7.0.14-4 +- Fix build with Linux 6.8 (patch from openSUSE:Factory/virtualbox) + * Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 7.0.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/kernel-6.8.patch b/kernel-6.8.patch new file mode 100644 index 0000000..5008e9d --- /dev/null +++ b/kernel-6.8.patch @@ -0,0 +1,76 @@ +From: Jiri Slaby <jslaby(a)suse.cz> +Subject: fix build with Linux 6.8 +Patch-mainline: no +References: kernel 6.8 + +strlcpy() was removed in commit d26270061ae6 (string: Remove strlcpy()), use +strscpy() instead. + +The patches fixes this (and similar): +modules_build_dir/default/vboxsf/vfsmod.c:1411:9: error: implicit declaration of function ‘strlcpy’; did you mean ‘strscpy’? + + +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +--- + src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c | 6 +++--- + src/VBox/Additions/linux/sharedfolders/vfsmod.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +--- a/vboxguest/VBoxGuest-linux.c.orig ++++ b/vboxguest/VBoxGuest-linux.c +@@ -1361,7 +1361,7 @@ static int vgdrvLinuxParamLogGrpSet(cons + RTLogGroupSettings(pLogger, pszValue); + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); ++ strscpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); + + return 0; + } +@@ -1387,7 +1387,7 @@ static int vgdrvLinuxParamLogFlagsSet(co + RTLogFlags(pLogger, pszValue); + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); ++ strscpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); + return 0; + } + +@@ -1412,7 +1412,7 @@ static int vgdrvLinuxParamLogDstSet(cons + RTLogDestinations(pLogger, pszValue); + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); ++ strscpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); + return 0; + } + +--- a/vboxsf/vfsmod.c.orig ++++ b/vboxsf/vfsmod.c +@@ -1408,7 +1408,7 @@ static int vbsf_parse_param(struct fs_co + switch (opt) { + case Opt_iocharset: + case Opt_nls: +- strlcpy(info->nls_name, param->string, sizeof(info->nls_name)); ++ strscpy(info->nls_name, param->string, sizeof(info->nls_name)); + break; + case Opt_uid: + info->uid = result.uint_32; +@@ -1469,7 +1469,7 @@ static int vbsf_parse_param(struct fs_co + printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32); + break; + case Opt_tag: +- strlcpy(info->szTag, param->string, sizeof(info->szTag)); ++ strscpy(info->szTag, param->string, sizeof(info->szTag)); + break; + default: + return invalf(fc, "Invalid mount option: '%s'", param->key); +@@ -1528,7 +1528,7 @@ static int vbsf_get_tree(struct fs_conte + } + + /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */ +- strlcpy(info->name, fc->source, sizeof(info->name)); ++ strscpy(info->name, fc->source, sizeof(info->name)); + + # if RTLNX_VER_MAX(5,3,0) + return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux);

8 months, 1 week

1
0
0 / 0

[ipu6-camera-bins/f39] Update to the latest upstream commit

by smallorange

commit 5ff2bfc2b1ed313ce99b47310adfd844063bd90c Author: Kate Hsuan <hpa(a)redhat.com> Date: Fri Mar 15 15:37:37 2024 +0800 Update to the latest upstream commit Update to commit af5ba0cb4a763569ac7514635013e9d870040bcf .gitignore | 1 + ipu6-camera-bins.spec | 68 ++++++++++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 42 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index b53bcf6..a47e7df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ipu6-camera-bins-4694ba7.tar.gz /ipu6-camera-bins-276859f.tar.gz +/ipu6-camera-bins-af5ba0c.tar.gz diff --git a/ipu6-camera-bins.spec b/ipu6-camera-bins.spec index 978921f..de4d276 100644 --- a/ipu6-camera-bins.spec +++ b/ipu6-camera-bins.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} -%global commit 276859fc6de83918a32727d676985ec40f31af2b -%global commitdate 20230208 +%global commit af5ba0cb4a763569ac7514635013e9d870040bcf +%global commitdate 20231027 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: ipu6-camera-bins Summary: Binary library for Intel IPU6 Version: 0.0 -Release: 8.%{commitdate}git%{shortcommit}%{?dist} +Release: 9.%{commitdate}git%{shortcommit}%{?dist} License: Proprietary Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}... @@ -48,37 +48,39 @@ This provides the necessary header files for IPU6 development. %prep %setup -q -n %{name}-%{commit} -for i in ipu6 ipu6ep; do - chrpath --delete $i/lib/*.so +for i in ipu_tgl ipu_adl ipu_mtl; do + chrpath --delete lib/$i/*.so done %build # Nothing to build %install -for i in ipu6 ipu6ep; do - mkdir -p %{buildroot}%{_includedir}/$i +mkdir -p %{buildroot}%{_includedir} +for i in ipu_tgl ipu_adl ipu_mtl; do mkdir -p %{buildroot}%{_libdir}/$i - cp -pr $i/include/* %{buildroot}%{_includedir}/$i/ - cp -pr $i/lib/lib* $i/lib/pkgconfig %{buildroot}%{_libdir}/$i + cp -pr include/$i %{buildroot}%{_includedir} + cp -pr lib/$i/lib* lib/$i/pkgconfig %{buildroot}%{_libdir}/$i patchelf --set-rpath %{_libdir}/$i %{buildroot}%{_libdir}/$i/*.so sed -i \ - -e "s|libdir=/usr/lib|libdir=%{_libdir}|g" \ - -e "s|libdir}|libdir}/$i|g" \ - -e "s|includedir}|includedir}/$i|g" \ + -e "s|libdir=\${prefix}/lib/$i|libdir=%{_libdir}/$i|g" \ %{buildroot}%{_libdir}/$i/pkgconfig/*.pc done # IPU6 firmwares -install -p -D -m 0644 ipu6/lib/firmware/intel/ipu6_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6_fw.bin -install -p -D -m 0644 ipu6ep/lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6ep_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6ep_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6epadln_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6epadln_fw.bin +install -p -D -m 0644 lib/firmware/intel/ipu6epmtl_fw.bin %{buildroot}/usr/lib/firmware/intel/ipu6epmtl_fw.bin %files %license LICENSE -%dir %{_libdir}/ipu6 -%dir %{_libdir}/ipu6ep -%{_libdir}/ipu6/*.so* -%{_libdir}/ipu6ep/*.so* +%dir %{_libdir}/ipu_tgl +%dir %{_libdir}/ipu_adl +%dir %{_libdir}/ipu_mtl +%{_libdir}/ipu_tgl/*.so* +%{_libdir}/ipu_adl/*.so* +%{_libdir}/ipu_mtl/*.so* %files firmware %license LICENSE @@ -86,21 +88,31 @@ install -p -D -m 0644 ipu6ep/lib/firmware/intel/ipu6ep_fw.bin %{buildroot}/usr/l %dir /usr/lib/firmware/intel /usr/lib/firmware/intel/ipu6_fw.bin /usr/lib/firmware/intel/ipu6ep_fw.bin +/usr/lib/firmware/intel/ipu6epadln_fw.bin +/usr/lib/firmware/intel/ipu6epmtl_fw.bin %files devel -%dir %{_includedir}/ipu6 -%dir %{_includedir}/ipu6ep -%dir %{_libdir}/ipu6/pkgconfig -%dir %{_libdir}/ipu6ep/pkgconfig -%{_includedir}/ipu6/* -%{_includedir}/ipu6ep/* -%{_libdir}/ipu6/pkgconfig/* -%{_libdir}/ipu6ep/pkgconfig/* -%{_libdir}/ipu6/*.a -%{_libdir}/ipu6ep/*.a +%dir %{_includedir}/ipu_tgl +%dir %{_includedir}/ipu_adl +%dir %{_includedir}/ipu_mtl +%dir %{_libdir}/ipu_tgl/pkgconfig +%dir %{_libdir}/ipu_adl/pkgconfig +%dir %{_libdir}/ipu_mtl/pkgconfig +%{_includedir}/ipu_tgl/* +%{_includedir}/ipu_adl/* +%{_includedir}/ipu_mtl/* +%{_libdir}/ipu_tgl/pkgconfig/* +%{_libdir}/ipu_adl/pkgconfig/* +%{_libdir}/ipu_mtl/pkgconfig/* +%{_libdir}/ipu_tgl/*.a +%{_libdir}/ipu_adl/*.a +%{_libdir}/ipu_mtl/*.a %changelog +* Fri Mar 08 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-9.220231027gitaf5ba0c +- Update to the latest upstream commit + * Tue Aug 08 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-8.20230208git276859f - Updated to commit 276859fc6de83918a32727d676985ec40f31af2b diff --git a/sources b/sources index bf257ce..40c229f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipu6-camera-bins-276859f.tar.gz) = 22afee090c68b92d504fc6643fefd12cc8a1554562e0a14694d30e57d5a86e68249bef7b81ed45544ddc3a7bf80d88044bcf7e4d9d0e8b7d6d695e0cce07e3f0 +SHA512 (ipu6-camera-bins-af5ba0c.tar.gz) = 3bc29a31388e599840e2b8af799a085ea19d33a613cd4487d75e34ca9050c56d1becdf24e368aa671ed32e063ecb751f6f7e75e72326fa059588a181d3c1823b

8 months, 1 week

1
0
0 / 0

[ipu6-camera-bins/f40] Update to the latest upstream commit

by smallorange

Summary of changes: 2d2dc40... Update to the latest upstream commit (*) (*) This commit already existed in another branch; no separate mail sent

8 months, 1 week

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits March 2024