1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00

- Update to 2.0.2

PR:		132473
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2009-03-14 14:10:06 +00:00
parent 0bb34d7328
commit 00268734bb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=230055
5 changed files with 37 additions and 43 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= Miro
PORTVERSION= 2.0.1
PORTVERSION= 2.0.2
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
http://ftp.osuosl.org/pub/pculture.org/miro/src/

View File

@ -1,3 +1,3 @@
MD5 (Miro-2.0.1.tar.gz) = 9f180474f97f179e78d919e92b66e3e4
SHA256 (Miro-2.0.1.tar.gz) = 395d3fceb1e42e5da20e29857b3562cfa065401bb7b6ae9a56351f9a59ef70ce
SIZE (Miro-2.0.1.tar.gz) = 7349695
MD5 (Miro-2.0.2.tar.gz) = ac72878d2faa0f62f96aca2e6d229cb9
SHA256 (Miro-2.0.2.tar.gz) = 9c7d695f2bc22c05c22d5bbc3355b756bf07e401f2550b22ae83072f401f95ed
SIZE (Miro-2.0.2.tar.gz) = 7502377

View File

@ -1,23 +0,0 @@
--- 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);

View File

@ -1,5 +1,5 @@
--- 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
--- platform/gtk-x11/setup.py.orig 2009-03-08 04:21:24.000000000 +0900
+++ platform/gtk-x11/setup.py 2009-03-09 15:35:56.000000000 +0900
@@ -111,12 +111,13 @@
# XPCOM_LIB = "firefox-xpcom"
# GTKMOZEMBED_LIB = "firefox-gtkmozembed"
@ -40,8 +40,8 @@
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 "$@"
- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
+ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@"
else
%(runtimelib)smiro.real "$@"
fi
@ -53,7 +53,7 @@
)
@@ -381,14 +386,14 @@
@@ -378,14 +383,14 @@
"-DHAVE___INCLUDE_LIBTORRENT_ASIO_HPP=1",
"-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
"-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
@ -71,7 +71,7 @@
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 @@
@@ -427,6 +432,7 @@
return Extension("miro.libtorrent",
include_dirs=include_dirs,
libraries=libraries,
@ -79,7 +79,7 @@
extra_compile_args=extra_compile_args,
sources=sources)
@@ -552,7 +558,7 @@
@@ -549,7 +555,7 @@
xlib_ext = \
Extension("miro.plat.xlibhelper",
[ os.path.join(platform_package_dir,'xlibhelper.pyx') ],
@ -88,7 +88,7 @@
libraries = ['X11'],
)
@@ -638,29 +644,29 @@
@@ -635,31 +641,31 @@
# 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']
@ -109,6 +109,9 @@
- ('/usr/share/pixmaps',
+ ('%%PREFIX%%/share/pixmaps',
glob(os.path.join(platform_dir, 'miro-*.png'))),
- ('/usr/share/pixmaps',
+ ('%%PREFIX%%/share/pixmaps',
glob(os.path.join(platform_dir, 'miro.xpm'))),
- ('/usr/share/applications',
+ ('%%PREFIX%%/share/applications',
[os.path.join(platform_dir, 'miro.desktop')]),
@ -126,7 +129,7 @@
[os.path.join(platform_dir, 'xine/xine_extractor')]),
]
@@ -684,7 +690,7 @@
@@ -683,7 +689,7 @@
def install_app_config(self):
source = os.path.join(resource_dir, 'app.config.template')
@ -135,7 +138,7 @@
config_file = util.read_simple_config_file(source)
print "Trying to figure out the svn revision...."
@@ -724,7 +730,7 @@
@@ -723,7 +729,7 @@
for source in glob (os.path.join (locale_dir, "*.mo")):
lang = os.path.basename(source)[:-3]
@ -144,16 +147,16 @@
if self.root:
dest = change_root(self.root, dest)
self.mkpath(os.path.dirname(dest))
@@ -753,7 +759,7 @@
@@ -752,7 +758,7 @@
#### install_theme installs a specifified theme .zip
#### install_theme installs a specified 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 @@
@@ -780,7 +786,7 @@
raise DistutilsOptionError, "invalid theme file"
self.zipfile = zf
self.theme_name = themeName

View File

@ -110,6 +110,9 @@ bin/miro.real
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.py
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.py
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.py
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyo
@ -122,9 +125,12 @@ bin/miro.real
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.py
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/shell.py
%%PYTHON_SITELIBDIR%%/miro/frontends/shell.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/shell.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.py
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.py
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.pyo
%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.py
%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyc
%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyo
@ -734,12 +740,15 @@ share/mime/packages/miro.xml
%%DATADIR%%/resources/images/pref-tab-general.png
%%DATADIR%%/resources/images/pref-tab-playback.png
%%DATADIR%%/resources/images/resume-button.png
%%DATADIR%%/resources/images/search_icon_5min.png
%%DATADIR%%/resources/images/search_icon_all.png
%%DATADIR%%/resources/images/search_icon_bliptv.png
%%DATADIR%%/resources/images/search_icon_blogdigger.png
%%DATADIR%%/resources/images/search_icon_dailymotion.png
%%DATADIR%%/resources/images/search_icon_everyzing.png
%%DATADIR%%/resources/images/search_icon_google.png
%%DATADIR%%/resources/images/search_icon_mefeedia.png
%%DATADIR%%/resources/images/search_icon_metavid.png
%%DATADIR%%/resources/images/search_icon_revver.png
%%DATADIR%%/resources/images/search_icon_veoh.png
%%DATADIR%%/resources/images/search_icon_yahoosearch.png
@ -776,10 +785,13 @@ share/mime/packages/miro.xml
%%DATADIR%%/resources/images/volume_track.png
%%DATADIR%%/resources/images/wtexture.png
%%DATADIR%%/resources/images/wtexture_inactive.png
%%DATADIR%%/resources/searchengines/5min.xml
%%DATADIR%%/resources/searchengines/bliptv.xml
%%DATADIR%%/resources/searchengines/blogdigger.xml
%%DATADIR%%/resources/searchengines/dailymotion.xml
%%DATADIR%%/resources/searchengines/everyzing.xml
%%DATADIR%%/resources/searchengines/google.xml
%%DATADIR%%/resources/searchengines/metavid.xml
%%DATADIR%%/resources/searchengines/revver.xml
%%DATADIR%%/resources/searchengines/veoh.xml
%%DATADIR%%/resources/searchengines/yahoosearch.xml
@ -827,6 +839,7 @@ share/mime/packages/miro.xml
share/pixmaps/miro-128x128.png
share/pixmaps/miro-24x24.png
share/pixmaps/miro-72x72.png
share/pixmaps/miro.xpm
@dirrm %%DATADIR%%/resources/testdata/stripperdata
@dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES
@dirrm %%DATADIR%%/resources/testdata/locale/fr
@ -859,6 +872,7 @@ share/pixmaps/miro-72x72.png
@dirrm %%PYTHON_SITELIBDIR%%/miro/plat
@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk
@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets
@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/shell
@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/cli
@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends
@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/private