On Tue, Mar 16, 2010 at 04:53:04PM +0000, Edd Barrett wrote:

> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
> retrieving revision 1.55
> diff -u -p -u -r1.55 patch-configure
> --- patches/patch-configure   23 Feb 2010 19:59:13 -0000      1.55
> +++ patches/patch-configure   16 Mar 2010 16:33:00 -0000
> @@ -1,50 +1,58 @@
>  $OpenBSD: patch-configure,v 1.55 2010/02/23 19:59:13 phessler Exp $
> ---- configure.orig   Thu Jun 25 01:31:17 2009
> -+++ configure        Sat Feb 13 11:34:11 2010
> -@@ -420,6 +420,7 @@ Audio output:
> +--- configure.orig   Thu Mar  4 14:46:44 2010
> ++++ configure        Mon Mar  8 21:09:42 2010
> +@@ -423,6 +423,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-sndio        disable sndio audio output [autodetect]
> ++  --disable-sndio        disable sndio output [autodetect]
> +   --disable-kai          disable KAI audio output [autodetect]
>     --disable-dart         disable DART audio output [autodetect]
>     --disable-win32waveout disable Windows waveout audio output [autodetect]
> -   --disable-coreaudio    disable CoreAudio audio output [autodetect]


why did you take out 'audio'?

> diff -u -p -u -r1.8 patch-libavcodec_Makefile
> --- patches/patch-libavcodec_Makefile 11 Oct 2009 13:36:23 -0000      1.8
> +++ patches/patch-libavcodec_Makefile 16 Mar 2010 16:33:00 -0000
> @@ -1,10 +1,20 @@
>  $OpenBSD: patch-libavcodec_Makefile,v 1.8 2009/10/11 13:36:23 edd Exp $
> ---- libavcodec/Makefile.orig Tue Jul  7 02:33:53 2009
> -+++ libavcodec/Makefile      Mon Jul 20 17:53:46 2009
> -@@ -575,4 +575,27 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
> +--- libavcodec/Makefile.orig Mon Mar  8 04:33:02 2010
> ++++ libavcodec/Makefile      Mon Mar  8 17:31:03 2010
> +@@ -1,5 +1,8 @@
> + include $(SUBDIR)../config.mak
>   
> - include $(SUBDIR)../subdir.mak
> ++# cabac.h wont build without this (OpenBSD)
> ++CFLAGS += -fomit-frame-pointer
> ++
> + NAME = avcodec
> + FFLIBS = avutil

whoa.  is all of libavodec going to be built with -fomit-frame-pointer?
you know, that only works with -O, so if someone builds with empty
CFLAGS, it won't build.  please add whichever objects need that (probably
whatever includes cabac.h) to the section below ...

> +@@ -728,6 +731,29 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
> + CLEANFILES = sin_tables.c cos_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
> + 
> + include $(SUBDIR)../subdir.mak
> ++
>  +ifdef ARCH_X86_32
>  +ifeq (,$(findstring -O,$(CFLAGS)))
>  +x86/dsputil_mmx.o: CFLAGS += -O
> @@ -27,5 +37,6 @@ $OpenBSD: patch-libavcodec_Makefile,v 1.
>  +h264_parser.o: CFLAGS += -fomit-frame-pointer
>  +cabac.o: CFLAGS += -fomit-frame-pointer
>  +endif

  ^^^^^
that section.

-- 
[email protected]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply via email to