mpv: bump version to 0.22

This commit is contained in:
Sergei Reznikov
2016-11-21 16:32:29 +03:00
parent 76afdaef4c
commit 784511aca5
2 changed files with 10 additions and 48 deletions

View File

@@ -1,16 +1,16 @@
SUMMARY="A free, open source, and cross-platform media player"
DESCRIPTION="
mpv is a media player based on MPlayer and mplayer2. It supports a wide \
variety of video file formats, audio and video codecs, and subtitle types."
DESCRIPTION="mpv is a media player based on MPlayer and mplayer2. It supports \
a wide variety of video file formats, audio and video codecs, and subtitle \
types."
HOMEPAGE="http://mpv.io"
COPYRIGHT="2013-2015 MPV Developers"
COPYRIGHT="2013-2016 MPV Developers"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/mpv-player/mpv/archive/v$portVersion.zip"
CHECKSUM_SHA256="853ab70c756db6a7f0bc639390f13768c171f3aed5a295c46f4fcb2262568295"
CHECKSUM_SHA256="9058539b3b5ae1ef1791eb38a69018995ccee58db7cefb0b1e368e114cf61b24"
SOURCE_DIR="mpv-$portVersion"
PATCHES="mpv_x86-$portVersion.patchset"
#PATCHES="mpv_x86-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -25,6 +25,7 @@ REQUIRES="
lib:libavdevice$secondaryArchSuffix >= 56
lib:libavutil$secondaryArchSuffix >= 54
lib:libavcodec$secondaryArchSuffix >= 56
lib:libass$secondaryArchSuffix
lib:libswscale$secondaryArchSuffix >= 3
lib:libavfilter$secondaryArchSuffix >= 5
lib:libbluray$secondaryArchSuffix
@@ -40,7 +41,7 @@ REQUIRES="
"
BUILD_REQUIRES="
# devel:libass$secondaryArchSuffix
devel:libass$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix >= 54
devel:libbluray$secondaryArchSuffix
devel:libdvdcss$secondaryArchSuffix
@@ -66,6 +67,7 @@ BUILD_PREREQUIRES="
cmd:perl
cmd:python
cmd:pkg_config$secondaryArchSuffix
# cmd:rst2man.py
cmd:yasm
"
@@ -76,7 +78,7 @@ BUILD()
python bootstrap.py
export LDFLAGS=-lnetwork
waf configure --disable-libass --enable-sdl2 --bindir=$binDir \
--confdir=$settingsDir/mpv # --datadir=$dataDir
--confdir=$settingsDir/mpv --disable-gl --datadir=$dataDir
waf build
}

View File

@@ -1,40 +0,0 @@
From f12700aa37882c3ac2fcb37ae522cec6143ac584 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 26 Apr 2015 18:39:57 +0300
Subject: Haiku: comment out subprocess functions
diff --git a/osdep/subprocess.c b/osdep/subprocess.c
index 84a1b52..beed2d0 100644
--- a/osdep/subprocess.c
+++ b/osdep/subprocess.c
@@ -22,7 +22,7 @@
#include "common/msg_control.h"
#include "subprocess.h"
-
+/*
struct subprocess_args {
struct mp_log *log;
char **args;
@@ -55,3 +55,4 @@ void mp_subprocess_detached(struct mp_log *log, char **args)
if (pthread_create(&thread, NULL, run_subprocess, p))
talloc_free(p);
}
+*/
diff --git a/player/command.c b/player/command.c
index 3556986..d914848 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4615,7 +4615,7 @@ int run_command(struct MPContext *mpctx, struct mp_cmd *cmd, struct mpv_node *re
char *args[MP_CMD_MAX_ARGS + 1] = {0};
for (int n = 0; n < cmd->nargs; n++)
args[n] = cmd->args[n].v.s;
- mp_subprocess_detached(mpctx->log, args);
+// mp_subprocess_detached(mpctx->log, args);
break;
}
--
2.2.2