* [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/
@ 2016-10-14 16:20 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-10-14 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 62d6aa651cc9cba85937b117a0d8a00e24cf0f22
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 16:20:12 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 16:20:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d6aa65
media-libs/kvazaar: Bump to 1.0.0.
Fix tests by downloading greatest, bug #595932
Package-Manager: portage-2.3.2
media-libs/kvazaar/Manifest | 2 ++
media-libs/kvazaar/files/multilib.patch | 15 +++++++++++++++
.../{kvazaar-9999.ebuild => kvazaar-1.0.0.ebuild} | 19 ++++++++++++++-----
media-libs/kvazaar/kvazaar-9999.ebuild | 17 ++++++++++++-----
4 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 10fb437..63b16fc 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1 +1,3 @@
+DIST greatest-1.2.1.tar.gz 19792 SHA256 e3c1211ec5dfea61092833bca56c6a14620ac23aa0d53940d99943587cbe1677 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 WHIRLPOOL b4e01659539e02224d5396609ba73715eca1391e9da165ac22cf28f25c13cf89a9c4059cfe3f88e1d88d06e35153f7d1d3e012433b9b4f4deaa2a464e6d6b7ca
DIST kvazaar-0.8.3.tar.gz 429852 SHA256 a5cebc313bc2edcf631684e67c33227e56d803bfbc940cf8c2f3906b4f543a12 SHA512 7de2c311c75b77d1f9a95f1de79212560b86bd6f8d7ae743240ff33cec52ecb2837be7984f12fe617560445838381ada245196bf1bf67eeb3861f025998fdf60 WHIRLPOOL 1fdcf9835aca8a4d4261c184e957abcc4fa21df5e3d0520a63e95dfc800d086dc6ae5f70fc4110db232a013f84205230f1c5e2043f57db21cc100b33ef504d05
+DIST kvazaar-1.0.0.tar.gz 473495 SHA256 40eb7b4b23897299e99050f0c011e9380cf898b25615dd143f018b278b972a46 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340 WHIRLPOOL ed0c6332c5a1efa88b569845f2cb5436881c3866e381369d770a3393d61e37605ad5c114dcbdae424035f451ceea5ab1ee0787769c9bf44fc44bbd2815e87ed7
diff --git a/media-libs/kvazaar/files/multilib.patch b/media-libs/kvazaar/files/multilib.patch
new file mode 100644
index 00000000..fb0711d
--- /dev/null
+++ b/media-libs/kvazaar/files/multilib.patch
@@ -0,0 +1,15 @@
+https://github.com/ultravideo/kvazaar/pull/141
+
+Index: kvazaar-1.0.0/src/global.h
+===================================================================
+--- kvazaar-1.0.0.orig/src/global.h
++++ kvazaar-1.0.0/src/global.h
+@@ -253,7 +253,7 @@ typedef enum { COLOR_Y = 0, COLOR_U, COL
+
+
+ // Hardware data (abstraction of defines). Extend for other compilers
+-#if defined(_M_IX86) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
++#if defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
+ # define COMPILE_INTEL 1
+ #else
+ # define COMPILE_INTEL 0
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-1.0.0.ebuild
similarity index 62%
copy from media-libs/kvazaar/kvazaar-9999.ebuild
copy to media-libs/kvazaar/kvazaar-1.0.0.ebuild
index 4d22819..ef87a92 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.0.0.ebuild
@@ -6,25 +6,29 @@ EAPI=5
SCM=""
+GREATEST_PV="1.2.1"
+
if [ "${PV#9999}" != "${PV}" ] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
fi
-inherit multilib autotools multilib-minimal toolchain-funcs ${SCM}
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
DESCRIPTION="An open-source HEVC encoder"
HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
if [ "${PV#9999}" = "${PV}" ] ; then
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
KEYWORDS="~amd64 ~ppc"
fi
LICENSE="LGPL-2.1"
# subslot = libkvazaar major
SLOT="0/3"
-IUSE="cpu_flags_x86_avx2 static-libs"
+IUSE="static-libs test"
+REQUIRED_USE="test? ( static-libs )"
DEPEND=""
RDEPEND="${DEPEND}"
@@ -35,15 +39,20 @@ DEPEND="${DEPEND}
abi_x86_64? ( ${ASM_DEP} )"
src_prepare() {
+ epatch "${FILESDIR}/multilib.patch"
eautoreconf
+ if use test ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=595932
+ rmdir "${S}/greatest" || die
+ mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+ fi
}
multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
--docdir "/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_avx2 asm)
+ $(use_enable static-libs static)
}
multilib_src_install_all() {
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index 4d22819..7f8fec2 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -6,25 +6,28 @@ EAPI=5
SCM=""
+GREATEST_PV="1.2.1"
+
if [ "${PV#9999}" != "${PV}" ] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
fi
-inherit multilib autotools multilib-minimal toolchain-funcs ${SCM}
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
DESCRIPTION="An open-source HEVC encoder"
HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
if [ "${PV#9999}" = "${PV}" ] ; then
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
KEYWORDS="~amd64 ~ppc"
fi
LICENSE="LGPL-2.1"
# subslot = libkvazaar major
SLOT="0/3"
-IUSE="cpu_flags_x86_avx2 static-libs"
+IUSE="static-libs test"
DEPEND=""
RDEPEND="${DEPEND}"
@@ -36,14 +39,18 @@ DEPEND="${DEPEND}
src_prepare() {
eautoreconf
+ if use test ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=595932
+ rmdir "${S}/greatest" || die
+ mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+ fi
}
multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
--docdir "/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_avx2 asm)
+ $(use_enable static-libs static)
}
multilib_src_install_all() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/
@ 2017-06-16 9:36 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-06-16 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 0ef1e5f072a695444bdfe65e8bb1e59291ca0288
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 09:16:38 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 09:36:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef1e5f0
media-libs/kvazaar: remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/kvazaar/Manifest | 1 -
media-libs/kvazaar/files/ppc.patch | 19 ------------
media-libs/kvazaar/kvazaar-0.8.3.ebuild | 51 ---------------------------------
3 files changed, 71 deletions(-)
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 97f0d7f0d2c..948a9e8db7f 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,4 +1,3 @@
DIST greatest-1.2.1.tar.gz 19792 SHA256 e3c1211ec5dfea61092833bca56c6a14620ac23aa0d53940d99943587cbe1677 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 WHIRLPOOL b4e01659539e02224d5396609ba73715eca1391e9da165ac22cf28f25c13cf89a9c4059cfe3f88e1d88d06e35153f7d1d3e012433b9b4f4deaa2a464e6d6b7ca
-DIST kvazaar-0.8.3.tar.gz 429852 SHA256 a5cebc313bc2edcf631684e67c33227e56d803bfbc940cf8c2f3906b4f543a12 SHA512 7de2c311c75b77d1f9a95f1de79212560b86bd6f8d7ae743240ff33cec52ecb2837be7984f12fe617560445838381ada245196bf1bf67eeb3861f025998fdf60 WHIRLPOOL 1fdcf9835aca8a4d4261c184e957abcc4fa21df5e3d0520a63e95dfc800d086dc6ae5f70fc4110db232a013f84205230f1c5e2043f57db21cc100b33ef504d05
DIST kvazaar-1.0.0.tar.gz 473495 SHA256 40eb7b4b23897299e99050f0c011e9380cf898b25615dd143f018b278b972a46 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340 WHIRLPOOL ed0c6332c5a1efa88b569845f2cb5436881c3866e381369d770a3393d61e37605ad5c114dcbdae424035f451ceea5ab1ee0787769c9bf44fc44bbd2815e87ed7
DIST kvazaar-1.1.0.tar.gz 484601 SHA256 8e382738a51004bfcfca4c832e8b41fe6a17f889f3c39151dc1c1a37261a3a6d SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9 WHIRLPOOL c37df11389c237af2c31cfcdbb6244c7e87f4d95f5550ee46e5f27c6eca39dd0328aaa81fbef3d555fc869072ac2226efb71566b7ca7ddda11bab3508d1f2caf
diff --git a/media-libs/kvazaar/files/ppc.patch b/media-libs/kvazaar/files/ppc.patch
deleted file mode 100644
index 9ee9f70e49f..00000000000
--- a/media-libs/kvazaar/files/ppc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 99e37ec23532a247b9e306ef87e9879385c625d8
-Author: Ari Lemmetti <ari.lemmetti@gmail.com>
-Date: Sat Jan 30 19:33:09 2016 +0200
-
- Update old pixel type to the current one
-
-diff --git a/src/strategies/altivec/picture-altivec.c b/src/strategies/altivec/picture-altivec.c
-index 7c9d1fb..28e86e8 100644
---- a/src/strategies/altivec/picture-altivec.c
-+++ b/src/strategies/altivec/picture-altivec.c
-@@ -28,7 +28,7 @@
- #include <stdlib.h>
-
-
--static unsigned reg_sad_altivec(const pixel * const data1, const pixel * const data2,
-+static unsigned reg_sad_altivec(const kvz_pixel * const data1, const kvz_pixel * const data2,
- const int width, const int height, const unsigned stride1, const unsigned stride2)
- {
- vector unsigned int vsad = {0,0,0,0}, vzero = {0,0,0,0};
diff --git a/media-libs/kvazaar/kvazaar-0.8.3.ebuild b/media-libs/kvazaar/kvazaar-0.8.3.ebuild
deleted file mode 100644
index 53dc8fab282..00000000000
--- a/media-libs/kvazaar/kvazaar-0.8.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
-fi
-
-inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="An open-source HEVC encoder"
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-# subslot = libkvazaar major
-SLOT="0/3"
-IUSE="cpu_flags_x86_avx2 static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${DEPEND}
- abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-
-src_prepare() {
- epatch "${FILESDIR}/ppc.patch"
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf \
- --docdir "/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_avx2 asm)
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/
@ 2017-06-16 9:36 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-06-16 9:36 UTC (permalink / raw
To: gentoo-commits
commit: bb4c53415c23a7a2e70f97f0690afad9ea06bb8f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 09:15:58 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 09:36:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4c5341
media-libs/kvazaar: backport upstream fix to build with gcc7.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/kvazaar/files/gcc7.patch | 46 +++++++++++++++++++++++++++++++++
media-libs/kvazaar/kvazaar-1.1.0.ebuild | 1 +
2 files changed, 47 insertions(+)
diff --git a/media-libs/kvazaar/files/gcc7.patch b/media-libs/kvazaar/files/gcc7.patch
new file mode 100644
index 00000000000..12ff8ad00ff
--- /dev/null
+++ b/media-libs/kvazaar/files/gcc7.patch
@@ -0,0 +1,46 @@
+commit 47a9f0de049e77e866ea5bdd4bc7c795ea6dd641
+Author: Ari Lemmetti <ari.lemmetti@gmail.com>
+Date: Tue Apr 11 12:57:22 2017 +0300
+
+ Modify and use FILL_ARRAY macro to prevent warning on GCC 7
+
+ Following warning was given and is false positive
+
+ error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
+
+diff --git a/src/global.h b/src/global.h
+index bedcd49..5181674 100644
+--- a/src/global.h
++++ b/src/global.h
+@@ -219,7 +219,11 @@ typedef int16_t coeff_t;
+ // Fill a structure or a static array with val bytes.
+ #define FILL(var, val) memset(&(var), (val), sizeof(var))
+ // Fill a number of elements in an array with val bytes.
+-#define FILL_ARRAY(ar, val, size) memset((ar), (val), (size) * sizeof(*(ar)))
++#define FILL_ARRAY(ar, val, size) \
++{\
++ void *temp_ptr = (void*)(ar);\
++ memset((temp_ptr), (val), (size) * sizeof(*(ar)));\
++}
+
+ #define FREE_POINTER(pointer) { free((void*)pointer); pointer = NULL; }
+ #define MOVE_POINTER(dst_pointer,src_pointer) { dst_pointer = src_pointer; src_pointer = NULL; }
+diff --git a/src/rdo.c b/src/rdo.c
+index 52305fd..2579f28 100644
+--- a/src/rdo.c
++++ b/src/rdo.c
+@@ -558,10 +558,10 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff,
+ // Explicitly tell the only possible numbers of elements to be zeroed.
+ // Hope the compiler is able to utilize this information.
+ switch (cg_num) {
+- case 1: memset(sig_coeffgroup_flag, 0, 1 * sizeof(sig_coeffgroup_flag[0])); break;
+- case 4: memset(sig_coeffgroup_flag, 0, 4 * sizeof(sig_coeffgroup_flag[0])); break;
+- case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break;
+- case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break;
++ case 1: FILL_ARRAY(sig_coeffgroup_flag, 0, 1); break;
++ case 4: FILL_ARRAY(sig_coeffgroup_flag, 0, 4); break;
++ case 16: FILL_ARRAY(sig_coeffgroup_flag, 0, 16); break;
++ case 64: FILL_ARRAY(sig_coeffgroup_flag, 0, 64); break;
+ default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups");
+ }
+
diff --git a/media-libs/kvazaar/kvazaar-1.1.0.ebuild b/media-libs/kvazaar/kvazaar-1.1.0.ebuild
index 750b6feced9..959e9d94b3d 100644
--- a/media-libs/kvazaar/kvazaar-1.1.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.1.0.ebuild
@@ -38,6 +38,7 @@ DEPEND="${DEPEND}
abi_x86_64? ( ${ASM_DEP} )"
src_prepare() {
+ epatch "${FILESDIR}/gcc7.patch"
eautoreconf
if use test && [ "${PV#9999}" = "${PV}" ]; then
# https://bugs.gentoo.org/show_bug.cgi?id=595932
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/
@ 2019-06-27 17:21 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 17:21 UTC (permalink / raw
To: gentoo-commits
commit: f0f3677537f204ec4473b3b4b37d30276b890271
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 17:02:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 17:18:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f36775
media-libs/kvazaar: Drop old
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/kvazaar/Manifest | 1 -
media-libs/kvazaar/files/gcc7.patch | 46 -------------------------
media-libs/kvazaar/kvazaar-1.1.0.ebuild | 60 ---------------------------------
media-libs/kvazaar/kvazaar-1.2.0.ebuild | 55 ------------------------------
4 files changed, 162 deletions(-)
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index a1c41dca370..2fa789b2afd 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,3 +1,2 @@
DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
-DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
diff --git a/media-libs/kvazaar/files/gcc7.patch b/media-libs/kvazaar/files/gcc7.patch
deleted file mode 100644
index 12ff8ad00ff..00000000000
--- a/media-libs/kvazaar/files/gcc7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 47a9f0de049e77e866ea5bdd4bc7c795ea6dd641
-Author: Ari Lemmetti <ari.lemmetti@gmail.com>
-Date: Tue Apr 11 12:57:22 2017 +0300
-
- Modify and use FILL_ARRAY macro to prevent warning on GCC 7
-
- Following warning was given and is false positive
-
- error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
-
-diff --git a/src/global.h b/src/global.h
-index bedcd49..5181674 100644
---- a/src/global.h
-+++ b/src/global.h
-@@ -219,7 +219,11 @@ typedef int16_t coeff_t;
- // Fill a structure or a static array with val bytes.
- #define FILL(var, val) memset(&(var), (val), sizeof(var))
- // Fill a number of elements in an array with val bytes.
--#define FILL_ARRAY(ar, val, size) memset((ar), (val), (size) * sizeof(*(ar)))
-+#define FILL_ARRAY(ar, val, size) \
-+{\
-+ void *temp_ptr = (void*)(ar);\
-+ memset((temp_ptr), (val), (size) * sizeof(*(ar)));\
-+}
-
- #define FREE_POINTER(pointer) { free((void*)pointer); pointer = NULL; }
- #define MOVE_POINTER(dst_pointer,src_pointer) { dst_pointer = src_pointer; src_pointer = NULL; }
-diff --git a/src/rdo.c b/src/rdo.c
-index 52305fd..2579f28 100644
---- a/src/rdo.c
-+++ b/src/rdo.c
-@@ -558,10 +558,10 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff,
- // Explicitly tell the only possible numbers of elements to be zeroed.
- // Hope the compiler is able to utilize this information.
- switch (cg_num) {
-- case 1: memset(sig_coeffgroup_flag, 0, 1 * sizeof(sig_coeffgroup_flag[0])); break;
-- case 4: memset(sig_coeffgroup_flag, 0, 4 * sizeof(sig_coeffgroup_flag[0])); break;
-- case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break;
-- case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break;
-+ case 1: FILL_ARRAY(sig_coeffgroup_flag, 0, 1); break;
-+ case 4: FILL_ARRAY(sig_coeffgroup_flag, 0, 4); break;
-+ case 16: FILL_ARRAY(sig_coeffgroup_flag, 0, 16); break;
-+ case 64: FILL_ARRAY(sig_coeffgroup_flag, 0, 64); break;
- default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups");
- }
-
diff --git a/media-libs/kvazaar/kvazaar-1.1.0.ebuild b/media-libs/kvazaar/kvazaar-1.1.0.ebuild
deleted file mode 100644
index 88a19051ba6..00000000000
--- a/media-libs/kvazaar/kvazaar-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-
-GREATEST_PV="1.2.1"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
-fi
-
-inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="An open-source HEVC encoder"
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="LGPL-2.1"
-# subslot = libkvazaar major
-SLOT="0/3"
-IUSE="static-libs test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-REQUIRED_USE="test? ( static-libs )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${DEPEND}
- abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-
-src_prepare() {
- epatch "${FILESDIR}/gcc7.patch"
- eautoreconf
- if use test && [ "${PV#9999}" = "${PV}" ]; then
- # https://bugs.gentoo.org/show_bug.cgi?id=595932
- rmdir "${S}/greatest" || die
- mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf \
- --disable-werror \
- --docdir "/usr/share/doc/${PF}" \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/kvazaar/kvazaar-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild
deleted file mode 100644
index 48ce175d048..00000000000
--- a/media-libs/kvazaar/kvazaar-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GREATEST_PV="1.2.1"
-
-if [[ ${PV} = *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
-else
- SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Open-source HEVC encoder"
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
-
-LICENSE="LGPL-2.1"
-# subslot = libkvazaar major
-SLOT="0/4"
-IUSE="static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
- abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )
-"
-
-src_prepare() {
- default
- sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
- eautoreconf
- if use test && [[ ${PV} != *9999 ]]; then
- # https://bugs.gentoo.org/show_bug.cgi?id=595932
- rmdir "${S}/greatest" || die
- mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
- fi
- # Some m4 macros append Werror, we do not want that.
- append-flags "-Wno-error"
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-werror \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/
@ 2023-12-19 5:23 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-12-19 5:23 UTC (permalink / raw
To: gentoo-commits
commit: df5ac2edd5156386f46f4335bc6e5003e9e3eb42
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 19 01:25:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 05:22:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df5ac2ed
media-libs/kvazaar: add patch to fix tests on big-endian
Trivial fix and only affects BE so no revbump.
See: https://github.com/ultravideo/kvazaar/pull/377
Bug: https://bugs.gentoo.org/902217
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34364
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/kvazaar-2.2.0-backport-pr377.patch | 32 ++++++++++++++++++++++
media-libs/kvazaar/kvazaar-2.2.0.ebuild | 2 ++
2 files changed, 34 insertions(+)
diff --git a/media-libs/kvazaar/files/kvazaar-2.2.0-backport-pr377.patch b/media-libs/kvazaar/files/kvazaar-2.2.0-backport-pr377.patch
new file mode 100644
index 000000000000..ef1711cf5cb2
--- /dev/null
+++ b/media-libs/kvazaar/files/kvazaar-2.2.0-backport-pr377.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/902217
+https://github.com/ultravideo/kvazaar/pull/377
+
+From e19b7925d910e4b77fc5a46d92de0f2563a7e506 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Wed, 29 Nov 2023 10:58:08 -0500
+Subject: [PATCH] Don't export MD5 byteReverse symbol on big-endian
+
+Otherwise this fails the test which checks that all exported symbols
+begin with kvz_ prefix.
+---
+ src/extras/libmd5.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/extras/libmd5.c b/src/extras/libmd5.c
+index b06b291eb..8a437da68 100644
+--- a/src/extras/libmd5.c
++++ b/src/extras/libmd5.c
+@@ -27,11 +27,11 @@ static void MD5Transform(uint32_t buf[4], uint32_t const in[16]);
+ #ifndef __BIG_ENDIAN__
+ # define byteReverse(buf, len) /* Nothing */
+ #else
+-void byteReverse(uint32_t *buf, unsigned len);
++static void byteReverse(uint32_t *buf, unsigned len);
+ /*
+ * Note: this code is harmless on little-endian machines.
+ */
+-void byteReverse(uint32_t *buf, unsigned len)
++static void byteReverse(uint32_t *buf, unsigned len)
+ {
+ uint32_t t;
+ do {
diff --git a/media-libs/kvazaar/kvazaar-2.2.0.ebuild b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
index 883e811045da..ebd8066837bd 100644
--- a/media-libs/kvazaar/kvazaar-2.2.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.2.0.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
abi_x86_64? ( ${ASM_DEP} )
"
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-backport-pr377.patch" )
+
src_prepare() {
default
sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-19 5:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-27 17:21 [gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/files/, media-libs/kvazaar/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 5:23 Sam James
2017-06-16 9:36 Alexis Ballier
2017-06-16 9:36 Alexis Ballier
2016-10-14 16:20 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox