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

(-)multimedia/mplayerxp/Makefile (-148 / +69 lines)
Lines 6-28 Link Here
6
#
6
#
7
7
8
PORTNAME=	mplayerxp
8
PORTNAME=	mplayerxp
9
PORTVERSION=	0.6.2
9
PORTVERSION=	0.7.2
10
PORTREVISION=	5
11
CATEGORIES=	multimedia audio
10
CATEGORIES=	multimedia audio
12
MASTER_SITES=	SF
11
MASTER_SITES=	SF
13
12
14
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	ports@FreeBSD.org
15
COMMENT=	Multi-threaded branch of the well known mplayer media player
14
COMMENT=	Multi-threaded branch of the well known mplayer media player
16
15
17
LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
16
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
18
		jpeg.9:${PORTSDIR}/graphics/jpeg \
19
		png.5:${PORTSDIR}/graphics/png \
17
		png.5:${PORTSDIR}/graphics/png \
20
		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager
18
		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager
21
RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
19
RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
22
20
21
OPTIONS=	DVDNAV       	"Enable libdvdnav support"   	off \
22
		DVDPLAY      	"Enable libdvdplay support"    	off \
23
		CDPARANOIA   	"Enable CDDA support"         	off \
24
		OCFLAGS     	"Use optimized compiler flags"	off \
25
		SDL          	"Enable SDL video output"     	off \
26
		TERMCAP      	"Enable termcap key support"  	off \
27
		WIN32        	"Enable win32 codec set"      	on
28
23
ONLY_FOR_ARCHS=	i386
29
ONLY_FOR_ARCHS=	i386
24
30
25
USE_BZIP2=	yes
31
USE_BZIP2=	yes
32
USE_XORG=	xinerama xv xxf86dga xxf86vm
26
USE_ICONV=	yes
33
USE_ICONV=	yes
27
USE_GMAKE=	yes
34
USE_GMAKE=	yes
28
HAS_CONFIGURE=	yes
35
HAS_CONFIGURE=	yes
Lines 35-161 Link Here
35
42
36
.include <bsd.port.pre.mk>
43
.include <bsd.port.pre.mk>
37
44
38
.if ${OSVERSION} >= 700042
39
BROKEN=		Does not compile with GCC 4.2
40
.endif
41
42
# add this after <bsd.port.pre.mk> so that we inherit /etc/make.conf
45
# add this after <bsd.port.pre.mk> so that we inherit /etc/make.conf
43
CONFIGURE_ARGS+=	--with-extralibdir=${LOCALBASE}/lib \
46
CONFIGURE_ARGS+=	--with-extralibdir=${LOCALBASE}/lib \
44
		--with-extraincdir=${LOCALBASE}/include \
47
		--with-extraincdir=${LOCALBASE}/include \
45
		--with-x11incdir=${LOCALBASE}/include \
46
		--with-x11libdir=${LOCALBASE}/lib \
47
		--cc=${CC} \
48
		--cc=${CC} \
48
		--prefix=${PREFIX} \
49
		--prefix=${PREFIX} \
49
		--confdir=${PREFIX}/etc/${PORTNAME} \
50
		--confdir=${ETCDIR} \
50
		--datadir=${LOCALBASE}/share/mplayer \
51
		--datadir=${LOCALBASE}/share/mplayer \
52
		--libdir=${PREFIX}/lib \
51
		--disable-fbdev \
53
		--disable-fbdev \
52
		--disable-lirc \
54
		--disable-lirc \
53
		--disable-rtc \
55
		--disable-rtc \
54
		--disable-vm \
55
		--disable-tv-v4l
56
		--disable-tv-v4l
56
CONFIGURE_ENV+=	LANG=C
57
CONFIGURE_ENV+=	LANG=C
57
# insure CC,LD safeness
58
# insure CC,LD safeness
58
MAKE_ARGS+=	CC="${CC}" LD="${LD}"
59
MAKE_ARGS+=	CC="${CC}" LD="${LD}" INSTALL="${INSTALL}"
59
60
60
CFLAGS+=	-I${LOCALBASE}/include
61
CFLAGS+=	-I${LOCALBASE}/include
61
CFLAGS+=	-fomit-frame-pointer
62
CFLAGS+=	-fomit-frame-pointer
62
63
63
##
64
##
64
## Feature detection
65
##
66
67
# xine libdvdnav
68
.if exists(${LOCALBASE}/lib/libdvdnav.so)
69
WITH_DVD=yes
70
WITH_LIBDVDNAV=yes
71
.endif
72
.if exists(${LOCALBASE}/lib/libdvdplay.a)
73
# ogle's libdvdplay
74
WITH_DVD=yes
75
WITH_DVDPLAY=yes
76
.endif
77
# cdparanoia (cdda support)
78
.if exists(${LOCALBASE}/lib/libcdda_paranoia.so)
79
WITH_CDPARANOIA=yes
80
.endif
81
# ogle's libdvdread (dvd support)
82
.if exists(${LOCALBASE}/lib/libdvdread.a)
83
WITH_DVD=yes
84
.endif
85
# sdl
86
.if ${HAVE_SDL:Msdl}!=""
87
WITH_SDL=yes
88
.endif
89
# sdl_image
90
.if ${HAVE_SDL:Mimage}!=""
91
WITH_SDL_IMAGE=yes
92
.endif
93
# xvid
94
.if exists(${LOCALBASE}/lib/libxvidcore.so)
95
WITH_XVID=yes
96
.endif
97
98
##
99
## Feature activation and Library Dependencies
65
## Feature activation and Library Dependencies
100
##
66
##
101
67
102
# libdvdnav does not currently work
103
.undef WITH_LIBDVDNAV
104
WITHOUT_LIBDVDNAV=yes
105
106
# compilation optimizations
107
.if defined(WITH_OPTIMIZED_CFLAGS)
108
CFLAGS+=	-O3 -ffast-math
109
.endif
110
# cdda support
68
# cdda support
111
.if defined(WITH_CDPARANOIA)
69
.if defined(WITH_CDPARANOIA)
112
LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
70
LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
71
72
CONFIGURE_ARGS+=	--enable-cdparanoia
113
.else
73
.else
114
CONFIGURE_ARGS+=	--disable-cdparanoia
74
CONFIGURE_ARGS+=	--disable-cdparanoia
115
.endif
75
.endif
116
# dvd support
76
# dvd support
117
.if defined(WITH_DVD)
77
.if defined(WITH_DVDNAV) || defined(WITH_DVDPLAY)
118
LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
78
LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
119
79
120
CONFIGURE_ARGS+=	--with-csslibdir=${LOCALBASE}/lib
80
CONFIGURE_ARGS+=	--enable-libdvdread
121
PLIST_SUB+=	DVD=''
122
.else
81
.else
123
PLIST_SUB+=	DVD='@comment '
82
CONFIGURE_ARGS+=	--disable-libdvdread
124
.endif
83
.endif
125
# xine libdvdnav
84
# xine libdvdnav
126
.if defined(WITH_LIBDVDNAV) && !defined(WITHOUT_LIBDVDNAV)
85
.if defined(WITH_DVDNAV)
127
LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
86
LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
128
87
129
CONFIGURE_ARGS+=	--with-libdvdnav=${LOCALBASE}
88
CONFIGURE_ARGS+=	--enable-libdvdnav
89
.else
90
CONFIGURE_ARGS+=	--disable-libdvdnav
130
.endif
91
.endif
131
# ogle's libdvdplay
92
# ogle's libdvdplay
132
.if defined(WITH_LIBDVDPLAY) && !defined(WITHOUT_LIBDVDPLAY)
93
.if defined(WITH_DVDPLAY)
133
LIB_DEPENDS+=	dvdplay.0:${PORTSDIR}/multimedia/libdvdplay
94
LIB_DEPENDS+=	dvdplay.0:${PORTSDIR}/multimedia/libdvdplay
134
95
135
CONFIGURE_ARGS+=	--with-libdvdplay=${LOCALBASE}
96
CONFIGURE_ARGS+=	--enable-libdvdplay
136
.endif
137
# sdl
138
.if defined(WITH_SDL)
139
USE_SDL=	sdl
140
CONFIGURE_ARGS+=	--enable-sdl
141
.else
97
.else
142
CONFIGURE_ARGS+=	--disable-sdl
98
CONFIGURE_ARGS+=	--disable-libdvdplay
143
.endif
99
.endif
144
# sdl_image
100
# compilation optimizations
145
.if defined(WITH_SDL_IMAGE)
101
.if defined(WITH_OCFLAGS)
146
USE_SDL+=	image
102
CFLAGS+=	-O3 -ffast-math
147
CONFIGURE_ARGS+=	--enable-sdl-image
148
.else
103
.else
149
CONFIGURE_ARGS+=	--disable-sdl-image
104
MAKE_ARGS+=	OPTFLAGS="${CFLAGS}" SHCFLAGS="${CFLAGS} -PIC"
150
.endif
105
.endif
151
# xvid
106
# sdl
152
.if defined(WITH_XVID)
107
.if defined(WITH_SDL)
153
LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
108
USE_SDL=	image sdl
154
109
CONFIGURE_ARGS+=	--enable-sdl --enable-sdl-image
155
CONFIGURE_ARGS+=	--enable-xvid \
156
			--with-xvidcore=${LOCALBASE}
157
.else
110
.else
158
CONFIGURE_ARGS+=	--disable-xvid
111
CONFIGURE_ARGS+=	--disable-sdl --disable-sdl-image
159
.endif
112
.endif
160
# termcap key support
113
# termcap key support
161
# mplayerxp does not clean up after itself yet
114
# mplayerxp does not clean up after itself yet
Lines 172-247 Link Here
172
CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
125
CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
173
.endif
126
.endif
174
127
175
pre-everything::
176
.if !defined(WITH_OPTIMIZED_CFLAGS)
177
	@${ECHO_MSG} '===>'
178
	@${ECHO_MSG} '===> You can enable additional compilation optimizations'
179
	@${ECHO_MSG} '		by defining WITH_OPTIMIZED_CFLAGS.'
180
.endif
181
.if !defined(WITH_CDPARANOIA)
182
	@${ECHO_MSG} '===>'
183
	@${ECHO_MSG} '===> You can enable cdda support by defining WITH_CDPARANOIA.'
184
.endif
185
.if !defined(WITH_DVD)
186
	@${ECHO_MSG} '===>'
187
	@${ECHO_MSG} '===> You can enable DVD support by defining WITH_DVD.'
188
.endif
189
.if !defined(WITH_LIBDVDNAV)
190
	@${ECHO_MSG} '===>'
191
	@${ECHO_MSG} '===> You can enable LIBDVDNAV support by defining WITH_LIBDVDNAV.'
192
.endif
193
.if !defined(WITH_LIBDVDNAV)
194
	@${ECHO_MSG} '===>'
195
	@${ECHO_MSG} '===> You can enable LIBDVDPLAY support by defining WITH_LIBDVDPLAY.'
196
.endif
197
.if !defined(WITH_SDL)
198
	@${ECHO_MSG} '===>'
199
	@${ECHO_MSG} '===> You can enable SDL support by defining WITH_SDL.'
200
.endif
201
.if !defined(WITH_SDL_IMAGE)
202
	@${ECHO_MSG} '===>'
203
	@${ECHO_MSG} '===> You can enable SDL_image support by defining WITH_SDL_IMAGE.'
204
.endif
205
.if !defined(WITH_TERMCAP)
206
	@${ECHO_MSG} '===>'
207
	@${ECHO_MSG} '===> You can enable termcap key database support by defining WITH_TERMCAP.'
208
.endif
209
.if !defined(WITH_XVID)
210
	@${ECHO_MSG} '===>'
211
	@${ECHO_MSG} '===> You can enable XVID support by defining WITH_XVID.'
212
.endif
213
.if !defined(WITHOUT_WIN32_CODECS)
214
	@${ECHO_MSG} '===>'
215
	@${ECHO_MSG} '===> You can disable support for Win32 codecs by defining WITHOUT_WIN32_CODECS'
216
.endif
217
	@${ECHO_MSG} '===>'
218
219
post-patch:
128
post-patch:
220
# win32 codec location
129
# win32 codec location
221
	@${REINPLACE_CMD} -E -e \
130
	@${REINPLACE_CMD} -e \
222
		's|WIN32_PATH|"${WIN32_CODEC_PREFIX}"|' \
131
		's|WIN32_PATH|"${WIN32_CODEC_PREFIX}"|' ${WRKSRC}/loader/win32.c
223
		${WRKSRC}/loader/win32.c
224
# FreeBSD's install utility does not support -D flag
132
# FreeBSD's install utility does not support -D flag
225
	@${FIND} ${WRKSRC} -name Makefile | \
133
	@${FIND} ${WRKSRC} -name "Makefile" -print0 | \
226
		${XARGS} -x -n 10 ${REINPLACE_CMD} -E -e \
134
		${XARGS} -0 ${REINPLACE_CMD} -e \
227
		's,(\$$\(INSTALL\)|install)(.*)-D,${INSTALL}\2,'
135
		'/INSTALL/s| -D | |g ; \
136
		 /install/s| -D | |g'
228
# PTHREAD_{CFLAGS,LIBS}
137
# PTHREAD_{CFLAGS,LIBS}
229
# stdint.h -> inttypes.h
138
	@${REINPLACE_CMD} -e \
230
	@${REINPLACE_CMD} -E -e  \
139
		'/pthread/s|_ld_i in .* ;|_ld_i in "${PTHREAD_LIBS}" ;|g ; \
231
		's|-lpthread|${PTHREAD_LIBS}|; \
140
		 s|pkg-config|true|g ; \
232
		s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|; \
141
		 s|^MAKE=|#MAKE=|g' ${WRKSRC}/codecs/configure
233
		s|<stdint\.h>|<inttypes.h>|' \
142
	@${REINPLACE_CMD} -e \
234
		${WRKSRC}/mplayerxp/configure
143
		'/pthread/s|_ld_i in .* ;|_ld_i in "${PTHREAD_LIBS}" ;|g ; \
235
# ffmpeg currently is not compatible with mplayerxp
144
		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/mplayerxp/configure
236
#.for file in ad_ffmp3.c vd_ffmpeg.c
145
#
237
#	@${REINPLACE_CMD} -e 's|libavcodec.so|libNOTavcodec.so|' \
146
	@${REINPLACE_CMD} -e \
238
#		${WRKSRC}/mplayerxp/libmpcodecs/${file}
147
		's|-Wl,-rpath |-Wl,-rpath,|g' ${WRKSRC}/codecs/common.mak
239
#.endfor
148
	@${REINPLACE_CMD} -e \
240
# native libdivxdecore is not compatible with mplayerxp
149
		'/install -d/d' ${WRKSRC}/codecs/subdir.mak
241
.for file in vd_divx4.c vd_xvid.c
150
242
	@${REINPLACE_CMD} -e 's|libdivxdecore|libNOTdivxdecore|' \
151
post-configure:
243
		${WRKSRC}/mplayerxp/libmpcodecs/${file}
152
	@cd ${WRKSRC}/codecs && ./configure --cc=${CC} \
244
.endfor
153
		--prefix=${PREFIX} \
154
		--confdir=${ETCDIR} \
155
		--datadir=${LOCALBASE}/share/mplayer \
156
		--libdir=${PREFIX}/lib
157
.if !defined(WITH_OCFLAGS)
158
	@${FIND} ${WRKSRC} -name "config.h" -print0 | \
159
		${XARGS} -0 ${REINPLACE_CMD} -e \
160
		'/CAN_COMPILE_/s|^#define|// #undef|g ; \
161
		 /_CLOBBERED/s|^#define|// #undef|g'
162
.endif
245
163
246
pre-install:
164
pre-install:
247
# create dirs before installation since the port uses a install
165
# create dirs before installation since the port uses a install
Lines 250-253 Link Here
250
	@${MKDIR} ${PREFIX}/${dir}
168
	@${MKDIR} ${PREFIX}/${dir}
251
.endfor
169
.endfor
252
170
171
post-install:
172
	@${STRIP_CMD} ${PREFIX}/bin/mplayerxp
173
253
.include <bsd.port.post.mk>
174
.include <bsd.port.post.mk>
(-)multimedia/mplayerxp/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (mplayerxp-0.6.2.tar.bz2) = 9c4c7d82c3f4bd83cfb5a600ca969974
1
MD5 (mplayerxp-0.7.2.tar.bz2) = ba68358f9fe2cc1fbbcb09432826aa09
2
SHA256 (mplayerxp-0.6.2.tar.bz2) = a8c7b4bbca99d738ce4e32801d2919681b8643346c2c6db7e7d9dc40d28750cf
2
SHA256 (mplayerxp-0.7.2.tar.bz2) = 0b1c5886701f7c856cb16b4075cb7cca180c020b6db6b212d5749fc5e44afa88
3
SIZE (mplayerxp-0.6.2.tar.bz2) = 4020226
3
SIZE (mplayerxp-0.7.2.tar.bz2) = 4646121
(-)multimedia/mplayerxp/files/patch-codecs__common.mak (-24 lines)
Lines 1-24 Link Here
1
--- codecs/common.mak.orig	Fri Dec  1 16:20:40 2006
2
+++ codecs/common.mak	Mon Dec 25 00:55:17 2006
3
@@ -22,7 +22,7 @@
4
 endif
5
 
6
 ifneq ($(TARGET_OS),WIN32)
7
-LDFLAGS+=-Xlinker -rpath=$(BINDIR)
8
+LDFLAGS+=-L${LOCALBASE}/lib -Xlinker -rpath=$(BINDIR)
9
 endif
10
 
11
 ifeq ($(TARGET_ARCH_SPARC64),yes)
12
@@ -42,9 +42,9 @@
13
 	$(RANLIB) $@
14
 
15
 $(SLIBNAME): $(SHARED_OBJS)
16
-ifneq ($(TARGET_OS),WIN32)
17
-	install -d  $(BINDIR)
18
-endif
19
+#ifneq ($(TARGET_OS),WIN32)
20
+#	install -d  $(BINDIR)
21
+#endif
22
 	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
23
 #ifeq ($(TARGET_OS),WIN32)
24
 #	-lib /machine:i386 /def:$(@:.dll=.def)
(-)multimedia/mplayerxp/files/patch-codecs__configure (-10 lines)
Lines 1-10 Link Here
1
--- codecs/configure.orig	Sat Sep 30 16:20:13 2006
2
+++ codecs/configure	Tue Oct  3 12:15:45 2006
3
@@ -604,7 +604,7 @@
4
 BUILD_SHARED=yes
5
 SRC_PATH=$source_path
6
 
7
-MAKE=make
8
+#MAKE=make
9
 CC=$_cc
10
 AR=ar
(-)multimedia/mplayerxp/files/patch-codecs__libavcodec__avcodec.h (-15 lines)
Lines 1-15 Link Here
1
--- codecs/libavcodec/avcodec.h.orig	Tue Apr  3 15:53:38 2007
2
+++ codecs/libavcodec/avcodec.h	Sun Apr 15 03:53:55 2007
3
@@ -34,6 +34,12 @@
4
 #include "avutil.h"
5
 #include <sys/types.h> /* size_t */
6
 
7
+#ifndef INT64_C
8
+#ifdef i386
9
+#define INT64_C(c) (c ## LL)
10
+#endif
11
+#endif
12
+
13
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
14
 #define AV_TOSTRING(s) #s
15
 
(-)multimedia/mplayerxp/files/patch-codecs__libavcodec__xvidff.c (-13 lines)
Lines 1-13 Link Here
1
--- codecs/libavcodec/xvidff.c.orig	Wed Oct 18 02:39:04 2006
2
+++ codecs/libavcodec/xvidff.c	Mon Dec 25 01:35:12 2006
3
@@ -31,6 +31,10 @@
4
 #include "avcodec.h"
5
 #include "xvid_internal.h"
6
 
7
+#ifndef roundf
8
+#define roundf(x) (floor((x)+(float )0.5f))
9
+#endif
10
+
11
 /**
12
  * Buffer management macros.
13
  */
(-)multimedia/mplayerxp/files/patch-loader__dmo__Makefile (-15 lines)
Lines 1-15 Link Here
1
--- loader/dmo/Makefile.orig	Fri Oct 20 00:57:44 2006
2
+++ loader/dmo/Makefile	Mon Dec 25 00:17:23 2006
3
@@ -29,9 +29,9 @@
4
 	$(CC) -c $(CFLAGS) -o $@ $<
5
 
6
 $(LIBNAME):	$(OBJS)
7
-ifneq ($(TARGET_OS),WIN32)
8
-	install -d  $(BINDIR)
9
-endif
10
+#ifneq ($(TARGET_OS),WIN32)
11
+#	install -d  $(BINDIR)
12
+#endif
13
 	$(LD) --shared $(LD_FLAGS) -o $@ $(OBJS) ../dshow/DS_Filter$(SLIBSUF) $(LD_LIBS)
14
 all:	$(LIBNAME)
15
 
(-)multimedia/mplayerxp/files/patch-loader__dshow__Makefile (-15 lines)
Lines 1-15 Link Here
1
--- loader/dshow/Makefile.orig	Fri Oct 20 00:57:44 2006
2
+++ loader/dshow/Makefile	Mon Dec 25 00:16:16 2006
3
@@ -34,9 +34,9 @@
4
 	$(CC) -c $(CFLAGS) -o $@ $<
5
 
6
 $(LIBNAME):	$(OBJS)
7
-ifneq ($(TARGET_OS),WIN32)
8
-	install -d  $(BINDIR)
9
-endif
10
+#ifneq ($(TARGET_OS),WIN32)
11
+#	install -d  $(BINDIR)
12
+#endif
13
 	$(LD) --shared $(LD_FLAGS) -o $(LIBNAME) $(OBJS) $(LD_LIBS)
14
 
15
 test:   test.c $(LIBNAME)
(-)multimedia/mplayerxp/files/patch-mplayerxp__configure (+34 lines)
Line 0 Link Here
1
--- mplayerxp/configure.orig	2009-01-25 17:00:03.000000000 +0900
2
+++ mplayerxp/configure	2009-02-03 00:18:15.000000000 +0900
3
@@ -85,13 +85,11 @@
4
   --enable-dga           build with DGA1 or DGA2 support [autodetect]
5
   --enable-vesa          build with VESA support [autodetect]
6
   --enable-sdl           build with SDL render support [autodetect]
7
-  --enable-vm            build with XF86VidMode support for X11 [autodetect]
8
   --enable-x11           build with X11 render support [autodetect]
9
   --enable-xdpms         build with X11 DPMS support [autodetect]
10
   --enable-xinerama      build with Xinerama support for X11 [autodetect]
11
   --enable-xf86vm        build with Xf86vm support for X11 [autodetect]
12
   --enable-xv            build with Xv render support for X 4.x [autodetect]
13
-  --enable-xv            build with Xv render support for X 4.x [autodetect]
14
   --enable-fbdev         build with FBDev render support [autodetect]
15
   --enable-fbdev=nocopy  yuv12 converts directly into framebuffer
16
   --enable-mlib          build with MLIB support (Solaris only) [autodetect]
17
@@ -431,6 +429,8 @@
18
   --disable-libdvdplay)	libdvdplay=no	;;
19
   --enable-xinerama)	xinerama=yes	;;
20
   --disable-xinerama)	xinerama=no	;;
21
+  --enable-xf86vm)	xf86vm=yes	;;
22
+  --disable-xf86vm)	xf86vm=no	;;
23
   --enable-alsa)	alsa=yes	;;
24
   --disable-alsa)	alsa=no		;;
25
   --enable-tv)		tv=yes		;;
26
@@ -806,7 +806,7 @@
27
 print_config HAVE_ config.h config.mak xv
28
 
29
 enabled xinerama	&& require2 xinerama "X11/Xlib.h X11/extensions/Xinerama.h" XineramaIsActive -lXinerama
30
-print_config HAVE_ config.h config.mak xv
31
+print_config HAVE_ config.h config.mak xinerama
32
 
33
 # Note: the -lXxf86vm library is the VideoMode extension and though it's not
34
 # needed for DGA, AFAIK every distribution packages together with DGA stuffs
(-)multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_null.c (-5 / +4 lines)
Lines 1-9 Link Here
1
--- mplayerxp/libao2/ao_null.c.orig	Thu Nov 30 15:32:02 2006
1
--- mplayerxp/libao2/ao_null.c.orig	2007-12-02 18:19:44.000000000 +0900
2
+++ mplayerxp/libao2/ao_null.c	Sun Dec 24 21:48:25 2006
2
+++ mplayerxp/libao2/ao_null.c	2009-01-07 18:28:00.000000000 +0900
3
@@ -1,7 +1,7 @@
3
@@ -3,6 +3,7 @@
4
-#include <stdint.h>
5
 #include <stdio.h>
6
 #include <stdlib.h>
4
 #include <stdlib.h>
5
 #include <string.h>
7
 #include <limits.h>
6
 #include <limits.h>
8
+#include <sys/types.h>
7
+#include <sys/types.h>
9
 #include <sys/time.h>
8
 #include <sys/time.h>
(-)multimedia/mplayerxp/files/patch-mplayerxp__libao2__ao_oss.c (-17 / +24 lines)
Lines 1-18 Link Here
1
--- mplayerxp/libao2/ao_oss.c.orig	Sat Jul  2 18:59:01 2005
1
--- mplayerxp/libao2/ao_oss.c.orig	2005-07-02 18:59:01.000000000 +0900
2
+++ mplayerxp/libao2/ao_oss.c	Sun Oct  1 22:06:55 2006
2
+++ mplayerxp/libao2/ao_oss.c	2009-01-07 18:26:10.000000000 +0900
3
@@ -171,6 +171,7 @@
3
@@ -18,6 +18,22 @@
4
   }
4
 #include "audio_out.h"
5
   show_fmts();
5
 #include "audio_out_internal.h"
6
   rval=0;
6
 
7
+#ifndef __FreeBSD__
7
+#ifndef DSP_CAP_COPROC
8
   if (ioctl (audio_fd, SNDCTL_DSP_GETCAPS, &rval) != -1)
8
+#define DSP_CAP_COPROC 0x00000800
9
   {
10
 	MSG_INFO("AO-INFO: Capabilities: ");
11
@@ -185,6 +186,7 @@
12
 	if(rval & DSP_CAP_BIND) MSG_INFO("bind ");
13
 	MSG_INFO("\n");	
14
   }
15
+#endif
9
+#endif
16
   close(audio_fd);
10
+#ifndef DSP_CAP_TRIGGER
17
 }
11
+#define DSP_CAP_TRIGGER 0x00001000
18
 // open & setup audio device
12
+#endif
13
+#ifndef DSP_CAP_MMAP
14
+#define DSP_CAP_MMAP 0x00002000
15
+#endif
16
+#ifndef DSP_CAP_MULTI
17
+#define DSP_CAP_MULTI 0x00004000
18
+#endif
19
+#ifndef DSP_CAP_BIND
20
+#define DSP_CAP_BIND  0x00008000
21
+#endif
22
+
23
 static ao_info_t info = 
24
 {
25
 	"OSS/ioctl audio output",
(-)multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__Makefile (+11 lines)
Line 0 Link Here
1
--- mplayerxp/libmpdemux/Makefile.orig	2008-12-25 01:04:59.000000000 +0900
2
+++ mplayerxp/libmpdemux/Makefile	2009-01-08 23:53:57.000000000 +0900
3
@@ -30,7 +30,7 @@
4
 
5
 OBJS	= $(SRCS:.c=.o)
6
 INCLUDE = -I../loader -I../../codecs/ -I../../codecs/libavcodec -I../../codecs/libavutil
7
-CFLAGS  = $(OPTFLAGS) $(INCLUDE) -W -Wall
8
+CFLAGS  = $(INCLUDE) $(OPTFLAGS) -W -Wall
9
 
10
 .SUFFIXES: .c .o
11
 
(-)multimedia/mplayerxp/files/patch-mplayerxp__libmpdemux__demux_mov.c (-13 lines)
Lines 1-13 Link Here
1
--- mplayerxp/libmpdemux/demux_mov.c.orig	Wed Sep 13 16:11:59 2006
2
+++ mplayerxp/libmpdemux/demux_mov.c	Sun Oct  1 21:57:58 2006
3
@@ -51,6 +51,10 @@
4
 #define char2short(x,y)	BE_16(*((uint16_t *)&(((unsigned char *)(x))[(y)])))
5
 #define char2int(x,y) 	BE_32(*((uint32_t *)&(((unsigned char *)(x))[(y)])))
6
 
7
+#ifndef SIZE_MAX
8
+#define SIZE_MAX ((size_t)-1)
9
+#endif
10
+
11
 typedef struct {
12
     unsigned int pts; // duration
13
     unsigned int size;
(-)multimedia/mplayerxp/files/patch-mplayerxp__libvo__vo_null.c (-12 lines)
Lines 1-12 Link Here
1
--- mplayerxp/libvo/vo_null.c.orig	Thu Jan 19 17:17:41 2006
2
+++ mplayerxp/libvo/vo_null.c	Sun Oct  1 22:39:27 2006
3
@@ -35,7 +35,9 @@
4
 #include "video_out_internal.h"
5
 #include "dri_vo.h"
6
 #include "vo_msg.h"
7
+#if 0
8
 #include <vidix/vidixlib.h>
9
+#endif
10
 
11
 LIBVO_EXTERN(null)
12
 
(-)multimedia/mplayerxp/files/patch-mplayerxp__nls__recode.c (-14 lines)
Lines 1-14 Link Here
1
--- mplayerxp/nls/recode.c.orig	Sat Feb 11 03:39:53 2006
2
+++ mplayerxp/nls/recode.c	Sun Oct  1 22:34:34 2006
3
@@ -3,11 +3,7 @@
4
 #include <stdlib.h>
5
 #include <errno.h>
6
 #ifdef USE_ICONV
7
-#ifdef __FreeBSD__
8
-#include <giconv.h>
9
-#else
10
 #include <iconv.h>
11
-#endif
12
 #endif
13
 #include "nls_msg.h"
14
 #include "./nls.h"
(-)multimedia/mplayerxp/files/patch-mplayerxp__postproc__dsp.c (-11 lines)
Lines 1-11 Link Here
1
--- mplayerxp/postproc/dsp.c.orig	Sat Jul  2 18:59:04 2005
2
+++ mplayerxp/postproc/dsp.c	Sun Oct  1 22:10:31 2006
3
@@ -11,7 +11,7 @@
4
 /* Design and implementation of different types of digital filters
5
 
6
 */
7
-#include <stdint.h>
8
+#include <inttypes.h>
9
 #include <string.h>
10
 #define __USE_ISOC99 1
11
 #include <math.h>
(-)multimedia/mplayerxp/files/patch-mplayerxp__subreader.c (-14 lines)
Lines 1-14 Link Here
1
--- mplayerxp/subreader.c.orig	Sat Feb 11 03:39:49 2006
2
+++ mplayerxp/subreader.c	Sun Oct  1 21:15:14 2006
3
@@ -19,11 +19,7 @@
4
 #define ERR ((void *) -1)
5
 
6
 #ifdef USE_ICONV
7
-#ifdef __FreeBSD__
8
-#include <giconv.h>
9
-#else
10
 #include <iconv.h>
11
-#endif
12
 #endif
13
 char *sub_cp=NULL;
14
 
(-)multimedia/mplayerxp/pkg-plist (-1 / +14 lines)
Lines 1-19 Link Here
1
%%DVD%%bin/fibmap_mplayerxp
2
bin/mplayerxp
1
bin/mplayerxp
3
etc/mplayerxp/codecs.conf
2
etc/mplayerxp/codecs.conf
4
etc/mplayerxp/eqbands
3
etc/mplayerxp/eqbands
4
etc/mplayerxp/menu.conf
5
lib/mplayerxp/codecs/libMP3.so
5
lib/mplayerxp/codecs/libMP3.so
6
lib/mplayerxp/codecs/liba52.so
6
lib/mplayerxp/codecs/liba52.so
7
lib/mplayerxp/codecs/libavcodec.so
7
lib/mplayerxp/codecs/libavcodec.so
8
lib/mplayerxp/codecs/libavcodec.so.mpxp
9
lib/mplayerxp/codecs/libavcodec.so.ver_mpxp
8
lib/mplayerxp/codecs/libavformat.so
10
lib/mplayerxp/codecs/libavformat.so
11
lib/mplayerxp/codecs/libavformat.so.mpxp
12
lib/mplayerxp/codecs/libavformat.so.ver_mpxp
9
lib/mplayerxp/codecs/libavutil.so
13
lib/mplayerxp/codecs/libavutil.so
14
lib/mplayerxp/codecs/libavutil.so.mpxp
15
lib/mplayerxp/codecs/libavutil.so.ver_mpxp
10
lib/mplayerxp/codecs/libdca.so
16
lib/mplayerxp/codecs/libdca.so
11
lib/mplayerxp/codecs/libfaad2.so
17
lib/mplayerxp/codecs/libfaad2.so
12
lib/mplayerxp/codecs/libmpeg2.so
18
lib/mplayerxp/codecs/libmpeg2.so
13
lib/mplayerxp/codecs/libnuppelvideo.so
19
lib/mplayerxp/codecs/libnuppelvideo.so
14
lib/mplayerxp/codecs/libpostproc.so
20
lib/mplayerxp/codecs/libpostproc.so
21
lib/mplayerxp/codecs/libpostproc.so.mpxp
22
lib/mplayerxp/codecs/libpostproc.so.ver_mpxp
23
lib/mplayerxp/codecs/libswscale.so
24
lib/mplayerxp/codecs/libswscale.so.mpxp
25
lib/mplayerxp/codecs/libswscale.so.ver_mpxp
15
lib/mplayerxp/wine/DMO_Filter.so
26
lib/mplayerxp/wine/DMO_Filter.so
16
lib/mplayerxp/wine/DS_Filter.so
27
lib/mplayerxp/wine/DS_Filter.so
28
lib/mplayerxp/wine/libDMO_Filter.so
29
lib/mplayerxp/wine/libDS_Filter.so
17
lib/mplayerxp/wine/libloader.so
30
lib/mplayerxp/wine/libloader.so
18
@dirrm lib/mplayerxp/wine
31
@dirrm lib/mplayerxp/wine
19
@dirrm lib/mplayerxp/codecs
32
@dirrm lib/mplayerxp/codecs

Return to bug 131846