On Wed, Aug 19, 2009 at 08:27:32AM +0100, Edd Barrett wrote:
> OK. I will leave it at the discretion of others as to whether this is
> ready then.
Here is an updated diff which pulls in faad non-conditionally.
--
Best Regards
Edd Barrett
(Freelance software developer / technical writer / open-source developer)
http://students.dec.bmth.ac.uk/ebarrett
diff -uNa mplayer/Makefile mplayer.new/Makefile
--- mplayer/Makefile Sun Aug 23 23:46:39 2009
+++ mplayer.new/Makefile Sun Aug 23 23:46:23 2009
@@ -1,41 +1,37 @@
-# $OpenBSD: Makefile,v 1.154 2009/08/11 08:42:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.150 2009/05/05 11:40:08 sthen Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
COMMENT= movie player supporting MPEG, DivX, AVI, ASF, MOV & more
-V= 1.0rc2
+V= 20090708
N= mplayer
-DISTNAME= MPlayer-${V}
-DIST_SUBDIR= ${N}
-PKGNAME= ${N}-${V}p27
+DISTNAME= mplayer-export-snapshot-${V}
+PKGNAME= ${N}-${V}
CATEGORIES= x11 multimedia
EXTRACT_SUFX= .tar.bz2
+WRKDIST = ${WRKDIR}/mplayer-export-2009-07-08
+
HOMEPAGE= http://www.mplayerhq.hu/
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB= c crypto m ncurses oil-0.3 pthread stdc++ util sndio \
+ z pthread-stubs xcb
-WANTLIB= c m ncurses pthread stdc++ util sndio z
+# snapshot
+#MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/
+MASTER_SITES = http://students.dec.bmth.ac.uk/ebarrett/distfiles/
+MASTER_SITES0 = http://www.mplayerhq.hu/MPlayer/skins/
-MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
- http://www2.mplayerhq.hu/MPlayer/releases/ \
- http://www.mplayerhq.hu/MPlayer/releases/ \
- http://ftp.lug.udel.edu/MPlayer/releases/
-
-# The skins tarball changes on a daily basis so it is mirrored
-# locally, do NOT change this.
-#MASTER_SITES0= http://www2.mplayerhq.hu/MPlayer/Skin/
-MASTER_SITES0= ${MASTER_SITE_BACKUP}
-
MAINTAINER= Bjorn Sandell <[email protected]>
-SKIN= default
+SKIN= Blue
SKINVER= 1.7
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKIN}-${SKINVER}${EXTRACT_SUFX}:0
@@ -51,13 +47,29 @@
ogg.>=5::audio/libogg \
xvidcore::multimedia/xvidcore \
x264.>=3::multimedia/x264 \
- faad.>=2::audio/faad \
- dca.>=0::audio/libdca \
mp3lame:lame-*:audio/lame \
- dv::multimedia/libdv
+ dv::multimedia/libdv \
+ dvdnavmini:libdvdnav->=4.1.3:multimedia/libdvdnav \
+ dvdread::devel/libdvdread \
+ faac::audio/faac \
+ faad:faad-*:audio/faad \
+ fribidi::devel/fribidi \
+ lcms::graphics/lcms \
+ mng::graphics/libmng \
+ vorbisidec::audio/tremor \
+ dca::audio/libdca \
+ bz2::archivers/bzip2 \
+ schroedinger-1.0::multimedia/schroedinger
BUILD_DEPENDS= ::net/livemedia \
- :rtunes->=0.8:audio/rtunes
+ :rtunes->=0.8:audio/rtunes \
+ :libxml-*:textproc/libxml \
+ :libxslt-*:textproc/libxslt \
+ ::textproc/docbook \
+ ::textproc/docbook-xsl \
+ ::audio/tremor \
+ ::devel/yasm \
+ ::audio/ladspa
CONFDIR= ${SYSCONFDIR}/mplayer
SUBST_VARS= CONFDIR
@@ -71,36 +83,27 @@
--disable-nas \
--disable-liblzo \
--disable-caca \
- --disable-vidix-internal \
- --disable-vidix-external \
- --enable-libdv \
+ --disable-vidix \
--disable-smb \
- --disable-tremor-external \
- --enable-tremor-internal \
- --disable-faac \
--disable-select \
- --enable-theora \
- --enable-libdca \
- --enable-menu \
- --enable-iconv \
- --enable-cdparanoia \
- --enable-x264 \
- --enable-tv-v4l2 \
-
--with-extraincdir=${LOCALBASE}/include/libpng:${LOCALBASE}/include \
- --with-extralibdir=${LOCALBASE}/lib \
- --extra-libs-mplayer="$$(pkg-config --libs x264)" \
- --extra-libs-mencoder="$$(pkg-config --libs x264)" \
- --confdir=${CONFDIR} \
- --mandir=${LOCALBASE}/man \
--disable-langinfo \
- --disable-fribidi \
--disable-openal \
- --disable-faad-internal \
- --enable-faad-external \
--disable-libvorbis \
- --disable-libcdio
+ --disable-libcdio \
+ --disable-toolame \
+ --disable-dvdread-internal \
+ --disable-libdvdcss-internal \
+ --disable-faad-internal \
+ --disable-tremor-internal \
+ --enable-faac \
+ --enable-menu \
+ --confdir=${CONFDIR} \
+ --mandir=${LOCALBASE}/man \
+ --extra-cflags="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
+ --extra-ldflags="-L${LOCALBASE}/lib"
CONFIGURE_ENV+= TMPDIR="${WRKBUILD}"
+CONFIGURE_ENV+= LDFLAGS="-lfaac"
.if ${MACHINE_ARCH:Mi386}
CONFIGURE_ARGS+=--enable-runtime-cpudetection
@@ -132,28 +135,26 @@
--disable-freetype
. endif
.else
-CONFIGURE_ARGS+=--enable-gui \
- --enable-gl
+CONFIGURE_ARGS+=--enable-gui
USE_X11= Yes
-LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0:gtk+2-*:x11/gtk+2,-main
WANTLIB+= GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86dga Xxf86vm \
+ Xfixes Xi Xinerama Xrandr Xrender Xss Xv Xxf86dga Xxf86vm \
atk-1.0 cairo expat fontconfig freetype gio-2.0 \
glib-2.0 glitz gmodule-2.0 gobject-2.0 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs xcb
+ pangocairo-1.0 pangoft2-1.0 pixman-1
MODULES= devel/gettext
+RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils
.endif
.if ${FLAVOR:L:Msdl}
-CONFIGURE_ARGS+=--enable-sdl \
- --with-sdl-config=${LOCALBASE}/bin/sdl-config
+CONFIGURE_ARGS+=--with-sdl-config=${LOCALBASE}/bin/sdl-config
LIB_DEPENDS+= SDL:sdl->=1.2.5:devel/sdl
.else
CONFIGURE_ARGS+=--disable-sdl
.endif
.if ${FLAVOR:L:Mggi}
-CONFIGURE_ARGS+=--enable-ggi
LIB_DEPENDS+= ggi::graphics/ggi
.else
CONFIGURE_ARGS+=--disable-ggi
@@ -164,7 +165,6 @@
.endif
.if ${FLAVOR:L:Mmad}
-CONFIGURE_ARGS+=--enable-mad
LIB_DEPENDS+= mad.>=2::audio/libmad
.else
CONFIGURE_ARGS+=--disable-mad
@@ -172,7 +172,6 @@
.if ${MACHINE_ARCH:Mi386}
CONFIGURE_ARGS+=--win32codecsdir=${LOCALBASE}/lib/win32 \
- --enable-qtx \
--realcodecsdir=${LOCALBASE}/lib/win32
.else
CONFIGURE_ARGS+=--disable-win32dll \
@@ -181,7 +180,6 @@
.endif
.if ${FLAVOR:L:Maa}
-CONFIGURE_ARGS+=--enable-aa
.if ${FLAVOR:L:Mno_x11}
LIB_DEPENDS+= aa.>=1.3:aalib-*-no_x11:graphics/aalib,no_x11
.else
@@ -192,7 +190,6 @@
.endif
.if ${FLAVOR:L:Mjack}
-CONFIGURE_ARGS+=--enable-jack
LIB_DEPENDS+= jack::audio/jack
.else
CONFIGURE_ARGS+=--disable-jack
@@ -201,17 +198,25 @@
NO_REGRESS= Yes
post-patch:
- @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_libsndio.c ${WRKSRC}/libao2
+ @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
+ @cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
+post-build:
+ @cd ${WRKSRC}/DOCS/xml && ${MAKE_PROGRAM}
+
+DOCDIR = ${PREFIX}/share/doc/mplayer
+EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplayer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mplayer
- ${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/skins/${SKIN}
- ${INSTALL_DATA} ${WRKDIR}/${SKIN}/*
${PREFIX}/share/mplayer/skins/${SKIN}
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+.if !${FLAVOR:L:Mno_x11}
+ cp -R ${WRKDIR}/${SKIN} ${PREFIX}/share/mplayer/skins/
+ cd ${PREFIX}/share/mplayer/skins && ln -s ${SKIN} default
+.endif
cd ${WRKDIST}/etc; ${INSTALL_DATA} input.conf menu.conf codecs.conf \
- ${PREFIX}/share/examples/mplayer
- ${INSTALL_DATA} ${WRKDIST}/etc/example.conf \
- ${PREFIX}/share/examples/mplayer/mplayer.conf
- ${INSTALL_DATA} ${WRKDIST}/DOCS/HTML/en/*.html
${PREFIX}/share/doc/mplayer
+ ${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKDIST}/etc/example.conf ${EXAMPLEDIR}/mplayer.conf
+ ${INSTALL_DATA} ${WRKDIST}/DOCS/HTML/en/*.html ${DOCDIR}
+ ${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${DOCDIR}
.include <bsd.port.mk>
diff -uNa mplayer/distinfo mplayer.new/distinfo
--- mplayer/distinfo Sun Aug 23 23:46:39 2009
+++ mplayer.new/distinfo Sun Aug 23 15:42:37 2009
@@ -1,10 +1,10 @@
-MD5 (mplayer/MPlayer-1.0rc2.tar.bz2) = fiflNcLSZ2N980iY8bkXBw==
-MD5 (mplayer/default-1.7.tar.bz2) = fh0WwvijJGn0NUywQ+7MXQ==
-RMD160 (mplayer/MPlayer-1.0rc2.tar.bz2) = O1y6FSmFahd6UZHiL43MALWoPFI=
-RMD160 (mplayer/default-1.7.tar.bz2) = X3j/nbKW2P1T72YD7IoifutgLdE=
-SHA1 (mplayer/MPlayer-1.0rc2.tar.bz2) = 6bSW81J8VSAE7G0B1rQ/GWtDzi0=
-SHA1 (mplayer/default-1.7.tar.bz2) = aRLD5YtMdvrZf9tylFsngVBp9+M=
-SHA256 (mplayer/MPlayer-1.0rc2.tar.bz2) =
OHW3zIXo59+BwCpjjba0qXDR5mqG2tbr8podGfOPWVM=
-SHA256 (mplayer/default-1.7.tar.bz2) =
qZkLpTTMqUwad0dF2eMUiRn3kAOmgz/8x4N3HM3gulM=
-SIZE (mplayer/MPlayer-1.0rc2.tar.bz2) = 9338201
-SIZE (mplayer/default-1.7.tar.bz2) = 173439
+MD5 (Blue-1.7.tar.bz2) = 5OICDRG2garImBA7O6cjxA==
+MD5 (mplayer-export-snapshot-20090708.tar.bz2) = XYBaG3E4g3fdMu6vTNW+4g==
+RMD160 (Blue-1.7.tar.bz2) = H4xTnMrcVO6l5meIObzIrh4W5us=
+RMD160 (mplayer-export-snapshot-20090708.tar.bz2) =
KWTgoDLjhsjTs4w9Qkm310WVDh4=
+SHA1 (Blue-1.7.tar.bz2) = ReXuelVBpfHP0meKbJtZEcpHPLk=
+SHA1 (mplayer-export-snapshot-20090708.tar.bz2) = /XGBmgcrR2zj4vYTTMU26N5wk8k=
+SHA256 (Blue-1.7.tar.bz2) = i805pXVcRN93jryjEZySI0er/a2xAdzvARziVmwfsdg=
+SHA256 (mplayer-export-snapshot-20090708.tar.bz2) =
CFtDchdvXwXt/4pQo7f6KpWXEIw6ghz5+e4Z//isIVE=
+SIZE (Blue-1.7.tar.bz2) = 222567
+SIZE (mplayer-export-snapshot-20090708.tar.bz2) = 8238626
Common subdirectories: mplayer/files and mplayer.new/files
Common subdirectories: mplayer/patches and mplayer.new/patches
Common subdirectories: mplayer/pkg and mplayer.new/pkg
