From: "Tom Wijsman (tomwij)" <tomwij@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mpv: mpv-9999.ebuild ChangeLog
Date: Fri, 22 Nov 2013 02:55:16 +0000 (UTC) [thread overview]
Message-ID: <20131122025516.E51712004E@flycatcher.gentoo.org> (raw)
tomwij 13/11/22 02:55:16
Modified: mpv-9999.ebuild ChangeLog
Log:
Upstream migrated to waf, migrate 9999 ebuild to git-r3 and made it use https; proxied commit for Nikoli.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.28 media-video/mpv/mpv-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/mpv-9999.ebuild?r1=1.27&r2=1.28
Index: mpv-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mpv-9999.ebuild 16 Nov 2013 13:43:07 -0000 1.27
+++ mpv-9999.ebuild 22 Nov 2013 02:55:16 -0000 1.28
@@ -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 @@
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
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ git-r3_src_unpack
- # 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
-
- #####################################
- # 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
1.41 media-video/mpv/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mpv/ChangeLog?r1=1.40&r2=1.41
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog 16 Nov 2013 13:43:07 -0000 1.40
+++ ChangeLog 22 Nov 2013 02:55:16 -0000 1.41
@@ -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)
next reply other threads:[~2013-11-22 2:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-22 2:55 Tom Wijsman (tomwij) [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-05 18:33 [gentoo-commits] gentoo-x86 commit in media-video/mpv: mpv-9999.ebuild ChangeLog Maxim Koltsov (maksbotan)
2014-10-27 19:04 Maxim Koltsov (maksbotan)
2014-10-12 8:24 Maxim Koltsov (maksbotan)
2014-09-30 15:32 Maxim Koltsov (maksbotan)
2014-07-20 19:24 Mikle Kolyada (zlogene)
2014-06-20 9:48 Maxim Koltsov (maksbotan)
2014-06-17 18:13 Maxim Koltsov (maksbotan)
2014-06-02 18:11 Tom Wijsman (tomwij)
2014-04-18 9:56 Markos Chandras (hwoarang)
2014-04-18 9:53 Markos Chandras (hwoarang)
2014-03-10 19:32 Maxim Koltsov (maksbotan)
2014-01-25 10:41 Tomas Chvatal (scarabeus)
2014-01-08 23:46 Tom Wijsman (tomwij)
2013-12-28 20:22 Maxim Koltsov (maksbotan)
2013-11-30 7:27 Tom Wijsman (tomwij)
2013-11-11 20:05 Tom Wijsman (tomwij)
2013-10-18 22:57 Tom Wijsman (tomwij)
2013-09-30 17:48 Tomas Chvatal (scarabeus)
2013-07-09 16:38 Tomas Chvatal (scarabeus)
2013-07-09 15:55 Tomas Chvatal (scarabeus)
2013-07-08 23:42 Tom Wijsman (tomwij)
2013-07-08 6:03 Tomas Chvatal (scarabeus)
2013-06-15 8:17 Tomas Chvatal (scarabeus)
2013-04-28 8:07 Tomas Chvatal (scarabeus)
2013-04-27 18:57 Tomas Chvatal (scarabeus)
2013-04-27 17:44 Tomas Chvatal (scarabeus)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131122025516.E51712004E@flycatcher.gentoo.org \
--to=tomwij@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox