Attachment #156518 for bug #198758




# $FreeBSD: head/multimedia/mpv/Makefile 385637 2015-05-07 16:32:43Z mat $

PORTNAME=	mpv
PORTVERSION=	0.9.1
DISTVERSIONPREFIX=	v
PORTEPOCH=	1
CATEGORIES=	multimedia audio


LICENSE=	GPLv2

LIB_DEPENDS=	libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
		libass.so:${PORTSDIR}/multimedia/libass \
		libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav

USE_GITHUB=	yes
GH_ACCOUNT=	mpv-player

WAF_VERSION=	1.8.9

USES=		compiler:c11 desktop-file-utils iconv pkgconfig python:build waf
USE_XORG=	x11 xv xxf86vm

		--disable-debug-build \
		--disable-optimize \
		--enable-libmpv-shared \
		--disable-mpg123 \
		--disable-alsa \
		--disable-pdf

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

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

Lines 1-4 Link Here

(-)/usr/ports/multimedia/mpv/distinfo (-4 / +4 lines)
1	SHA256 (mpv-player-mpv-v0.8.3_GH0.tar.gz) = 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf	1	SHA256 (mpv-player-mpv-v0.9.1_GH0.tar.gz) = 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e
2	SIZE (mpv-player-mpv-v0.8.3_GH0.tar.gz) = 2664730	2	SIZE (mpv-player-mpv-v0.9.1_GH0.tar.gz) = 2698031
3	SHA256 (waf-1.8.7) = 0c637a207f35412feb134e9995dc2d0b7918236210a34cabec011464a4b8ad13	3	SHA256 (waf-1.8.9) = 751b4a0338a94e557c554b32e19137f70b67f3b2d1e748281f543307ce796674
4	SIZE (waf-1.8.7) = 96856	4	SIZE (waf-1.8.9) = 97060




--- wscript.orig	2015-05-08 02:18:06 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',

Lines 5-11 Link Here

(-)/usr/ports/multimedia/mpv/pkg-plist (-1 / +1 lines)
5	include/mpv/qthelper.hpp	5	include/mpv/qthelper.hpp
6	lib/libmpv.so	6	lib/libmpv.so
7	lib/libmpv.so.1	7	lib/libmpv.so.1
8	lib/libmpv.so.1.14.0	8	lib/libmpv.so.1.16.0
9	libdata/pkgconfig/mpv.pc	9	libdata/pkgconfig/mpv.pc
10	man/man1/mpv.1.gz	10	man/man1/mpv.1.gz
11	share/applications/mpv.desktop	11	share/applications/mpv.desktop

Return to bug 198758

Lines 2-8 Link Here

(-)/usr/ports/multimedia/mpv/Makefile (-8 / +6 lines)
2	# $FreeBSD: head/multimedia/mpv/Makefile 385637 2015-05-07 16:32:43Z mat $	2	# $FreeBSD: head/multimedia/mpv/Makefile 385637 2015-05-07 16:32:43Z mat $
3		3
4	PORTNAME= mpv	4	PORTNAME= mpv
5	PORTVERSION= 0.8.3	5	PORTVERSION= 0.9.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= multimedia audio	8	CATEGORIES= multimedia audio
Lines 16-22 Link Here
16		16
17	LICENSE= GPLv2	17	LICENSE= GPLv2
18		18
19	LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \	19	LIB_DEPENDS= libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
20	libass.so:${PORTSDIR}/multimedia/libass \	20	libass.so:${PORTSDIR}/multimedia/libass \
21	libdvdread.so:${PORTSDIR}/multimedia/libdvdread \	21	libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
22	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav	22	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
Lines 25-31 Link Here
25	USE_GITHUB= yes	25	USE_GITHUB= yes
26	GH_ACCOUNT= mpv-player	26	GH_ACCOUNT= mpv-player
27		27
28	WAF_VERSION= 1.8.7	28	WAF_VERSION= 1.8.9
29		29
30	USES= compiler:c11 desktop-file-utils iconv pkgconfig python:build waf	30	USES= compiler:c11 desktop-file-utils iconv pkgconfig python:build waf
31	USE_XORG= x11 xv xxf86vm	31	USE_XORG= x11 xv xxf86vm
Lines 41-51 Link Here
41	--disable-debug-build \	41	--disable-debug-build \
42	--disable-optimize \	42	--disable-optimize \
43	--enable-libmpv-shared \	43	--enable-libmpv-shared \
44	--disable-mpg123 \
45	--disable-alsa \	44	--disable-alsa \
46	--disable-pdf	45	--disable-pdf
47		46
48	OPTIONS_DEFINE= BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LIRC LUAJIT ZSH	47	CONFLICTS_BUILD= ffmpeg
		48
		49	OPTIONS_DEFINE= BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH
49	OPTIONS_GROUP= IN VO AO	50	OPTIONS_GROUP= IN VO AO
50	OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L YTDL SMB	51	OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L YTDL SMB
51	OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU XINERAMA	52	OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU XINERAMA
Lines 76-84 Link Here
76	LIBGUESS_LIB_DEPENDS= libguess.so:${PORTSDIR}/textproc/libguess	77	LIBGUESS_LIB_DEPENDS= libguess.so:${PORTSDIR}/textproc/libguess
77	LIBGUESS_CONFIGURE_ENABLE= libguess	78	LIBGUESS_CONFIGURE_ENABLE= libguess
78		79
79	LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc
80	LIRC_CONFIGURE_ENABLE= lirc
81
82	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit	80	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit
83	LUAJIT_USES_OFF= lua	81	LUAJIT_USES_OFF= lua
84	LUAJIT_CONFIGURE_ON= --lua=luajit	82	LUAJIT_CONFIGURE_ON= --lua=luajit

Line 0 Link Here

(-)/usr/ports/multimedia/mpv/files/patch-wscript (+45 lines)
	1	--- wscript.orig 2015-05-08 02:18:06 UTC
	2	+++ wscript
	3	@@ -374,10 +374,10 @@ iconv support use --disable-iconv.",
	4	]
	5
	6	libav_pkg_config_checks = [
	7	- 'libavutil', '>= 54.02.0',
	8	- 'libavcodec', '>= 56.1.0',
	9	- 'libavformat', '>= 56.01.0',
	10	- 'libswscale', '>= 2.1.3'
	11	+ 'libavutil26', '>= 54.02.0',
	12	+ 'libavcodec26', '>= 56.1.0',
	13	+ 'libavformat26', '>= 56.01.0',
	14	+ 'libswscale26', '>= 2.1.3'
	15	]
	16	libav_versions_string = "FFmpeg 2.4 or Libav 11"
	17
	18	@@ -392,11 +392,11 @@ FFmpeg/Libav libraries. You need at leas
	19	}, {
	20	'name': '--libswresample',
	21	'desc': 'libswresample',
	22	- 'func': check_pkg_config('libswresample', '>= 1.1.100'),
	23	+ 'func': check_pkg_config('libswresample26', '>= 1.1.100'),
	24	}, {
	25	'name': '--libavresample',
	26	'desc': 'libavresample',
	27	- 'func': check_pkg_config('libavresample', '>= 2.1.0'),
	28	+ 'func': check_pkg_config('libavresample26', '>= 2.1.0'),
	29	'deps_neg': ['libswresample'],
	30	}, {
	31	'name': 'resampler',
	32	@@ -408,11 +408,11 @@ FFmpeg/Libav libraries. You need at leas
	33	}, {
	34	'name': '--libavfilter',
	35	'desc': 'libavfilter',
	36	- 'func': check_pkg_config('libavfilter', '>= 5.0.0'),
	37	+ 'func': check_pkg_config('libavfilter26', '>= 5.0.0'),
	38	}, {
	39	'name': '--libavdevice',
	40	'desc': 'libavdevice',
	41	- 'func': check_pkg_config('libavdevice', '>= 55.0.0'),
	42	+ 'func': check_pkg_config('libavdevice26', '>= 55.0.0'),
	43	}, {
	44	'name': 'avcodec-chroma-pos-api',
	45	'desc': 'libavcodec avcodec_enum_to_chroma_pos API',