svn commit: r331165 - in head/multimedia/miro: . files

[William Grzybowski]

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 at 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],