diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-07-04 14:05:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-07-04 14:05:23 +0100 |
| commit | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (patch) | |
| tree | 43b0410e62aba677b4b256bc3ffe3fd333d28dbe /media-libs/openh264 | |
| parent | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (diff) | |
gentoo resync : 04.07.2020
Diffstat (limited to 'media-libs/openh264')
| -rw-r--r-- | media-libs/openh264/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/openh264/openh264-2.1.0.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/openh264/openh264-2.1.1.ebuild | 19 |
3 files changed, 15 insertions, 10 deletions
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index 2876eb1efd49..feeee81edf16 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -5,6 +5,6 @@ DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc DIST openh264-2.1.0.tar.gz 60239088 BLAKE2B 4941399476fb6184fc09b09d9bd496d9f3fa77a424199f6cb0d61d654d6cf88b49eecc32d748b656cec663c31844165b81b7962de163441f04e5a606a48879d5 SHA512 7a65f494e6a1b5a9d96115dcd15853ebb804f0ba259b20ddab01770afde31f370536d9e365b18a6f4168eae7f57351d9fc2d3d3a0c51bb21db7b4d5c48240848 DIST openh264-2.1.1.tar.gz 60239654 BLAKE2B d541fa686b1eb8352dbb4088fc4ef508f947660815c86b2bb7db841c927b7b9f763d7fe793f0fa1511620dbdc506c20cd5ad52740140337aa12b8c31b857a8e6 SHA512 f9c2925fa902c6278da40f68b967d25e62db7ce3541e8f5e7a0ee174204b6ecc7026b5853885c361f48ca01d71bacd585fb5b91f01f0c054ece80943f1afcf79 EBUILD openh264-1.7.0-r1.ebuild 2949 BLAKE2B 2085049cb86b5ac355e552acf9b0aedb363f6d9fd6ed806ce1bdf70e9da633b8a9657eef131af8dbc647e9e66e410190fe7c05ae99ff4311423b81ec4ceda08f SHA512 d5ed45707baa5a689b9060e0a1c784721b3f8be5632565bc0581acc9dec982666b54bed97aa7e04f0ecd429784e45aabf20c2fed88f7bf5d8e648308668c1140 -EBUILD openh264-2.1.0.ebuild 3016 BLAKE2B 9f66932a8bc4adb8999889fbab3ba7dd45e6115c8e90a244ae476099bdaf24001c8bfba25e95c4c6ad789de40b45ba2853884fd3a0134a9cc2ad8823069e418e SHA512 f5a3b0afc0c30d53d5770a6a0423176f77fd6c23d16b91458cbc654b907324fa294674ecd89f3e3a2c78f818c8325cbc7be846bdb813fc31ad469d479798bebd -EBUILD openh264-2.1.1.ebuild 3016 BLAKE2B c8bf727c8abbaa423d170755e9af055afcee35f84c8b544b5cf279d373288453941ccf6633c5e674365903be1445869dc27f3bd794ceab34cd286a3e71bba080 SHA512 68dec8fc95fb150be83d05afa0661aa3365d703442e7c785f500a3225b354bde698ab1a79d1e94f71985eb0afe7cab4e79a3b7472eb5abf5b2e40a910e2a894c +EBUILD openh264-2.1.0.ebuild 3015 BLAKE2B 2706d011a3f40bc4aa9580b42a17bf867f059d7a5c35f5cfa8a62c41d22a4b9a367b5d40796eeaa1a434091251efb02f48c9f14efb3163bd295db9d3fbc6f961 SHA512 3402b5d01047da3ea94c40223999c3be15d5f8ce34a2440b5ed807198d67c1ea1dfa532c0228385d0394b9bf2be13e9a12a321d6f504d59daf15da5a99b6a114 +EBUILD openh264-2.1.1.ebuild 3151 BLAKE2B 5f72a6b52cfc6d2483eb078f70d1eb5b197182d86c45acf1b35d69aa2a1528515d11036ecb0812d9a82386c1991b1dd1e5cb9c772fe5842c7d59ae8316e85304 SHA512 8d7dab0838b532243281c9c1e90c480a1394b00f169a958d925d7a0ddae62770dd554d143d49d3e775597868e6d4bcd1c9e199b99c54644a683e736e9fa05894 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220 diff --git a/media-libs/openh264/openh264-2.1.0.ebuild b/media-libs/openh264/openh264-2.1.0.ebuild index adcec1df1fb6..486e6828d1b7 100644 --- a/media-libs/openh264/openh264-2.1.0.ebuild +++ b/media-libs/openh264/openh264-2.1.0.ebuild @@ -65,7 +65,7 @@ multilib_src_install() { fi if use plugin; then - local plugpath="${EROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed" + local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed" insinto "${plugpath}" doins libgmpopenh264.so* gmpopenh264.info echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN} diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild index 49c486ea6f52..b18de1c269b6 100644 --- a/media-libs/openh264/openh264-2.1.1.ebuild +++ b/media-libs/openh264/openh264-2.1.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0/6" # subslot = openh264 soname version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_avx2 +plugin utils" +IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils" RESTRICT="bindist test" @@ -36,24 +36,29 @@ multilib_src_configure() { } emakecmd() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \ PREFIX="${EPREFIX}/usr" \ LIBDIR_NAME="$(get_libdir)" \ SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \ HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \ + ARCH="$(tc-arch)" \ $@ } multilib_src_compile() { - local mybits="ENABLE64BIT=No" + local myopts="ENABLE64BIT=No" case "${ABI}" in - s390x|alpha|*64) mybits="ENABLE64BIT=Yes";; + s390x|alpha|*64) myopts="ENABLE64BIT=Yes";; esac - emakecmd ${mybits} - use plugin && emakecmd ${mybits} plugin + if use arm; then + myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)" + fi + + emakecmd ${myopts} + use plugin && emakecmd ${myopts} plugin } multilib_src_install() { @@ -65,7 +70,7 @@ multilib_src_install() { fi if use plugin; then - local plugpath="${EROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed" + local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed" insinto "${plugpath}" doins libgmpopenh264.so* gmpopenh264.info echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN} |