archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux-raspberrypi to 5.10.63-15

Browse source 
Fix build error on $CARCH check
This commit is contained in:
graysky 2021-10-02 06:12:55 -04:00
parent 521d9e3e6e
commit 43737f4aa2
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aur/ffmpeg-shinobi/PKGBUILD
View file

@ -11,9 +11,9 @@ buildarch=28
pkgname=ffmpeg-shinobi pkgname=ffmpeg-shinobi
_pkgname=ffmpeg _pkgname=ffmpeg
pkgver=4.3.2 pkgver=4.3.2
pkgrel=2 pkgrel=3
pkgdesc='FFmpeg from the 4.3 release branch for use with Shinobi' pkgdesc='FFmpeg from the 4.3 release branch with hw accel decoding for use with Shinobi'
arch=(x86_64 aarch64 armv6h armv7h) arch=(aarch64 armv6h armv7h)
url=https://ffmpeg.org/ url=https://ffmpeg.org/
license=(GPL3) license=(GPL3)
depends=( depends=(
@ -111,6 +111,7 @@ _tag=f719f869907764e6412a6af6e178c46e5f915d25
source=( source=(
git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag} git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
vmaf-model-path.patch vmaf-model-path.patch
try.patch
) )
sha256sums=( sha256sums=(
SKIP SKIP
@ -126,6 +127,7 @@ pkgver() {
prepare() { prepare() {
cd ffmpeg cd ffmpeg
[[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && patch -Np1 -i ../try.patch
patch -Np1 -i "${srcdir}"/vmaf-model-path.patch patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
} }
@ -181,8 +183,6 @@ build() {
--enable-version3 --enable-version3
) )
[[ $CARCH == "x86_64" ]] && _args+=(--enable-libaom --enable-libmfx --enable-librav1e --enable-libvmaf --enable-nvdec --enable-nvenc)
[[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && _args+=('--host-cflags="-fPIC"' --enable-librsvg) [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && _args+=('--host-cflags="-fPIC"' --enable-librsvg)
[[ $CARCH == "armv6h" || $CARCH == 'arm' ]] && _args+=('--extra-libs="-latomic"' --enable-librsvg) [[ $CARCH == "armv6h" || $CARCH == 'arm' ]] && _args+=('--extra-libs="-latomic"' --enable-librsvg)

9
core/linux-raspberrypi/PKGBUILD
View file

@ -12,7 +12,7 @@ _srcname=linux-${_commit}
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="Raspberry Pi 1 and 2" _desc="Raspberry Pi 1 and 2"
pkgver=5.10.63 pkgver=5.10.63
pkgrel=14 pkgrel=15
pkgdesc='Linux' pkgdesc='Linux'
url="http://www.kernel.org/" url="http://www.kernel.org/"
arch=(armv6h armv7h) arch=(armv6h armv7h)
@ -94,8 +94,11 @@ _package() {
install -m644 ../$_bconfig "${pkgdir}/boot/config.txt" install -m644 ../$_bconfig "${pkgdir}/boot/config.txt"
install -m644 ../cmdline.txt "${pkgdir}/boot" install -m644 ../cmdline.txt "${pkgdir}/boot"
[[ $CARCH == "armv6h" ]] && rm -f "${pkgdir}"/boot/bcm{2836,2837,2838,2709,2710,2711}*.dtb if [[ $CARCH == "armv6h" ]]; then
[[ $CARCH == "armv7h" ]] && rm -f "${pkgdir}"/boot/bcm{2835,2838,2708,2711}*.dtb rm -f "${pkgdir}"/boot/bcm{2836,2837,2838,2709,2710,2711}*.dtb
elif [[ $CARCH == "armv7h" ]]; then
rm -f "${pkgdir}"/boot/bcm{2835,2838,2708,2711}*.dtb
fi
} }
_package-headers() { _package-headers() {