[Midnightbsd-cvs] mports [18365] U trunk/audio/openal/files: use pathfix

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 27 12:27:16 EDT 2015 

Revision: 18365
          http://svnweb.midnightbsd.org/mports/?rev=18365
Author:   laffer1
Date:     2015-03-27 12:27:14 -0400 (Fri, 27 Mar 2015)
Log Message:
-----------
use pathfix

Modified Paths:
--------------
    trunk/audio/openal/Makefile
    trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c

Property Changed:
----------------
    trunk/audio/openal/files/patch-common__include__AL__alc.h
    trunk/audio/openal/files/patch-src-arch-i386-memcpy_mmx_prk.nasm
    trunk/audio/openal/files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
    trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c
    trunk/audio/openal/files/patch-src-backends-alc_backend_bsd.c
    trunk/audio/openal/files/patch-src-backends-alc_backend_esd.c

Modified: trunk/audio/openal/Makefile
===================================================================
--- trunk/audio/openal/Makefile	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/Makefile	2015-03-27 16:27:14 UTC (rev 18365)
@@ -3,9 +3,9 @@
 
 PORTNAME=	openal
 PORTVERSION=	20060211
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	audio
-MASTER_SITES=	http://openal.org/openal_webstf/downloads/
+MASTER_SITES=	GENTOO/distfiles
 DISTVERSION=	0.0.8
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -13,72 +13,37 @@
 
 LICENSE=	gpl2
 
-USES=	libtool gmake pkgconfig
+CONFLICTS=	openal-soft-[0-9]*
+
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	${MACHINE_ARCH}-portbld-freebsd7.0
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-capture
-WANT_SDL=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-Wno-return-type
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_TARGET=	${MACHINE_ARCH}-portbld-freebsd9.0
+CONFIGURE_ARGS=	--enable-capture \
+		--disable-arts
+USES=		pathfix pkgconfig gmake libtool:keepla
 USE_LDCONFIG=	yes
 
-OPTIONS=	ARTS "aRts backend" off \
-		ESD "esd backend" off \
-		SDL "SDL backend" off \
-		VORBIS "vorbis support" off \
-		SMPEG "smpeg support" off
+OPTIONS_DEFINE=	ESOUND SDL VORBIS SMPEG ALSA
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFAULT_i386=	ASM
+SMPEG_DESC=	smpeg support
 
-.include <bsd.port.pre.mk>
+ESOUND_USE=		GNOME=esound
+ESOUND_CONFIGURE_ENABLE=esd
+SDL_USE=		SDL=sdl
+SDL_CONFIGURE_ENABLE=	sdl
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENABLE=vorbis
+SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_CONFIGURE_ENABLE=	mp3
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_ENABLE=	alsa
+ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-.if defined(WITH_SMPEG)
-WITH_SDL=	yes	# smpeg requires SDL
-.endif
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_ARTS)
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=--enable-arts
-.else
-CONFIGURE_ARGS+=--disable-arts
-.endif
-
-.if defined(WITH_ESD)
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=--enable-esd
-.else
-CONFIGURE_ARGS+=--disable-esd
-.endif
-
-.if defined(WITH_SDL)
-USE_SDL+=	sdl
-CONFIGURE_ENV+=	HAVESDL="${SDL_CONFIG}"
-CONFIGURE_ARGS+=--enable-sdl
-.else
-CONFIGURE_ARGS+=--disable-sdl
-.endif
-
-.if defined(WITH_VORBIS)
-LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-vorbis
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
-
-.if defined(WITH_SMPEG)
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
-CONFIGURE_ARGS+=--enable-smpeg
-.else
-CONFIGURE_ARGS+=--disable-smpeg
-.endif
-
-.if ${ARCH} == "i386"
-OPTIONS+=	X86_ASM "Enable x86 assembly code" on
-.if !defined(WITHOUT_X86_ASM)
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-.endif
-.endif
-
-NOT_FOR_ARCHS=	ia64
-NOT_FOR_ARCHS_REASON_ia64=	does not compile
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/; \
 		s/x86_64\*/amd64\* | \*ia64\*/g; \
@@ -91,8 +56,8 @@
 		s|Libs: |&${PTHREAD_LIBS} |;\
 		s|Cflags: |&${PTHREAD_CFLAGS} |' \
 		${WRKSRC}/admin/pkgconfig/openal.pc.in
-.if defined(WITHOUT_X86_ASM)
+.if ! ${PORT_OPTIONS:MASM}
 	@${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Index: trunk/audio/openal/files/patch-common__include__AL__alc.h
===================================================================
--- trunk/audio/openal/files/patch-common__include__AL__alc.h	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-common__include__AL__alc.h	2015-03-27 16:27:14 UTC (rev 18365)

Property changes on: trunk/audio/openal/files/patch-common__include__AL__alc.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/openal/files/patch-src-arch-i386-memcpy_mmx_prk.nasm
===================================================================
--- trunk/audio/openal/files/patch-src-arch-i386-memcpy_mmx_prk.nasm	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-src-arch-i386-memcpy_mmx_prk.nasm	2015-03-27 16:27:14 UTC (rev 18365)

Property changes on: trunk/audio/openal/files/patch-src-arch-i386-memcpy_mmx_prk.nasm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/openal/files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
===================================================================
--- trunk/audio/openal/files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm	2015-03-27 16:27:14 UTC (rev 18365)

Property changes on: trunk/audio/openal/files/patch-src-arch-i386-x86_cpu_caps_detect_prk.nasm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c
===================================================================
--- trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c	2015-03-27 16:27:14 UTC (rev 18365)
@@ -9,3 +9,31 @@
  		samples_pre /= sizeof(ALshort);
  		samples_main = len - samples_pre;
  		samples_post = samples_main % 8;
+@@ -82,11 +82,27 @@ void _alFloatMul(ALshort *bpt, ALfloat s
+ 			v_sa.s[3] = v_sa.s[0];
+ 			
+ 			while (samples_main--) {
++				union {
++					short s[4];
++					v4hi v;
++				} ALIGN16(v_one);
++				v_one.s[0] = 1;
++				v_one.s[1] = 0;
++				v_one.s[2] = 0;
++				v_one.s[3] = 0;
+ 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
+ 				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++#else
++				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
++#endif
+ 				bpt += 4;
+ 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
+ 				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++#else
++				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
++#endif
+ 				bpt += 4;
+ 			}
+ 		}


Property changes on: trunk/audio/openal/files/patch-src-arch-i386-x86_floatmul.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/openal/files/patch-src-backends-alc_backend_bsd.c
===================================================================
--- trunk/audio/openal/files/patch-src-backends-alc_backend_bsd.c	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-src-backends-alc_backend_bsd.c	2015-03-27 16:27:14 UTC (rev 18365)

Property changes on: trunk/audio/openal/files/patch-src-backends-alc_backend_bsd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/openal/files/patch-src-backends-alc_backend_esd.c
===================================================================
--- trunk/audio/openal/files/patch-src-backends-alc_backend_esd.c	2015-03-27 16:23:06 UTC (rev 18364)
+++ trunk/audio/openal/files/patch-src-backends-alc_backend_esd.c	2015-03-27 16:27:14 UTC (rev 18365)

Property changes on: trunk/audio/openal/files/patch-src-backends-alc_backend_esd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list