Hi,

  as seen in
http://www.mail-archive.com/[EMAIL PROTECTED]/msg405972.html
the attached diff allows me to play some .ogm files in amd64 that will make
mplayer crash otherwise. the tremor update has been sent separately.
  OK?

  f.-

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.129
diff -u -p -r1.129 Makefile
--- Makefile    25 Mar 2008 17:29:57 -0000      1.129
+++ Makefile    26 Mar 2008 02:33:23 -0000
@@ -9,7 +9,7 @@ V=                      1.0rc2
 N=                     mplayer
 DISTNAME=              MPlayer-${V}
 DIST_SUBDIR=           ${N}
-PKGNAME=               ${N}-${V}p3
+PKGNAME=               ${N}-${V}p4
 CATEGORIES=            x11 multimedia
 EXTRACT_SUFX=          .tar.bz2
 
Index: patches/patch-tremor_block_h
===================================================================
RCS file: patches/patch-tremor_block_h
diff -N patches/patch-tremor_block_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tremor_block_h        26 Mar 2008 02:33:23 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- tremor/block.h.orig        Wed Mar 26 02:31:01 2008
++++ tremor/block.h     Wed Mar 26 02:31:15 2008
+@@ -0,0 +1,23 @@
++/********************************************************************
++ *                                                                  *
++ * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE.   *
++ *                                                                  *
++ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
++ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
++ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
++ *                                                                  *
++ * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002    *
++ * BY THE Xiph.Org FOUNDATION http://www.xiph.org/                  *
++ *                                                                  *
++ ********************************************************************
++
++ function: basic shared block operations
++
++ ********************************************************************/
++
++#ifndef _V_BLOCK_H_
++#define _V_BLOCK_H_
++
++void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
++
++#endif
Index: patches/patch-tremor_floor0_c
===================================================================
RCS file: patches/patch-tremor_floor0_c
diff -N patches/patch-tremor_floor0_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tremor_floor0_c       26 Mar 2008 02:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- tremor/floor0.c.orig       Wed Mar 26 02:31:25 2008
++++ tremor/floor0.c    Wed Mar 26 02:31:58 2008
+@@ -25,6 +25,7 @@
+ #include "codebook.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+ 
+ #define LSP_FRACBITS 14
+ 
Index: patches/patch-tremor_floor1_c
===================================================================
RCS file: patches/patch-tremor_floor1_c
diff -N patches/patch-tremor_floor1_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tremor_floor1_c       26 Mar 2008 02:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- tremor/floor1.c.orig       Wed Mar 26 02:31:32 2008
++++ tremor/floor1.c    Wed Mar 26 02:32:03 2008
+@@ -24,6 +24,7 @@
+ #include "registry.h"
+ #include "codebook.h"
+ #include "misc.h"
++#include "block.h"
+ 
+ #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
+ 
Index: patches/patch-tremor_res012_c
===================================================================
RCS file: patches/patch-tremor_res012_c
diff -N patches/patch-tremor_res012_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tremor_res012_c       26 Mar 2008 02:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- tremor/res012.c.orig       Wed Mar 26 02:31:40 2008
++++ tremor/res012.c    Wed Mar 26 02:32:08 2008
+@@ -25,6 +25,7 @@
+ #include "codebook.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+ 
+ typedef struct {
+   vorbis_info_residue0 *info;
Index: patches/patch-tremor_synthesis_c
===================================================================
RCS file: patches/patch-tremor_synthesis_c
diff -N patches/patch-tremor_synthesis_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tremor_synthesis_c    26 Mar 2008 02:33:23 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- tremor/synthesis.c.orig    Wed Mar 26 02:31:43 2008
++++ tremor/synthesis.c Wed Mar 26 02:32:12 2008
+@@ -23,6 +23,7 @@
+ #include "registry.h"
+ #include "misc.h"
+ #include "os.h"
++#include "block.h"
+ 
+ int vorbis_synthesis(vorbis_block *vb,ogg_packet *op){
+   vorbis_dsp_state     *vd=vb->vd;

Reply via email to