From 2f541b4b17766f7e587e37bb2fb9564ffc14e1bf Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 13 Feb 2025 20:48:39 +0800 Subject: [PATCH] chore(sync): frawhide -> f41 (#3308) --- anda/apps/envision/envision.spec | 7 +- .../apps/legcord/nightly/legcord-nightly.spec | 4 +- anda/apps/mpv/mpv-nightly.spec | 4 +- anda/desktops/kde/kf6-kio/kf6-kio.spec | 4 +- .../latte-dock-nightly.spec | 2 +- anda/desktops/waylands/eww/eww.spec | 2 +- .../devs/ghostty/nightly/ghostty-nightly.spec | 4 +- anda/devs/zed/nightly/zed-nightly.spec | 4 +- .../gamescope-session/gamescope-session.spec | 4 +- .../prismlauncher-nightly.spec | 4 +- anda/langs/nim/choosenim/choosenim.spec | 2 +- anda/lib/davs2/anda.hcl | 4 + anda/lib/davs2/davs2.spec | 2 +- anda/lib/libde265/anda.hcl | 2 + anda/lib/libde265/libde265.spec | 2 - anda/lib/mesa/anda.hcl | 2 +- anda/lib/xavs/anda.hcl | 4 + anda/lib/xavs/xavs.spec | 8 +- anda/lib/xavs2/anda.hcl | 10 ++ anda/lib/xavs2/update.rhai | 5 + anda/lib/xavs2/xavs2.spec | 108 ++++++++++++++++++ .../telescope/stardust-telescope.spec | 4 +- .../cros-keyboard-map/cros-keyboard-map.spec | 6 +- .../ipu6-camera-hal/0000-lib-path.patch | 35 +++--- .../ipu6-camera-hal/60-intel-ipu6.rules | 30 ++--- .../ipu6-camera-hal/ipu6-camera-hal.spec | 48 ++++---- .../ipu6-camera-hal/ipu6-driver-select.sh | 0 anda/system/nvidia-patch/nvidia-patch.spec | 4 +- .../opentabletdriver-nightly.spec | 6 +- anda/tools/rpi-utils/rpi-utils.spec | 6 +- anda/tools/spotx-bash/spotx-bash.spec | 2 +- 31 files changed, 232 insertions(+), 97 deletions(-) create mode 100644 anda/lib/xavs2/anda.hcl create mode 100644 anda/lib/xavs2/update.rhai create mode 100644 anda/lib/xavs2/xavs2.spec mode change 100755 => 100644 anda/system/ipu6-camera-hal/ipu6-driver-select.sh diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 3d18c6a3b9..1ff9b5c4f0 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,8 +1,8 @@ -%global commit 18e5670d90c1277f09705d4c04585078ebff1bf6 -%global commit_date 20250113 +%global commit 3680e305a9824f851a441bc96fc7654ef849b01a +%global commit_date 20250127 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: envision +Name: envision-nightly Version: %commit_date.%shortcommit Release: 1%?dist Summary: UI for building, configuring and running Monado, the open source OpenXR runtime @@ -23,6 +23,7 @@ BuildRequires: desktop-file-utils BuildRequires: glib2-devel BuildRequires: git-core Recommends: android-tools +Conflicts: envision %description %summary. diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 523fb05891..369392ea4f 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit 85c7990b511fb7099d5d460aa07051be6638f767 -%global commit_date 20250115 +%global commit 07451f0d7e110cf6d31d0e32abedcefcff256d78 +%global commit_date 20250213 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index bfafd03528..ef65a97355 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit f385a6b25313c1d018f58523654c6b2313a72911 +%global commit f7a681b3624fe95bd9b8bcb390f3259481a18532 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250211 +%global commit_date 20250213 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/kde/kf6-kio/kf6-kio.spec b/anda/desktops/kde/kf6-kio/kf6-kio.spec index 720615a58d..124637f8b7 100644 --- a/anda/desktops/kde/kf6-kio/kf6-kio.spec +++ b/anda/desktops/kde/kf6-kio/kf6-kio.spec @@ -1,11 +1,11 @@ %global framework kio %global stable_kf6 stable -%global majmin_ver_kf6 6.10 +%global majmin_ver_kf6 6.11 Name: kf6-%{framework} Version: %{majmin_ver_kf6}.0 -Release: 3%{?dist}.switcheroo +Release: 1%{?dist}.switcheroo Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index fd3e9657c7..2f8dc88558 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit a53f381352dae5319cb159692aa8a83574963a5c +%global commit 60bc8ee65b49e9c28973f89e3c299a95e0de5b96 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/desktops/waylands/eww/eww.spec b/anda/desktops/waylands/eww/eww.spec index 9eacafd6d7..368ad18727 100644 --- a/anda/desktops/waylands/eww/eww.spec +++ b/anda/desktops/waylands/eww/eww.spec @@ -7,7 +7,7 @@ Name: eww Version: %ver^%commit_date.git~%shortcommit -Release: %autorelease +Release: 1%?dist Summary: Widgets for everyone! SourceLicense: MIT diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index bbff706b4b..8ac88da8e6 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit a3e462bbba724bcf312fcd5edd12bb5e0251c853 +%global commit 432beac3151d84c78dfe7ab860c1c3f7957f4775 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global fulldate 2025-02-09 +%global fulldate 2025-02-13 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV %global dev_ver 1.1.1 diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index dc7b6d19f1..1d603c63d8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit c89ad6578231018b31a4c2c9484b7bbb8a7e9c37 +%global commit f0cd71e43c0254bac25c05b3c8ac56a7d1ab05d3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250211 +%global commit_date 20250213 %global ver 0.174.0 %bcond_with check diff --git a/anda/games/gamescope-session/gamescope-session.spec b/anda/games/gamescope-session/gamescope-session.spec index 2157e8487b..22f091ae92 100644 --- a/anda/games/gamescope-session/gamescope-session.spec +++ b/anda/games/gamescope-session/gamescope-session.spec @@ -1,8 +1,8 @@ %define debug_package %nil -%global commit b5dae06669866377951ef676aa3e100682e03e47 +%global commit 533e51f2f50aebc4457d04372ab9b05a9c56ac10 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250119 +%global commit_date 20250126 Name: gamescope-session Version: %commit_date.%shortcommit diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 302f3f0065..2a8f9a178a 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 6ae9fa4df445aa577d58230559f5b025c93e1e7c +%global commit e41a60e57e4d66b3394f285bf832b01e4ef8f12c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad -%global commit_date 20250130 +%global commit_date 20250213 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec index 19d31c5bae..b5316aae49 100644 --- a/anda/langs/nim/choosenim/choosenim.spec +++ b/anda/langs/nim/choosenim/choosenim.spec @@ -1,6 +1,6 @@ Name: choosenim -Version: 0.8.9 +Version: 0.8.12 Release: 1%?dist Summary: Easily install and manage multiple versions of the Nim programming language License: BSD-3-Clause diff --git a/anda/lib/davs2/anda.hcl b/anda/lib/davs2/anda.hcl index bcf66e55a0..6f70ad753d 100644 --- a/anda/lib/davs2/anda.hcl +++ b/anda/lib/davs2/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "davs2.spec" } + labels { + mock = 1 + } } diff --git a/anda/lib/davs2/davs2.spec b/anda/lib/davs2/davs2.spec index 8d91711d40..381a723a2f 100644 --- a/anda/lib/davs2/davs2.spec +++ b/anda/lib/davs2/davs2.spec @@ -55,7 +55,7 @@ cd build/linux %configure \ --bit-depth='8' \ --chroma-format='all' \ -%ifarch aarch64 +%ifarch aarch64 %ix86 --disable-asm \ %endif --disable-static \ diff --git a/anda/lib/libde265/anda.hcl b/anda/lib/libde265/anda.hcl index 38f8c72d07..cc0f1db0fd 100644 --- a/anda/lib/libde265/anda.hcl +++ b/anda/lib/libde265/anda.hcl @@ -2,6 +2,8 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "libde265.spec" + } + labels { mock = 1 } } diff --git a/anda/lib/libde265/libde265.spec b/anda/lib/libde265/libde265.spec index 97d35a8b8b..08fe3fc697 100644 --- a/anda/lib/libde265/libde265.spec +++ b/anda/lib/libde265/libde265.spec @@ -73,9 +73,7 @@ find %{buildroot} -name '*.la' -delete %{_bindir}/enc265 %{_bindir}/gen-enc-table %{_bindir}/rd-curves -%ifnarch i686 %{_bindir}/sherlock265 -%endif %{_bindir}/tests %{_bindir}/yuv-distortion diff --git a/anda/lib/mesa/anda.hcl b/anda/lib/mesa/anda.hcl index ffff098046..5da277684e 100644 --- a/anda/lib/mesa/anda.hcl +++ b/anda/lib/mesa/anda.hcl @@ -1,6 +1,6 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] - rpm { + rpm { spec = "mesa.spec" } labels { diff --git a/anda/lib/xavs/anda.hcl b/anda/lib/xavs/anda.hcl index b360cf80c0..4a5ac3f4c3 100644 --- a/anda/lib/xavs/anda.hcl +++ b/anda/lib/xavs/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "xavs.spec" } + labels { + mock = 1 + } } diff --git a/anda/lib/xavs/xavs.spec b/anda/lib/xavs/xavs.spec index 74d860bafd..749d0f0b3a 100644 --- a/anda/lib/xavs/xavs.spec +++ b/anda/lib/xavs/xavs.spec @@ -4,14 +4,12 @@ Release: 1%{?dist} Summary: AVS1 (First-generation AVS Standards) library License: GPLv2 URL: http://xavs.sourceforge.net/ - -Source0: https://sourceforge.net/code-snapshots/svn/x/xa/xavs/code/xavs-code-r55-trunk.zip Patch0: %{name}-cflags.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: libtool +BuildRequires: subversion #BuildRequires: yasm %description @@ -37,7 +35,9 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n xavs-code-r55-trunk +svn co https://svn.code.sf.net/p/xavs/code/trunk %{name} +%setup -T -D -n %{name} +%autopatch -p1 %build %configure \ diff --git a/anda/lib/xavs2/anda.hcl b/anda/lib/xavs2/anda.hcl new file mode 100644 index 0000000000..4edf53b893 --- /dev/null +++ b/anda/lib/xavs2/anda.hcl @@ -0,0 +1,10 @@ +project pkg { + arches = ["x86_64", "aarch64", "i386"] + rpm { + spec = "xavs2.spec" + } + labels { + mock = 1 + weekly = 1 + } +} diff --git a/anda/lib/xavs2/update.rhai b/anda/lib/xavs2/update.rhai new file mode 100644 index 0000000000..b767071a0e --- /dev/null +++ b/anda/lib/xavs2/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gh_commit("pkuvcl/xavs2")); +if rpm.changed() { + rpm.release(); + rpm.global("commit_date", date()); +} diff --git a/anda/lib/xavs2/xavs2.spec b/anda/lib/xavs2/xavs2.spec new file mode 100644 index 0000000000..6867cb68b3 --- /dev/null +++ b/anda/lib/xavs2/xavs2.spec @@ -0,0 +1,108 @@ +%global commit eae1e8b9d12468059bdd7dee893508e470fa83d8 +%global commit_date 20190422 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: xavs2 +Version: 1.4 +Release: 1%{?shortcommit:.%{commit_date}git%{shortcommit}}%{?dist} +Summary: An open-source encoder of AVS2-P2/IEEE1857.4 video coding standard +URL: https://github.com/pkuvcl/%{name} +License: GPLv2 + +%if "%{?shortcommit}" +Source0: https://github.com/pkuvcl/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +%else +Source0: https://github.com/pkuvcl/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +%endif + +BuildRequires: gcc +%ifarch x86_64 +BuildRequires: nasm >= 2.13 +%endif + +%description +xavs2 is an open-source encoder of AVS2-P2/IEEE1857.4 video coding standard. + +This package contains the command line encoder. + +%package libs +Summary: AVS2-P2/IEEE1857.4 encoder library + +%description libs +davs2 is an open-source encoder of AVS2-P2/IEEE1857.4 video coding standard. + +This package contains the shared library. + +%package devel +Summary: AVS2-P2/IEEE1857.4 encoder library development files +Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel +davs2 is an open-source encoder of AVS2-P2/IEEE1857.4 video coding standard. + +This package contains the shared library development files. + +%prep +%if "%{?shortcommit}" +%autosetup -n %{name}-%{commit} +%else +%autosetup +%endif + +%build +cd build/linux +export CFLAGS="%{optflags} -Wno-incompatible-pointer-types" +%configure \ + --bit-depth='8' \ + --chroma-format='all' \ +%ifarch aarch64 %ix86 + --disable-asm \ +%endif + --disable-static \ + --enable-pic \ + --enable-shared + +# Remove hardcoded CFLAGS on generated file containing variables +sed -i \ + -e 's|CFLAGS=.*%{optflags}|CFLAGS=%{optflags}|g' \ + config.mak + +%make_build + +%install +cd build/linux +%make_install + +find %{buildroot} -name "*a" -delete + +%ldconfig_scriptlets libs + +%files +%{_bindir}/%{name} + +%files libs +%license COPYING +%{_libdir}/lib%{name}.so.13 + +%files devel +%doc README.md +%{_includedir}/%{name}.h +%{_includedir}/%{name}_config.h +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/%{name}.pc + +%changelog +* Thu Mar 21 2024 Simone Caronni - 1.3-5.20190422giteae1e8b +- Fix build on Fedora 40. + +* Sat May 23 2020 Simone Caronni - 1.3-4.20190422giteae1e8b +- Disable ASM for aarch64. + +* Sun Mar 15 2020 Simone Caronni - 1.3-3.20190422giteae1e8b +- Update to latest snapshot. + +* Sun Jun 09 2019 Simone Caronni - 1.3-2.20181229gitf45c340 +- Update to latest snapshot to fix various bugs. + +* Sat Jun 08 2019 Simone Caronni - 1.3-1 +- First build. diff --git a/anda/stardust/telescope/stardust-telescope.spec b/anda/stardust/telescope/stardust-telescope.spec index 5ce98f7d7f..6e2fcc55a5 100644 --- a/anda/stardust/telescope/stardust-telescope.spec +++ b/anda/stardust/telescope/stardust-telescope.spec @@ -1,7 +1,7 @@ %define debug_package %nil -%global commit a262440b23c106e4061fb5e4407a2d33f1d26b3b -%global commit_date 20250106 +%global commit 31aaa1d6a3c1cbf1795981432c9ec2cbcc142ba9 +%global commit_date 20250121 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: stardust-xr-telescope diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index 0cc7b520d5..6893b3cdbc 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -1,6 +1,6 @@ -%global commit_date 20241129 +%global commit_date 20250123 -%global tree_commit 3a1ed2307a0df118e6525f8df75756d2d1694664 +%global tree_commit 4647ce2297a7142dabe3cae1de718a69cb370448 %global tree_shortcommit %(c=%{tree_commit}; echo ${c:0:7}) %global um_commit 46892acafb2fff3f3ace425d4694382c92645feb @@ -11,7 +11,7 @@ Name: cros-keyboard-map Version: %commit_date.%tree_shortcommit.%um_shortcommit -Release: 2%?dist +Release: 1%?dist License: BSD-3-Clause and GPLv3 Summary: Utility to generate keyd configurations for use on Chromebooks diff --git a/anda/system/ipu6-camera-hal/0000-lib-path.patch b/anda/system/ipu6-camera-hal/0000-lib-path.patch index 3153ac888e..df8913015d 100644 --- a/anda/system/ipu6-camera-hal/0000-lib-path.patch +++ b/anda/system/ipu6-camera-hal/0000-lib-path.patch @@ -1,14 +1,13 @@ -From 50bfe3c1d2d2d357b518e5951244dd244b03ad78 Mon Sep 17 00:00:00 2001 -From: Kate Hsuan -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 +--- ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee.old/cmake/libcamhal.pc.cmakein 2024-08-06 08:24:01.897232057 +0200 ++++ ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee/cmake/libcamhal.pc.cmakein 2024-08-06 08:25:08.361731743 +0200 +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/@CMAKE_INSTALL_SUB_PATH@ +-libdir=${prefix}/lib/@CMAKE_INSTALL_SUB_PATH@ ++libdir=${prefix}/lib64/@CMAKE_INSTALL_SUB_PATH@ + includedir=${prefix}/include/@CMAKE_INSTALL_SUB_PATH@/libcamhal + + Name: libcamhal --- a/src/hal/hal_adaptor/HalAdaptor.cpp +++ b/src/hal/hal_adaptor/HalAdaptor.cpp @@ -62,7 +62,7 @@ static void load_camera_hal_library() { @@ -20,6 +19,14 @@ index e14418a..17e9697 100644 if (IPU6_UPSTREAM) { if (strstr(pciID, "0x7d19") != nullptr /* MTL */) { libName += "ipu_mtl_upstream"; --- -2.44.0 - +--- ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee.old/src/platformdata/PlatformData.h 2024-08-06 08:24:01.919232222 +0200 ++++ ipu6-camera-hal-8863bda8b15bef415f112700d0fb04e00a48dbee/src/platformdata/PlatformData.h 2024-08-06 08:25:08.362731750 +0200 +@@ -89,7 +89,7 @@ + #define MAX_CAMERA_NUMBER 100 + // Temporarily using current path to save aiqd file for none CAL platforms. + #define CAMERA_CACHE_DIR "./" +-#define CAMERA_DEFAULT_CFG_PATH "/etc/camera/" ++#define CAMERA_DEFAULT_CFG_PATH "/usr/share/camera/" + #define CAMERA_GRAPH_DESCRIPTOR_FILE "gcss/graph_descriptor.xml" + #define CAMERA_GRAPH_SETTINGS_DIR "gcss/" + #endif diff --git a/anda/system/ipu6-camera-hal/60-intel-ipu6.rules b/anda/system/ipu6-camera-hal/60-intel-ipu6.rules index 42b42543bd..967b72cb12 100644 --- a/anda/system/ipu6-camera-hal/60-intel-ipu6.rules +++ b/anda/system/ipu6-camera-hal/60-intel-ipu6.rules @@ -1,28 +1,16 @@ # Tiger Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", GOTO="ipu6_tgl" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x9a19", RUN+="/usr/bin/echo /usr/lib64/ipu_tgl > /etc/ld.so.conf.d/ipu6-x86_64.conf" # Alder Lake-N -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", GOTO="ipu6_adl" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x465d", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" # Alder Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", GOTO="ipu6_adl" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x462e", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" # Raptor Lake-P -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", GOTO="ipu6_adl" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa75d", RUN+="/usr/bin/echo /usr/lib64/ipu_adl > /etc/ld.so.conf.d/ipu6-x86_64.conf" # Meteor Lake -SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x7d19", GOTO="ipu6_mtl" - -GOTO="ipu6_end" - -LABEL="ipu6_tgl" -RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu_tgl/v4l2-relayd /run/v4l2-relayd" -GOTO="ipu6_end" - -LABEL="ipu6_adl" -RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu_adl/v4l2-relayd /run/v4l2-relayd" -GOTO="ipu6_end" - -LABEL="ipu6_mtl" -RUN+="/bin/ln -sf /usr/share/defaults/etc/camera/ipu_mtl/v4l2-relayd /run/v4l2-relayd" -GOTO="ipu6_end" - -LABEL="ipu6_end" +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x7d19", RUN+="/usr/bin/echo /usr/lib64/ipu_mtl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +# Lunar Lake +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x645d", RUN+="/usr/bin/echo /usr/lib64/ipu_lnl > /etc/ld.so.conf.d/ipu6-x86_64.conf" +# Jasper Lake +SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0x4e19", RUN+="/usr/bin/echo /usr/lib64/ipu_jsl > /etc/ld.so.conf.d/ipu6-x86_64.conf" KERNEL=="ipu-psys0", TAG+="uaccess" diff --git a/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec b/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec index e6275c6a81..51ba9cedfe 100644 --- a/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec +++ b/anda/system/ipu6-camera-hal/ipu6-camera-hal.spec @@ -1,13 +1,15 @@ %global commit 289e645dffbd0ea633f10bb4f93855f1e4429e9a %global commitdate 20240509 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -Wno-alloc-size-larger-than +%global build_cxxflags %{__build_flags_lang_cxx} %{?_distro_extra_cxxflags} -Wno-alloc-size-larger-than %global __cmake_in_source_build 1 Name: ipu6-camera-hal Summary: Hardware abstraction layer for Intel IPU6 URL: https://github.com/intel/ipu6-camera-hal Version: %{commitdate}.%{shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: 60-intel-ipu6.rules @@ -15,7 +17,7 @@ Source2: v4l2-relayd-adl Source3: v4l2-relayd-tgl Source4: icamera_ipu6_isys.conf Source5: ipu6-driver-select.sh -### RPM Fusion | [ipu6-camera-hal] Update to the latest commit +### RPM Fusion | [ipu6-camera-hal] Update to the latest commit | MODIFIED ## https://lists.rpmfusion.org/archives/list/rpmfusion-commits@lists.rpmfusion.org/thread/O6IPZMHMP7A3LQBDY4AEORTDEX4P6ESY Patch00: 0000-lib-path.patch ### intel/ipu6-camera-hal | PR #113 | CMakeLists fixes @@ -47,7 +49,7 @@ This provides the necessary header files for IPU6 HAL development. %prep %autosetup -p1 -n %{name}-%{commit} -sed -i "s|/etc/camera/|/usr/share/defaults/etc/camera/|g" \ +sed -i "s|/etc/camera/|/usr/share/camera/|g" \ src/platformdata/PlatformData.h @@ -65,10 +67,15 @@ for i in ipu_tgl ipu_adl ipu_mtl; do else IPU_VERSION=ipu fi - %cmake -DCMAKE_BUILD_TYPE=Release -DIPU_VER=$IPU_VERSION \ - -DCMAKE_INSTALL_SUB_PATH:PATH="$i" \ - -DCMAKE_INSTALL_SYSCONFDIR:PATH="share/defaults/etc" \ - -DBUILD_CAMHAL_TESTS=OFF -DUSE_PG_LITE_PIPE=ON .. + %cmake \ + -DBUILD_CAMHAL_ADAPTOR=ON \ + -DBUILD_CAMHAL_PLUGIN=ON \ + -DBUILD_CAMHAL_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_SUB_PATH:PATH="$i" \ + -DCMAKE_INSTALL_SYSCONFDIR=%{_datadir} \ + -DIPU_VER="$IPU_VERSION" \ + -DUSE_PG_LITE_PIPE=ON .. %make_build popd done @@ -79,13 +86,11 @@ mkdir hal_adaptor && pushd hal_adaptor %make_build popd - %install for i in ipu_tgl ipu_adl ipu_mtl; do pushd $i %make_install rm %{buildroot}%{_libdir}/$i/libcamhal.a - ### New icamerasrc must use hal_adaptor so drop libcamhal.pc! rm -r %{buildroot}%{_libdir}/$i/pkgconfig popd done @@ -94,20 +99,22 @@ pushd hal_adaptor %make_install popd -### udev-rules set the ipu_xxx /run/v4l2-relayd cfg link + /dev/ipu-psys0 uaccess -install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_udevrulesdir}/60-intel-ipu6.rules +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/60-intel-ipu6.rules ### v4l2-relayd configuration examples (mtl uses same config as adl) -install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/defaults/etc/camera/ipu_adl/v4l2-relayd -install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/defaults/etc/camera/ipu_mtl/v4l2-relayd -install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/camera/ipu_tgl/v4l2-relayd +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/camera/ipu_adl/v4l2-relayd +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/camera/ipu_mtl/v4l2-relayd +install -Dpm 0644 %{SOURCE3} %{buildroot}%{_datadir}/camera/ipu_tgl/v4l2-relayd ### Make kmod-intel-ipu6 use /dev/video7 leaving /dev/video0 for loopback -install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_modprobedir}/icamera_ipu6_isys.conf +install -Dpm 0644 %{SOURCE4} %{buildroot}%{_modprobedir}/icamera_ipu6_isys.conf -### Script to switch between proprietary and foss ipu6 stacks -install -p -D -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/ipu6-driver-select +### Script to switch between proprietary and open IPU6 stacks +install -Dpm 0755 %{SOURCE5} %{buildroot}%{_bindir}/ipu6-driver-select +### Needed for GStreamer ICamera builds. +ln -sf hal_adaptor %{buildroot}%{_includedir}/libcamhal +ln -sf hal_adaptor.pc %{buildroot}%{_libdir}/pkgconfig/libcamhal.pc %posttrans ### Ensure that v4l2-relayd service enabled if ipu6-driver-select is installed @@ -120,21 +127,22 @@ if [ -S /run/udev/control ]; then /usr/bin/udevadm trigger /sys/devices/pci0000:00/0000:00:05.0 fi - %files %license LICENSE %ghost %{_sysconfdir}/modprobe.d/ipu6-driver-select.conf %{_bindir}/ipu6-driver-select -%{_libdir}/*/libcamhal.so* +%{_libdir}/ipu*/libcamhal.so* %{_libdir}/libhal_adaptor.so.* -%{_datadir}/defaults +%{_datadir}/camera %{_modprobedir}/icamera_ipu6_isys.conf %{_udevrulesdir}/60-intel-ipu6.rules %files devel %{_includedir}/hal_adaptor +%{_includedir}/libcamhal %{_libdir}/libhal_adaptor.so %{_libdir}/pkgconfig/hal_adaptor.pc +%{_libdir}/pkgconfig/libcamhal.pc %changelog diff --git a/anda/system/ipu6-camera-hal/ipu6-driver-select.sh b/anda/system/ipu6-camera-hal/ipu6-driver-select.sh old mode 100755 new mode 100644 diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 940e1b9618..64353127ce 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 0837f46dfe25b6e750abc7e601032bdd12c70be0 +%global commit ab88d5ec996e841255e3c5215a360b7de306f375 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250115 +%global commit_date 20250212 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec b/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec index f5acbd8a5e..cf21027be3 100644 --- a/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec +++ b/anda/system/opentabletdriver-nightly/opentabletdriver-nightly.spec @@ -1,6 +1,6 @@ -%global commit f2d88169791f5c3c54c1beac6f402552d0b35d62 +%global commit d4150dea3c0e1f60177b3bb47faea114ba221663 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250118 +%global commit_date 20250125 %global ver 0.6.5.0 # We aren't using Mono but RPM expected Mono @@ -11,7 +11,7 @@ Name: opentabletdriver-nightly Version: %ver^%commit_date.git~%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Open source, cross-platform, user-mode tablet driver License: LGPL-3.0-or-later Conflicts: opentabletdriver diff --git a/anda/tools/rpi-utils/rpi-utils.spec b/anda/tools/rpi-utils/rpi-utils.spec index 12a8830722..6148f0cc6d 100644 --- a/anda/tools/rpi-utils/rpi-utils.spec +++ b/anda/tools/rpi-utils/rpi-utils.spec @@ -1,12 +1,12 @@ -%global commit 33aa4da93d8da90d5075e8cd48e72cc90048b9f3 -%global commit_date 20250107 +%global commit 6c3ace77f2299f9a2e442c2eb10d67ae73c949ba +%global commit_date 20250213 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define _unpackaged_files_terminate_build 0 Name: rpi-utils Version: %{commit_date}.%{shortcommit} -Release: 2%?dist +Release: 1%?dist Summary: A collection of scripts and simple applications for Raspberry Pi devices License: BSD-3-Clause URL: https://github.com/raspberrypi/utils diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index f4a1a6ae47..afd2beb673 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -33,4 +33,4 @@ install -Dm 755 spotx.sh %buildroot%{_bindir}/spotx %changelog * Sat Dec 14 2024 Its-J -- Package SpotX-Bash +- Package SpotX-Bash \ No newline at end of file