From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- media-video/mplayer/Manifest | 4 ++-- media-video/mplayer/mplayer-1.3.0-r5.ebuild | 2 -- media-video/mplayer/mplayer-9999.ebuild | 22 +++++++--------------- 3 files changed, 9 insertions(+), 19 deletions(-) (limited to 'media-video/mplayer') diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 7faa780127e5..9aca096dd73a 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -8,6 +8,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 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 -EBUILD mplayer-1.3.0-r5.ebuild 17297 BLAKE2B 5cf6ff6c9d48f91e837c4fd3e2d6bda6486e85ef01427943bd2c12fd7a68264ca5c0ad52c48624b72e0b73721c649a95804e2569ddb98555d8dfe5cdf74597ea SHA512 42b9866eecfb3eb44fecdb08dfdeac0a8ae878cb3c4757f5fe7b2f97bc7e60fbf8451ccef81bac7ec49c24072260dfd43d8a661e52a5c9edc15f5e75ef37ea3f -EBUILD mplayer-9999.ebuild 16983 BLAKE2B 22736905b595451ca6ecbb09ca28a32e59655de960850764e22a228caceb515a05b4dca2af04af1d63c1a1b3e78709c69c69b35f28e79c15aa9149e1344b3e36 SHA512 a8625386b91ee53d09dc50ae5a34938f9e981e174748399d580329308fbca99afdf71340214f4a7d577f5c4c61dd7ba1a6edef11d62f40bf3430eb3d365889a5 +EBUILD mplayer-1.3.0-r5.ebuild 17239 BLAKE2B 14610d37c97c6ef7e1a7fd25a10814fdc8f5228e22dfb72fe7ff187be109df22726d971b8055573998f5195980147e11c825b0b9523565547e7f697f086bdbf3 SHA512 3e465467b575b01809513618f5a87d94673041e2408466e59af852c971bcaf1adfff15c703bd9b756b6bbd86351a3b1afcc186681d47c1e7c092a4aedcb6da6b +EBUILD mplayer-9999.ebuild 16826 BLAKE2B 241abb8f0f5f14dcfef74ee2d4ea246bf41192748142539d8d91bb587d9452717c4994964b6d618efb1067523a3a8b3f55589cda86e425331a205ae508c1200d SHA512 dc8bce1f333b2ed5e1f791fb44db4572c046994b6076be7e68aa1d1ce729d84c9c3c7d3b89ca66ba2ec972ef4bc54a4dd9f8f6baca8f47ccab1e99368732d487 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index 6b515f5212dc..bd0a05495e9c 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -152,8 +152,6 @@ SLOT="0" LICENSE="GPL-2" if [[ ${PV} != *9999* ]]; then 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="alpha amd64 arm ~hppa ia64 ppc ppc64 x86" fi # faac codecs are nonfree diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 252dcec7163c..c93bd3174815 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -3,9 +3,9 @@ EAPI=6 -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" +EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS="" +[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} @@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa +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 tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix -vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran" +vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" VIDEO_CARDS="mga tdfx" for x in ${VIDEO_CARDS}; do @@ -126,7 +126,6 @@ RDEPEND+=" xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) " ASM_DEP="dev-lang/yasm" @@ -152,8 +151,6 @@ 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" -else - KEYWORDS="" fi # faac codecs are nonfree @@ -162,7 +159,6 @@ fi # ass and freetype font require iconv and ass requires freetype fonts # unicode transformations are usefull only with iconv # radio requires oss or alsa backend -# xvmc requires xvideo support REQUIRED_USE=" dga? ( X ) dvdnav? ( dvd ) @@ -176,8 +172,7 @@ REQUIRED_USE=" vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) - xv? ( X ) - xvmc? ( xv )" + xv? ( X )" RESTRICT="faac? ( bindist )" pkg_setup() { @@ -213,7 +208,7 @@ src_unpack() { subversion_src_unpack cd "${WORKDIR}" rm -rf "${WORKDIR}/${P}/ffmpeg/" - ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) + ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack ) else unpack ${A} fi @@ -279,9 +274,11 @@ src_configure() { --disable-svga --disable-svgalib_helper --disable-ass-internal --disable-arts + --disable-directfb --disable-kai --disable-libopus --disable-libilbc + --disable-xvmc $(use_enable network networking) $(use_enable joystick) " @@ -489,11 +486,6 @@ src_configure() { use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" use xscreensaver || myconf+=" --disable-xss" use X || myconf+=" --disable-x11" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi ############################ # OSX (aqua) configuration # -- cgit v1.2.3