Attachment #126953 for bug #170735

View | Details | Raw Unified | Return to bug 170735
Collapse All | Expand All





PORTNAME=	mencoder
PORTVERSION=	${MPLAYER_PORT_VERSION}
PORTREVISION=	3

COMMENT=	Convenient video file and movie encoder
RESTRICTED=	Port has restricted dependencies

.include "${.CURDIR}/../mplayer/Makefile.shared"

OPTIONS=	DEBUG "Include debug symbols in mencoder's binary" off
OPTIONS+=	RTCPU "Allow runtime CPU detection" on
OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
OPTIONS+=	IPV6 "Include inet6 network support" on
OPTIONS+=	JACK "Enable JackIt audio server support" off
OPTIONS+=	NAS "Enable NAS sound server support" off


MAN1=		mencoder.1

RESTRICTED=	Port has restricted dependencies

PATCHDIR=	${.CURDIR}/../mplayer/files
FILESDIR=	${PATCHDIR}
DATADIR=	${PREFIX}/share/mplayer


.include <bsd.port.pre.mk>

LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame

CONFIGURE_ARGS+=	--disable-mplayer \
			--disable-libdca \

.include "${.CURDIR}/../mplayer/Makefile.options"

.if defined(WITH_FONTCONFIG)
LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
.else
CONFIGURE_ARGS+=	--disable-fontconfig
.endif

.if defined(WITH_TWOLAME)
LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
.else
CONFIGURE_ARGS+=	--disable-twolame
.endif

.if defined(WITH_FAAC)
LIB_DEPENDS+=		faac:${PORTSDIR}/audio/faac
.else
CONFIGURE_ARGS+=	--disable-faac
.endif

.if !defined(WITHOUT_X264)
LIB_DEPENDS+=		x264.125:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+=	--disable-x264
.endif

.if !defined(WITHOUT_XVID)
LIB_DEPENDS+=		xvidcore:${PORTSDIR}/multimedia/xvid
.else
CONFIGURE_ARGS+=	--disable-xvid
.endif

.ifdef(WITH_DIRAC)
LIB_DEPENDS+=		dirac_encoder:${PORTSDIR}/multimedia/dirac
.else
CONFIGURE_ARGS+=	--disable-libdirac-lavc
.endif

Lines 1-2 Link Here

(-)b/mencoder/distinfo (-2 / +2 lines)
1	SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd	1	SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
2	SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056	2	SIZE (mplayer-1.1.20120721.tar.xz) = 10480368





PORTNAME=	mplayer
PORTVERSION=	${MPLAYER_PORT_VERSION}
PORTREVISION=	2

COMMENT=	High performance media player supporting many formats


OPTIONS=	DEBUG "Include debug symbols in mplayer's binaries" off
OPTIONS+=	RTCPU "Allow runtime CPU detection" on
OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
OPTIONS+=	OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
OPTIONS+=	IPV6 "Include inet6 network support" on
OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
OPTIONS+=	X11XV "X11 video drivers: XV" on

.endif
.if !defined(WITHOUT_X11GL)
USE_XORG+=	glproto
LIB_DEPENDS+=	GL:${PORTSDIR}/graphics/libGL
.else
CONFIGURE_ARGS+=--disable-gl
.endif

.endif

.if defined(WITH_VDPAU)
LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
.else
CONFIGURE_ARGS+=	--disable-vdpau
.endif

.endif

.if defined(WITH_ARTS)
LIB_DEPENDS+=		artsc:${PORTSDIR}/audio/arts
.else
CONFIGURE_ARGS+=	--disable-arts
.endif

.if defined(WITH_LIBCACA)
LIB_DEPENDS+=		caca:${PORTSDIR}/graphics/libcaca
.else
CONFIGURE_ARGS+=	--disable-caca
.endif

.if defined(WITH_LIRC)
LIB_DEPENDS+=		lirc_client:${PORTSDIR}/comms/lirc
.else
CONFIGURE_ARGS+=	--disable-lirc
.endif

.endif

.if defined(WITH_SVGALIB)
LIB_DEPENDS+=		vga:${PORTSDIR}/graphics/svgalib
.else
CONFIGURE_ARGS+=	--disable-svga
.endif

.if defined(WITH_AALIB)
LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
.else
CONFIGURE_ARGS+=	--disable-aa
.endif

.endif

.if defined(WITH_ENCA)
LIB_DEPENDS+=		enca:${PORTSDIR}/converters/enca
.else
CONFIGURE_ARGS+=	--disable-enca
.endif

Lines 55-66 Link Here

(-)b/mplayer/Makefile.options (-20 / +34 lines)
55	CONFIGURE_ARGS+=--enable-runtime-cpudetection	55	CONFIGURE_ARGS+=--enable-runtime-cpudetection
56	.endif	56	.endif
57		57
		58	.if ${OSVERSION} >= 900033
		59	WITH_BASE_CLANG=yes
		60	.endif
		61
		62	.if defined(WITH_BASE_CLANG)
		63	CC= clang
		64	CXX= clang++
		65	.else
58	.if defined(WITH_OTCHAIN)	66	.if defined(WITH_OTCHAIN)
59	USE_GCC?= 4.6+	67	USE_GCC?= 4.6+
60	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils	68	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
61	.else	69	.else
62	CONFIGURE_ARGS+=--disable-ssse3 --disable-fast-cmov	70	CONFIGURE_ARGS+=--disable-ssse3 --disable-fast-cmov
63	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_gcc	71	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_gcc
		72	.if ${ARCH} == "amd64"
		73	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
		74	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
		75	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
		76	.endif
		77	.endif
64	.endif	78	.endif
65		79
66	.if defined(WITHOUT_IPV6)	80	.if defined(WITHOUT_IPV6)
Lines 70-106 Link Here
70	.endif	84	.endif
71		85
72	.if !defined(WITHOUT_LIBUNGIF)	86	.if !defined(WITHOUT_LIBUNGIF)
73	LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib	87	LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib
74	.else	88	.else
75	CONFIGURE_ARGS+= --disable-gif	89	CONFIGURE_ARGS+= --disable-gif
76	.endif	90	.endif
77		91
78	.if defined(WITH_OPENJPEG)	92	.if defined(WITH_OPENJPEG)
79	LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg	93	LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg
80	.else	94	.else
81	CONFIGURE_ARGS+= --disable-libopenjpeg	95	CONFIGURE_ARGS+= --disable-libopenjpeg
82	.endif	96	.endif
83		97
84	.if defined(WITH_MAD)	98	.if defined(WITH_MAD)
85	LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad	99	LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
86	.else	100	.else
87	CONFIGURE_ARGS+= --disable-mad	101	CONFIGURE_ARGS+= --disable-mad
88	.endif	102	.endif
89		103
90	.if defined(WITH_LIBDV)	104	.if defined(WITH_LIBDV)
91	LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv	105	LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv
92	.else	106	.else
93	CONFIGURE_ARGS+= --disable-libdv	107	CONFIGURE_ARGS+= --disable-libdv
94	.endif	108	.endif
95		109
96	.if defined(WITH_THEORA)	110	.if defined(WITH_THEORA)
97	LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora	111	LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora
98	.else	112	.else
99	CONFIGURE_ARGS+= --disable-theora	113	CONFIGURE_ARGS+= --disable-theora
100	.endif	114	.endif
101		115
102	.if defined(WITH_VPX)	116	.if defined(WITH_VPX)
103	LIB_DEPENDS+= vpx.1:${PORTSDIR}/multimedia/libvpx	117	LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx
104	.else	118	.else
105	CONFIGURE_ARGS+= --disable-libvpx-lavc	119	CONFIGURE_ARGS+= --disable-libvpx-lavc
106	.endif	120	.endif
Lines 112-118 Link Here
112	.endif	126	.endif
113		127
114	.if !defined(WITHOUT_SPEEX)	128	.if !defined(WITHOUT_SPEEX)
115	LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex	129	LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex
116	.else	130	.else
117	CONFIGURE_ARGS+= --disable-speex	131	CONFIGURE_ARGS+= --disable-speex
118	.endif	132	.endif
Lines 125-137 Link Here
125	.endif	139	.endif
126		140
127	.if defined(WITH_JACK)	141	.if defined(WITH_JACK)
128	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack	142	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
129	.else	143	.else
130	CONFIGURE_ARGS+= --disable-jack	144	CONFIGURE_ARGS+= --disable-jack
131	.endif	145	.endif
132		146
133	.if defined(WITH_NAS)	147	.if defined(WITH_NAS)
134	LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas	148	LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
135	.else	149	.else
136	CONFIGURE_ARGS+= --disable-nas	150	CONFIGURE_ARGS+= --disable-nas
137	.endif	151	.endif
Lines 143-179 Link Here
143	.endif	157	.endif
144		158
145	.if defined(WITH_PULSE)	159	.if defined(WITH_PULSE)
146	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio	160	LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
147	.else	161	.else
148	CONFIGURE_ARGS+= --disable-pulse	162	CONFIGURE_ARGS+= --disable-pulse
149	.endif	163	.endif
150		164
151	.if defined(WITH_BLURAY)	165	.if defined(WITH_BLURAY)
152	LIB_DEPENDS+= bluray.2:${PORTSDIR}/multimedia/libbluray	166	LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray
153	.else	167	.else
154	CONFIGURE_ARGS+= --disable-bluray	168	CONFIGURE_ARGS+= --disable-bluray
155	.endif	169	.endif
156		170
157	.if defined(WITH_SMB)	171	.if defined(WITH_SMB)
158	LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient	172	LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
159	.else	173	.else
160	CONFIGURE_ARGS+= --disable-smb	174	CONFIGURE_ARGS+= --disable-smb
161	.endif	175	.endif
162		176
163	.if defined(WITH_FRIBIDI)	177	.if defined(WITH_FRIBIDI)
164	LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi	178	LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi
165	.else	179	.else
166	CONFIGURE_ARGS+= --disable-fribidi	180	CONFIGURE_ARGS+= --disable-fribidi
167	.endif	181	.endif
168		182
169	.if defined(WITH_CDPARANOIA)	183	.if defined(WITH_CDPARANOIA)
170	LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia	184	LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia
171	.else	185	.else
172	CONFIGURE_ARGS+= --disable-cdparanoia	186	CONFIGURE_ARGS+= --disable-cdparanoia
173	.endif	187	.endif
174		188
175	.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)	189	.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)
176	LIB_DEPENDS+= cdio.13:${PORTSDIR}/sysutils/libcdio	190	LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio
177	.else	191	.else
178	CONFIGURE_ARGS+= --disable-libcdio	192	CONFIGURE_ARGS+= --disable-libcdio
179	.endif	193	.endif
Lines 185-191 Link Here
185	.endif	199	.endif
186		200
187	.if defined(WITH_LIBLZO)	201	.if defined(WITH_LIBLZO)
188	LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2	202	LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2
189	.else	203	.else
190	CONFIGURE_ARGS+= --disable-liblzo	204	CONFIGURE_ARGS+= --disable-liblzo
191	.endif	205	.endif
Lines 222-228 Link Here
222	.endif	236	.endif
223		237
224	.if defined(WITH_AMR_NB) \|\| defined (WITH_AMR_WB)	238	.if defined(WITH_AMR_NB) \|\| defined (WITH_AMR_WB)
225	LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr	239	LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr
226	.endif	240	.endif
227		241
228	.ifdef(WITHOUT_AMR_NB)	242	.ifdef(WITHOUT_AMR_NB)
Lines 234-240 Link Here
234	.endif	248	.endif
235		249
236	.ifdef(WITH_GSM)	250	.ifdef(WITH_GSM)
237	LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm	251	LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm
238	.else	252	.else
239	CONFIGURE_ARGS+= --disable-libgsm	253	CONFIGURE_ARGS+= --disable-libgsm
240	.endif	254	.endif
Lines 251-257 Link Here
251	.endif	265	.endif
252		266
253	.if defined(WITH_LIBRTMP)	267	.if defined(WITH_LIBRTMP)
254	LIB_DEPENDS+= rtmp.0:${PORTSDIR}/multimedia/rtmpdump	268	LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump
255	CONFIGURE_ARGS+= --enable-librtmp	269	CONFIGURE_ARGS+= --enable-librtmp
256	EXTRA_LIBS+= -lrtmp	270	EXTRA_LIBS+= -lrtmp
257	.else	271	.else
Lines 259-265 Link Here
259	.endif	273	.endif
260		274
261	.if defined(WITH_MNG)	275	.if defined(WITH_MNG)
262	LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng	276	LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng
263	.else	277	.else
264	CONFIGURE_ARGS+= --disable-mng	278	CONFIGURE_ARGS+= --disable-mng
265	.endif	279	.endif




#
# $FreeBSD: ports/multimedia/mplayer/Makefile.shared,v 1.19 2012/07/11 15:07:50 pawel Exp $

MPLAYER_SNAPSHOT_DATE=	2012-07-21
MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?=	multimedia audio
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/rc/g}
WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}

PROJECTHOST=	bsdistfiles

LICENSE=	GPLv2

LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
		freetype:${PORTSDIR}/print/freetype2

BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm


Lines 1-2 Link Here

(-)b/mplayer/distinfo (-2 / +2 lines)
1	SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd	1	SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787
2	SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056	2	SIZE (mplayer-1.1.20120721.tar.xz) = 10480368




 
--- configure.orig	2011-12-31 00:40:03.990976000 +0100
+++ configure	2011-12-31 01:33:51.407685009 +0100
@@ -1533,7 +1533,7 @@
 fi
 
 extra_cflags="-I. -Iffmpeg $extra_cflags"
-extra_ldflags="-lm $extra_ldflags"
+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
 _timer=timer-linux.c
 _getch=getch2.c
 
@@ -2683,10 +2683,6 @@
 def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
 def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'




--- configure.orig	2012-07-24 20:47:24.721531229 +0200
+++ configure	2012-07-24 20:49:56.207569906 +0200
@@ -3130,7 +3130,7 @@
 echores "$_kstat"
 
 
-for func in cbrtf exp2 exp2f isnan isinf llrint llrintf log2 log2f lrint lrintf rint round roundf trunc truncf; do
+for func in cbrtf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf trunc truncf; do
 echocheck $func
 eval _$func=no
 statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
@@ -3142,7 +3142,9 @@
   echores no
 fi
 done

Lines 17-22 Link Here

(-)b/mplayer/files/patch-configure (+9 lines)
17	;;	17	;;
18		18
19	esac	19	esac
		20	@@ -1533,7 +1533,7 @@
		21	fi
		22
		23	extra_cflags="-I. -Iffmpeg $extra_cflags"
		24	-extra_ldflags="-lm $extra_ldflags"
		25	+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
		26	_timer=timer-linux.c
		27	_getch=getch2.c
		28
20	@@ -3576,7 +3575,7 @@	29	@@ -3576,7 +3575,7 @@
21	if linux ; then	30	if linux ; then
22	THREAD_CFLAGS=-D_REENTRANT	31	THREAD_CFLAGS=-D_REENTRANT

Added Link Here

(-)b/mplayer/files/patch-ffmpeg-Makefile (+11 lines)
1	--- ffmpeg/Makefile.orig 2012-06-29 19:20:03.000000000 +0200
2	+++ ffmpeg/Makefile 2012-07-21 18:47:01.068697043 +0200
3	@@ -82,7 +82,7 @@
4	$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
5	SUBDIR := $(1)/
6	include $(SRC_PATH)/$(1)/Makefile
7	--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
8	+-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile
9	include $(SRC_PATH)/library.mak
10	endef
11




--- ffmpeg/libavcodec/Makefile.orig	2012-07-20 19:20:04.000000000 +0200
+++ ffmpeg/libavcodec/Makefile	2012-07-21 18:25:12.582670118 +0200
@@ -788,7 +788,7 @@
                                           codec_names.h                 \
 OBJS-$(!CONFIG_SMALL)                  += inverse.o
 
+-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
+
 SKIPHEADERS                            += %_tablegen.h                  \
                                           %_tables.h                    \
                                           aac_tablegen_decl.h           \
                                           fft-internal.h                \
                                           tableprint.h                  \
-                                          $(ARCH)/vp56_arith.h          \
+                                          $(MPLAYER_ARCH)/vp56_arith.h  \
 
 SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBDIRAC)         += libdirac.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h

Return to bug 170735

Lines 6-22 Link Here

(-)b/mencoder/Makefile (-10 / +10 lines)
6		6
7	PORTNAME= mencoder	7	PORTNAME= mencoder
8	PORTVERSION= ${MPLAYER_PORT_VERSION}	8	PORTVERSION= ${MPLAYER_PORT_VERSION}
9	PORTREVISION= 3
10		9
11	COMMENT= Convenient video file and movie encoder	10	COMMENT= Convenient video file and movie encoder
12	RESTRICTED= Port has restricted dependencies
13		11
14	.include "${.CURDIR}/../mplayer/Makefile.shared"	12	.include "${.CURDIR}/../mplayer/Makefile.shared"
15		13
16	OPTIONS= DEBUG "Include debug symbols in mencoder's binary" off	14	OPTIONS= DEBUG "Include debug symbols in mencoder's binary" off
17	OPTIONS+= RTCPU "Allow runtime CPU detection" on	15	OPTIONS+= RTCPU "Allow runtime CPU detection" on
18	OPTIONS+= OCFLAGS "Use optimized compiler flags" on	16	OPTIONS+= OCFLAGS "Use optimized compiler flags" on
19	OPTIONS+= OTCHAIN "Use up-to-date toolchain (gcc 4.6)" on	17	OPTIONS+= OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
20	OPTIONS+= IPV6 "Include inet6 network support" on	18	OPTIONS+= IPV6 "Include inet6 network support" on
21	OPTIONS+= JACK "Enable JackIt audio server support" off	19	OPTIONS+= JACK "Enable JackIt audio server support" off
22	OPTIONS+= NAS "Enable NAS sound server support" off	20	OPTIONS+= NAS "Enable NAS sound server support" off
Lines 55-60 Link Here
55		53
56	MAN1= mencoder.1	54	MAN1= mencoder.1
57		55
		56	RESTRICTED= Port has restricted dependencies
		57
58	PATCHDIR= ${.CURDIR}/../mplayer/files	58	PATCHDIR= ${.CURDIR}/../mplayer/files
59	FILESDIR= ${PATCHDIR}	59	FILESDIR= ${PATCHDIR}
60	DATADIR= ${PREFIX}/share/mplayer	60	DATADIR= ${PREFIX}/share/mplayer
Lines 70-76 Link Here
70		70
71	.include <bsd.port.pre.mk>	71	.include <bsd.port.pre.mk>
72		72
73	LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame	73	LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
74		74
75	CONFIGURE_ARGS+= --disable-mplayer \	75	CONFIGURE_ARGS+= --disable-mplayer \
76	--disable-libdca \	76	--disable-libdca \
Lines 95-131 Link Here
95	.include "${.CURDIR}/../mplayer/Makefile.options"	95	.include "${.CURDIR}/../mplayer/Makefile.options"
96		96
97	.if defined(WITH_FONTCONFIG)	97	.if defined(WITH_FONTCONFIG)
98	LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig	98	LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig
99	.else	99	.else
100	CONFIGURE_ARGS+= --disable-fontconfig	100	CONFIGURE_ARGS+= --disable-fontconfig
101	.endif	101	.endif
102		102
103	.if defined(WITH_TWOLAME)	103	.if defined(WITH_TWOLAME)
104	LIB_DEPENDS+= twolame.0:${PORTSDIR}/audio/twolame	104	LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame
105	.else	105	.else
106	CONFIGURE_ARGS+= --disable-twolame	106	CONFIGURE_ARGS+= --disable-twolame
107	.endif	107	.endif
108		108
109	.if defined(WITH_FAAC)	109	.if defined(WITH_FAAC)
110	LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac	110	LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac
111	.else	111	.else
112	CONFIGURE_ARGS+= --disable-faac	112	CONFIGURE_ARGS+= --disable-faac
113	.endif	113	.endif
114		114
115	.if !defined(WITHOUT_X264)	115	.if !defined(WITHOUT_X264)
116	LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264	116	LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264
117	.else	117	.else
118	CONFIGURE_ARGS+= --disable-x264	118	CONFIGURE_ARGS+= --disable-x264
119	.endif	119	.endif
120		120
121	.if !defined(WITHOUT_XVID)	121	.if !defined(WITHOUT_XVID)
122	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid	122	LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid
123	.else	123	.else
124	CONFIGURE_ARGS+= --disable-xvid	124	CONFIGURE_ARGS+= --disable-xvid
125	.endif	125	.endif
126		126
127	.ifdef(WITH_DIRAC)	127	.ifdef(WITH_DIRAC)
128	LIB_DEPENDS+= dirac_encoder.1:${PORTSDIR}/multimedia/dirac	128	LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac
129	.else	129	.else
130	CONFIGURE_ARGS+= --disable-libdirac-lavc	130	CONFIGURE_ARGS+= --disable-libdirac-lavc
131	.endif	131	.endif

Lines 7-13 Link Here

(-)b/mplayer/Makefile (-10 / +9 lines)
7		7
8	PORTNAME= mplayer	8	PORTNAME= mplayer
9	PORTVERSION= ${MPLAYER_PORT_VERSION}	9	PORTVERSION= ${MPLAYER_PORT_VERSION}
10	PORTREVISION= 2
11		10
12	COMMENT= High performance media player supporting many formats	11	COMMENT= High performance media player supporting many formats
13		12
Lines 16-22 Link Here
16	OPTIONS= DEBUG "Include debug symbols in mplayer's binaries" off	15	OPTIONS= DEBUG "Include debug symbols in mplayer's binaries" off
17	OPTIONS+= RTCPU "Allow runtime CPU detection" on	16	OPTIONS+= RTCPU "Allow runtime CPU detection" on
18	OPTIONS+= OCFLAGS "Use optimized compiler flags" on	17	OPTIONS+= OCFLAGS "Use optimized compiler flags" on
19	OPTIONS+= OTCHAIN "Use up-to-date toolchain (gcc 4.6)" on	18	OPTIONS+= OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off
20	OPTIONS+= IPV6 "Include inet6 network support" on	19	OPTIONS+= IPV6 "Include inet6 network support" on
21	OPTIONS+= X11 "Enable X11 support for mplayer's video output" on	20	OPTIONS+= X11 "Enable X11 support for mplayer's video output" on
22	OPTIONS+= X11XV "X11 video drivers: XV" on	21	OPTIONS+= X11XV "X11 video drivers: XV" on
Lines 129-135 Link Here
129	.endif	128	.endif
130	.if !defined(WITHOUT_X11GL)	129	.if !defined(WITHOUT_X11GL)
131	USE_XORG+= glproto	130	USE_XORG+= glproto
132	LIB_DEPENDS+= GL.1:${PORTSDIR}/graphics/libGL	131	LIB_DEPENDS+= GL:${PORTSDIR}/graphics/libGL
133	.else	132	.else
134	CONFIGURE_ARGS+=--disable-gl	133	CONFIGURE_ARGS+=--disable-gl
135	.endif	134	.endif
Lines 153-159 Link Here
153	.endif	152	.endif
154		153
155	.if defined(WITH_VDPAU)	154	.if defined(WITH_VDPAU)
156	LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau	155	LIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau
157	.else	156	.else
158	CONFIGURE_ARGS+= --disable-vdpau	157	CONFIGURE_ARGS+= --disable-vdpau
159	.endif	158	.endif
Lines 167-185 Link Here
167	.endif	166	.endif
168		167
169	.if defined(WITH_ARTS)	168	.if defined(WITH_ARTS)
170	LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts	169	LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts
171	.else	170	.else
172	CONFIGURE_ARGS+= --disable-arts	171	CONFIGURE_ARGS+= --disable-arts
173	.endif	172	.endif
174		173
175	.if defined(WITH_LIBCACA)	174	.if defined(WITH_LIBCACA)
176	LIB_DEPENDS+=caca.0:${PORTSDIR}/graphics/libcaca	175	LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca
177	.else	176	.else
178	CONFIGURE_ARGS+= --disable-caca	177	CONFIGURE_ARGS+= --disable-caca
179	.endif	178	.endif
180		179
181	.if defined(WITH_LIRC)	180	.if defined(WITH_LIRC)
182	LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc	181	LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
183	.else	182	.else
184	CONFIGURE_ARGS+= --disable-lirc	183	CONFIGURE_ARGS+= --disable-lirc
185	.endif	184	.endif
Lines 193-205 Link Here
193	.endif	192	.endif
194		193
195	.if defined(WITH_SVGALIB)	194	.if defined(WITH_SVGALIB)
196	LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib	195	LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
197	.else	196	.else
198	CONFIGURE_ARGS+= --disable-svga	197	CONFIGURE_ARGS+= --disable-svga
199	.endif	198	.endif
200		199
201	.if defined(WITH_AALIB)	200	.if defined(WITH_AALIB)
202	LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib	201	LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib
203	.else	202	.else
204	CONFIGURE_ARGS+= --disable-aa	203	CONFIGURE_ARGS+= --disable-aa
205	.endif	204	.endif
Lines 224-230 Link Here
224	.endif	223	.endif
225		224
226	.if defined(WITH_ENCA)	225	.if defined(WITH_ENCA)
227	LIB_DEPENDS+= enca.5:${PORTSDIR}/converters/enca	226	LIB_DEPENDS+= enca:${PORTSDIR}/converters/enca
228	.else	227	.else
229	CONFIGURE_ARGS+= --disable-enca	228	CONFIGURE_ARGS+= --disable-enca
230	.endif	229	.endif

Lines 4-15 Link Here

(-)b/mplayer/Makefile.shared (-6 / +5 lines)
4	#	4	#
5	# $FreeBSD: ports/multimedia/mplayer/Makefile.shared,v 1.19 2012/07/11 15:07:50 pawel Exp $	5	# $FreeBSD: ports/multimedia/mplayer/Makefile.shared,v 1.19 2012/07/11 15:07:50 pawel Exp $
6		6
7	MPLAYER_SNAPSHOT_DATE= 2012-03-22	7	MPLAYER_SNAPSHOT_DATE= 2012-07-21
8	MPLAYER_PORT_VERSION= 1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}	8	MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
9	CATEGORIES?= multimedia audio	9	CATEGORIES?= multimedia audio
10	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \	10	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
11	http://www.rrr.de/~riggs/mplayer/	11	DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
12	DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/rc/g}
13	WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}	12	WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
14		13
15	PROJECTHOST= bsdistfiles	14	PROJECTHOST= bsdistfiles
Lines 19-25 Link Here
19	LICENSE= GPLv2	18	LICENSE= GPLv2
20		19
21	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \	20	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
22	freetype.9:${PORTSDIR}/print/freetype2	21	freetype:${PORTSDIR}/print/freetype2
23		22
24	BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm	23	BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
25		24

Lines 11-25 Link Here

(-)b/mplayer/files/extra-patch-base_system_gcc (-9 lines)
11		11
12	--- configure.orig 2011-12-31 00:40:03.990976000 +0100	12	--- configure.orig 2011-12-31 00:40:03.990976000 +0100
13	+++ configure 2011-12-31 01:33:51.407685009 +0100	13	+++ configure 2011-12-31 01:33:51.407685009 +0100
14	@@ -1533,7 +1533,7 @@
15	fi
16
17	extra_cflags="-I. -Iffmpeg $extra_cflags"
18	-extra_ldflags="-lm $extra_ldflags"
19	+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
20	_timer=timer-linux.c
21	_getch=getch2.c
22
23	@@ -2683,10 +2683,6 @@	14	@@ -2683,10 +2683,6 @@
24	def_ebx_available='#define HAVE_EBX_AVAILABLE 0'	15	def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
25	def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'	16	def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'

Lines 1-15 Link Here

(-)b/mplayer/files/extra-patch-base_system_log2f (-6 / +6 lines)
1	--- configure.orig 2011-12-15 15:01:05.000000000 +0100	1	--- configure.orig 2012-07-24 20:47:24.721531229 +0200
2	+++ configure 2012-01-28 17:33:54.674887100 +0100	2	+++ configure 2012-07-24 20:49:56.207569906 +0200
3	@@ -3107,7 +3107,7 @@	3	@@ -3130,7 +3130,7 @@
4	echores "$_kstat"	4	echores "$_kstat"
5		5
6		6
7	-for func in cbrtf exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf trunc truncf; do	7	-for func in cbrtf exp2 exp2f isnan isinf llrint llrintf log2 log2f lrint lrintf rint round roundf trunc truncf; do
8	+for func in cbrtf exp2 exp2f llrint llrintf lrint lrintf round roundf trunc truncf; do	8	+for func in cbrtf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf trunc truncf; do
9	echocheck $func	9	echocheck $func
10	eval _$func=no	10	eval _$func=no
11	statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes	11	statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
12	@@ -3119,7 +3119,9 @@	12	@@ -3142,7 +3142,9 @@
13	echores no	13	echores no
14	fi	14	fi
15	done	15	done

Lines 1-18 Link Here

(-)b/mplayer/files/patch-libavcodec-Makefile (-14 / +7 lines)
1	--- ffmpeg/libavcodec/Makefile.orig 2012-03-21 19:20:05.000000000 +0100	1	--- ffmpeg/libavcodec/Makefile.orig 2012-07-20 19:20:04.000000000 +0200
2	+++ ffmpeg/libavcodec/Makefile 2012-03-22 16:12:43.333951792 +0100	2	+++ ffmpeg/libavcodec/Makefile 2012-07-21 18:25:12.582670118 +0200
3	@@ -735,12 +735,14 @@	3	@@ -788,7 +788,7 @@
4	# well.	4	codec_names.h \
5	OBJS-$(!CONFIG_SMALL) += inverse.o
6
7	+-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
8	+
9	SKIPHEADERS += %_tablegen.h \
10	%_tables.h \
11	aac_tablegen_decl.h \
12	fft-internal.h \	5	fft-internal.h \
13	tableprint.h \	6	tableprint.h \
14	- $(ARCH)/vp56_arith.h	7	- $(ARCH)/vp56_arith.h \
15	+ $(MPLAYER_ARCH)/vp56_arith.h	8	+ $(MPLAYER_ARCH)/vp56_arith.h \
		9
16	SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h	10	SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
17	SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h
18	SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h	11	SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h