From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 17:51:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C1E4831C; Mon, 21 Oct 2013 17:51:01 +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 9F9EA2952; Mon, 21 Oct 2013 17:51:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LHp1SD048824; Mon, 21 Oct 2013 17:51:01 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LHp1dD048821; Mon, 21 Oct 2013 17:51:01 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310211751.r9LHp1dD048821@svn.freebsd.org> From: William Grzybowski Date: Mon, 21 Oct 2013 17:51:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331165 - in head/multimedia/miro: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 17:51:01 -0000 Author: wg Date: Mon Oct 21 17:51:00 2013 New Revision: 331165 URL: http://svnweb.freebsd.org/changeset/ports/331165 Log: multimedia/miro: link against ffmpeg-2 - Link against ffmpeg-2 - Remove leading article from COMMENT - Convert lib depends to new format Approved by: portmgr (bapt, implicit) Modified: head/multimedia/miro/Makefile head/multimedia/miro/files/patch-linux__setup.py Modified: head/multimedia/miro/Makefile ============================================================================== --- head/multimedia/miro/Makefile Mon Oct 21 17:39:42 2013 (r331164) +++ head/multimedia/miro/Makefile Mon Oct 21 17:51:00 2013 (r331165) @@ -3,12 +3,13 @@ PORTNAME= miro PORTVERSION= 6.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \ http://ftp.osuosl.org/pub/pculture.org/miro/src/ MAINTAINER= swills@FreeBSD.org -COMMENT= A video player to get internet TV broadcasts +COMMENT= Video player to get internet TV broadcasts LICENSE= GPLv2 @@ -17,8 +18,8 @@ BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/ update-mime-database:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:${PORTSDIR}/devel/boost-libs \ ${LOCALBASE}/include/taglib/taglib.h:${PORTSDIR}/audio/taglib -LIB_DEPENDS= avutil1:${PORTSDIR}/multimedia/ffmpeg1 \ - sqlite3:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libavutil.so:${PORTSDIR}/multimedia/ffmpeg \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_SITELIBDIR}/dbus/glib.py:${PORTSDIR}/devel/py-dbus \ Modified: head/multimedia/miro/files/patch-linux__setup.py ============================================================================== --- head/multimedia/miro/files/patch-linux__setup.py Mon Oct 21 17:39:42 2013 (r331164) +++ head/multimedia/miro/files/patch-linux__setup.py Mon Oct 21 17:51:00 2013 (r331165) @@ -101,22 +101,12 @@ if self.root: dest = change_root(self.root, dest) self.mkpath(os.path.dirname(dest)) -@@ -434,12 +435,15 @@ - def build_segmenter(self): - segmenter_src = os.path.join(platform_dir, 'miro-segmenter.c') +@@ -434,7 +435,8 @@ cc = ccompiler.new_compiler() -- cc.add_library('avutil') -- cc.add_library('avformat') -- cc.add_library('avcodec') -+ cc.add_library('avutil1') -+ cc.add_library('avformat1') -+ cc.add_library('avcodec1') # Fedora places ffmpeg include into this directory rather than # root /usr/include. - cc.add_include_dir('/usr/include/ffmpeg') -+ cc.add_include_dir('/usr/local/include/ffmpeg1') + cc.add_include_dir('/usr/local/include') -+ cc.add_library_dir('/usr/local/lib/ffmpeg1') + cc.add_library_dir('/usr/local/lib') output_dir = os.path.join(self.build_base, 'miro-segmenter') segmenter_objs = cc.compile([segmenter_src],