Re: UPDATE: MPlayer 20140106
On 08/01/14 6:48 AM, Edd Barrett wrote:
Hi Brad,
I have installed your update and will be testing it over the next few
days. In the meantime some comments.
On Mon, Jan 06, 2014 at 07:52:23PM -0500, Brad Smith wrote:
Here is an update to MPlayer 20140106.
Any and all testing welcome.
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH= generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH= ${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
This is a small nit, but it helps if formatting changes come as separate
diffs. This allows me to see easier what is a functional change and what
is a formatting tweak.
If there were more formatting changes I would separate the changes
but its two lines and you can quite clearly see what has changed which
is nothing.
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
That seems fishy. -ffast-math is not a linker flag. It just defines
__FAST_MATH__. Perhaps it is not needed?
None of what you said is true.
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
Do we do this because PIE is default on OpenBSD?
Yes. It only does anything on x86 and OpenBSD already builds
PIE binaries by default.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: MPlayer 20140106
Hi Brad,
I have installed your update and will be testing it over the next few
days. In the meantime some comments.
On Mon, Jan 06, 2014 at 07:52:23PM -0500, Brad Smith wrote:
Here is an update to MPlayer 20140106.
Any and all testing welcome.
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH=generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH=${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
This is a small nit, but it helps if formatting changes come as separate
diffs. This allows me to see easier what is a functional change and what
is a formatting tweak.
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
That seems fishy. -ffast-math is not a linker flag. It just defines
__FAST_MATH__. Perhaps it is not needed?
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
Do we do this because PIE is default on OpenBSD?
-@@ -523,6 +523,7 @@ Audio output:
- --disable-nas disable NAS audio output [autodetect]
- --disable-sgiaudio disable SGI audio output [autodetect]
- --disable-sunaudio disable Sun audio output [autodetect]
-+ --disable-sndiodisable OpenBSD sndio audio output [autodetect]
- --disable-kai disable KAI audio output [autodetect]
- --disable-dart disable DART audio output [autodetect]
- --disable-win32waveout disable Windows waveout audio output [autodetect]
Nice that the sndio backend is finally upstream.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: UPDATE: MPlayer 20140106
On Jan 07 17:53:40, b...@comstyle.com wrote: On 07/01/14 9:14 AM, Jan Stary wrote: On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm It is a build dependency so it has to be there. You left out the most important part which the error message points you towards. Sorry; here goes: Checking for yasm pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) After a pkg_add -ui yasm, it builds fine. Sorry for the noise. Jan
Re: UPDATE: MPlayer 20140106
On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm Jan
Re: UPDATE: MPlayer 20140106
On 07/01/14 9:14 AM, Jan Stary wrote: On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm It is a build dependency so it has to be there. You left out the most important part which the error message points you towards. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: MPlayer 20140106
Here is an update to MPlayer 20140106.
Any and all testing welcome.
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.230
diff -u -p -u -p -r1.230 Makefile
--- Makefile2 Jan 2014 12:21:49 - 1.230
+++ Makefile7 Jan 2014 00:49:11 -
@@ -7,9 +7,8 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20130819
+V =20140106
FFMPEG_V = 20131216
-REVISION = 2
SUBST_VARS += PREFIX CONFDIR
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses ogg=5 opus png postproc \
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH= generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH= ${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
+# Add back fast math flag since we override CFLAGS
+CFLAGS += -ffast-math
+
# PIE doesn't leave sufficient registers
.if ${MACHINE_ARCH:Mi386}
-CFLAGS += -fomit-frame-pointer
+CFLAGS += -fomit-frame-pointer
.endif
USE_GMAKE =Yes
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
@@ -212,7 +215,7 @@ EXAMPLEDIR =${PREFIX}/share/examples/mp
# copy in rtunes and sndio backends
post-extract:
- @cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
+ @cp ${FILESDIR}/ao_rtunes.c ${WRKSRC}/libao2
@cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
# link FFmpeg sources to where build expects
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 distinfo
--- distinfo6 Sep 2013 23:14:40 - 1.38
+++ distinfo6 Jan 2014 22:20:53 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20130819.tar.xz) = +sUhhiXfXp+jUAILtZqMlcHuUaQ5u7ARJd8CXwNLfCc=
-SIZE (mplayer-20130819.tar.xz) = 5270956
+SHA256 (mplayer-20140106.tar.xz) = cll7+pWtmcggOIGbFRhDZ46j4lyOt6cVpXFE7KNHGys=
+SIZE (mplayer-20140106.tar.xz) = 5277680
Index: files/ao_sndio.c
===
RCS file: files/ao_sndio.c
diff -N files/ao_sndio.c
--- files/ao_sndio.c17 Apr 2013 23:03:23 - 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2008 Alexandre Ratchov a...@caoua.org
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include sys/types.h
-#include poll.h
-#include errno.h
-#include sndio.h
-
-#include config.h
-#include mp_msg.h
-#include mixer.h
-#include help_mp.h
-
-#include libaf/af_format.h
-
-#include audio_out.h
-#include audio_out_internal.h
-
-static ao_info_t info = {
- sndio audio output,
- sndio,
- Alexandre Ratchov a...@caoua.org,
-
-};
-
-LIBAO_EXTERN(sndio)
-
-static struct sio_hdl *hdl = NULL;
-struct pollfd *pfds;
-static struct sio_par par;
-static int delay, vol, havevol;
-#define SILENCE_NMAX 0x1000
-static char silence[SILENCE_NMAX];
-
