From 970ad6d839b01116bca1955f1c4f6e175b0b7398 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Mon, 21 Oct 2013 17:51:00 +0000 Subject: [PATCH] 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) --- multimedia/miro/Makefile | 7 ++++--- multimedia/miro/files/patch-linux__setup.py | 12 +----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile index 4b6eecdc140a..90b81da3f41f 100644 --- a/multimedia/miro/Makefile +++ b/multimedia/miro/Makefile @@ -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/pyrex \ 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 \ diff --git a/multimedia/miro/files/patch-linux__setup.py b/multimedia/miro/files/patch-linux__setup.py index 6a6411995fc2..0bc54c37bfa3 100644 --- a/multimedia/miro/files/patch-linux__setup.py +++ b/multimedia/miro/files/patch-linux__setup.py @@ -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],