svn commit: r385830 - in head/multimedia/mpv: . files

[Kurt Jaeger]

Author: pi
Date: Fri May  8 20:41:25 2015
New Revision: 385830
URL: https://svnweb.freebsd.org/changeset/ports/385830

Log:
  multimedia/mpv: 0.8.3 -> 0.9.1
  
  - Added CONFLICTS_BUILD variable to avoid ffmpeg build error
  - Cleanup Makefile (e.g. LIRC support was removed)
  
  ChangeLog
  https://github.com/mpv-player/mpv/releases/tag/v0.9.1
  
  PR:		198758
  Submitted by:	Carlos Jacobo Puga Medina <cpm at fbsd.es> (maintainer)

Added:
  head/multimedia/mpv/files/
  head/multimedia/mpv/files/patch-wscript   (contents, props changed)
Modified:
  head/multimedia/mpv/Makefile
  head/multimedia/mpv/distinfo
  head/multimedia/mpv/pkg-plist

Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile	Fri May  8 20:24:33 2015	(r385829)
+++ head/multimedia/mpv/Makefile	Fri May  8 20:41:25 2015	(r385830)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
@@ -16,7 +16,7 @@ COMMENT=	Free and open-source general-pu
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+LIB_DEPENDS=	libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
 		libass.so:${PORTSDIR}/multimedia/libass \
 		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
 		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textp
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 
-WAF_VERSION=	1.8.7
+WAF_VERSION=	1.8.9
 
 USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build waf
 USE_XORG=	x11 xv xxf86vm
@@ -41,11 +41,12 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--disable-debug-build \
 		--disable-optimize \
 		--enable-libmpv-shared \
-		--disable-mpg123 \
 		--disable-alsa \
 		--disable-pdf
 
-OPTIONS_DEFINE=		BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LIRC LUAJIT ZSH
+CONFLICTS_BUILD=	ffmpeg
+
+OPTIONS_DEFINE=		BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO LIBBLURAY V4L YTDL SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU XINERAMA
@@ -76,9 +77,6 @@ LCMS2_CONFIGURE_ENABLE=		lcms2
 LIBGUESS_LIB_DEPENDS=		libguess.so:${PORTSDIR}/textproc/libguess
 LIBGUESS_CONFIGURE_ENABLE=	libguess
 
-LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
-LIRC_CONFIGURE_ENABLE=		lirc
-
 LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
 LUAJIT_USES_OFF=		lua
 LUAJIT_CONFIGURE_ON=		--lua=luajit

Modified: head/multimedia/mpv/distinfo
==============================================================================
--- head/multimedia/mpv/distinfo	Fri May  8 20:24:33 2015	(r385829)
+++ head/multimedia/mpv/distinfo	Fri May  8 20:41:25 2015	(r385830)
@@ -1,4 +1,4 @@
-SHA256 (mpv-player-mpv-v0.8.3_GH0.tar.gz) = 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf
-SIZE (mpv-player-mpv-v0.8.3_GH0.tar.gz) = 2664730
-SHA256 (waf-1.8.7) = 0c637a207f35412feb134e9995dc2d0b7918236210a34cabec011464a4b8ad13
-SIZE (waf-1.8.7) = 96856
+SHA256 (mpv-player-mpv-v0.9.1_GH0.tar.gz) = 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e
+SIZE (mpv-player-mpv-v0.9.1_GH0.tar.gz) = 2698031
+SHA256 (waf-1.8.9) = 751b4a0338a94e557c554b32e19137f70b67f3b2d1e748281f543307ce796674
+SIZE (waf-1.8.9) = 97060

Added: head/multimedia/mpv/files/patch-wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mpv/files/patch-wscript	Fri May  8 20:41:25 2015	(r385830)
@@ -0,0 +1,45 @@
+--- wscript.orig	2015-04-29 10:03:56 UTC
++++ wscript
+@@ -374,10 +374,10 @@ iconv support use --disable-iconv.",
+ ]
+ 
+ libav_pkg_config_checks = [
+-    'libavutil',   '>= 54.02.0',
+-    'libavcodec',  '>= 56.1.0',
+-    'libavformat', '>= 56.01.0',
+-    'libswscale',  '>= 2.1.3'
++    'libavutil26',   '>= 54.02.0',
++    'libavcodec26',  '>= 56.1.0',
++    'libavformat26', '>= 56.01.0',
++    'libswscale26',  '>= 2.1.3'
+ ]
+ libav_versions_string = "FFmpeg 2.4 or Libav 11"
+ 
+@@ -392,11 +392,11 @@ FFmpeg/Libav libraries. You need at leas
+     }, {
+         'name': '--libswresample',
+         'desc': 'libswresample',
+-        'func': check_pkg_config('libswresample', '>= 1.1.100'),
++        'func': check_pkg_config('libswresample26', '>= 1.1.100'),
+     }, {
+         'name': '--libavresample',
+         'desc': 'libavresample',
+-        'func': check_pkg_config('libavresample',  '>= 2.1.0'),
++        'func': check_pkg_config('libavresample26',  '>= 2.1.0'),
+         'deps_neg': ['libswresample'],
+     }, {
+         'name': 'resampler',
+@@ -408,11 +408,11 @@ FFmpeg/Libav libraries. You need at leas
+     }, {
+         'name': '--libavfilter',
+         'desc': 'libavfilter',
+-        'func': check_pkg_config('libavfilter', '>= 5.0.0'),
++        'func': check_pkg_config('libavfilter26', '>= 5.0.0'),
+     }, {
+         'name': '--libavdevice',
+         'desc': 'libavdevice',
+-        'func': check_pkg_config('libavdevice', '>= 55.0.0'),
++        'func': check_pkg_config('libavdevice26', '>= 55.0.0'),
+     }, {
+         'name': 'avcodec-chroma-pos-api',
+         'desc': 'libavcodec avcodec_enum_to_chroma_pos API',

Modified: head/multimedia/mpv/pkg-plist
==============================================================================
--- head/multimedia/mpv/pkg-plist	Fri May  8 20:24:33 2015	(r385829)
+++ head/multimedia/mpv/pkg-plist	Fri May  8 20:41:25 2015	(r385830)
@@ -5,7 +5,7 @@ include/mpv/opengl_cb.h
 include/mpv/qthelper.hpp
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.14.0
+lib/libmpv.so.1.16.0
 libdata/pkgconfig/mpv.pc
 man/man1/mpv.1.gz
 share/applications/mpv.desktop