enable xvidcore

tweak default dvd device to match OpenBSD.
This commit is contained in:
espie 2007-01-22 15:04:04 +00:00
parent 150b76cccb
commit df6efb0282
2 changed files with 15 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.109 2007/01/04 20:19:54 steven Exp $
# $OpenBSD: Makefile,v 1.110 2007/01/22 15:04:04 espie Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
@ -7,7 +7,7 @@ COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-1.0pre8
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p4
PKGNAME= ${DISTNAME:L}p5
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -47,7 +47,8 @@ LIB_DEPENDS= png::graphics/png \
theora::multimedia/libtheora \
speex::audio/speex \
mpcdec::audio/libmpcdec \
vorbis::audio/libvorbis
vorbis::audio/libvorbis \
xvidcore::multimedia/xvidcore
CONFDIR= ${SYSCONFDIR}/mplayer
SUBST_VARS= CONFDIR
@ -61,7 +62,6 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-caca \
--disable-internal-vidix \
--disable-external-vidix \
--disable-xvid \
--disable-libdv \
--disable-smb \
--disable-external-tremor \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.39 2006/08/16 15:17:15 biorn Exp $
$OpenBSD: patch-configure,v 1.40 2007/01/22 15:04:04 espie Exp $
--- configure.orig Sun Jun 11 20:35:47 2006
+++ configure Sat Aug 12 12:01:53 2006
+++ configure Mon Jan 15 14:07:33 2007
@@ -839,6 +839,8 @@ if x86 || x86_64 ; then
pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \
-e s/xmm/sse/ -e s/kni/sse/`
@ -64,3 +64,12 @@ $OpenBSD: patch-configure,v 1.39 2006/08/16 15:17:15 biorn Exp $
#endif
/* Define this if your system has the "alloca.h" header file */
@@ -8042,7 +8046,7 @@ $_def_vcd
#define DEFAULT_DVD_DEVICE "/dev/rdiskN"
#elif defined(__OpenBSD__)
#define DEFAULT_CDROM_DEVICE "/dev/rcd0a"
-#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
+#define DEFAULT_DVD_DEVICE "/dev/rcd0c"
#elif defined(__FreeBSD__)
#define DEFAULT_CDROM_DEVICE "/dev/acd0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE