Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Nov 2012 09:25:48 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307229 - in head/emulators/dolphin-emu-devel: . files
Message-ID:  <201211090925.qA99PmMF040338@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Fri Nov  9 09:25:48 2012
New Revision: 307229
URL: http://svnweb.freebsd.org/changeset/ports/307229

Log:
  - Update to 20121107
  - Fix build with clang when both audio/portaudio and audio/portaudio2
    are installed
  
  Feature safe:	yes

Modified:
  head/emulators/dolphin-emu-devel/Makefile
  head/emulators/dolphin-emu-devel/distinfo
  head/emulators/dolphin-emu-devel/files/patch-CMakeLists.txt

Modified: head/emulators/dolphin-emu-devel/Makefile
==============================================================================
--- head/emulators/dolphin-emu-devel/Makefile	Fri Nov  9 09:24:19 2012	(r307228)
+++ head/emulators/dolphin-emu-devel/Makefile	Fri Nov  9 09:25:48 2012	(r307229)
@@ -7,7 +7,6 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	3.0.r${REVDATE}
-PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
@@ -24,7 +23,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/
 		lzo2:${PORTSDIR}/archivers/lzo2 \
 		sfml-network:${PORTSDIR}/devel/sfml
 
-REVDATE=	20120912
+REVDATE=	20121107
 
 USE_ICONV=	yes
 USE_GNOME=	pkgconfig

Modified: head/emulators/dolphin-emu-devel/distinfo
==============================================================================
--- head/emulators/dolphin-emu-devel/distinfo	Fri Nov  9 09:24:19 2012	(r307228)
+++ head/emulators/dolphin-emu-devel/distinfo	Fri Nov  9 09:25:48 2012	(r307229)
@@ -1,2 +1,2 @@
-SHA256 (dolphin-emu-3.0.r20120912.tgz) = af7a14c6d6ab2e07786dc2d6652d874bf2ebddbf1cb72c8640af2dfebbbcc4a6
-SIZE (dolphin-emu-3.0.r20120912.tgz) = 26154876
+SHA256 (dolphin-emu-3.0.r20121107.tgz) = dbbd6116a4c998d6df7c5db776fcddc6d134e0a7a2b658c4f86c7dfd66bfb353
+SIZE (dolphin-emu-3.0.r20121107.tgz) = 26168234

Modified: head/emulators/dolphin-emu-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/dolphin-emu-devel/files/patch-CMakeLists.txt	Fri Nov  9 09:24:19 2012	(r307228)
+++ head/emulators/dolphin-emu-devel/files/patch-CMakeLists.txt	Fri Nov  9 09:25:48 2012	(r307229)
@@ -131,7 +131,7 @@
 +option(DISABLE_PORTAUDIO "Disable PortAudio (mic) support" OFF)
 +if(NOT DISABLE_PORTAUDIO)
 +	include(CheckCXXSourceRuns)
-+	include_directories(${CMAKE_INSTALL_PREFIX}/include/portaudio2)
++	include_directories(BEFORE ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
 +	link_directories(${CMAKE_INSTALL_PREFIX}/lib/portaudio2)
 +	set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
 +	set(CMAKE_REQUIRED_FLAGS -L${CMAKE_INSTALL_PREFIX}/lib/portaudio2)



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