diff options
| author | Philip Sequeira | 2017-12-05 23:29:32 -0500 |
|---|---|---|
| committer | Philip Sequeira | 2017-12-05 23:29:32 -0500 |
| commit | bc3ac332ee6eba36dcade8016c2260762459ae87 (patch) | |
| tree | 676263b1d4dd161fed71fdbdc4ebb87e68404d52 | |
| parent | 0f2be7e43e3f53f29ca152dcd2f94bd24ff6d1d6 (diff) | |
| download | aur-bc3ac332ee6e.tar.gz | |
remove ffmpeg-mpv stuff
Upstream has dropped it and is back to supporting upstream ffmpeg by
default.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 19 |
2 files changed, 5 insertions, 20 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Nov 2 05:11:38 UTC 2017 +# Wed Dec 6 04:23:12 UTC 2017 pkgbase = mpv-git pkgdesc = Video player based on MPlayer/mplayer2 (git version) - pkgver = 0.27.0_332_g09c61347a8 + pkgver = 0.27.0_495_g0433162f7f pkgrel = 1 url = https://mpv.io install = mpv.install @@ -13,7 +13,7 @@ pkgbase = mpv-git license = GPL makedepends = git makedepends = python-docutils - depends = ffmpeg-mpv-git + depends = ffmpeg depends = hicolor-icon-theme optdepends = youtube-dl: for --ytdl provides = mpv @@ -3,13 +3,6 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> -# Upstream recommends their forked ffmpeg, which can be installed alongside a -# different system ffmpeg. You can build mpv against the system ffmpeg instead -# by uncommenting the second line below, but this may sometimes fail to build -# when mpv depends on a feature that hasn't been merged into upstream ffmpeg. -_ffmpeg_depend=ffmpeg-mpv-git -#_ffmpeg_depend=ffmpeg - _opt_features=( # Disabled by default, need to be enabled every build: @@ -55,14 +48,14 @@ _opt_features=( pkgname=mpv-git _gitname=mpv -pkgver=0.27.0_332_g09c61347a8 +pkgver=0.27.0_495_g0433162f7f pkgrel=1 pkgdesc='Video player based on MPlayer/mplayer2 (git version)' arch=('i686' 'x86_64' 'armv6h' 'armv7h') license=('GPL') url='https://mpv.io' _undetected_depends=('hicolor-icon-theme') -depends=("$_ffmpeg_depend" "${_undetected_depends[@]}") +depends=('ffmpeg' "${_undetected_depends[@]}") optdepends=('youtube-dl: for --ytdl') makedepends=('git' 'python-docutils') provides=('mpv') @@ -143,14 +136,6 @@ prepare() { build() { cd "$srcdir/$_gitname" - if [[ "$_ffmpeg_depend" = *-mpv* ]]; then - export CFLAGS="$CFLAGS -I/usr/include/ffmpeg-mpv-git" \ - LDFLAGS="$LDFLAGS -L/usr/lib/ffmpeg-mpv-git" \ - PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}/usr/lib/ffmpeg-mpv-git/pkgconfig" - else - _opt_extra_flags+=("--enable-ffmpeg-upstream") - fi - ./waf configure --prefix=/usr \ --confdir=/etc/mpv \ --enable-zsh-comp \ |