Match latest upstream changes

3 files changed, 16 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d86e0149360..0e6dce0b5abb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = uavs3d-git
 	pkgdesc = An AVS3 decoder supporting AVS3-P2 baseline profile (git version)
-	pkgver = 1.1.r3.gbdd82f2
+	pkgver = 1.1.r39.g15cee5f
 	pkgrel = 1
 	url = https://github.com/uavs3/uavs3d/
 	arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = uavs3d-git
 	source = git+https://github.com/uavs3/uavs3d.git
 	source = 010-uavs3d-10bit.patch
 	sha256sums = SKIP
-	sha256sums = 44c5880aad6ae7891c761dfbcc3ea6c0304e5272953275167054904349bd901f
+	sha256sums = 4cf38433b65937565935b922201e539eb0f5fd0ef32970b78b25f08c8e4519f1
 
 pkgname = uavs3d-git
-
diff --git a/010-uavs3d-10bit.patch b/010-uavs3d-10bit.patch
index c548e07f4e63..649bd09b8002 100644
--- a/010-uavs3d-10bit.patch
+++ b/010-uavs3d-10bit.patch
@@ -1,6 +1,6 @@
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -95,7 +95,7 @@ MESSAGE(STATUS "Target CPU\t\t\t: ${UAVS3D_TARGET_CPU}")
+@@ -104,7 +104,7 @@ MESSAGE(STATUS "Target CPU\t\t\t: ${UAVS3D_TARGET_CPU}")
  find_package(Threads REQUIRED)
  set(prefix "${CMAKE_INSTALL_PREFIX}")
  set(includedir "include")
@@ -9,14 +9,3 @@
  set(pc_file "${CONFIG_DIR}/${LIBNAME}.pc")
  
  set(CMAKE_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${includedir}")
---- a/source/decore/com_def.h
-+++ b/source/decore/com_def.h
-@@ -40,7 +40,7 @@
- 
- #include "com_sys.h"
- 
--#define BIT_DEPTH 8
-+#define BIT_DEPTH 10
- 
- #define CHECK_RAND_STRM 0
- 
diff --git a/PKGBUILD b/PKGBUILD
index 34053f2b9412..aa0b10bfb33a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=uavs3d-git
-pkgver=1.1.r3.gbdd82f2
+pkgver=1.1.r39.g15cee5f
 pkgrel=1
 pkgdesc='An AVS3 decoder supporting AVS3-P2 baseline profile (git version)'
 arch=('x86_64')
@@ -14,9 +14,10 @@ conflicts=('uavs3d')
 source=('git+https://github.com/uavs3/uavs3d.git'
         '010-uavs3d-10bit.patch')
 sha256sums=('SKIP'
-            '44c5880aad6ae7891c761dfbcc3ea6c0304e5272953275167054904349bd901f')
+            '4cf38433b65937565935b922201e539eb0f5fd0ef32970b78b25f08c8e4519f1')
 
 prepare() {
+    [ -d uavs3d-10bit ] && rm -r uavs3d-10bit
     cp -a uavs3d uavs3d-10bit
     patch -d uavs3d-10bit -Np1 -i "${srcdir}/010-uavs3d-10bit.patch"
 }
@@ -26,29 +27,29 @@ pkgver() {
 }
 
 build() {
-    cd uavs3d
-    cmake -B build/linux -S . \
+    cmake -B build -S uavs3d \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_SKIP_RPATH:BOOL='YES' \
         -DBUILD_SHARED_LIBS:BOOL='ON' \
+        -DCOMPILE_10BIT='0' \
         -Wno-dev
-    make -C build/linux
+    make -C build
     
-    cd "${srcdir}/uavs3d-10bit"
-    cmake -B build/linux -S . \
+    cmake -B build-10bit -S uavs3d-10bit \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
         -DCMAKE_SKIP_RPATH:BOOL='YES' \
         -DBUILD_SHARED_LIBS:BOOL='ON' \
+        -DCOMPILE_10BIT='1' \
         -Wno-dev
-    make -C build/linux
+    make -C build-10bit
 }
 
 package() {
-    make -C uavs3d/build/linux DESTDIR="$pkgdir" install
-    make -C uavs3d-10bit/build/linux DESTDIR="$pkgdir" install
-    install -D -m755 uavs3d/build/linux/uavs3dec -t "${pkgdir}/usr/bin"
-    install -D -m755 uavs3d-10bit/build/linux/uavs3dec "${pkgdir}/usr/bin/uavs3dec-10bit"
+    make -C build DESTDIR="$pkgdir" install
+    make -C build-10bit DESTDIR="$pkgdir" install
+    install -D -m755 build/uavs3dec -t "${pkgdir}/usr/bin"
+    install -D -m755 build-10bit/uavs3dec "${pkgdir}/usr/bin/uavs3dec-10bit"
     install -D -m644 uavs3d/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }