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 9421E158009 for ; Sun, 18 Jun 2023 21:05:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4D15E08D6; Sun, 18 Jun 2023 21:05:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 A5AB0E08D6 for ; Sun, 18 Jun 2023 21:05:06 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BA7A33E830 for ; Sun, 18 Jun 2023 21:05:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C967FA91 for ; Sun, 18 Jun 2023 21:05:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1687122289.86b79f2f09384512b5467ab67804716ec8a1e30e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mplayer/Manifest media-video/mplayer/mplayer-1.5_p20230618.ebuild media-video/mplayer/mplayer-9999.ebuild X-VCS-Directories: media-video/mplayer/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 86b79f2f09384512b5467ab67804716ec8a1e30e X-VCS-Branch: master Date: Sun, 18 Jun 2023 21:05:03 +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: 5c4da060-f6f7-45a9-9968-42aac93f2309 X-Archives-Hash: cde5812ded0c05c93af8136b4e2a5a8f commit: 86b79f2f09384512b5467ab67804716ec8a1e30e Author: Sam James gentoo org> AuthorDate: Sun Jun 18 19:57:46 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 18 21:04:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b79f2f media-video/mplayer: add 1.5_p20230618 Bug: https://bugs.gentoo.org/888821 Bug: https://bugs.gentoo.org/908553 Signed-off-by: Sam James gentoo.org> media-video/mplayer/Manifest | 1 + ...er-9999.ebuild => mplayer-1.5_p20230618.ebuild} | 26 +++++++++++++++------- media-video/mplayer/mplayer-9999.ebuild | 7 +++--- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index ff9e526a0f68..00ffd71a6226 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -2,3 +2,4 @@ DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73 +DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild similarity index 95% copy from media-video/mplayer/mplayer-9999.ebuild copy to media-video/mplayer/mplayer-1.5_p20230618.ebuild index b686cded65a2..7f503efeaf49 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild @@ -36,12 +36,15 @@ SRC_URI=" !truetype? ( ${FONT_URI} ) " -IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4" +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2" +IUSE+=" cpu_flags_x86_fma3 cpu_flags_x86_fma4" IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext" IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1" IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop" IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext" +IUSE+=" cpu_flags_arm_thumb cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3" +IUSE+=" cpu_flags_arm_iwmmxt" IUSE+=" cpu_flags_ppc_altivec" IUSE+=" a52 aalib +alsa aqua bidi bl bluray" @@ -121,7 +124,7 @@ RDEPEND=" opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) - pulseaudio? ( media-libs/libpulse ) + pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar @@ -268,7 +271,7 @@ src_configure() { # Set LINGUAS [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}" - [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 + [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" # bug #482968 # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable # compilation in almost every situation. The reason for this is @@ -461,14 +464,21 @@ src_configure() { # Platform specific flags, hardcoded on amd64 (see below) use cpudetection && myconf+=( --enable-runtime-cpudetection ) - uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop" - for i in ${uses}; do + local x86_uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop" + for i in ${x86_uses}; do myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) ) done - myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) ) - myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) ) + myconf+=( + $(use_enable cpu_flags_x86_sse4_1 sse4) + $(use_enable cpu_flags_x86_sse4_2 sse42) + ) myconf+=( + $(use_enable cpu_flags_arm_iwmmxt iwmmxt) + $(use_enable cpu_flags_arm_thumb thumb) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_arm_vfp armvfp) + $(use_enable cpu_flags_arm_vfpv3 vfpv3) $(use_enable cpu_flags_ppc_altivec altivec) $(use_enable shm) ) @@ -603,7 +613,7 @@ src_install() { _EOF_ fi - # bug 256203 + # bug #256203 if use rar; then cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_ unrarexec=${EPREFIX}/usr/bin/unrar diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index b686cded65a2..8abf788096fd 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -121,7 +121,7 @@ RDEPEND=" opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) pnm? ( media-libs/netpbm ) - pulseaudio? ( media-libs/libpulse ) + pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar @@ -268,7 +268,7 @@ src_configure() { # Set LINGUAS [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}" - [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 + [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" # bug #482968 # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable # compilation in almost every situation. The reason for this is @@ -461,6 +461,7 @@ src_configure() { # Platform specific flags, hardcoded on amd64 (see below) use cpudetection && myconf+=( --enable-runtime-cpudetection ) + # TODO: refresh this list uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop" for i in ${uses}; do myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) ) @@ -603,7 +604,7 @@ src_install() { _EOF_ fi - # bug 256203 + # bug #256203 if use rar; then cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_ unrarexec=${EPREFIX}/usr/bin/unrar