From owner-svn-ports-all@FreeBSD.ORG Mon Oct 21 16:23:23 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 078FCC8C; Mon, 21 Oct 2013 16:23:23 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E90D6231F; Mon, 21 Oct 2013 16:23:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LGNMSq001011; Mon, 21 Oct 2013 16:23:22 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LGNMUO001010; Mon, 21 Oct 2013 16:23:22 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310211623.r9LGNMUO001010@svn.freebsd.org> From: William Grzybowski Date: Mon, 21 Oct 2013 16:23:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331154 - in head/emulators/dolphin-emu: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 16:23:23 -0000 Author: wg Date: Mon Oct 21 16:23:22 2013 New Revision: 331154 URL: http://svnweb.freebsd.org/changeset/ports/331154 Log: emulators/dolphin-emu: link against ffmpeg - Link against ffmpeg instead of ffmpeg1 Approved by: portmgr (bapt, implicit) Deleted: head/emulators/dolphin-emu/files/patch-CMakeTests-CheckLib.cmake Modified: head/emulators/dolphin-emu/Makefile Modified: head/emulators/dolphin-emu/Makefile ============================================================================== --- head/emulators/dolphin-emu/Makefile Mon Oct 21 16:20:56 2013 (r331153) +++ head/emulators/dolphin-emu/Makefile Mon Oct 21 16:23:22 2013 (r331154) @@ -3,6 +3,7 @@ PORTNAME= dolphin-emu PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -79,10 +80,10 @@ CMAKE_ARGS+= -DDISABLE_PORTAUDIO:BOOL=ON .if ${PORT_OPTIONS:MFRAMEDUMPS} CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=ON -LIB_DEPENDS+= libavcodec1.so:${PORTSDIR}/multimedia/ffmpeg1 \ - libavformat1.so:${PORTSDIR}/multimedia/ffmpeg1 \ - libswscale1.so:${PORTSDIR}/multimedia/ffmpeg1 \ - libavutil1.so:${PORTSDIR}/multimedia/ffmpeg1 +LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ + libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ + libavutil.so:${PORTSDIR}/multimedia/ffmpeg .else CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=OFF .endif