Updated to version 1.6

2 files changed, 13 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5ed5170dfde..8acd33d1a07f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = davs2
 	pkgdesc = Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard
-	pkgver = 1.0
-	pkgrel = 4
+	pkgver = 1.6
+	pkgrel = 1
 	url = https://github.com/pkuvcl/davs2/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gcc7
 	makedepends = yasm
-	makedepends = l-smash
 	depends = glibc
-	depends = liblsmash.so
 	provides = libdavs2
 	conflicts = libdavs2
 	replaces = libdavs2
-	source = davs2-1.0.tar.gz::https://github.com/pkuvcl/davs2/archive/1.0.tar.gz
+	source = davs2-1.6.tar.gz::https://github.com/pkuvcl/davs2/archive/1.6.tar.gz
 	source = davs2-1.0-add-linux-support.patch
-	sha256sums = 1b8bd800f7c4d63e904a4355de0144c55d427d3f1477064b53de1c3e028d9eaa
+	sha256sums = de93800f016cbaf08cb40184a8069050dc625da5240a528155137052d1cf81c8
 	sha256sums = 66166908defadbac7bbaab44a2eaab09af9f6b9ad37c035772e32a6a09c0b605
 
 pkgname = davs2
diff --git a/PKGBUILD b/PKGBUILD
index 1a03be1321a0..f358df0df1b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,55 +5,44 @@
 # https://github.com/pkuvcl/davs2/issues/4
 
 pkgname=davs2
-pkgver=1.0
-pkgrel=4
+pkgver=1.6
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard'
 url='https://github.com/pkuvcl/davs2/'
 license=('GPL')
-depends=('glibc' 'liblsmash.so')
-makedepends=('gcc7' 'yasm' 'l-smash')
+depends=('glibc')
+makedepends=('gcc7' 'yasm')
 provides=('libdavs2')
 conflicts=('libdavs2')
 replaces=('libdavs2')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/pkuvcl/${pkgname}/archive/${pkgver}.tar.gz"
         'davs2-1.0-add-linux-support.patch')
-sha256sums=('1b8bd800f7c4d63e904a4355de0144c55d427d3f1477064b53de1c3e028d9eaa'
+sha256sums=('de93800f016cbaf08cb40184a8069050dc625da5240a528155137052d1cf81c8'
             '66166908defadbac7bbaab44a2eaab09af9f6b9ad37c035772e32a6a09c0b605')
 
 prepare() {
     cd "${pkgname}-${pkgver}"
     
-    # add linux support
-    sed -i $'s/\r$//' source/common/vec/intrinsic_sao_avx2.cc
-    patch -Np1 -i "${srcdir}/davs2-1.0-add-linux-support.patch"
-    
     # use gcc7 (it does not build with gcc8)
     sed -i 's/g++/g++-7/' build/linux/configure
-    
-    # must copy the entire source tree or it will not work
-    cd "$srcdir"
-    cp -af "${pkgname}-${pkgver}" build-8bit
 }
 
 build() {
-    cd build-8bit/build/linux
+    cd "${pkgname}-${pkgver}/build/linux"
     
     ./configure \
         --prefix='/usr' \
         --enable-shared \
+        --disable-static \
         --bit-depth='8' \
         --chroma-format='all' \
         --enable-lto \
-        --enable-pic \
-        --disable-swscale \
-        --disable-lavf \
-        --disable-ffms \
-        --disable-gpac
+        --enable-pic
         
     make
 }
 
 package() {
-    make -C build-8bit/build/linux DESTDIR="$pkgdir" install-cli install-lib-shared
+    make -C "${pkgname}-${pkgver}/build/linux" DESTDIR="$pkgdir" install-cli install-lib-shared
 }