Here we go again: mplayer 1.0 rc2, please test

[Jung-uk Kim]

On Sunday 11 November 2007 09:50 am, Pav Lucistnik wrote:
> Thomas Zander p紫e v ne 11. 11. 2007 v 14:49 +0800:
> > Hi Pav,
> >
> > On 27/10/2007, Pav Lucistnik <pav at freebsd.org> wrote:
> > > It have troubles compiling assembly on amd64 in h264.c:
> >
> > Could you do me a favour and have a quick look into this? I do
> > not have an amd64 machine running FreeBSD currently. There were a
> > few postings to ffmpeg mailing list in August with this exact
> > problem, but nobody came up with a solution:
> > http://lists.mplayerhq.hu/pipermail/ffmpeg-user/2007-August/01087
> >4.html
> > http://lists.mplayerhq.hu/pipermail/ffmpeg-user/2007-August/01108
> >4.html However, since the ffmpeg mailing list is not filling up
> > with messages like this right now, maybe a more recent version
> > compiles. I'd suggest to replace h264.c and/or the included
> > headers by up-to-date versions from svn.
>
> That assembly comes from cabac.h file, which is identical in SVN to
> the version in port. I also tried replacing h264.c and h264.h, with
> no visible change.

FYI, I built it on amd64 -CURRENT with attached patches.  Inline 
assembly in cabac.h generates invalid instructions for amd64.  The 
Makefile patch disables it.  Also, sysdep/pci_x86.c works fine on 
amd64 and linker fails without it.

Jung-uk Kim
-------------- next part --------------
--- libavcodec/Makefile.orig	2007-10-07 15:49:37.000000000 -0400
+++ libavcodec/Makefile	2007-11-14 02:49:09.000000000 -0500
@@ -6,6 +6,10 @@
 
 CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
 
+ifeq ($(ARCH_X86_64),yes)
+CFLAGS += -DBROKEN_RELOCATIONS
+endif
+
 OBJS = allcodecs.o \
        audioconvert.o \
        bitstream.o \
-------------- next part --------------
--- vidix/pci.c.orig	2007-10-07 15:49:27.000000000 -0400
+++ vidix/pci.c	2007-11-14 03:12:26.000000000 -0500
@@ -484,8 +484,6 @@
 #include "sysdep/pci_arm32.c"
 #elif defined(__powerpc__)
 #include "sysdep/pci_powerpc.c"
-#elif defined(__x86_64__)
-/* Nothing here right now */
 #else
 #include "sysdep/pci_x86.c"
 #endif