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 558B4138331 for ; Wed, 14 Feb 2018 20:07:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A06CE0B8B; Wed, 14 Feb 2018 20:07:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5AE83E0B8B for ; Wed, 14 Feb 2018 20:07:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4E643335C2F for ; Wed, 14 Feb 2018 20:07:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D5C0213 for ; Wed, 14 Feb 2018 20:07:12 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1518638695.8dbb1b8af44280388f0a24d9cc83251b343b6a25.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/, media-video/mplayer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch media-video/mplayer/mplayer-1.3.0-r4.ebuild media-video/mplayer/mplayer-9999.ebuild X-VCS-Directories: media-video/mplayer/files/ media-video/mplayer/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 8dbb1b8af44280388f0a24d9cc83251b343b6a25 X-VCS-Branch: master Date: Wed, 14 Feb 2018 20:07:12 +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-Archives-Salt: 53d69d6b-12a3-4c2c-b5eb-a61f7ee9f981 X-Archives-Hash: b952ed1a519d8fa49c937d504ce2a3dc commit: 8dbb1b8af44280388f0a24d9cc83251b343b6a25 Author: Pacho Ramos gentoo org> AuthorDate: Wed Feb 14 19:53:31 2018 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Wed Feb 14 20:04:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbb1b8a media-video/mplayer: Drop directfb support (#642506), stop using deprecated eclasses Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../mplayer/files/mplayer-1.3-vdpau-x11.patch | 4 ++-- ...mplayer-9999.ebuild => mplayer-1.3.0-r4.ebuild} | 24 +++++++++++++--------- media-video/mplayer/mplayer-9999.ebuild | 18 ++++++++-------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch index ae21941a8aa..cfefb63deb9 100644 --- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch +++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch @@ -7,8 +7,8 @@ commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . Index: libvo/vo_vdpau.c =================================================================== ---- libvo/vo_vdpau.c (revision 37931) -+++ libvo/vo_vdpau.c (revision 37932) +--- a/libvo/vo_vdpau.c (revision 37931) ++++ b/libvo/vo_vdpau.c (revision 37932) @@ -34,6 +34,7 @@ #include diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild similarity index 97% copy from media-video/mplayer/mplayer-9999.ebuild copy to media-video/mplayer/mplayer-1.3.0-r4.ebuild index b75b7dbc479..d1f122ab57d 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" -inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} +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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon +doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif 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 @@ -69,7 +69,6 @@ RDEPEND+=" cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) @@ -156,9 +155,9 @@ RDEPEND+=" SLOT="0" LICENSE="GPL-2" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" else - KEYWORDS="" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" fi # faac codecs are nonfree @@ -185,6 +184,8 @@ REQUIRED_USE=" xvmc? ( xv )" RESTRICT="faac? ( bindist )" +PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) + pkg_setup() { if [[ ${PV} == *9999* ]]; then elog @@ -238,11 +239,15 @@ src_unpack() { } src_prepare() { + default + local svf=snapshot_version if [[ ${PV} = *9999* ]]; then # Set SVN version manually subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf + else + eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch fi if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" @@ -253,8 +258,6 @@ src_prepare() { # fix path to bash executable in configure scripts sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die - base_src_prepare - # Use sane default for >=virtual/udev-197 sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die } @@ -414,7 +417,7 @@ src_configure() { ################ # Video Output # ################ - uses="directfb md5sum sdl yuv4mpeg" + uses="md5sum sdl yuv4mpeg" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -524,7 +527,8 @@ src_configure() { } src_compile() { - base_src_compile + default + # Build only user-requested docs if they're available. if use doc ; then # select available languages from $LINGUAS diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index b75b7dbc479..bc3255c4703 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" +[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS="" -inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} +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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon +doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif 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 @@ -69,7 +69,6 @@ RDEPEND+=" cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) @@ -238,6 +237,8 @@ src_unpack() { } src_prepare() { + default + local svf=snapshot_version if [[ ${PV} = *9999* ]]; then # Set SVN version manually @@ -253,8 +254,6 @@ src_prepare() { # fix path to bash executable in configure scripts sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die - base_src_prepare - # Use sane default for >=virtual/udev-197 sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die } @@ -414,7 +413,7 @@ src_configure() { ################ # Video Output # ################ - uses="directfb md5sum sdl yuv4mpeg" + uses="md5sum sdl yuv4mpeg" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -524,7 +523,8 @@ src_configure() { } src_compile() { - base_src_compile + default + # Build only user-requested docs if they're available. if use doc ; then # select available languages from $LINGUAS