diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-libs/liboil |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-libs/liboil')
-rw-r--r-- | dev-libs/liboil/Manifest | 7 | ||||
-rw-r--r-- | dev-libs/liboil/files/liboil-0.3.17-amd64-cpuid.patch | 38 | ||||
-rw-r--r-- | dev-libs/liboil/files/liboil-0.3.17-x32.patch | 224 | ||||
-rw-r--r-- | dev-libs/liboil/liboil-0.3.17-r2.ebuild | 56 | ||||
-rw-r--r-- | dev-libs/liboil/metadata.xml | 7 |
5 files changed, 332 insertions, 0 deletions
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest new file mode 100644 index 000000000000..34826f75fadb --- /dev/null +++ b/dev-libs/liboil/Manifest @@ -0,0 +1,7 @@ +AUX liboil-0.3.17-amd64-cpuid.patch 1040 SHA256 6bf12ddbe2f9443b9597abed906ed2d5b82a998e3851c22fc90639b4b2de55ca SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73 WHIRLPOOL ec95328bccc16bec177bfe90456fd7f2e793b34d86e342f18ef4ca3f61f84db3d20e70c061fc87f9846ddcd1892b19eb6c257909a33f2066ac9d543466ce67e4 +AUX liboil-0.3.17-x32.patch 7762 SHA256 d53bf438336b134450ce3de0cb15e695a0179fd7d2d0ac80618d45ab2eca2d05 SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5 WHIRLPOOL 09604399ec3bdd77f45ba572a138b098e9b302d2251d6193c7618f5ab00531cfadb9e4d032fa8d445ae5d6534b1ec23e2dae9ecd1f0ea58b2d00fccd29aabc4a +DIST liboil-0.3.17.tar.gz 912563 SHA256 105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145 WHIRLPOOL ae26cf5b4f5f0b87104c2d5e2dc81d22c9ea4c4fecf4606e03d8b66ad44d5c9ae2330e4d08a9691f205d03c84c249f2374381a4b9d93c345be486cb6d5efa9fe +EBUILD liboil-0.3.17-r2.ebuild 1730 SHA256 80bb1a5a5b674843acfe3e718bf81508b0281fedab71169cd78d2c5164baa23e SHA512 ee62657d621d8b2bf657b0c7e65441ad39bfb295f1056650a3e28b6cbe19884aac9a890c03ee2a4fdf3f716b9bff5e00a4f541538dca5bee5c39f5a9d6d4ac45 WHIRLPOOL d776b3934ca98f5d2c7254e3c63fd5aecfb9347ee6f005619297c704f79617378a888948c2c2283efaca08e573fbb161126f2bd8eceaef26145a5bbe423e4c7e +MISC ChangeLog 3885 SHA256 3daace5170268b25fe5fd531836094b97cc2ee3408e91005c28223f186a2588f SHA512 80ff9d18eade630ac6168531f75452f431f7b0ad0858dbde4742107d07afc6662057dd9d6d3aa149f256408e053ecf9ad88cf98e26786e6e999b5399ac39db34 WHIRLPOOL d275d3fb0c2b0a280ec3136716eb26dc4541ce7ed5bfe5db798dbfdbb0b9ca9513c0ac2930516576705da41d4dc49d8345b0aed7d67cb7553ae822289ee1d2af +MISC ChangeLog-2015 12058 SHA256 4fdbaa71f679df1ff284088bcc8c3b0f2f8cf667c2c38815e8ab2f78513c0a54 SHA512 1560333930da808dbdd066416039110974a1449ce38203a4df0f2b8e02ad2be8d2baa567bf87ef30e52743470643a69eb184d1cc5009d96ff1f7ed46ba8f818a WHIRLPOOL 5b26bca5f6e889fa67b96e74055884f31c5987b8a8417bc6b0f70d628127dc2a55d4a826004219b9005c550d0121c5cad66e4e0b2580ebadb4a1e84bc1056378 +MISC metadata.xml 228 SHA256 a3c8fb486cd4bec96195197f2974a236066bd02c05d29ace05a844a43bbfd66e SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae WHIRLPOOL 4690b7b1591c1f8a8b55f8693dbd5172642a2d377c2f12f3b20dca75a6befc9eeac6eeb7e83ba2332b760d64b5c6fd0ac0000b5a40c416eaeec05f49eb6de750 diff --git a/dev-libs/liboil/files/liboil-0.3.17-amd64-cpuid.patch b/dev-libs/liboil/files/liboil-0.3.17-amd64-cpuid.patch new file mode 100644 index 000000000000..d86dd79c3bcb --- /dev/null +++ b/dev-libs/liboil/files/liboil-0.3.17-amd64-cpuid.patch @@ -0,0 +1,38 @@ +From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 +From: David Schleef <ds@schleef.org> +Date: Tue, 20 Jul 2010 21:05:26 +0000 +Subject: x86: Fix cpuid function on x86-64 + +Fixes: #28956. +--- +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..ef4d3f2 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); +-- +cgit v0.9.0.2-2-gbebe diff --git a/dev-libs/liboil/files/liboil-0.3.17-x32.patch b/dev-libs/liboil/files/liboil-0.3.17-x32.patch new file mode 100644 index 000000000000..416c78757de4 --- /dev/null +++ b/dev-libs/liboil/files/liboil-0.3.17-x32.patch @@ -0,0 +1,224 @@ +http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f3c0a02b920efa5747474b4c65aba12a928e56de + +Upstream-Status: Pending + +Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2011/12/01 + + +Index: liboil-0.3.17/liboil/amd64/wavelet.c +=================================================================== +--- liboil-0.3.17.orig/liboil/amd64/wavelet.c ++++ liboil-0.3.17/liboil/amd64/wavelet.c +@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t + asm volatile ("\n" + " sub $2, %%rcx\n" + "1:\n" +- " movw (%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%0,%%rcx,2)\n" +- " movw 2(%1,%%rcx,4), %%ax\n" +- " movw %%ax, (%2,%%rcx,2)\n" +- " movw 4(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%0,%%rcx,2)\n" +- " movw 6(%1,%%rcx,4), %%ax\n" +- " movw %%ax, 2(%2,%%rcx,2)\n" ++ " movw (%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q0,%%rcx,2)\n" ++ " movw 2(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, (%q2,%%rcx,2)\n" ++ " movw 4(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q0,%%rcx,2)\n" ++ " movw 6(%q1,%%rcx,4), %%ax\n" ++ " movw %%ax, 2(%q2,%%rcx,2)\n" + " sub $2, %%rcx\n" + " jge 1b\n" + : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n) +@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " pslld $16, %%mm0\n" + " pslld $16, %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq (%1,%%rcx,4), %%mm0\n" +- " movq 8(%1,%%rcx,4), %%mm1\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq (%q1,%%rcx,4), %%mm0\n" ++ " movq 8(%q1,%%rcx,4), %%mm1\n" + " psrad $16, %%mm0\n" + " psrad $16, %%mm1\n" + " packssdw %%mm1, %%mm0\n" +- " movq %%mm0, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%0,%%rcx,2)\n" +- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n" +- " movd %%mm0, (%2,%%rcx,2)\n" ++ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q0,%%rcx,2)\n" ++ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n" ++ " movd %%mm0, (%q2,%%rcx,2)\n" + " add $2, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" +- " movq (%1,%%rcx,4), %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm2\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" + " punpcklwd %%mm0, %%mm1\n" + " punpckhwd %%mm0, %%mm2\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm2, %%mm1\n" +- " movq %%mm0, (%0,%%rcx,2)\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_ + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,4), %%mm1\n" ++ " movq (%q1,%%rcx,4), %%mm1\n" + " movq %%mm1, %%mm2\n" +- " movq 8(%1,%%rcx,4), %%mm0\n" +- " movq 16(%1,%%rcx,4), %%mm5\n" ++ " movq 8(%q1,%%rcx,4), %%mm0\n" ++ " movq 16(%q1,%%rcx,4), %%mm5\n" + " punpcklwd %%mm0, %%mm1\n" + " movq %%mm5, %%mm6\n" + " punpckhwd %%mm0, %%mm2\n" +- " movq 24(%1,%%rcx,4), %%mm4\n" ++ " movq 24(%q1,%%rcx,4), %%mm4\n" + " movq %%mm1, %%mm0\n" + " punpcklwd %%mm4, %%mm5\n" + " punpcklwd %%mm2, %%mm0\n" + " punpckhwd %%mm4, %%mm6\n" + " punpckhwd %%mm2, %%mm1\n" + " movq %%mm5, %%mm4\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " punpcklwd %%mm6, %%mm4\n" +- " movq %%mm1, (%2,%%rcx,2)\n" ++ " movq %%mm1, (%q2,%%rcx,2)\n" + " punpckhwd %%mm6, %%mm5\n" +- " movq %%mm4, 8(%0,%%rcx,2)\n" +- " movq %%mm5, 8(%2,%%rcx,2)\n" ++ " movq %%mm4, 8(%q0,%%rcx,2)\n" ++ " movq %%mm5, 8(%q2,%%rcx,2)\n" + " add $8, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%1,%%rcx,2), %%mm0\n" +- " movq (%2,%%rcx,2), %%mm1\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" + " movq %%mm0, %%mm2\n" + " punpckhwd %%mm1, %%mm0\n" + " punpcklwd %%mm1, %%mm2\n" +- " movq %%mm2, (%0,%%rcx,4)\n" +- " movq %%mm0, 8(%0,%%rcx,4)\n" ++ " movq %%mm2, (%q0,%%rcx,4)\n" ++ " movq %%mm0, 8(%q0,%%rcx,4)\n" + " add $4, %%rcx\n" + " cmp %3, %%ecx\n" + " jl 1b\n" +@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $1, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" +- " paddw (%1,%%rcx,2), %%mm1\n" +- " movq %%mm1, (%0,%%rcx,2)\n" ++ " paddw (%q1,%%rcx,2), %%mm1\n" ++ " movq %%mm1, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" +@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t + asm volatile ("\n" + " xor %%rcx, %%rcx\n" + "1:\n" +- " movq (%2,%%rcx,2), %%mm1\n" +- " movq (%3,%%rcx,2), %%mm2\n" +- " movq (%1,%%rcx,2), %%mm0\n" ++ " movq (%q2,%%rcx,2), %%mm1\n" ++ " movq (%q3,%%rcx,2), %%mm2\n" ++ " movq (%q1,%%rcx,2), %%mm0\n" + " paddw %%mm2, %%mm1\n" + " psraw $2, %%mm1\n" + " psubw %%mm1, %%mm0\n" +- " movq %%mm0, (%0,%%rcx,2)\n" ++ " movq %%mm0, (%q0,%%rcx,2)\n" + " add $4, %%rcx\n" + " cmp %4, %%ecx\n" + " jl 1b\n" diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild new file mode 100644 index 000000000000..d75f2a77362a --- /dev/null +++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic multilib autotools-multilib + +DESCRIPTION="Library of simple functions that are optimized for various CPUs" +HOMEPAGE="https://liboil.freedesktop.org/" +SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0.3" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+examples static-libs test" + +RDEPEND="examples? ( dev-libs/glib:2 ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig" +DOCS=( AUTHORS BUG-REPORTING HACKING NEWS README ) + +src_prepare() { + if ! use examples; then + sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \ + -i Makefile.am Makefile.in || die + fi + + if ! use test; then + sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \ + -i Makefile.am Makefile.in || die + fi + + epatch "${FILESDIR}/${P}-amd64-cpuid.patch" + has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-0.3.17-x32.patch +} + +src_configure() { + strip-flags + filter-flags -O? + append-flags -O2 + + # For use with Clang, which is the only compiler on OSX, bug #576646 + [[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions + + autotools-multilib_src_configure +} + +pkg_postinst() { + if ! use examples; then + ewarn "You have disabled examples USE flag. Beware that upstream might" + ewarn "want the output of some utilities that are only built with" + ewarn "USE='examples' if you report bugs to them." + fi +} diff --git a/dev-libs/liboil/metadata.xml b/dev-libs/liboil/metadata.xml new file mode 100644 index 000000000000..95e86c12108a --- /dev/null +++ b/dev-libs/liboil/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> +</pkgmetadata> |