diff options
| -rw-r--r-- | media-video/mpv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mpv/Manifest | 19 | ||||
| -rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 239 |
3 files changed, 96 insertions, 168 deletions
diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog index 0dff6f085095..1bbbfca1a217 100644 --- a/media-video/mpv/ChangeLog +++ b/media-video/mpv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mpv # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.40 2013/11/16 13:43:07 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.41 2013/11/22 02:55:16 tomwij Exp $ + + 22 Nov 2013; Tom Wijsman <TomWij@gentoo.org> mpv-9999.ebuild: + Upstream migrated to waf, migrate 9999 ebuild to git-r3 and made it use https; + proxied commit for Nikoli. *mpv-0.2.3 (16 Nov 2013) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 39444e6a7f8f..9ce515994133 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -5,21 +5,22 @@ DIST mpv-0.1.7.tar.gz 1651651 SHA256 989cb7518baf3ee641748bf1f7f335cf68730943b0d DIST mpv-0.2.1.tar.gz 2475744 SHA256 95594fe529d09eba918393cb04547d4a7ebbb6c73f9ae12dfd0a2506a1f2d8e1 SHA512 2a5c87950c7950f79537c155cc444ff13a462a8ab5b5a03419e5f9cc4706a5d030798801243284e24ffa34a4d8a216bdd134d91defde28aacaa5d3b2c4c538c1 WHIRLPOOL 33a1c2dea318199ccdc5ce44f90c7bc2359204c6dd1eeaf911e9ac216f6fe683c087f8c9ffe176b31982973114b174612f1df4f9611db7abd3c85b768f8bc10a DIST mpv-0.2.2.tar.gz 2477517 SHA256 0bbb1537880b6f8d0bb2469ff12c6961150f20c2ab13f17f267051accbb27bf7 SHA512 e90a29d5b24c657ec91b5de03b250f08dd0bf13c472643e410ae9bfb203bb2a24a596c2d3dd7331243c26f22c703e7caa311b7370b7f7783b7d00e06be3b0e71 WHIRLPOOL 5502b451c6935dfd0cbf647cca9936e6e4c235557a1ba86f4c7c4ff6b639b2e6a503e2b21455fa5b64c1841eaa46bbeb87acd5288412dc0e9db44d26e58fc423 DIST mpv-0.2.3.tar.gz 2477398 SHA256 6a0fe8b889dabdde68011dd0d3694dd36a747fc88d64f9ac9aa1e5c5d51d210c SHA512 db111172f9c483c07ad79e020d9cf92ccc93b73dcbb05d28be7165a4591ae5c415b7cc4d806f859857263857af96249590076b4ba09eb01b29601bdc20c45846 WHIRLPOOL 7280c762267bba7034c5c426979ae26bd64ad3d4316b8fbaa2ae895b3c0bf4e51d36a614fefba4286532c16569ae3fb8da7ffd21d8ef6ab45903a2b9118513f3 +DIST waf-1.7.13 90702 SHA256 03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873 SHA512 4388cd200d86d9757db95a138d75655e419fd9372de1dc392025b2ecfb9a0cc95d0b17639689ac293b753355af4baea0fc700ddd5d419755facc4e1dfa009521 WHIRLPOOL db94ba365aa84927942e1d95079f9efe377e646dcb7183d6a80d4b57ebbe195d48d23b7688216bd0b793e2f914e1d83caae3b517e385f891a26f670ebc17ed05 EBUILD mpv-0.1.7.ebuild 7893 SHA256 5808a37468bd31d56647ad389a6bea9a225ae5386861b39e70f9e8026b4b2b54 SHA512 c430b2dbd03254350651ecf66b69397fbdf657af49903128dfb33418396727c59d991e22ce00925960f526b41aab378846a156a6699b6679aa2521cc5ff46336 WHIRLPOOL 8ff09600acc35f35874525f886e0b15f280ab7b94a51ba24218dd2df5b0278b4c49b38c9c2dfe0912c38b043a262076c2bf6041c2c6fd41d79f57213c34268bd EBUILD mpv-0.2.1.ebuild 8295 SHA256 1c9864aa21e9177637ec356df1e949ae4f552c38198bc69f1c2fdf0d3acd9c37 SHA512 40628fad2eee2901d313217daa3d8ba4a3b10984fbc16c04932e82facf3758146bf269464c632fd3cc29128e9ee1faed1b3fcea4330b930c6b886e1459428afc WHIRLPOOL ade51c0139f4fc55d0ed1fb16e43df38811602ae152843464f061a993c14789bcc6eb1211134596315387013ac5f6931739555f3a84e22ff58670ce480daff52 EBUILD mpv-0.2.2.ebuild 8295 SHA256 141348925326998d503a9d5103fdcf6c333bbfd1df0ebe7153d4d7ac86581d36 SHA512 fa911fb1370a594ebd562301322f02dfb4975c8c6f8574b74f06c83ed138a0cfb311a61d97307da08e44c1dedaa77371d6564989aec062c4afcdfb9e5afda64f WHIRLPOOL 9f30b5d6aea07d3954e6dc0cf5e39382c5ba5dde4ccfb5e5b74e87304622cc5193ef0abd8c0f7e95f77514e2b9fe7fa50a001345c48fca9ab00f2ad3063dca3f EBUILD mpv-0.2.3.ebuild 8270 SHA256 599442eeeefee7bfa46181eb1a792fd740535aa162093e9580f704a817c9267d SHA512 b131dd0130f4417d3cff4d08bc5e181b83c007e6de8c418eae8636bc8b29cfd1a7215369cdbe50d5c71aa23161560e97a94c91f5e9fbb83b905532b04e14c5c1 WHIRLPOOL 96c9221a60f794a4f2fd62ca501827b1bc29329ef4da842758a9ecd768333f46b7805077d66b72a374e27d0c0ea46bf069c2bd5b5bdf11510110a0dd29df8983 -EBUILD mpv-9999.ebuild 8243 SHA256 0b2f5e9b29064fe4293101eeabf706718513dc96bda1b70247d417248fe7c146 SHA512 2eac2d27ca51f40eee23518f2b658008895d1b68f8eec4f399bf1c6b4c4440ea83ee95a4dd55a8f4262de5c9e48befd6f27f90915ee7ee4dd8048ef4c4a735d4 WHIRLPOOL 095ae5d9d06748b9810a55f5b11747ce83f7a0f1baea85fe06b341b384393c4574e12afc25fbe44e666b3ba2b91ba646a5971a593ef3a2db30f82607d7d519e1 -MISC ChangeLog 6962 SHA256 bebd993f8b01e952c17082ca9cc614c5b3482c196843009763e44f124f8b2c46 SHA512 c70aee6c8a2a922edef4283c50771bad9a842cd3206389c7d9d7056846d31face564a86b4488d3caaf59230480bc24d822b5b1a9943ad5b2edfb199d909b252d WHIRLPOOL 0e68cd34967496caf03e550989b0a5a8945729cc302d1c73685cf49d7be721dbf3e10d9f5898683e191fd3dc297d030e62e5c0c3c209f54a79b0eba0b6266a7d +EBUILD mpv-9999.ebuild 6215 SHA256 89adfd3a39fb2f0d710252b84b0e7426551b01aee719a0b3239a763daada1c92 SHA512 885d7efc7d9eab702613fb787cc59102e24630bb88fb269bbf87bf8e3c2dd1a95f9552613c5c41ad13224dd37ba95dfbbc6cf112d13f3a6dbefb060afb73e672 WHIRLPOOL 3f6b54d73cd9be770a47f31198664c6d2412f7a46adb03e5391cf3cfcdb79bc9f8c408ec65d24829dda756b3412de7db62ccf547255e3419cd09598f728519cd +MISC ChangeLog 7137 SHA256 a9d91c99bab29da4d65622c19abe57618b308e4ffc22d0feea634abf66b4ff4b SHA512 925743fda2618cf37931b5dc6ae7c9350ee964c62738bc6486d8daac716e3f877a430b21d963bda88010f787aa090182d881d61ab2ab16c8cafaf173f5faf8ad WHIRLPOOL 861a6dee837646f8bfa7e0fd3a485a2da39e11e51d477cad5b8e353606820c5f59ee6a8a9bd723c3a89aee9a6c0f919a8f104b73faafdfee3865e244c879f5e8 MISC metadata.xml 1693 SHA256 055d3d622637c9cef8eb1a95f7c1c43676bd3ce583954fc259b7fea91011f7e8 SHA512 4c492dd0978a94be30600b84ac2b0bb6371a37facdc3a74bfc4b14031947ea39825ab30c03cde783c5277cb248f714d81971e4493106f9a4e5588ec8c3e73d0d WHIRLPOOL 0476560ed7b77fa8390cf73fd672e27b2e929546554cbf237e9d5e8b4ebdce48e2011b86de22ea2cbb72234b656c6a7e38a82d3b47329686ddab366a22cda3fe -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSh3Y7AAoJEJWyH81tNOV9uDIIAIQQ5UXZGAKsRTq/bsjzrCZJ -LoAVucuRzO4gekN/sszwwmeYoTjwSG/g5WYwTJqQ0SmK/l3+4lyiQqgf/WLAj9/p -Fo0ITkJAuaoZtPb/ccRhDKrglcmES0NmbWd0JFGqXQI/NNNh7jKUxwVRzTpTUT+C -FXtred8Cc6inSE9x1nr5Povs+JttBxPnvngU7hzBQo1oMRDJ0U1yTpV3m351wZJr -V3afVM1F3jlCiLY6KSaOHRxX/wmkuAUZHY8T8XJJlUeevdwG5xn9dzBMKMPWpYpq -o9UA0O63QeRFXExXMUGHNJk4rgs/IuIxvP0VWxnwywmxpFT1/GgH5R8WDxns6iQ= -=dmT+ +iQEcBAEBCAAGBQJSjsdaAAoJEJWyH81tNOV9rvEH/29WuJt9F4c1/66h6uA8IC7e +zRa2o+LhFd8fiw3Cnf4Ma6fYh1Nc1ZNiAr24fgrWsPnQR8nfh5sjZaRUGHAamCC5 +Pxv+SzuaaMbLF3/vOcGOzcdcFdqnYcFMVlLXBQyTfJc1lM4SIhC1VLXIbbTl9YCt +oAuZEjU000Q8a0UC07rdHmeToA1hWnsN8/3UmjJc2/Ggar9NU8JiGOJuHRMJHzd8 +ovmHJwEOB5gndxHKp0M1RFv1pPDYRzV1C0snRT4PbjUPaMZQ4NCMusbotOUnRq8X +m/i9r/qfNSEPFIf1rIGMNBdxpGfyood7Rj3ZaRFuepGM8kBzOVotTt5j5TkABXA= +=A8d/ -----END PGP SIGNATURE----- diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index f5741df286c9..8093ef1a770f 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -1,24 +1,26 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.27 2013/11/16 13:43:07 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.28 2013/11/22 02:55:16 tomwij Exp $ EAPI=5 -EGIT_REPO_URI="git://github.com/mpv-player/mpv.git" +EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" -inherit toolchain-funcs flag-o-matic multilib base pax-utils -[[ ${PV} == *9999* ]] && inherit git-2 +inherit flag-o-matic base waf-utils pax-utils +[[ ${PV} == *9999* ]] && inherit git-r3 DESCRIPTION="Video player based on MPlayer/mplayer2" HOMEPAGE="http://mpv.io/" [[ ${PV} == *9999* ]] || \ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" +[[ ${PV} == *9999* ]] && \ +SRC_URI="https://waf.googlecode.com/files/waf-1.7.13" LICENSE="GPL-2" SLOT="0" [[ ${PV} == *9999* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" -IUSE="+alsa bluray bs2b +cdio doc-pdf dvb +dvd +enca encode +iconv jack -joystick +IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libcaca libguess lirc lua luajit +mpg123 -openal +opengl oss portaudio +postproc pulseaudio pvr +quvi -radio samba +shm +threads v4l vaapi vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv" @@ -135,185 +137,106 @@ DEPEND="${RDEPEND} DOCS=( Copyright README.md etc/example.conf etc/input.conf etc/encoding-example-profiles.conf ) pkg_setup() { - if [[ ${PV} == *9999* ]]; then - elog - elog "This is a live ebuild which installs the latest from upstream's" - elog "git repository, and is unsupported by Gentoo." - elog "Everything but bugs in the ebuild itself will be ignored." - elog - fi - if use !libass; then ewarn ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed." fi - if use openal; then - ewarn - ewarn "You've enabled the openal flag. OpenAL is disabled by default," - ewarn "because it supposedly inteferes with some other configure tests" - ewarn "and makes them fail silently." - fi - einfo "For additional format support you need to enable the support on your" einfo "libavcodec/libavformat provider:" einfo " media-video/libav or media-video/ffmpeg" } -src_prepare() { - # fix path to bash executable in configure scripts - sed -i -e "1c\#!${EPREFIX}/bin/bash" \ - configure version.sh || die - - base_src_prepare -} - -src_configure() { - local myconf="" - local uses i - - # ebuild uses "use foo || --disable-foo" to forcibly disable - # compilation in almost every situation. The reason for this is - # because if --enable is used, it will force the build of that option, - # regardless of whether the dependency is available or not. - - ##################### - # Optional features # - ##################### - # SDL output is fallback for platforms where nothing better is available - myconf+=" --disable-sdl --disable-sdl2" - use encode || myconf+=" --disable-encoding" - myconf+=" $(use_enable joystick)" - uses="bluray vcd" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9" - use samba || myconf+=" --disable-smb" - use lirc || myconf+=" --disable-lirc --disable-lircc" - use lua || myconf+=" --disable-lua" - use luajit && myconf+=" --lua=luajit" - use doc-pdf || myconf+=" --disable-pdf" - - ######## - # CDDA # - ######## - use cdio || myconf+=" --disable-libcdio" - - ############ - # DVD read # - ############ - use dvd || myconf+=" --disable-dvdread" - - ############# - # Subtitles # - ############# - uses="enca iconv libass libguess" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack - ##################################### - # DVB / Video4Linux / Radio support # - ##################################### - use dvb || myconf+=" --disable-dvb" - use pvr || myconf+=" --disable-pvr" - use v4l || myconf+=" --disable-libv4l2 --disable-tv --disable-tv-v4l2" - if use radio; then - myconf+=" --enable-radio --enable-radio-capture" + cp "${DISTDIR}"/waf-1.7.13 "${S}"/waf || die + chmod 0755 "${S}"/waf || die else - myconf+=" --disable-radio-v4l2" + default_src_unpack fi +} - ########## - # Codecs # - ########## - uses="jpeg mpg123" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - - ################ - # Video Output # - ################ - use libcaca || myconf+=" --disable-caca" - use postproc || myconf+=" --disable-libpostproc" - - ################ - # Audio Output # - ################ - myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only - uses="alsa jack ladspa portaudio" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bs2b || myconf+=" --disable-libbs2b" - use openal && myconf+=" --enable-openal" - use oss || myconf+=" --disable-ossaudio" - use pulseaudio || myconf+=" --disable-pulse" - - #################### - # Advanced Options # - #################### - # keep build reproducible - myconf+=" --disable-build-date" - # do not add -g to CFLAGS - myconf+=" --disable-debug" - use threads || myconf+=" --disable-pthreads" - - # Platform specific flags, hardcoded on amd64 (see below) - use shm || myconf+=" --disable-shm" +src_prepare() { + base_src_prepare +} +src_configure() { if use x86 && gcc-specs-pie; then filter-flags -fPIC -fPIE append-ldflags -nopie fi - ########################### - # X enabled configuration # - ########################### - use X || myconf+=" --disable-x11" - uses="vaapi vdpau wayland xinerama xv" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use opengl || myconf+=" --disable-gl" - use lcms || myconf+=" --disable-lcms2" - use xscreensaver || myconf+=" --disable-xss" - - CFLAGS= LDFLAGS= ./configure \ - --cc="$(tc-getCC)" \ - --extra-cflags="${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --prefix="${EPREFIX}"/usr \ - --bindir="${EPREFIX}"/usr/bin \ + # keep build reproducible + # do not add -g to CFLAGS + # SDL output is fallback for platforms where nothing better is available + # media-sound/rsound is in pro-audio overlay only + waf-utils_src_configure \ + --disable-build-date \ + --disable-debug-build \ + --disable-sdl \ + --disable-sdl2 \ + --disable-rsound \ + $(use_enable encode encoding) \ + $(use_enable joystick) \ + $(use_enable bluray libbluray) \ + $(use_enable vcd) \ + $(use_enable quvi libquvi4) \ + --disable-libquvi9 \ + $(use_enable samba libsmbclient) \ + $(use_enable lirc) \ + $(use_enable lirc lircc) \ + $(use_enable lua) \ + $(usex luajit '--lua=luajit' '') \ + $(use_enable doc-pdf pdf-build) \ + $(use_enable vf-dlopen vf-dlopen-filters) \ + $(use_enable cdio cdda) \ + $(use_enable dvd dvdread) \ + $(use_enable enca) \ + $(use_enable iconv) \ + $(use_enable libass) \ + $(use_enable libguess) \ + $(use_enable dvb) \ + $(use_enable pvr) \ + $(use_enable v4l libv4l2) \ + $(use_enable v4l tv) \ + $(use_enable v4l tv-v4l2) \ + $(use_enable radio) \ + $(use_enable radio radio-capture) \ + $(use_enable radio radio-v4l2) \ + $(use_enable mpg123) \ + $(use_enable jpeg) \ + $(use_enable libcaca caca) \ + $(use_enable postproc libpostproc) \ + $(use_enable alsa) \ + $(use_enable jack) \ + $(use_enable ladspa) \ + $(use_enable portaudio) \ + $(use_enable bs2b libbs2b) \ + $(use_enable openal) \ + $(use_enable oss oss-audio) \ + $(use_enable pulseaudio pulse) \ + $(use_enable threads pthreads) \ + $(use_enable shm) \ + $(use_enable X x11) \ + $(use_enable vaapi) \ + $(use_enable vdpau) \ + $(use_enable wayland) \ + $(use_enable xinerama) \ + $(use_enable xv) \ + $(use_enable opengl gl) \ + $(use_enable lcms lcms2) \ + $(use_enable xscreensaver xss) \ --confdir="${EPREFIX}"/etc/${PN} \ --mandir="${EPREFIX}"/usr/share/man \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - ${myconf} || die - - MAKEOPTS+=" V=1" -} - -src_compile() { - base_src_compile - - if use vf-dlopen; then - tc-export CC - emake -C TOOLS/vf_dlopen - fi + --docdir="${EPREFIX}"/usr/share/doc/${PF} } src_install() { - base_src_install + waf-utils_src_install if use luajit; then pax-mark -m "${ED}"usr/bin/mpv fi - - if use vf-dlopen; then - exeinto /usr/$(get_libdir)/${PN} - doexe TOOLS/vf_dlopen/*.so - fi -} +}
\ No newline at end of file |