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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BCEB3138350 for ; Sat, 22 Feb 2020 23:17:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D808EE0815; Sat, 22 Feb 2020 23:17:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C8EEE0815 for ; Sat, 22 Feb 2020 23:17:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0FA934EF69 for ; Sat, 22 Feb 2020 23:17:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72F58116 for ; Sat, 22 Feb 2020 23:17:51 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1582413454.568f99f6c440db42edc001e6074a50eb614ae131.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mplayer/mplayer-1.3.0-r5.ebuild media-video/mplayer/mplayer-1.3.0-r6.ebuild media-video/mplayer/mplayer-9999.ebuild X-VCS-Directories: media-video/mplayer/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 568f99f6c440db42edc001e6074a50eb614ae131 X-VCS-Branch: master Date: Sat, 22 Feb 2020 23:17:51 +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: 3315164d-a19a-4b3f-9e05-051a2f47b884 X-Archives-Hash: 23b55b23db98d7c72b8bdf4c13fbc949 commit: 568f99f6c440db42edc001e6074a50eb614ae131 Author: David Seifert gentoo org> AuthorDate: Sat Feb 22 23:17:34 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 22 23:17:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568f99f6 media-video/mplayer: Disable GIF support * mplayer relies on private APIs of giflib that have been moved around and will be removed in a future release. Bug: https://bugs.gentoo.org/682198 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../{mplayer-1.3.0-r5.ebuild => mplayer-1.3.0-r6.ebuild} | 8 +++++--- media-video/mplayer/mplayer-9999.ebuild | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild similarity index 97% rename from media-video/mplayer/mplayer-1.3.0-r5.ebuild rename to media-video/mplayer/mplayer-1.3.0-r6.ebuild index 925a8f47c76..7163acf21ea 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild @@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 @@ -55,6 +55,8 @@ X_RDEPS=" " # Rar: althrought -gpl version is nice, it cant do most functions normal rars can # nemesi? ( net-libs/libnemesi ) +# mplayer relies on private APIs in giflib that have been removed: +# https://sourceforge.net/p/giflib/bugs/132/ RDEPEND+=" sys-libs/ncurses:0= app-arch/bzip2 @@ -84,7 +86,6 @@ RDEPEND+=" enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) - gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) @@ -371,6 +372,7 @@ src_configure() { ########## myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 + myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ use dts || myconf+=" --disable-libdca" if ! use mp3; then myconf+=" @@ -383,7 +385,7 @@ src_configure() { use ${i} || myconf+=" --disable-lib${i}" done - uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" + uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 8ca4b4a54f5..ab5fe353ff5 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 @@ -55,6 +55,8 @@ X_RDEPS=" " # Rar: althrought -gpl version is nice, it cant do most functions normal rars can # nemesi? ( net-libs/libnemesi ) +# mplayer relies on private APIs in giflib that have been removed: +# https://sourceforge.net/p/giflib/bugs/132/ RDEPEND+=" sys-libs/ncurses:0= app-arch/bzip2 @@ -84,7 +86,6 @@ RDEPEND+=" enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) - gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( virtual/jack ) @@ -363,6 +364,7 @@ src_configure() { ########## myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 + myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ use dts || myconf+=" --disable-libdca" if ! use mp3; then myconf+=" @@ -375,7 +377,7 @@ src_configure() { use ${i} || myconf+=" --disable-lib${i}" done - uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" + uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done