Skip to content

Commit e26b4dd

Browse files
committed
Add FORTIFY_SOURCE fix and pin package versions
As described in #77 and #79, FORTIFY_SOURCE is needed for Cmake to work on icamerasrc and intel-ipu36-camera-hal. Additionally, recent upstream releases have broken several dependencies. While I'm hoping the recent flurry of activity upstream means support for kernel 6.7+ is on the way, these workarounds should keep us running for now.
1 parent 8aed83f commit e26b4dd

File tree

4 files changed

+48
-3
lines changed

4 files changed

+48
-3
lines changed

icamerasrc-git-fix.old/PKGBUILD

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ conflicts=('icamerasrc-git')
2222
source=("git+${url}.git#commit=17841ab6249aaa69bd9b3959262bf182dee74111")
2323
sha256sums=('SKIP')
2424

25+
prepare() {
26+
cd $_pkgname
27+
sed -i "s|-D_FORTIFY_SOURCE=2| |" src/Makefile.am
28+
sed -i "s|-D_FORTIFY_SOURCE=2| |" src/interfaces/Makefile.am
29+
}
30+
2531
pkgver() {
2632
cd $_pkgname
2733
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"

install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PKGS=(base-devel
2424
intel-ipu6ep-camera-hal-git
2525
v4l2loopback-dkms-git
2626
v4l2-relayd
27-
icamerasrc-git # Will build from repos, old fix PKGBUILD is renamed to icamerasrc-git.old
27+
icamerasrc-git-fix.old
2828
gst-plugin-pipewire
2929
gst-plugins-good
3030
)

intel-ipu6-dkms-git/PKGBUILD

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Maintainer: Karim Vergnes <me@thesola.io>
2+
3+
pkgname=intel-ipu6-dkms-git
4+
_pkgname=ipu6-drivers
5+
pkgver=r165.cfb7af1e5
6+
pkgrel=1
7+
pkgdesc="Intel IPU6 camera drivers (DKMS)"
8+
arch=('any')
9+
url="https://github.com/intel/${_pkgname}"
10+
license=('unknown')
11+
depends=('dkms' 'intel-ivsc-firmware')
12+
provides=('intel-ivsc-driver-dkms-git')
13+
conflicts=('intel-ivsc-driver-dkms-git')
14+
makedepends=('git')
15+
source=("git+${url}#commit=cfb7af1e50a9f04e06d6bb77ea2340eb78350859")
16+
sha256sums=('SKIP')
17+
18+
pkgver() {
19+
cd $_pkgname
20+
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
21+
}
22+
23+
prepare() {
24+
cd "$srcdir/$_pkgname"
25+
sed -i "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"$pkgver\"/g" ./dkms.conf
26+
git clone https://github.com/intel/ivsc-driver
27+
cp -r ivsc-driver/{backport-include,drivers,include} .
28+
rm -rf ivsc-driver
29+
}
30+
31+
package() {
32+
cd "$srcdir"
33+
install -dm755 "$pkgdir/usr/src"
34+
cp -rT "$_pkgname" "$pkgdir/usr/src/$_pkgname-$pkgver"
35+
}

intel-ipu6ep-camera-hal-git/PKGBUILD

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@ depends=('intel-ipu6-dkms-git' 'intel-ipu6ep-camera-bin')
1414
makedepends=('git' 'cmake')
1515
provides=(ipu6-camera-hal)
1616
conflicts=('intel-ipu6-camera-hal-git' 'intel-ipu6ep-camera-hal-git')
17-
source=("git+${url}.git")
17+
source=("git+${url}.git#commit=da2e2821244f21b95bcb37a1271bf73360c4669e")
1818
sha256sums=('SKIP')
1919

20+
prepare() {
21+
cd $_pkgname
22+
sed -i "s|-D_FORTIFY_SOURCE=2| |" CMakeLists.txt
23+
}
24+
2025
pkgver() {
2126
cd $_pkgname
2227
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -34,4 +39,3 @@ build() {
3439
package() {
3540
DESTDIR="$pkgdir" cmake --install build
3641
}
37-

0 commit comments

Comments
 (0)