- Update to 2.0.1

PR:		131832
Submitted by:	Ports Fury

multimedia/miro/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Miro
-PORTVERSION=	1.2.8
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.osuosl.org/pub/pculture.org/miro/src/	\
 		http://ftp.osuosl.org/pub/pculture.org/miro/src/
@@ -16,67 +16,67 @@ COMMENT=	A video player to get internet TV broadcasts
 
 BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex				\
 		update-mime-database:${PORTSDIR}/misc/shared-mime-info
-LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine			\
-		fame-0.9:${PORTSDIR}/multimedia/libfame			\
-		boost_python.4:${PORTSDIR}/devel/boost-python
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick			\
+LIB_DEPENDS=	boost_python.4:${PORTSDIR}/devel/boost-python		\
+		xine.1:${PORTSDIR}/multimedia/libxine
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb	\
+		${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23	\
 		${PYTHON_SITELIBDIR}/dbus/glib.py:${PORTSDIR}/devel/py-dbus	\
-		${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb	\
-		${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23
-
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	glib20 gtk20 pygnomeextras
-USE_GECKO=	firefox seamonkey mozilla
-USE_GSTREAMER=	python
-INSTALLS_EGGINFO=	yes
+		convert:${PORTSDIR}/graphics/ImageMagick
 
 BUILD_WRKSRC=	${WRKSRC}/platform/gtk-x11
+INSTALL_WRKSRC=	${WRKSRC}/platform/gtk-x11
+
+USE_GNOME=	gtk20 pygnomeextras
+USE_GECKO=	firefox seamonkey xulrunner mozilla
+USE_OPENSSL=	yes
+USE_PYTHON=	yes
+WANT_GSTREAMER=	yes
+USE_GETTEXT=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	${PORTNAME:L}
 MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+INSTALLS_EGGINFO=	yes
+
+MANCOMPRESSED=	yes
+MAN1=		miro.1 miro.real.1
 
 DATADIR=	${PREFIX}/share/${PORTNAME:L}
-PLIST_SUB=	VER=${PORTVERSION} PYTHON_VER=${_PYTHON_VERSION}	\
-		DESKTOPDIR=share/applications
-PYDISTUTILS_PKGNAME=	${PORTNAME:L}
-
-MAN1=		miro.1
-MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
-pre-configure:
-.for pyscr in setup.py platform/resources.py
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|'		\
-		-e 's|/usr/X11R6|${LOCALBASE}|g'				\
-		-e 's|/usr/share|${PREFIX}/share|g'			\
-		-e 's|/usr/libexec|${PREFIX}/libexec|g'			\
-		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|'		\
-		-e 's|${LOCALBASE}/man|${MANPREFIX}/man|'		\
-		${BUILD_WRKSRC}/${pyscr}
+.if defined(WITH_GSTREAMER)
+USE_GSTREAMER+=	python
+.endif
+
+.SILENT:
+
+post-patch:
+.for file in setup.py plat/resources.py
+	${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g ; \
+		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		 s|%%CC%%|${CC}|g ; \
+		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \
+		 s|%%PREFIX%%|${PREFIX}|g ; \
+		 s|%%MANPREFIX%%|${MANPREFIX}|g' \
+		${BUILD_WRKSRC}/${file}
 .endfor
-.for pyscr in miro.real timetemplates.py
-	${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|'		\
-		-e '/^PREFIX/s|/usr|${PREFIX}|' ${BUILD_WRKSRC}/${pyscr}
+.for file in miro.real
+	${REINPLACE_CMD} -e 's|python2.4|${PYTHON_VERSION}|g' \
+		${BUILD_WRKSRC}/${file}
+.endfor
+.for file in run.sh
+	${REINPLACE_CMD} -e 's|^PREFIX=.*|PREFIX=${PREFIX}|g' \
+		${BUILD_WRKSRC}/${file}
+.endfor
+.for file in plat/renderers/xinerenderer.py
+	${REINPLACE_CMD} -e 's|lib/miro|libexec/miro|g' \
+		${BUILD_WRKSRC}/${file}
 .endfor
-	${REINPLACE_CMD} -e 's|BOOST_LIB_PATH|${LOCALBASE}/lib|'	\
-		${WRKSRC}/portable/setup_portable.py
-	${REINPLACE_CMD} -e 's|return "Linux"|return "${OPSYS}"|'	\
-		${BUILD_WRKSRC}/platform/__init__.py
-
-do-build:
-	(cd ${BUILD_WRKSRC} &&	\
-	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py build)
-
-do-install:
-	(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV}		\
-	${PYTHON_CMD} setup.py install --prefix=${PREFIX})
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
-	${PYTHON_SITELIBDIR}/miro
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	LANG=C LC_ALL=C ${PREFIX}/bin/miro --unittest
 .endif
 
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 .include <bsd.port.post.mk>

multimedia/miro/distinfo

@@ -1,3 +1,3 @@
-MD5 (Miro-1.2.8.tar.gz) = b468a953014272095171303ba3f0745d
-SHA256 (Miro-1.2.8.tar.gz) = 05472bc02e50512983618802bfec3c6acd8734090cb0f4d5dd6d49f4c4c347ef
-SIZE (Miro-1.2.8.tar.gz) = 14498464
+MD5 (Miro-2.0.1.tar.gz) = 9f180474f97f179e78d919e92b66e3e4
+SHA256 (Miro-2.0.1.tar.gz) = 395d3fceb1e42e5da20e29857b3562cfa065401bb7b6ae9a56351f9a59ef70ce
+SIZE (Miro-2.0.1.tar.gz) = 7349695

multimedia/miro/files/patch-platform__gtk-x11__plat__options.py

@@ -0,0 +1,20 @@
+--- platform/gtk-x11/plat/options.py.orig	2009-02-12 06:37:07.000000000 +0900
++++ platform/gtk-x11/plat/options.py	2009-02-12 18:24:15.000000000 +0900
+@@ -39,7 +39,7 @@
+ from miro.prefs import Pref
+ 
+ USE_RENDERER = Pref(key="useRenderer",
+-                    default=u"gstreamer",
++                    default=u"xine",
+                     platformSpecific=False,
+                     alias="renderer",
+                     help="Which renderer to use.  (gstreamer, xine)" )
+@@ -51,7 +51,7 @@
+                   help="Which visualization plugin to use for audio files.  (goom or none)" )
+ 
+ USE_XINE_XV_HACK = Pref(key="UseXineXVHack",
+-                        default=True,
++                        default=False,
+                         platformSpecific=False,
+                         alias="xine-xvhack",
+                         help="Whether or not to use the Xine xv hack.  (true, false)" )

multimedia/miro/files/patch-platform__gtk-x11__plat__resources.py

@@ -0,0 +1,24 @@
+--- platform/gtk-x11/plat/resources.py.orig	2009-02-12 06:37:07.000000000 +0900
++++ platform/gtk-x11/plat/resources.py	2009-02-13 01:56:28.000000000 +0900
+@@ -29,10 +29,10 @@
+ import os
+ import urllib
+ 
+-resource_root = os.environ.get('MIRO_RESOURCE_ROOT', '/usr/share/miro/resources/')
++resource_root = os.environ.get('MIRO_RESOURCE_ROOT', '%%PREFIX%%/share/miro/resources/')
+ resource_root = os.path.abspath(resource_root)
+ 
+-share_root = os.environ.get('MIRO_SHARE_ROOT', '/usr/share/')
++share_root = os.environ.get('MIRO_SHARE_ROOT', '%%PREFIX%%/share/')
+ share_root = os.path.abspath(share_root)
+ 
+ # Note: some of these functions are probably not absolutely correct in
+@@ -63,7 +63,7 @@
+     return u"file://%s" % urllib.quote(absolute_path)
+ 
+ def theme_path(theme, relative_path):
+-    return os.path.join('/usr/share/miro/themes', theme, relative_path)
++    return os.path.join('%%PREFIX%%/share/miro/themes', theme, relative_path)
+ 
+ def check_kde():
+     return os.environ.get("KDE_FULL_SESSION", None) != None

multimedia/miro/files/patch-platform__gtk-x11__xine__xine_impl.c

@@ -0,0 +1,23 @@
+--- platform/gtk-x11/xine/xine_impl.c.orig	2009-02-12 06:37:07.000000000 +0900
++++ platform/gtk-x11/xine/xine_impl.c	2009-02-12 18:22:22.000000000 +0900
+@@ -251,14 +251,18 @@
+     vis.user_data = xine;
+   
+     /* opening xine output ports */
++    /* Try to use char *driver for video, default to "auto" if NULL */
++    if (!driver)
++            driver = "auto";
++
+ #ifdef INCLUDE_XINE_DRIVER_HACK
+     miro_using_xv_driver_hack = 0;    /* by default, don't use the hack */
+-    xine->videoPort = xine_open_video_driver(xine->xine, "xv",
++    xine->videoPort = xine_open_video_driver(xine->xine, driver,
+             XINE_VISUAL_TYPE_X11, (void *)&vis);
+     if (!xine->videoPort) {
+ #endif
+ 
+-      xine->videoPort = xine_open_video_driver(xine->xine, "auto",
++      xine->videoPort = xine_open_video_driver(xine->xine, driver,
+            XINE_VISUAL_TYPE_X11, (void *)&vis);
+ 
+ 

multimedia/miro/files/patch-platform_gtk-x11_setup.py

@@ -1,14 +1,23 @@
---- platform/gtk-x11/setup.py.orig	2008-05-28 16:05:13.000000000 +0200
-+++ platform/gtk-x11/setup.py	2008-06-14 15:40:32.000000000 +0200
-@@ -61,6 +61,7 @@
- ###############################################################################
+--- platform/gtk-x11/setup.py.orig	2009-02-12 06:37:07.000000000 +0900
++++ platform/gtk-x11/setup.py	2009-02-15 05:49:26.000000000 +0900
+@@ -111,12 +111,13 @@
+ # XPCOM_LIB = "firefox-xpcom"
+ # GTKMOZEMBED_LIB = "firefox-gtkmozembed"
+ # XULRUNNER_19 = False
+-XPCOM_LIB = None
+-GTKMOZEMBED_LIB = None
+-XULRUNNER_19 = None
++XPCOM_LIB = "%%GECKO%%-xpcom"
++GTKMOZEMBED_LIB = "%%GECKO%%-gtkmozembed"
++XULRUNNER_19 = False
  
+ # The name of the boost library.  Used for building extensions.
  BOOST_LIB = 'boost_python'
-+BOOST_LIB_PATH = '/usr/local/lib'
++BOOST_LIB_PATH = '%%LOCALBASE%%/lib'
  
- USE_XINE_HACK = True #use_xine_hack_default()
  
-@@ -222,6 +223,9 @@
+ ###############################################################################
+@@ -282,6 +283,9 @@
              options_dict['library_dirs'].append(rest)
          elif prefix == '-l':
              options_dict['libraries'].append(rest)
@@ -17,65 +26,139 @@
 +            continue
          else:
              options_dict['extra_compile_args'].append(comp)
+ 
+@@ -292,7 +296,7 @@
      return options_dict
-@@ -231,6 +235,7 @@
-     Extension("miro.fasttypes", 
+ 
+ def compile_xine_extractor():
+-    rv = os.system("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine`" %
++    rv = os.system("%%CC%% %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine` %%PTHREAD_LIBS%%" %
+                    (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
+     if rv != 0:
+         raise RuntimeError("xine_extractor compilation failed.  Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
+@@ -330,7 +334,7 @@
+         exit;
+     fi
+ 
+-    %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
++    %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@"
+ else
+     %(runtimelib)smiro.real "$@"
+ fi
+@@ -343,6 +347,7 @@
+     Extension("miro.fasttypes",
          sources = [os.path.join(portable_dir, 'fasttypes.cpp')],
          libraries = [BOOST_LIB],
 +        library_dirs = [BOOST_LIB_PATH],
      )
  
- ##### The libtorrent extension ####
-@@ -243,21 +248,17 @@
-     sys.exit("Package config error:\n%s" % (error,))
  
- xulrunner19 = False
--if re.search("^libxul", packages, re.MULTILINE):
--    xulrunner19 = True
--    xpcom = 'libxul'
--    gtkmozembed = 'libxul'
--elif re.search("^xulrunner-xpcom", packages, re.MULTILINE):
--    xpcom = 'xulrunner-xpcom'
--    gtkmozembed = 'xulrunner-gtkmozembed'
-+if re.search("^firefox-xpcom", packages, re.MULTILINE):
-+    xpcom = 'firefox-xpcom'
-+    gtkmozembed = 'firefox-gtkmozembed'
-+elif re.search("^seamonkey-xpcom", packages, re.MULTILINE):
-+    xpcom = 'seamonkey-xpcom'
-+    gtkmozembed = 'seamonkey-gtkmozembed'
- elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
-     xpcom = 'mozilla-xpcom'
-     gtkmozembed = 'mozilla-gtkmozembed'
--elif re.search("^firefox-xpcom", packages, re.MULTILINE):
--    xpcom = 'firefox-xpcom'
--    gtkmozembed = 'firefox-gtkmozembed'
- else:
--    sys.exit("Can't find libxul, xulrunner-xpcom, mozilla-xpcom or firefox-xpcom")
-+    sys.exit("Can't find seamonkey-xpcom, mozilla-xpcom or firefox-xpcom")
+@@ -381,14 +386,14 @@
+                           "-DHAVE___INCLUDE_LIBTORRENT_ASIO_HPP=1",
+                           "-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
+                           "-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
+-                          "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1",
+-                          "-DNDEBUG=1", "-O2"]
++                          "-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1",
++                          "-DHAVE_SSL=1"]
+ 
+     if is_x64():
+         extra_compile_args.append("-DAMD64")
+ 
+     # check for mt
+-    libraries = ['z', 'pthread', 'ssl']
++    libraries = ['z', 'ssl']
+     all_libs = []
+     if os.path.exists(os.path.join(sysconfig.PREFIX, "lib")):
+         all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib")))
+@@ -430,6 +435,7 @@
+     return Extension("miro.libtorrent",
+                      include_dirs=include_dirs,
+                      libraries=libraries,
++                     library_dirs=[BOOST_LIB_PATH],
+                      extra_compile_args=extra_compile_args,
+                      sources=sources)
+ 
+@@ -552,7 +558,7 @@
+ xlib_ext = \
+     Extension("miro.plat.xlibhelper",
+         [ os.path.join(platform_package_dir,'xlibhelper.pyx') ],
+-        library_dirs = ['/usr/X11R6/lib'],
++        library_dirs = ['%%LOCALBASE%%/lib'],
+         libraries = ['X11'],
+     )
+ 
+@@ -638,29 +644,29 @@
+ # filter out app.config.template (which is handled specially)
+ files = [f for f in listfiles(resource_dir) \
+         if os.path.basename(f) != 'app.config.template']
+-data_files.append(('/usr/share/miro/resources/', files))
++data_files.append(('%%PREFIX%%/share/miro/resources/', files))
+ # handle the sub directories.
+ for dir in ('searchengines', 'images', 'testdata',
+         os.path.join('testdata', 'stripperdata'),
+         os.path.join('testdata', 'locale', 'fr', 'LC_MESSAGES')):
+     source_dir = os.path.join(resource_dir, dir)
+-    dest_dir = os.path.join('/usr/share/miro/resources/', dir)
++    dest_dir = os.path.join('%%PREFIX%%/share/miro/resources/', dir)
+     data_files.append((dest_dir, listfiles(source_dir)))
+ 
  
- if not "clean" in sys.argv:
-     # build a miro script that wraps the miro.real script with an LD_LIBRARY_PATH
-@@ -383,7 +384,7 @@
  # add the desktop file, icons, mime data, and man page.
- 
- if not "clean" in sys.argv:
--    rv = os.system ("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine`" % (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
-+    rv = os.system ("gcc %s -o %s `pkg-config --libs --cflags gdk-pixbuf-2.0 glib-2.0 libxine` %%PTHREAD_LIBS%%" % (os.path.join(platform_dir, "xine/xine_extractor.c"), os.path.join(platform_dir, "xine/xine_extractor")))
- 
-     if rv != 0:
-         raise RuntimeError("xine_extractor compilation failed.  Possibly missing libxine, gdk-pixbuf-2.0, or glib-2.0.")
-@@ -391,11 +392,11 @@
  data_files += [
-     ('/usr/share/pixmaps', 
+-    ('/usr/share/pixmaps',
++    ('%%PREFIX%%/share/pixmaps',
       glob(os.path.join(platform_dir, 'miro-*.png'))),
--    ('/usr/share/applications', 
-+    ('/usr/local/share/applications', 
+-    ('/usr/share/applications',
++    ('%%PREFIX%%/share/applications',
       [os.path.join(platform_dir, 'miro.desktop')]),
--    ('/usr/share/mime/packages', 
-+    ('/usr/local/share/mime/packages', 
+-    ('/usr/share/mime/packages',
++    ('%%PREFIX%%/share/mime/packages',
       [os.path.join(platform_dir, 'miro.xml')]),
 -    ('/usr/share/man/man1',
-+    ('/usr/local/man/man1',
++    ('%%MANPREFIX%%/man/man1',
       [os.path.join(platform_dir, 'miro.1.gz')]),
-     ('/usr/libexec/',
+-    ('/usr/share/man/man1',
++    ('%%MANPREFIX%%/man/man1',
+      [os.path.join(platform_dir, 'miro.real.1.gz')]),
+-    ('/usr/lib/miro/',
++    ('%%PREFIX%%/libexec/miro',
       [os.path.join(platform_dir, 'xine/xine_extractor')]),
+ ]
+ 
+@@ -684,7 +690,7 @@
+ 
+     def install_app_config(self):
+         source = os.path.join(resource_dir, 'app.config.template')
+-        dest = '/usr/share/miro/resources/app.config'
++        dest = '%%PREFIX%%/share/miro/resources/app.config'
+ 
+         config_file = util.read_simple_config_file(source)
+         print "Trying to figure out the svn revision...."
+@@ -724,7 +730,7 @@
+ 
+         for source in glob (os.path.join (locale_dir, "*.mo")):
+             lang = os.path.basename(source)[:-3]
+-            dest = '/usr/share/locale/%s/LC_MESSAGES/miro.mo' % lang
++            dest = '%%PREFIX%%/share/locale/%s/LC_MESSAGES/miro.mo' % lang
+             if self.root:
+                 dest = change_root(self.root, dest)
+             self.mkpath(os.path.dirname(dest))
+@@ -753,7 +759,7 @@
+ 
+ #### install_theme installs a specifified theme .zip
+ class install_theme(Command):
+-    description = 'Install a provided theme to /usr/share/miro/themes'
++    description = 'Install a provided theme to %%PREFIX%%/share/miro/themes'
+     user_options = [("theme=", None, 'ZIP file containing the theme')]
+ 
+     def initialize_options(self):
+@@ -781,7 +787,7 @@
+             raise DistutilsOptionError, "invalid theme file"
+         self.zipfile = zf
+         self.theme_name = themeName
+-        self.theme_dir = '/usr/share/miro/themes/%s' % themeName
++        self.theme_dir = '%%PREFIX%%/share/miro/themes/%s' % themeName
+ 
+     def run(self):
+         if os.path.exists(self.theme_dir):

multimedia/miro/files/patch-portable__startup.py

@@ -0,0 +1,11 @@
+--- portable/startup.py.orig	2009-02-12 06:37:23.000000000 +0900
++++ portable/startup.py	2009-02-12 18:25:40.000000000 +0900
+@@ -250,7 +250,7 @@
+     yield None
+     parse_command_line_args()
+     yield None
+-    autoupdate.check_for_updates()
++    # autoupdate.check_for_updates()
+     yield None
+     # Wait a bit before starting the downloader daemon.  It can cause a bunch
+     # of disk/CPU load, so try to avoid it slowing other stuff down.

multimedia/miro/files/patch-portable_libtorrent_bindings_python_src_peer_plugin.cpp

@@ -1,12 +0,0 @@
---- portable/libtorrent/bindings/python/src/peer_plugin.cpp.orig	2008-01-10 20:55:51.000000000 +0100
-+++ portable/libtorrent/bindings/python/src/peer_plugin.cpp	2008-01-11 21:47:50.000000000 +0100
-@@ -2,6 +2,9 @@
- // subject to the Boost Software License, Version 1.0. (See accompanying
- // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+#include <cctype>
-+#include <iostream>
-+
- #include <libtorrent/extensions.hpp>
- #include <libtorrent/entry.hpp>
- #include <libtorrent/peer_request.hpp>

multimedia/miro/files/patch-portable_setup_portable.py

@@ -1,10 +0,0 @@
---- ./portable/setup_portable.py.orig	2008-01-10 20:55:52.000000000 +0100
-+++ ./portable/setup_portable.py	2008-01-11 22:35:18.000000000 +0100
-@@ -182,6 +182,7 @@
-         return Extension("miro.libtorrent", 
-                          include_dirs = include_dirs,
-                          libraries = librariestype,
-+                         library_dirs = ['BOOST_LIB_PATH'],
-                          extra_compile_args = EXTRA_COMPILE_ARGS,
-                          sources = sources)
-     else: