diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-libs/libdvbcsa | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'media-libs/libdvbcsa')
| -rw-r--r-- | media-libs/libdvbcsa/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libdvbcsa/files/altivec.patch | 33 | ||||
| -rw-r--r-- | media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild | 8 |
3 files changed, 42 insertions, 2 deletions
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest index a2292244bedb..9e485bcb3dcb 100644 --- a/media-libs/libdvbcsa/Manifest +++ b/media-libs/libdvbcsa/Manifest @@ -1,4 +1,5 @@ +AUX altivec.patch 1627 BLAKE2B 306742b8fea3fcbf21bf7839c05252284c4d05f33022f1f5655a633b421b1e3ae5db165dc870d4c1f2706620d6c0618bae8ca7a730da453332d4641610a4dbeb SHA512 290ac3aa86a932923c3332b7bcc910907e07dfc5a401d28ca8918b3b90b3d40a24724d8ffc18ead1ed6c5b9fa4cc2c886bcbea78f4528fb2e18fc7cf113ee6f2 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015 -EBUILD libdvbcsa-1.1.0-r1.ebuild 929 BLAKE2B 1ae4d5ca06732c7f4a26ea5971a2f9ca45c9fa97246952e57886e28d810406253cea97cbd2b3e5efaddfd91f800cfd617dc4efe09bb0cc3418148b8252b1756b SHA512 a11adb8e18b6394337517cc05f71aef069b7b075594df3664eb01b29d5be5846a03173167764de1ce3b2b68dee115d977b0726c6e278cabd04d35513e04cb910 +EBUILD libdvbcsa-1.1.0-r1.ebuild 1174 BLAKE2B f0f20496b3eaf1cab744f9aa8825194881f84c58e3123aea957a528a1549a8ea974464a767c7a3e905b8325dcf680d9fc228938d0d6d9fe0dee30a049e2fde48 SHA512 182d76d45d559fd7c5fe64771270249da3fa701cfa1d05026f475d3ccd93821dfa0013da62c55e8d3ba491931b32389580bcfc8eb1876cd0f7ca0bfc4d27c8d5 EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc diff --git a/media-libs/libdvbcsa/files/altivec.patch b/media-libs/libdvbcsa/files/altivec.patch new file mode 100644 index 000000000000..3605c146a794 --- /dev/null +++ b/media-libs/libdvbcsa/files/altivec.patch @@ -0,0 +1,33 @@ +Fix compile on powerpc64/powerpc64le w/ altivec + +Correct the type of some vectors passed to vec_slo() or vec_sro(), which only +takes a char vector. + +Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> + +--- a/src/dvbcsa_bs_altivec.h 2016-11-28 14:33:34.410021500 +1100 ++++ b/src/dvbcsa_bs_altivec.h 2016-11-28 14:34:25.442238715 +1100 +@@ -64,7 +64,7 @@ + } + case 0x29: { + dvbcsa_bs_word_t x = vec_splat_u8(10); +- return (dvbcsa_bs_word_t)vec_add(vec_splat_u8(0x1),vec_rl(x,x)); ++ return (dvbcsa_bs_word_t)vec_add((dvbcsa_bs_word_t)vec_splat_u8(0x1),vec_rl(x,x)); + } + case 0x40: { + dvbcsa_bs_word_t x = vec_splat_u8(4); +@@ -99,10 +99,10 @@ + #define SHVAL_14 BS_VAL8(0e) + #define SHVAL_7 BS_VAL8(07) + +-#define BS_SHL(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) +-#define BS_SHR(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) +-#define BS_SHL8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) +-#define BS_SHR8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) ++#define BS_SHL(a, n) ({ vector unsigned char x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) ++#define BS_SHR(a, n) ({ vector unsigned char x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) ++#define BS_SHL8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) ++#define BS_SHR8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) + + #define BS_EXTRACT8(a, n) ((uint8_t*)&(a))[15 - (n)] + diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild index 7b7b9c47a784..f57c4314130e 100644 --- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild +++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild @@ -3,16 +3,22 @@ EAPI=7 +inherit flag-o-matic + DESCRIPTION="Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA" HOMEPAGE="https://www.videolan.org/developers/libdvbcsa.html" SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug" +# https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/ +PATCHES=( "${FILESDIR}/altivec.patch" ) + src_configure() { + use cpu_flags_ppc_altivec && append-cflags '-flax-vector-conversions' # needed for altivec.patch local myeconfargs=( --disable-static $(use_enable cpu_flags_ppc_altivec altivec) |