From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- media-libs/libaom/Manifest | 2 +- media-libs/libaom/libaom-9999.ebuild | 128 ++++++++++++----------------------- 2 files changed, 44 insertions(+), 86 deletions(-) (limited to 'media-libs/libaom') diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest index 751ec1f10524..e98a71eeff7f 100644 --- a/media-libs/libaom/Manifest +++ b/media-libs/libaom/Manifest @@ -1,2 +1,2 @@ -EBUILD libaom-9999.ebuild 3578 BLAKE2B 57c0a8a29ba9004be516a3875998c04777ec435ea9d1532585e34b433ca029f73fe6511ecf339ded7ecf07c238be1f525064f99d047be830da54b7f6e8b171f3 SHA512 4e371d6a85f3588b671d859873c695269aedcab88a5f23d253a9fc02138e11f661f94d40cb2c6c1081a106efbe5e43a126c68a90d3ae429bf8065eec3d19c03c +EBUILD libaom-9999.ebuild 2039 BLAKE2B 57bdf5ef9b2de6a347fb2e0cd1ab6c1ff502800a5257a30d09b6c234c83cd14dd36006118a6c7ad25eada94a1b493ad245c340190693e10d21c11886f36ed562 SHA512 691d3020210c00620fb4cf265ade8d76809df61afe90338de6a9d0f6e5d383c2fd6e41e6d363ea89c484f4f13ad6878e007172b83bcf4044f0a4b548bbb14a55 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild index 4a8404db590b..f940504046ee 100644 --- a/media-libs/libaom/libaom-9999.ebuild +++ b/media-libs/libaom/libaom-9999.ebuild @@ -1,40 +1,33 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils multilib toolchain-funcs multilib-minimal - -LIBVPX_TESTDATA_VER=1.6.0 +EAPI=6 +inherit cmake-multilib if [[ ${PV} == *9999* ]]; then - inherit git-2 + inherit git-r3 EGIT_REPO_URI="https://aomedia.googlesource.com/aom" elif [[ ${PV} == *pre* ]]; then SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~amd64" fi -# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing -# it. -#SRC_URI="${SRC_URI} -# test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )" DESCRIPTION="Alliance for Open Media AV1 Codec SDK" HOMEPAGE="http://aomedia.org" -LICENSE="BSD" -SLOT="0/4" -IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs test +threads" +LICENSE="BSD-2" +SLOT="0/0" +IUSE="doc examples" +IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2" +IUSE="${IUSE} cpu_flags_arm_neon" -RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND="" DEPEND="abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) amd64-fbsd? ( dev-lang/yasm ) - doc? ( - app-doc/doxygen - dev-lang/php - ) + doc? ( app-doc/doxygen ) " REQUIRED_USE=" @@ -42,75 +35,40 @@ REQUIRED_USE=" cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) " -#src_prepare() { -#} - -multilib_src_configure() { - unset CODECS #357487 - - # let the build system decide which AS to use (it honours $AS but - # then feeds it with yasm flags without checking...) #345161 - tc-export AS - case "${CHOST}" in - i?86*) export AS=yasm;; - x86_64*) export AS=yasm;; - esac - - # https://bugs.gentoo.org/show_bug.cgi?id=384585 - # https://bugs.gentoo.org/show_bug.cgi?id=465988 - # copied from php-pear-r1.eclass - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/ - addpredict /var/lib/net-snmp/mib_indexes - addpredict /session_mm_cli0.sem - - # Build with correct toolchain. - tc-export CC CXX AR NM - # Link with gcc by default, the build system should override this if needed. - export LD="${CC}" - - local myconf - if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then - myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)" - else - # not needed for multilib and will be overwritten anyway. - myconf+=" --disable-examples --disable-install-docs --disable-docs" - fi - - # #498364: sse doesn't work without sse2 enabled, - "${S}/configure" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --enable-pic \ - --enable-av1 \ - --enable-shared \ - --extra-cflags="${CFLAGS}" \ - $(use_enable cpu_flags_x86_avx avx) \ - $(use_enable cpu_flags_x86_avx2 avx2) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable cpu_flags_x86_sse3 sse3) \ - $(use_enable cpu_flags_x86_sse4_1 sse4_1) \ - $(use_enable cpu_flags_x86_ssse3 ssse3) \ - $(use_enable static-libs static) \ - $(use_enable test unit-tests) \ - $(use_enable threads multithread) \ - ${myconf} \ - || die +src_prepare() { + sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die + cmake-utils_src_prepare } -multilib_src_compile() { - # build verbose by default and do not build examples that will not be installed - emake verbose=yes GEN_EXAMPLES= +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_DOCS=$(multilib_native_usex doc ON OFF) + -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF) + -DENABLE_NASM=OFF + -DENABLE_TOOLS=ON + -DENABLE_WERROR=OFF + + -DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF) + -DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF) + # ENABLE_DSPR2 / ENABLE_MSA for mips + -DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF) + -DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF) + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF) + -DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF) + -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF) + -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) + -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) + -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) + + -DBUILD_SHARED_LIBS=ON + ) + cmake-utils_src_configure } -#multilib_src_test() { - #LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \ - # emake verbose=yes GEN_EXAMPLES= LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test -#} - multilib_src_install() { - emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install - [ "${ABI}" = "${DEFAULT_ABI}" ] && use doc && dohtml docs/html/* + cmake-utils_src_install + if multilib_is_native_abi && use doc ; then + docinto html + dodoc docs/html/* + fi } -- cgit v1.2.3