From 8d91d7b1327bc646234945a3472bcef20d86e07f Mon Sep 17 00:00:00 2001 From: uglyside Date: Sun, 9 Feb 2025 12:19:37 +0300 Subject: [PATCH] davs2-1.7.0 --- multimedia/video/davs2/actions.py | 22 ++- .../davs2/files/davs2-1.6-gcc8-fix.patch | 180 ------------------ multimedia/video/davs2/pspec.xml | 19 +- 3 files changed, 23 insertions(+), 198 deletions(-) delete mode 100644 multimedia/video/davs2/files/davs2-1.6-gcc8-fix.patch diff --git a/multimedia/video/davs2/actions.py b/multimedia/video/davs2/actions.py index 20133b02de..9cb61deed4 100755 --- a/multimedia/video/davs2/actions.py +++ b/multimedia/video/davs2/actions.py @@ -4,25 +4,27 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get +WorkDir = "%s-%s/build/linux" % (get.srcNAME(), get.srcVERSION()) + +y = ''.join([ + ' --prefix=/usr', + ' --chroma-format=\'all\'', + ' --extra-ldflags=\'-Wl,-z,noexecstack\'', + ' --enable-shared', + ' --disable-static ' + ]) + def setup(): - shelltools.system("patch -p1 --binary < davs2-1.6-gcc8-fix.patch") - shelltools.cd("build/linux") - autotools.configure("--extra-ldflags='-Wl,-z,noexecstack' \ - --chroma-format='all' \ - --enable-shared ") + autotools.rawConfigure(y) def build(): - shelltools.cd("build/linux") autotools.make() def install(): - shelltools.cd("build/linux") autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - shelltools.cd("../..") - pisitools.dodoc("COPYING", "README.md") + pisitools.dodoc("../../COPYING") diff --git a/multimedia/video/davs2/files/davs2-1.6-gcc8-fix.patch b/multimedia/video/davs2/files/davs2-1.6-gcc8-fix.patch deleted file mode 100644 index 592a8cd3ad..0000000000 --- a/multimedia/video/davs2/files/davs2-1.6-gcc8-fix.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 00ef2c8062a7f7d7265d933676fb5cc60f1ea659 Mon Sep 17 00:00:00 2001 -From: Daniel Bermond -Date: Tue, 20 Nov 2018 16:54:25 +0000 -Subject: [PATCH] Make AVX symbols to be strictly visible (fix build with gcc8) - -_mm256_insertf128_si256 and _mm256_castsi128_si256 are undeclared -in the scope of source/common/vec/intrinsic.h, which seems to be -strictly not permitted by gcc8. - -Fixes #9 ---- - source/common/vec/intrinsic_deblock_avx2.cc | 5 ++--- - source/common/vec/intrinsic_idct_avx2.cc | 6 +++--- - source/common/vec/intrinsic_inter_pred.cc | 6 +++--- - source/common/vec/intrinsic_inter_pred_avx2.cc | 7 ++++--- - source/common/vec/intrinsic_intra-pred_avx2.cc | 6 +++--- - source/common/vec/intrinsic_pixel_avx.cc | 6 +++--- - source/common/vec/intrinsic_sao_avx2.cc | 6 +++--- - 7 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/source/common/vec/intrinsic_deblock_avx2.cc b/source/common/vec/intrinsic_deblock_avx2.cc -index b87e472..ca9534e 100644 ---- a/source/common/vec/intrinsic_deblock_avx2.cc -+++ b/source/common/vec/intrinsic_deblock_avx2.cc -@@ -30,15 +30,14 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" - - #if !HIGH_BIT_DEPTH - __m128i c_0_128; -diff --git a/source/common/vec/intrinsic_idct_avx2.cc b/source/common/vec/intrinsic_idct_avx2.cc -index 0b40fde..ee5384d 100644 ---- a/source/common/vec/intrinsic_idct_avx2.cc -+++ b/source/common/vec/intrinsic_idct_avx2.cc -@@ -30,15 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" -+ - /* disable warnings */ - #pragma warning(disable:4127) // warning C4127: 条件表达式是常量 - -diff --git a/source/common/vec/intrinsic_inter_pred.cc b/source/common/vec/intrinsic_inter_pred.cc -index 46c0da8..55ff6a0 100644 ---- a/source/common/vec/intrinsic_inter_pred.cc -+++ b/source/common/vec/intrinsic_inter_pred.cc -@@ -30,15 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" -+ - #if !HIGH_BIT_DEPTH - /* --------------------------------------------------------------------------- - */ -diff --git a/source/common/vec/intrinsic_inter_pred_avx2.cc b/source/common/vec/intrinsic_inter_pred_avx2.cc -index 6f35771..05f6957 100644 ---- a/source/common/vec/intrinsic_inter_pred_avx2.cc -+++ b/source/common/vec/intrinsic_inter_pred_avx2.cc -@@ -30,14 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include -+ -+#include "../common.h" -+#include "intrinsic.h" -+ - #pragma warning(disable:4127) // warning C4127: 条件表达式是常量 - - #if !HIGH_BIT_DEPTH -diff --git a/source/common/vec/intrinsic_intra-pred_avx2.cc b/source/common/vec/intrinsic_intra-pred_avx2.cc -index 6440929..1357bdb 100644 ---- a/source/common/vec/intrinsic_intra-pred_avx2.cc -+++ b/source/common/vec/intrinsic_intra-pred_avx2.cc -@@ -30,15 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" -+ - #if !HIGH_BIT_DEPTH - - void intra_pred_ver_avx(pel_t *src, pel_t *dst, int i_dst, int dir_mode, int bsx, int bsy) -diff --git a/source/common/vec/intrinsic_pixel_avx.cc b/source/common/vec/intrinsic_pixel_avx.cc -index 813a36f..fba7e46 100644 ---- a/source/common/vec/intrinsic_pixel_avx.cc -+++ b/source/common/vec/intrinsic_pixel_avx.cc -@@ -30,15 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" -+ - /* --------------------------------------------------------------------------- - */ - void *davs2_memzero_aligned_c_avx(void *dst, size_t n) -diff --git a/source/common/vec/intrinsic_sao_avx2.cc b/source/common/vec/intrinsic_sao_avx2.cc -index 11be4d3..bb0c4aa 100644 ---- a/source/common/vec/intrinsic_sao_avx2.cc -+++ b/source/common/vec/intrinsic_sao_avx2.cc -@@ -30,15 +30,15 @@ - * For more information, contact us at sswang @ pku.edu.cn. - */ - --#include "../common.h" --#include "intrinsic.h" -- - #include - #include - #include - #include - #include - -+#include "../common.h" -+#include "intrinsic.h" -+ - #if !HIGH_BIT_DEPTH - #ifdef _MSC_VER - #pragma warning(disable:4244) // TODO: 修正编译warning diff --git a/multimedia/video/davs2/pspec.xml b/multimedia/video/davs2/pspec.xml index 8870fae38b..a3eef93ef9 100755 --- a/multimedia/video/davs2/pspec.xml +++ b/multimedia/video/davs2/pspec.xml @@ -8,18 +8,15 @@ Mathias Freire mathiasfreire45@gmail.com - GPL + GPLv2 library multimedia.video - Open-Source decoder of AVS2-P2/IEEE1857.4 video coding standard + Open-Source decoder of AVS2-P2/IEEE1857.4 video coding standard. davs2 is an open-source decoder of AVS2-P2/IEEE1857.4 video coding standard. - https://github.com/pkuvcl/davs2/archive/1.6.tar.gz + https://github.com/pkuvcl/davs2/archive/1.7/davs2-1.7.tar.gz yasm-devel - - davs2-1.6-gcc8-fix.patch - @@ -42,11 +39,18 @@ /usr/include - /usr/lib/pkgconfig + /usr/lib/pkgconfig + + 2025-02-09 + 1.7 + Version bump. + Idris Kalp + idriskalp@gmail.com + 2020-01-12 1.6 @@ -56,4 +60,3 @@ -