$OpenBSD: patch-Makefile,v 1.23 2011/06/25 14:15:43 edd Exp $
--- Makefile.orig	Wed Mar  9 00:33:03 2011
+++ Makefile	Fri Jun 24 12:19:26 2011
@@ -26,6 +26,7 @@ include config.mak
 SRCS_AUDIO_INPUT-$(ALSA1X)           += stream/ai_alsa1x.c
 SRCS_AUDIO_INPUT-$(ALSA9)            += stream/ai_alsa.c
 SRCS_AUDIO_INPUT-$(OSS)              += stream/ai_oss.c
+SRCS_AUDIO_INPUT-$(SNDIO)            += stream/ai_sndio.c
 SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
 SRCS_COMMON-$(BITMAP_FONT)           += sub/font_load.c
 SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
@@ -585,6 +586,7 @@ SRCS_MPLAYER-$(S3FB)          += libvo/vo_s3fb.c
 SRCS_MPLAYER-$(SDL)           += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.c
 SRCS_MPLAYER-$(SGIAUDIO)      += libao2/ao_sgi.c
 SRCS_MPLAYER-$(SUNAUDIO)      += libao2/ao_sun.c
+SRCS_MPLAYER-$(SNDIO)         += libao2/ao_sndio.c
 SRCS_MPLAYER-$(SVGA)          += libvo/vo_svga.c
 SRCS_MPLAYER-$(TDFXFB)        += libvo/vo_tdfxfb.c
 SRCS_MPLAYER-$(TDFXVID)       += libvo/vo_tdfx_vid.c
@@ -648,7 +650,8 @@ SRCS_MPLAYER = command.c \
                libvo/vo_mpegpes.c \
                libvo/vo_null.c \
                sub/spuenc.c \
-               $(SRCS_MPLAYER-yes)
+               $(SRCS_MPLAYER-yes) \
+	       libao2/ao_rtunes.c
 
 
 SRCS_MENCODER-$(FAAC)             += libmpcodecs/ae_faac.c
@@ -814,7 +817,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
 	$(CC) -o $@ $^ $(EXTRALIBS)
 
 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-	$(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
+	$(HOST_CC) ${CFLAGS} -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
 
 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
 	./$^ > $@
@@ -864,7 +867,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
 
-mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+mp3lib/decode_i586.o: CFLAGS += -O
+mp3lib/dct64_sse.o: CFLAGS += -O
+liba52/imdct.o: CFLAGS += -O
+endif
+mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
+mp3lib/dct64_sse.o: CFLAGS += -fomit-frame-pointer
+liba52/imdct.o: CFLAGS += -fomit-frame-pointer
+endif
 
 stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS)