Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FORTIFY_SOURCE fix and pin package versions #80

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions icamerasrc-git-fix.old/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ conflicts=('icamerasrc-git')
source=("git+${url}.git#commit=17841ab6249aaa69bd9b3959262bf182dee74111")
sha256sums=('SKIP')

prepare() {
cd $_pkgname
sed -i "s|-D_FORTIFY_SOURCE=2| |" src/Makefile.am
sed -i "s|-D_FORTIFY_SOURCE=2| |" src/interfaces/Makefile.am
}

pkgver() {
cd $_pkgname
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
Expand Down
3 changes: 2 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ FLAG_QUIET_MODE=false
SUPPORTED_KERNELS=(linux linux-lts linux-zen linux-hardened)
# All packages installed, in order.
PKGS=(base-devel
intel-ivsc-firmware
intel-ipu6-dkms-git
intel-ipu6ep-camera-bin
intel-ipu6ep-camera-hal-git
v4l2loopback-dkms-git
v4l2-relayd
icamerasrc-git # Will build from repos, old fix PKGBUILD is renamed to icamerasrc-git.old
icamerasrc-git-fix.old
gst-plugin-pipewire
gst-plugins-good
)
Expand Down
37 changes: 37 additions & 0 deletions intel-ipu6-dkms-git/PKGBUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Fixed PKGBUILD from https://github.com/stefanpartheym/archlinux-ipu6-webcam
# Pinned upstream driver version to a specific commit
# Original PKGBUILD: https://aur.archlinux.org/packages/intel-ipu6-dkms-git
pkgbase=intel-ipu6-dkms-git
pkgname=intel-ipu6-dkms-git-fix
_pkgname=ipu6-drivers
pkgver=r165.cfb7af1e5
pkgrel=1
pkgdesc="Intel IPU6 camera drivers (DKMS)"
arch=('any')
url="https://github.com/intel/${_pkgname}"
license=('unknown')
depends=('dkms' 'intel-ivsc-firmware')
provides=('intel-ivsc-driver-dkms-git' 'intel-ipu6-dkms-git')
conflicts=('intel-ivsc-driver-dkms-git' 'intel-ipu6-dkms-git')
makedepends=('git')
source=("git+${url}#commit=cfb7af1e50a9f04e06d6bb77ea2340eb78350859")
sha256sums=('SKIP')

pkgver() {
cd $_pkgname
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}

prepare() {
cd "$srcdir/$_pkgname"
sed -i "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"$pkgver\"/g" ./dkms.conf
git clone https://github.com/intel/ivsc-driver
cp -r ivsc-driver/{backport-include,drivers,include} .
rm -rf ivsc-driver
}

package() {
cd "$srcdir"
install -dm755 "$pkgdir/usr/src"
cp -rT "$_pkgname" "$pkgdir/usr/src/$_pkgname-$pkgver"
}
8 changes: 6 additions & 2 deletions intel-ipu6ep-camera-hal-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@ depends=('intel-ipu6-dkms-git' 'intel-ipu6ep-camera-bin')
makedepends=('git' 'cmake')
provides=(ipu6-camera-hal)
conflicts=('intel-ipu6-camera-hal-git' 'intel-ipu6ep-camera-hal-git')
source=("git+${url}.git")
source=("git+${url}.git#commit=da2e2821244f21b95bcb37a1271bf73360c4669e")
sha256sums=('SKIP')

prepare() {
cd $_pkgname
sed -i "s|-D_FORTIFY_SOURCE=2| |" CMakeLists.txt
}

pkgver() {
cd $_pkgname
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
Expand All @@ -34,4 +39,3 @@ build() {
package() {
DESTDIR="$pkgdir" cmake --install build
}