diff options
Diffstat (limited to 'media-libs/openh264')
-rw-r--r-- | media-libs/openh264/Manifest | 7 | ||||
-rw-r--r-- | media-libs/openh264/openh264-1.4.0-r1.ebuild | 93 | ||||
-rw-r--r-- | media-libs/openh264/openh264-1.5.0.ebuild | 95 | ||||
-rw-r--r-- | media-libs/openh264/openh264-1.7.0-r1.ebuild (renamed from media-libs/openh264/openh264-1.7.0.ebuild) | 12 |
4 files changed, 11 insertions, 196 deletions
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index fb724a28b6d2..6f60a0e3f220 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -2,12 +2,7 @@ AUX openh264-1.5.0-pkgconfig-pathfix.patch 1903 BLAKE2B e1287e4f3bb2453c170c1fb2 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849 AUX pkgconfig-pathfix.patch 1921 BLAKE2B 1f807eeca318dd8e78033291e3465f0da92c156b42f3aa848b2af81be4ac5d1980b791e63da41947a9c7ffc3df3eb9b39cb248b61efb49222554c21e9b378126 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8 AUX pkgconfig_install.patch 711 BLAKE2B c75f750f3c4419323a34acc4c8490525a1dc6b1c628ea1233a124e4689c6ac1ef4338c5786cc040b9a87fd446708cbbc338fe37b2edfc16298391bdd7c66fe7a SHA512 1d3a38b35ac73cc3af6ae24d9bd537712d66f99faa9687bb8c26b3a45d559ccad6917ea1aff11030ff61c9b4c4e89701584d72e35b80b52c514e5f4e56516fe0 -DIST gmp-api-Firefox38.tar.gz 16209 BLAKE2B 688aceb707ca0c5bacbce6dca6d039b31634d4ea21973103fb147e6a9f7abf019166ecf8326a707ff87fe48774111b2b77cc02d33bc31b33eb16537348ddb368 SHA512 9aecbc84b1ba2fcfcb10c56680d92a72dd55f7ef7b8a68a3950dbce65fb7eb2c5e6a211149889f618bef2468ba1f3f8c01dc63e86e0a30d9295b019b75657eb8 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a -DIST openh264-1.4.0.tar.gz 37681189 BLAKE2B 273389f39bec341d9509521b5910b9e0fce6b092623c531a6117060ab5bdd21e0de17c4f3e6770b987a267ba136f101b8e0b9a4bec911fcf48bb3b9b13aa6e3b SHA512 8192494698cb5557331be56ecbe2b7b143e0ed95739a69a88bdb34a58f66710ef1cd9234f1e98c9b16432a41a3243634e6ca63c58119315f2f9360cb2959e42b -DIST openh264-1.5.0.tar.gz 37851166 BLAKE2B 90e25d87248bdcf5d2a0b2eaa87e104d6045b4b69859c96301c519ddded9c383d7fb32bcbc4ad39e38374b51754bb1d28fb7f9e4293b37a75f83ef7de1fd23bc SHA512 30599fed5e928af7dfec079d101a22885e52874c1d7db91ff289b989a9a20548b6bbd5d25e4e546efedd4e5aba97cbc42b1e847970b93116d86efc7af394aeaf DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa -EBUILD openh264-1.4.0-r1.ebuild 2619 BLAKE2B b671ea8d2c6078ca7bd6054667fbd8c7f026c4408a0b8f5788fe256d84baaf6c9f209201c71f9aa76da27ebda00d307f9080573d6cb3538f64ad3c51aa3084e1 SHA512 1cdd4d436f1f83b8c42dfc0c313b41a765b2d3a77afaf0e9f6c5123f25364deb3e6f0eb1cf6b2c3140e14770cf40cbf55e1e5c4db730d9309d65333de0d2e682 -EBUILD openh264-1.5.0.ebuild 2689 BLAKE2B 39f4ead0d19f2502e02492eec5486091e8991465d0310ea814e75ccd55712e5fb3a88786b86fa75380202e248b29b91b0f948524282be35ad823e6589aeeae0b SHA512 14c727969ea3471a6038e65c323d62f2cda602e32da8d99196e7e333c4f5ffa328c7e287e1e98eb1255a855387ffd983f97ce138bcb0c0be60f6af749387a109 -EBUILD openh264-1.7.0.ebuild 2703 BLAKE2B 309c7dac407b9bb49a67153f4e4a7fd028f3dd4e4127fdb2d7b168d223a6ce3a07a04730c8fbec3820d20055311f3872751d24f7a38148a2379c8a09bd7ddb96 SHA512 67205997297e88013b810cf67f1bf0bcf9001c99671888be1c19559c5ac3faabdb4b5abaf25588efd745c6860808cdfacce2b371e4136c1c85bc1abd3fa542ac +EBUILD openh264-1.7.0-r1.ebuild 2929 BLAKE2B 9e72b4b26c0748f1d8293943a1bae1fc90346ed78474e508d7c265dcd86366b8a737ea556b9f58cf9516bb5b91e153402b371af4f2a34813388bf2e93a594d89 SHA512 dd008099e9cea12ad28f5ab1b447cca9308e3cdb3f859818eb5889b540241d7ef7e460fca4d9fd00b964cc65119cd6e5b764e4b0f3902ab42576b06851ed17cd MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220 diff --git a/media-libs/openh264/openh264-1.4.0-r1.ebuild b/media-libs/openh264/openh264-1.4.0-r1.ebuild deleted file mode 100644 index 9a705d5dd6f7..000000000000 --- a/media-libs/openh264/openh264-1.4.0-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit nsplugins multilib-minimal - -MOZVER=38 -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="http://www.openh264.org/" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+plugin utils" - -RESTRICT="bindist" - -RDEPEND="!<www-client/firefox-${MOZVER}" -DEPEND="dev-lang/nasm" - -DOCS=( LICENSE CONTRIBUTORS README.md ) - -src_prepare() { - epatch "${FILESDIR}"/pkgconfig-pathfix.patch - epatch "${FILESDIR}"/pkgconfig_install.patch - epatch_user - multilib_copy_sources -} - -multilib_src_configure() { - ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die -} - -emakecmd() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \ - PREFIX="${EPREFIX}/usr" \ - SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ - INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \ - $@ -} - -multilib_src_compile() { - local mybits="ENABLE64BIT=No" - case "${ABI}" in - s390x|alpha|*64) mybits="ENABLE64BIT=Yes";; - esac - - emakecmd ${mybits} ${tgt} - use plugin && emakecmd ${mybits} plugin -} - -multilib_src_install() { - emakecmd DESTDIR="${D}" install-shared - - use utils && dobin h264{enc,dec} - - if use plugin; then - local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed" - insinto "/${plugpath}" - doins libgmpopenh264.so* gmpopenh264.info - echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <<PREFEOF >"${T}"/${P}.js -pref("media.gmp-gmp${PN}.autoupdate", false); -pref("media.gmp-gmp${PN}.version", "system-installed"); -PREFEOF - - insinto /usr/$(get_libdir)/firefox/defaults/pref - doins "${T}"/${P}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - doins "${T}"/${P}.js - fi -} - -pkg_postinst() { - if use plugin; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please restart your login session, in order for the session's environment" - elog "to include the new MOZ_GMP_PATH variable." - elog "" - fi - elog "This package attempts to override the Mozilla GMPInstaller auto-update process," - elog "however even if it is not successful in doing so the profile-installed plugin" - elog "will not be used unless this package is removed. This package will take precedence" - elog "over any gmp-gmpopenh264 that may be installed in a user's profile." - elog "" - fi -} diff --git a/media-libs/openh264/openh264-1.5.0.ebuild b/media-libs/openh264/openh264-1.5.0.ebuild deleted file mode 100644 index aab9349bbcfe..000000000000 --- a/media-libs/openh264/openh264-1.5.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit nsplugins multilib-minimal - -MOZVER=39 -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="http://www.openh264.org/" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86" -IUSE="+plugin utils" - -RESTRICT="bindist" - -RDEPEND="!<www-client/firefox-${MOZVER}" -DEPEND=" - abi_x86_32? ( dev-lang/nasm ) - abi_x86_64? ( dev-lang/nasm )" - -DOCS=( LICENSE CONTRIBUTORS README.md ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-pkgconfig-pathfix.patch - epatch_user - multilib_copy_sources -} - -multilib_src_configure() { - ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die -} - -emakecmd() { - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - 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}" \ - $@ -} - -multilib_src_compile() { - local mybits="ENABLE64BIT=No" - case "${ABI}" in - s390x|alpha|*64) mybits="ENABLE64BIT=Yes";; - esac - - emakecmd ${mybits} ${tgt} - use plugin && emakecmd ${mybits} plugin -} - -multilib_src_install() { - emakecmd DESTDIR="${D}" install-shared - - use utils && dobin h264{enc,dec} - - if use plugin; then - local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed" - insinto "/${plugpath}" - doins libgmpopenh264.so* gmpopenh264.info - echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <<PREFEOF >"${T}"/${P}.js -pref("media.gmp-gmp${PN}.autoupdate", false); -pref("media.gmp-gmp${PN}.version", "system-installed"); -PREFEOF - - insinto /usr/$(get_libdir)/firefox/defaults/pref - doins "${T}"/${P}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - doins "${T}"/${P}.js - fi -} - -pkg_postinst() { - if use plugin; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please restart your login session, in order for the session's environment" - elog "to include the new MOZ_GMP_PATH variable." - elog "" - fi - elog "This package attempts to override the Mozilla GMPInstaller auto-update process," - elog "however even if it is not successful in doing so the profile-installed plugin" - elog "will not be used unless this package is removed. This package will take precedence" - elog "over any gmp-gmpopenh264 that may be installed in a user's profile." - elog "" - fi -} diff --git a/media-libs/openh264/openh264-1.7.0.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild index 1c42837a9727..ef0c663fca56 100644 --- a/media-libs/openh264/openh264-1.7.0.ebuild +++ b/media-libs/openh264/openh264-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -57,7 +57,10 @@ multilib_src_compile() { multilib_src_install() { emakecmd DESTDIR="${D}" install-shared - use utils && dobin h264{enc,dec} + if use utils ; then + newbin h264enc openh264enc + newbin h264dec openh264dec + fi if use plugin; then local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed" @@ -92,4 +95,9 @@ pkg_postinst() { elog "over any gmp-gmpopenh264 that may be installed in a user's profile." elog "" fi + if use utils; then + elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec" + elog "to avoid file collisions with media-video/h264enc" + elog "" + fi } |