From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A740158043 for ; Mon, 1 Apr 2024 06:47:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F978E2A25; Mon, 1 Apr 2024 06:47:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87BD6E2A23 for ; Mon, 1 Apr 2024 06:47:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCC9E3431CB for ; Mon, 1 Apr 2024 06:47:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E3821628 for ; Mon, 1 Apr 2024 06:47:40 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1711954054.fc1cc66ce2bcebd7d46dc5a5ed2ac474adbe3d08.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openh264/Manifest media-libs/openh264/openh264-2.4.0-r1.ebuild X-VCS-Directories: media-libs/openh264/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: fc1cc66ce2bcebd7d46dc5a5ed2ac474adbe3d08 X-VCS-Branch: master Date: Mon, 1 Apr 2024 06:47:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 185b2122-d89d-4311-b297-4a3fa8d099b3 X-Archives-Hash: b602215650cc9080d7833be506d98b75 commit: fc1cc66ce2bcebd7d46dc5a5ed2ac474adbe3d08 Author: Joonas Niilola gentoo org> AuthorDate: Mon Apr 1 06:41:38 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Apr 1 06:47:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1cc66c media-libs/openh264: drop 2.4.0-r1 Signed-off-by: Joonas Niilola gentoo.org> media-libs/openh264/Manifest | 1 - media-libs/openh264/openh264-2.4.0-r1.ebuild | 136 --------------------------- 2 files changed, 137 deletions(-) diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index 42da792c7ee9..8848227b305f 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -1,4 +1,3 @@ DIST gmp-api-Firefox114_2-e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7.tar.gz 10915 BLAKE2B aa4b82baebbd990d94f381be4516e8780f6bc3a2104c4b899f091a9e6ec91dff9788ee6ef548d3bc07c7bf50f56347c44d01e51805f96cf9b59494889a5f7b61 SHA512 f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1 -DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971a7f0f443f6dee0abffbadc53cce8ba7fe6612a966c697296bf46c3035bd03ac9a65e63d6d87853317b178b06a236 SHA512 dc66986e84ad328e1615384e7bff93d6eaac42a68e87d9c9b59f55d9f90efd13dc87637a7e3b8c9694634dfa82351c5944828f3f478286608e362e014dd70ca1 DIST openh264-2.4.1.tar.gz 60297304 BLAKE2B c66dbe8003072c406641b3f1453df6d8e574b5526d6748d5f4efa4921ca6a438df2e491143dc07c8f9297d253e97cd4ee2dada450845e7d9323cb31dddc6fff4 SHA512 eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf diff --git a/media-libs/openh264/openh264-2.4.0-r1.ebuild b/media-libs/openh264/openh264-2.4.0-r1.ebuild deleted file mode 100644 index 5824fdfe525a..000000000000 --- a/media-libs/openh264/openh264-2.4.0-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs multilib-minimal - -MOZVER=114_2 -MY_GMP_COMMIT="e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7" - -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264" -SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz" -LICENSE="BSD" - -# openh264 soname version. -# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure. -# https://github.com/cisco/openh264/issues/3459 ) -SLOT="0/7" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc64 ~riscv ~sparc x86" -IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils" - -RESTRICT="bindist !test? ( test )" - -BDEPEND=" - abi_x86_32? ( dev-lang/nasm ) - abi_x86_64? ( dev-lang/nasm ) - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" - -DOCS=( LICENSE CONTRIBUTORS README.md ) - -PATCHES=( - "${FILESDIR}"/openh264-2.3.0-pkgconfig-pathfix.patch - "${FILESDIR}"/${PN}-2.3.1-pr3630.patch - "${FILESDIR}"/openh264-2.4.0-fix-off-by-one-decode-regression.patch - "${FILESDIR}"/openh264-2.4.0-unordered-frame-glitches.patch -) - -src_prepare() { - default - - ln -svf "/dev/null" "build/gtest-targets.mk" || die - sed -i -e 's/$(LIBPREFIX)gtest.$(LIBSUFFIX)//g' Makefile || die - - sed -i -e 's/ | generate-version//g' Makefile || die - sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \ - codec/common/inc/version_gen.h - - multilib_copy_sources -} - -multilib_src_configure() { - ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die -} - -emakecmd() { - 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) \ - HAVE_GTEST=$(usex test Yes No) \ - ARCH="$(tc-arch)" \ - ENABLEPIC="Yes" \ - $@ -} - -multilib_src_compile() { - local myopts="ENABLE64BIT=No" - case "${ABI}" in - s390x|alpha|*64) myopts="ENABLE64BIT=Yes";; - esac - - if use arm; then - myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)" - fi - - emakecmd ${myopts} - use plugin && emakecmd ${myopts} plugin -} - -multilib_src_test() { - emakecmd test -} - -multilib_src_install() { - emakecmd DESTDIR="${D}" install-shared - - if use utils; then - newbin h264enc openh264enc - newbin h264dec openh264dec - fi - - if use plugin; then - 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} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <"${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 - newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - newins "${T}"/${P}.js ${PN}-${PV/_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 - - 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 -}