Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 May 2015 16:48:41 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387283 - head/devel/sdl20
Message-ID:  <201505241648.t4OGmf2K096837@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun May 24 16:48:41 2015
New Revision: 387283
URL: https://svnweb.freebsd.org/changeset/ports/387283

Log:
  Replace MMX and SSE options with CPU autodetection such that they aren't
  enabled by default on i386.
  
  PR:		198738
  Approved by:	maintainer timeout (2 weeks)

Modified:
  head/devel/sdl20/Makefile

Modified: head/devel/sdl20/Makefile
==============================================================================
--- head/devel/sdl20/Makefile	Sun May 24 16:43:36 2015	(r387282)
+++ head/devel/sdl20/Makefile	Sun May 24 16:48:41 2015	(r387283)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sdl2
 PORTVERSION=	2.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/
 DISTNAME=	SDL2-${PORTVERSION}
@@ -25,13 +25,33 @@ CONFIGURE_ARGS+=	--disable-video-opengle
 			--disable-dbus \
 			--disable-input-tslib \
 			--disable-rpath
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx}
+CONFIGURE_ARGS+=	--enable-mmx
+.else
+CONFIGURE_ARGS+=	--disable-mmx
+.endif
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:M3dnow}
+CONFIGURE_ARGS+=	--enable-3dnow
+.else
+CONFIGURE_ARGS+=	--disable-3dnow
+.endif
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse}
+CONFIGURE_ARGS+=	--enable-sse
+.else
+CONFIGURE_ARGS+=	--disable-sse
+.endif
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2}
+CONFIGURE_ARGS+=	--enable-sse2
+.else
+CONFIGURE_ARGS+=	--disable-sse2
+.endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 
-OPTIONS_DEFINE=		ALSA ASM DLOPEN ESOUND MMX NAS OSS \
-			PULSEAUDIO PTHREADS SSE SDL_ATOMIC SDL_AUDIO \
+OPTIONS_DEFINE=		ALSA ASM DLOPEN ESOUND NAS OSS \
+			PULSEAUDIO PTHREADS SDL_ATOMIC SDL_AUDIO \
 			SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
 			SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
 			SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_OPENGL VIDEO_X11
@@ -39,8 +59,6 @@ OPTIONS_DEFAULT=	ASM DLOPEN OSS PTHREADS
 			SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
 			SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
 			SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_OPENGL VIDEO_X11
-OPTIONS_DEFAULT_i386=	MMX SSE
-OPTIONS_DEFAULT_amd64=	MMX SSE
 
 ALSA_DESC=		Audio output via the ALSA audio architecture
 DLOPEN_DESC=		Use dlopen for loading 3rd party libraries
@@ -67,7 +85,6 @@ VIDEO_X11_DESC=		X11 rendering support
 
 ASM_CONFIGURE_ENABLE=		assembly
 DLOPEN_CONFIGURE_ENABLE=	sdl-dlopen
-MMX_CONFIGURE_ENABLE=		mmx 3dnow
 PTHREADS_CONFIGURE_ENABLE=	pthreads pthreads-sem
 SDL_ATOMIC_CONFIGURE_ENABLE=	atomic gcc-atomics
 SDL_AUDIO_CONFIGURE_ENABLE=	audio
@@ -82,7 +99,6 @@ SDL_RENDER_CONFIGURE_ENABLE=	render
 SDL_THREADS_CONFIGURE_ENABLE=	threads
 SDL_TIMERS_CONFIGURE_ENABLE=	timers
 SDL_VIDEO_CONFIGURE_EANBLE=	video
-SSE_CONFIGURE_ENABLE=		sse sse2 ssemath
 
 .include <bsd.port.options.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505241648.t4OGmf2K096837>