diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:06:58 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 19:06:58 +0100 |
commit | f3b17e517082e3c6581428440a122f1a2679e278 (patch) | |
tree | 874b962f0cd31907c24532d3159a5622db355700 /media-libs/libaom | |
parent | 511de054920d6e2f43eb973d13aee9b4e3e9a926 (diff) |
gentoo resync : 21.07.2018
Diffstat (limited to 'media-libs/libaom')
-rw-r--r-- | media-libs/libaom/Manifest | 8 | ||||
-rw-r--r-- | media-libs/libaom/files/libdirpc.patch | 40 | ||||
-rw-r--r-- | media-libs/libaom/files/pthread_lib.patch | 14 | ||||
-rw-r--r-- | media-libs/libaom/libaom-0_pre20180421.ebuild | 78 | ||||
-rw-r--r-- | media-libs/libaom/libaom-1.0.0.ebuild | 3 | ||||
-rw-r--r-- | media-libs/libaom/libaom-9999.ebuild | 3 |
6 files changed, 6 insertions, 140 deletions
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest index 6f5f01c5fc15..11443326b87a 100644 --- a/media-libs/libaom/Manifest +++ b/media-libs/libaom/Manifest @@ -1,10 +1,6 @@ -AUX libdirpc.patch 1877 BLAKE2B e8df5b7b5a662d68d3386e348964b17b15bfed49b8cafed55b9893878ead75e00a1ceac92e63f5dc446b03faf09af26e732c508c83e851a7e3664471c8dd8521 SHA512 ead273addda6b39b6f10b7636465cf313b1dfeb344457227acb1d8c03bdab8f78ba0e44ec90b1044359ae445e1e1ce1a87a06df91c86a406b6fd4ce41713df0a AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb -AUX pthread_lib.patch 561 BLAKE2B 7d1a68f9c8a9f250aee9ca44a2cb787a802195708f0dc156d22073f21f83772167c5c57d953551a55385edb13ea8c5e8c28cd1379814175ff915d03ad8bf2860 SHA512 7a7060aa7a7062d85ba9ec3e0bdacdd552c5f2b7ee5c326da1d0d4a48b28693651703deccddcbc31b6e3190fcc6ac6e665bf09621b0ad278638d0812f557be85 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001 -DIST libaom-0_pre20180421.tar.xz 1927112 BLAKE2B 3e70917e58ea4871c640f9df1da17f50dd7b1b1c41b99a2411bc68f11ae4acd76f358d1aaab17ba240dfa104fca1d5ebea057a0ba5666741658943dad10601ef SHA512 169872495a210192ae4f97d4d630b00d2219aa085999d9d90136274ec2dcf60d5001c91b5d920ee5b14b76cf02a9a067a3bf57a152bee9e9bc5a524c9205642b DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4 -EBUILD libaom-0_pre20180421.ebuild 2205 BLAKE2B 9cf6720694c443ec5d20bc7df86a7a6abb4a91fe53e90678e07b2634537167a21e645f8c4f6722e093ff26d84ee83b18aaacb959d9a13bea3b6b4136cb3637d0 SHA512 5c9a0143b6b88adb7753285ff9169def2ee2bd9ff5dadb367f110da152d06b34eb188e8b76b0227cba40da29124fd8a7400ed0c68a551e5b58b5f754ac2d32fb -EBUILD libaom-1.0.0.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188 -EBUILD libaom-9999.ebuild 2327 BLAKE2B 96fb2a1b53847b34059f8afcac3ce84a3092ff8082201ea08d42cc48849a7533f8a9f76270a76446395ad42f382cfe4b07955c95bcd1705e3459e6cd277c2922 SHA512 7e1cf492f664ff77f797ce9464e62aa33a650e47d62193056cc64a81e1fc3b158bc3dcf2f05b1c58f688fd3fa5536cb040887b4e88cbc6719f0c1e3d676e6188 +EBUILD libaom-1.0.0.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965 +EBUILD libaom-9999.ebuild 2369 BLAKE2B f3fab7bda7c1aaaeab7dfb6cc3da7ddec3e1176e48a48a912b0e11a8206ce3ee3200993b94fb00759f3b75e701659157f15b7fdca2208d7d1d07a59f75969409 SHA512 7f7d1450f4f7c1bd605c86f0d0900b50d1773a7f19b2da3efb6f1077f46acc1912c7c5635010ba57661cacf5cef436040f3257d817812ce538b3f5785d03a965 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db diff --git a/media-libs/libaom/files/libdirpc.patch b/media-libs/libaom/files/libdirpc.patch deleted file mode 100644 index ac6466433683..000000000000 --- a/media-libs/libaom/files/libdirpc.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: libaom-9999/CMakeLists.txt -=================================================================== ---- libaom-9999.orig/CMakeLists.txt -+++ libaom-9999/CMakeLists.txt -@@ -248,6 +248,7 @@ if (NOT MSVC) - -DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME} - -DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD} - -DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -+ -DLIB_SUFFIX=${LIB_SUFFIX} - -P "${AOM_ROOT}/build/cmake/pkg_config.cmake" - COMMENT "Writing aom.pc" - VERBATIM) -Index: libaom-9999/build/cmake/pkg_config.cmake -=================================================================== ---- libaom-9999.orig/build/cmake/pkg_config.cmake -+++ libaom-9999/build/cmake/pkg_config.cmake -@@ -35,12 +35,13 @@ endif () - - # Write pkg-config info. - set(prefix "${CMAKE_INSTALL_PREFIX}") -+set(libdir "lib${LIB_SUFFIX}") - set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc") - string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name) - file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n") - file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n") - file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n") --file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n") -+file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n") - file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n") - file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n") - file(APPEND "${pkgconfig_file}" -@@ -48,7 +49,7 @@ file(APPEND "${pkgconfig_file}" - file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n") - file(APPEND "${pkgconfig_file}" "Requires:\n") - file(APPEND "${pkgconfig_file}" "Conflicts:\n") --file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n") -+file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n") - if (CONFIG_MULTITHREAD AND HAVE_PTHREAD_H) - file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n") - else () diff --git a/media-libs/libaom/files/pthread_lib.patch b/media-libs/libaom/files/pthread_lib.patch deleted file mode 100644 index d8770bc687ca..000000000000 --- a/media-libs/libaom/files/pthread_lib.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libaom-9999/CMakeLists.txt -=================================================================== ---- libaom-9999.orig/CMakeLists.txt -+++ libaom-9999/CMakeLists.txt -@@ -598,6 +598,9 @@ if (BUILD_SHARED_LIBS) - include("${AOM_ROOT}/build/cmake/exports.cmake") - setup_exports_target() - set_target_properties(aom PROPERTIES SOVERSION 0) -+ if (HAVE_PTHREAD_H AND CONFIG_MULTITHREAD) -+ target_link_libraries(aom ${AOM_LIB_LINK_TYPE} Threads::Threads) -+ endif () - endif () - - # Handle user supplied compile and link flags last to ensure they're obeyed. diff --git a/media-libs/libaom/libaom-0_pre20180421.ebuild b/media-libs/libaom/libaom-0_pre20180421.ebuild deleted file mode 100644 index 6b45d369d2b9..000000000000 --- a/media-libs/libaom/libaom-0_pre20180421.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-multilib - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://aomedia.googlesource.com/aom" -elif [[ ${PV} == *pre* ]]; then - SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~amd64 ~hppa ~ia64 ~x86" - S="${WORKDIR}/${PN}" -fi - -DESCRIPTION="Alliance for Open Media AV1 Codec SDK" -HOMEPAGE="https://aomedia.org" - -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="" -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 ) -" - -REQUIRED_USE=" - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) -" - -PATCHES=( "${FILESDIR}/libdirpc.patch" "${FILESDIR}/pthread_lib.patch" ) - -src_prepare() { - sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die - cmake-utils_src_prepare -} - -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 - rm aom.pc # ensure it is rebuilt with proper libdir -} - -multilib_src_install() { - cmake-utils_src_install - if multilib_is_native_abi && use doc ; then - docinto html - dodoc docs/html/* - fi -} diff --git a/media-libs/libaom/libaom-1.0.0.ebuild b/media-libs/libaom/libaom-1.0.0.ebuild index 7b41eb397c28..eaba897ff301 100644 --- a/media-libs/libaom/libaom-1.0.0.ebuild +++ b/media-libs/libaom/libaom-1.0.0.ebuild @@ -12,7 +12,8 @@ else SRC_URI="mirror://gentoo/${P}.tar.xz" S="${WORKDIR}/${PN}" else - SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz" + # SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="mirror://gentoo/${P}.tar.gz" S="${WORKDIR}" fi KEYWORDS="~amd64 ~hppa ~ia64 ~x86" diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild index 7b41eb397c28..eaba897ff301 100644 --- a/media-libs/libaom/libaom-9999.ebuild +++ b/media-libs/libaom/libaom-9999.ebuild @@ -12,7 +12,8 @@ else SRC_URI="mirror://gentoo/${P}.tar.xz" S="${WORKDIR}/${PN}" else - SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz" + # SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="mirror://gentoo/${P}.tar.gz" S="${WORKDIR}" fi KEYWORDS="~amd64 ~hppa ~ia64 ~x86" |