diff --git a/README.md b/README.md index d189740..2fa7adb 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ https://github.com/her01n/linux-rock64/releases/latest And install: # pacman -Syu - # pacman -U linux-rock64-4.4.167.1217-1-aarch64.pkg.tar.xz + # pacman -U linux-rock64-4.4.197.1236-1-aarch64.pkg.tar.xz # pacman -U mpp-20171218-1-aarch64.pkg.tar.xz - # pacman -U ffmpeg-mpp-1:4.1.3-1-aarch.pkg.tar.xz + # pacman -U ffmpeg-mpp-1:4.2.1-2-aarch.pkg.tar.xz # pacamn -U libmali-rock64-1.6.3.5-1-aarch64.pkg.tar.xz # pacman -S mpv # gpasswd -a username video diff --git a/ffmpeg-mpp/PKGBUILD b/ffmpeg-mpp/PKGBUILD index e1cf273..9d6d03f 100644 --- a/ffmpeg-mpp/PKGBUILD +++ b/ffmpeg-mpp/PKGBUILD @@ -1,19 +1,19 @@ -# Maintainer: Maxime Gauduin -# Contributor: Bartłomiej Piotrowski -# Contributor: Ionut Biru -# Contributor: Tom Newsom -# Contributor: Paul Mattal +# Maintainer: Maxime Gauduin +# Contributor: Bartłomiej Piotrowski +# Contributor: Ionut Biru +# Contributor: Tom Newsom +# Contributor: Paul Mattal -# ALARM: Kevin Mihelich +# ALARM: Kevin Mihelich # - use -fPIC in host cflags for v7/v8 to fix print_options.c compile # - remove makedepends on ffnvcodec-headers, remove --enable-nvenc, --enable-nvdec # - remove depends on aom, remove --enable-libaom pkgname=ffmpeg-mpp -pkgver=4.1.3 -pkgrel=1 +pkgver=4.2.1 +pkgrel=2 epoch=1 -pkgdesc='Complete solution to record, convert and stream audio and video - With mpp support' +pkgdesc='Complete solution to record, convert and stream audio and video' arch=(aarch64) url=https://ffmpeg.org/ license=(GPL3) @@ -30,6 +30,7 @@ depends=( libass.so libavc1394 libbluray.so + libdav1d.so libdrm libfreetype.so libiec61883 @@ -73,7 +74,6 @@ makedepends=( nasm ) optdepends=('ladspa: LADSPA filters') -conflicts=(ffmpeg) provides=( ffmpeg libavcodec.so @@ -85,8 +85,21 @@ provides=( libswresample.so libswscale.so ) -source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}) -sha256sums=('SKIP') +conflicts=(ffmpeg) +source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=cbb3c9497549f8856d8cd37ac63af1406a784e58) +sha256sums=(SKIP) + +pkgver() { + cd ffmpeg + + git describe --tags | sed 's/^n//' +} + +prepare() { + cd ffmpeg + + git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7 +} build() { cd ffmpeg @@ -94,7 +107,7 @@ build() { [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"' ./configure \ - --prefix='/usr' \ + --prefix=/usr \ --disable-debug \ --disable-static \ --disable-stripping \ @@ -105,6 +118,7 @@ build() { --enable-ladspa \ --enable-libass \ --enable-libbluray \ + --enable-libdav1d \ --enable-libdrm \ --enable-libfreetype \ --enable-libfribidi \ diff --git a/ffmpeg-mpp/PKGBUILD.ffmpeg b/ffmpeg-mpp/PKGBUILD.ffmpeg new file mode 100644 index 0000000..5866383 --- /dev/null +++ b/ffmpeg-mpp/PKGBUILD.ffmpeg @@ -0,0 +1,161 @@ +# Maintainer: Maxime Gauduin +# Contributor: Bartłomiej Piotrowski +# Contributor: Ionut Biru +# Contributor: Tom Newsom +# Contributor: Paul Mattal + +# ALARM: Kevin Mihelich +# - use -fPIC in host cflags for v7/v8 to fix print_options.c compile +# - remove makedepends on ffnvcodec-headers, remove --enable-nvenc, --enable-nvdec +# - remove depends on aom, remove --enable-libaom + +pkgname=ffmpeg +pkgver=4.2.1 +pkgrel=2 +epoch=1 +pkgdesc='Complete solution to record, convert and stream audio and video' +arch=(x86_64) +url=https://ffmpeg.org/ +license=(GPL3) +depends=( + alsa-lib + bzip2 + fontconfig + fribidi + gmp + gnutls + gsm + jack + lame + libass.so + libavc1394 + libbluray.so + libdav1d.so + libdrm + libfreetype.so + libiec61883 + libmodplug + libomxil-bellagio + libpulse + libraw1394 + libsoxr + libssh + libtheora + libva.so + libva-drm.so + libva-x11.so + libvdpau + libvidstab.so + libvorbisenc.so + libvorbis.so + libvpx.so + libwebp + libx11 + libx264.so + libx265.so + libxcb + libxext + libxml2 + libxv + libxvidcore.so + opencore-amr + openjpeg2 + opus + sdl2 + speex + v4l-utils + xz + zlib +) +makedepends=( + git + ladspa + nasm +) +optdepends=('ladspa: LADSPA filters') +provides=( + libavcodec.so + libavdevice.so + libavfilter.so + libavformat.so + libavutil.so + libpostproc.so + libswresample.so + libswscale.so +) +source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=cbb3c9497549f8856d8cd37ac63af1406a784e58) +sha256sums=(SKIP) + +pkgver() { + cd ffmpeg + + git describe --tags | sed 's/^n//' +} + +prepare() { + cd ffmpeg + + git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7 +} + +build() { + cd ffmpeg + + [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"' + + ./configure \ + --prefix=/usr \ + --disable-debug \ + --disable-static \ + --disable-stripping \ + --enable-fontconfig \ + --enable-gmp \ + --enable-gnutls \ + --enable-gpl \ + --enable-ladspa \ + --enable-libass \ + --enable-libbluray \ + --enable-libdav1d \ + --enable-libdrm \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libgsm \ + --enable-libiec61883 \ + --enable-libjack \ + --enable-libmodplug \ + --enable-libmp3lame \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libopenjpeg \ + --enable-libopus \ + --enable-libpulse \ + --enable-libsoxr \ + --enable-libspeex \ + --enable-libssh \ + --enable-libtheora \ + --enable-libv4l2 \ + --enable-libvidstab \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libxcb \ + --enable-libxml2 \ + --enable-libxvid \ + --enable-omx \ + --enable-shared \ + --enable-version3 \ + $CONFIG + + make + make tools/qt-faststart + make doc/ff{mpeg,play}.1 +} + +package() { + make DESTDIR="${pkgdir}" -C ffmpeg install install-man + install -Dm 755 ffmpeg/tools/qt-faststart "${pkgdir}"/usr/bin/ +} + +# vim: ts=2 sw=2 et: diff --git a/linux-rock64/PKGBUILD b/linux-rock64/PKGBUILD index 60a0a0d..3f652df 100644 --- a/linux-rock64/PKGBUILD +++ b/linux-rock64/PKGBUILD @@ -1,7 +1,7 @@ pkgname=(linux-rock64 linux-rock64-headers) -_linuxver=4.4.167 -_ayufanver=1217 +_linuxver=4.4.197 +_ayufanver=1236 _version=${_linuxver}-${_ayufanver} pkgver=${_linuxver}.${_ayufanver} pkgrel=1 @@ -10,12 +10,12 @@ licence=(GPL2) url='https://github.com/ayufan-rock64/linux-kernel' # It really does not want to build with gcc8 # try out gcc8 with the next version -makedepends=(gcc7 python) +makedepends=(bc gcc7 python) # not sure what this does, but it is in the main kernel PKGBUILD options=('!strip') source=("https://github.com/ayufan-rock64/linux-kernel/archive/${_version}-rockchip-ayufan.tar.gz" "compressed-modules.patch") -sha256sums=('f3be03432fa2c298f5c752b2d4ace3b4abfd4a0a67baf5ee4911e92e5bff8086' +sha256sums=('2d0cf04eb3b0c6bcc5ea536aef30a869ab0c1b015734defa1dff27b6c6ebd314' '8fc582d911f8cd7e95035cb481dc9c38c807bef997d8d7243fd4a78c300374f4') prepare() {