diff options
author | Daniel Bermond | 2018-11-09 18:56:00 +0000 |
---|---|---|
committer | Daniel Bermond | 2018-11-09 18:56:00 +0000 |
commit | 212ecb841fde2d0c65b00fadf3312ae434f53e9d (patch) | |
tree | 6a5406f08567b8ec75dd7953494bfa4911f23637 | |
parent | c8f9f2c7666abf4f10d738f7271d89bf82127991 (diff) | |
download | aur-212ecb841fde2d0c65b00fadf3312ae434f53e9d.tar.gz |
Remove 10bit template
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 61 | ||||
-rw-r--r-- | xavs2-1.0-disable-10bit.patch | 23 |
3 files changed, 9 insertions, 80 deletions
@@ -1,7 +1,7 @@ pkgbase = xavs2 pkgdesc = Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard pkgver = 1.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/pkuvcl/xavs2/ arch = i686 arch = x86_64 @@ -12,13 +12,10 @@ pkgbase = xavs2 depends = glibc depends = liblsmash.so provides = libxavs2 - provides = libxavs2.so conflicts = libxavs2 replaces = libxavs2 source = xavs2-1.0.tar.gz::https://github.com/pkuvcl/xavs2/archive/1.0.tar.gz - source = xavs2-1.0-disable-10bit.patch sha256sums = 0e7f682ad20dc783864ff0c483d03b2fbcd70d2fbd098e18c8d06ab6341da71d - sha256sums = e4893da3e1f22e85f8a8f50e58ecaff037d729a3ed64b71794aab6f359c0370c pkgname = xavs2 @@ -6,20 +6,18 @@ pkgname=xavs2 pkgver=1.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') pkgdesc='Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard' url='https://github.com/pkuvcl/xavs2/' license=('GPL') depends=('glibc' 'liblsmash.so') makedepends=('gcc7' 'yasm' 'l-smash') -provides=('libxavs2' 'libxavs2.so') +provides=('libxavs2') conflicts=('libxavs2') replaces=('libxavs2') -source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/pkuvcl/${pkgname}/archive/${pkgver}.tar.gz" - 'xavs2-1.0-disable-10bit.patch') -sha256sums=('0e7f682ad20dc783864ff0c483d03b2fbcd70d2fbd098e18c8d06ab6341da71d' - 'e4893da3e1f22e85f8a8f50e58ecaff037d729a3ed64b71794aab6f359c0370c') +source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/pkuvcl/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('0e7f682ad20dc783864ff0c483d03b2fbcd70d2fbd098e18c8d06ab6341da71d') prepare() { cd "${pkgname}-${pkgver}" @@ -27,18 +25,14 @@ prepare() { # use gcc7 (it does not build with gcc8) sed -i 's/gcc/gcc-7/' build/linux/configure - # disable 10-bit in configure to avoid misleading errors - patch -Np1 -i "${srcdir}/xavs2-1.0-disable-10bit.patch" - - # must copy the entire source tree for each build or it will not work + # must copy the entire source tree or it will not work cd "$srcdir" cp -af "${pkgname}-${pkgver}" build-8bit - cp -af "${pkgname}-${pkgver}" build-10bit } build() { - printf '%s\n' ' -> Building for 8-bit...' cd build-8bit/build/linux + ./configure \ --prefix='/usr' \ --enable-shared \ @@ -50,49 +44,10 @@ build() { --disable-lavf \ --disable-ffms \ --disable-gpac + make - - printf '%s\n' ' -> Building for 10-bit...' - cd "${srcdir}/build-10bit/build/linux" - if ./configure \ - --prefix='/usr' \ - --libdir='/usr/lib/xavs2-10bit' \ - --includedir='/usr/include/xavs2-10bit' \ - --enable-shared \ - --bit-depth='10' \ - --chroma-format='all' \ - --enable-lto \ - --enable-pic \ - --disable-swscale \ - --disable-lavf \ - --disable-ffms \ - --disable-gpac - then - make - else - cd "$srcdir" - rm -rf build-10bit - fi } package() { - local _depth - - for _depth in 10 8 - do - printf '%s\n' " -> Installing for ${_depth}-bit..." - - if [ "$_depth" -eq '10' ] && ! [ -d 'build-10bit' ] - then - printf '%s\n' 'BitDepth 10 not supported currently.' - continue - fi - - make -C "build-${_depth}bit/build/linux" DESTDIR="$pkgdir" install-cli install-lib-shared - - if [ "$_depth" -eq '10' ] - then - mv "${pkgdir}/usr/bin/xavs2" "${pkgdir}/usr/bin/xavs2-${_depth}bit" - fi - done + make -C build-8bit/build/linux DESTDIR="$pkgdir" install-cli install-lib-shared } diff --git a/xavs2-1.0-disable-10bit.patch b/xavs2-1.0-disable-10bit.patch deleted file mode 100644 index cf40ff42677f..000000000000 --- a/xavs2-1.0-disable-10bit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 074a1cb4a5b01ddf6577cbb6cf511d15f298855a Mon Sep 17 00:00:00 2001 -From: luofl <falei.luo@gmail.com> -Date: Sat, 28 Jul 2018 18:50:51 +0800 -Subject: [PATCH] Disable `10-bit` in configure to avoid misleading errors. - ---- - build/linux/configure | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/build/linux/configure b/build/linux/configure -index 6aacf67..637188e 100755 ---- a/build/linux/configure -+++ b/build/linux/configure -@@ -496,6 +496,9 @@ for opt do - if [ "$bit_depth" -lt "8" -o "$bit_depth" -gt "10" ]; then - echo "Supplied bit depth must be in range [8,10]." - exit 1 -+ elif [[ "$bit_depth" = "9" || "$bit_depth" = "10" ]]; then -+ echo "BitDepth $bit_depth not supported currently." -+ exit 1 - fi - bit_depth=`expr $bit_depth + 0` - ;; |