cvs commit: ports/audio/openal Makefile

[Dmitry Marakasov]

* Oliver Lehmann (lehmann at ans-netz.de) wrote:

> sounds good!

Here's the patch. I guess we can commit it right away since there
weren't word from maintainer on both PRs. Should I or will you do it?

--- openal.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/openal/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile	16 Mar 2009 00:54:39 -0000	1.49
+++ Makefile	16 Mar 2009 19:04:02 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	openal
 PORTVERSION=	20060211
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://openal.org/openal_webstf/downloads/
 DISTVERSION=	0.0.8
@@ -74,6 +74,13 @@
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
+.if ${ARCH} == "i386"
+OPTIONS+=	X86_ASM "Enable x86 assembly code" on
+.if !defined(WITHOUT_X86_ASM)
+BUILD_DEPENDS+=	nasm:${LOCALBASE}/devel/nasm
+.endif
+.endif
+
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON_ia64=	does not compile
 
@@ -89,8 +96,9 @@
 		s|Libs: |&${PTHREAD_LIBS} |;\
 		s|Cflags: |&${PTHREAD_CFLAGS} |' \
 		${WRKSRC}/admin/pkgconfig/openal.pc.in
-# broken openal library will be produced if nasm is installed
+.if defined(WITHOUT_X86_ASM)
 	@${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: files/patch-src-arch-i386-memcpy_mmx_prk.nasm
===================================================================
RCS file: files/patch-src-arch-i386-memcpy_mmx_prk.nasm
diff -N files/patch-src-arch-i386-memcpy_mmx_prk.nasm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-arch-i386-memcpy_mmx_prk.nasm	16 Mar 2009 19:04:02 -0000
@@ -0,0 +1,10 @@
+--- src/arch/i386/memcpy_mmx_prk.nasm.orig	2005-12-17 15:50:39.000000000 +0300
++++ src/arch/i386/memcpy_mmx_prk.nasm	2009-03-16 17:20:23.000000000 +0300
+@@ -22,6 +22,7 @@
+ ; pretty straight-forward implementation
+ ; by design broken for n<8, so check that before calling
+ ; x86 32 bit only!
++[Section .text]
+ global __alMMXmemcpy
+ global _alMMXmemcpy
+ 
Index: files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
===================================================================
RCS file: files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
diff -N files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm	16 Mar 2009 19:04:02 -0000
@@ -0,0 +1,10 @@
+--- src/arch/i386/x86_cpu_caps_detect_prk.nasm.orig	2005-12-17 15:50:39.000000000 +0300
++++ src/arch/i386/x86_cpu_caps_detect_prk.nasm	2009-03-16 17:20:50.000000000 +0300
+@@ -23,6 +23,7 @@
+ ; using infos from sandpile.org
+ 
+ ; returns 0 if no CPUID available
++[Section .text]
+ global __alDetectx86CPUCaps
+ global _alDetectx86CPUCaps
+ 
--- openal.patch ends here ---

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru  ..:  jabber: amdmi3 at jabber.ru    http://www.amdmi3.ru