Attachment #94341 for bug #132473

View | Details | Raw Unified | Return to bug 132473
Collapse All | Expand All

Lines 6-12 Link Here

(-)multimedia/miro/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= Miro	8	PORTNAME= Miro
9	PORTVERSION= 2.0.1	9	PORTVERSION= 2.0.2
10	CATEGORIES= multimedia	10	CATEGORIES= multimedia
11	MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \	11	MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
12	http://ftp.osuosl.org/pub/pculture.org/miro/src/	12	http://ftp.osuosl.org/pub/pculture.org/miro/src/

Lines 1-3 Link Here

(-)multimedia/miro/distinfo (-3 / +3 lines)
1	MD5 (Miro-2.0.1.tar.gz) = 9f180474f97f179e78d919e92b66e3e4	1	MD5 (Miro-2.0.2.tar.gz) = ac72878d2faa0f62f96aca2e6d229cb9
2	SHA256 (Miro-2.0.1.tar.gz) = 395d3fceb1e42e5da20e29857b3562cfa065401bb7b6ae9a56351f9a59ef70ce	2	SHA256 (Miro-2.0.2.tar.gz) = 9c7d695f2bc22c05c22d5bbc3355b756bf07e401f2550b22ae83072f401f95ed
3	SIZE (Miro-2.0.1.tar.gz) = 7349695	3	SIZE (Miro-2.0.2.tar.gz) = 7502377




--- 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);
 
 




--- 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"

         exit;
     fi
 
-    %(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

     )
 
 
@@ -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",

     all_libs = []
     if os.path.exists(os.path.join(sysconfig.PREFIX, "lib")):
         all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib")))
@@ -427,6 +432,7 @@
     return Extension("miro.libtorrent",
                      include_dirs=include_dirs,
                      libraries=libraries,

                      extra_compile_args=extra_compile_args,
                      sources=sources)
 
@@ -549,7 +555,7 @@
 xlib_ext = \
     Extension("miro.plat.xlibhelper",
         [ os.path.join(platform_package_dir,'xlibhelper.pyx') ],

         libraries = ['X11'],
     )
 
@@ -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']

-    ('/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')]),

      [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 
@@ -683,7 +689,7 @@
 
     def install_app_config(self):
         source = os.path.join(resource_dir, 'app.config.template')

 
         config_file = util.read_simple_config_file(source)
         print "Trying to figure out the svn revision...."
@@ -723,7 +729,7 @@
 
         for source in glob (os.path.join (locale_dir, "*.mo")):
             lang = os.path.basename(source)[:-3]

             if self.root:
                 dest = change_root(self.root, dest)
             self.mkpath(os.path.dirname(dest))
@@ -752,7 +758,7 @@
 
 #### 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):
@@ -780,7 +786,7 @@
             raise DistutilsOptionError, "invalid theme file"
         self.zipfile = zf
         self.theme_name = themeName

Return to bug 132473

Lines 1-23 Link Here

(-)multimedia/miro/files/patch-platform__gtk-x11__xine__xine_impl.c (-23 lines)
1	--- platform/gtk-x11/xine/xine_impl.c.orig 2009-02-12 06:37:07.000000000 +0900
2	+++ platform/gtk-x11/xine/xine_impl.c 2009-02-12 18:22:22.000000000 +0900
3	@@ -251,14 +251,18 @@
4	vis.user_data = xine;
5
6	/* opening xine output ports */
7	+ /* Try to use char driver for video, default to "auto" if NULL /
8	+ if (!driver)
9	+ driver = "auto";
10	+
11	#ifdef INCLUDE_XINE_DRIVER_HACK
12	miro_using_xv_driver_hack = 0; /* by default, don't use the hack */
13	- xine->videoPort = xine_open_video_driver(xine->xine, "xv",
14	+ xine->videoPort = xine_open_video_driver(xine->xine, driver,
15	XINE_VISUAL_TYPE_X11, (void *)&vis);
16	if (!xine->videoPort) {
17	#endif
18
19	- xine->videoPort = xine_open_video_driver(xine->xine, "auto",
20	+ xine->videoPort = xine_open_video_driver(xine->xine, driver,
21	XINE_VISUAL_TYPE_X11, (void *)&vis);
22
23

Lines 1-5 Link Here

(-)multimedia/miro/files/patch-platform_gtk-x11_setup.py (-13 / +16 lines)
1	--- platform/gtk-x11/setup.py.orig 2009-02-12 06:37:07.000000000 +0900	1	--- platform/gtk-x11/setup.py.orig 2009-03-08 04:21:24.000000000 +0900
2	+++ platform/gtk-x11/setup.py 2009-02-15 05:49:26.000000000 +0900	2	+++ platform/gtk-x11/setup.py 2009-03-09 15:35:56.000000000 +0900
3	@@ -111,12 +111,13 @@	3	@@ -111,12 +111,13 @@
4	# XPCOM_LIB = "firefox-xpcom"	4	# XPCOM_LIB = "firefox-xpcom"
5	# GTKMOZEMBED_LIB = "firefox-gtkmozembed"	5	# GTKMOZEMBED_LIB = "firefox-gtkmozembed"
Lines 40-47 Link Here
40	exit;	40	exit;
41	fi	41	fi
42		42
43	- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"	43	- %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
44	+ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@"	44	+ %(runtimelib)s$GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON %%PREFIX%%/bin/miro.real --sync "$@"
45	else	45	else
46	%(runtimelib)smiro.real "$@"	46	%(runtimelib)smiro.real "$@"
47	fi	47	fi
Lines 53-59 Link Here
53	)	53	)
54		54
55		55
56	@@ -381,14 +386,14 @@	56	@@ -378,14 +383,14 @@
57	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_HPP=1",	57	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_HPP=1",
58	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",	58	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
59	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",	59	"-DHAVE___INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
Lines 71-77 Link Here
71	all_libs = []	71	all_libs = []
72	if os.path.exists(os.path.join(sysconfig.PREFIX, "lib")):	72	if os.path.exists(os.path.join(sysconfig.PREFIX, "lib")):
73	all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib")))	73	all_libs.extend(os.listdir(os.path.join(sysconfig.PREFIX, "lib")))
74	@@ -430,6 +435,7 @@	74	@@ -427,6 +432,7 @@
75	return Extension("miro.libtorrent",	75	return Extension("miro.libtorrent",
76	include_dirs=include_dirs,	76	include_dirs=include_dirs,
77	libraries=libraries,	77	libraries=libraries,
Lines 79-85 Link Here
79	extra_compile_args=extra_compile_args,	79	extra_compile_args=extra_compile_args,
80	sources=sources)	80	sources=sources)
81		81
82	@@ -552,7 +558,7 @@	82	@@ -549,7 +555,7 @@
83	xlib_ext = \	83	xlib_ext = \
84	Extension("miro.plat.xlibhelper",	84	Extension("miro.plat.xlibhelper",
85	[ os.path.join(platform_package_dir,'xlibhelper.pyx') ],	85	[ os.path.join(platform_package_dir,'xlibhelper.pyx') ],
Lines 88-94 Link Here
88	libraries = ['X11'],	88	libraries = ['X11'],
89	)	89	)
90		90
91	@@ -638,29 +644,29 @@	91	@@ -635,31 +641,31 @@
92	# filter out app.config.template (which is handled specially)	92	# filter out app.config.template (which is handled specially)
93	files = [f for f in listfiles(resource_dir) \	93	files = [f for f in listfiles(resource_dir) \
94	if os.path.basename(f) != 'app.config.template']	94	if os.path.basename(f) != 'app.config.template']
Lines 109-114 Link Here
109	- ('/usr/share/pixmaps',	109	- ('/usr/share/pixmaps',
110	+ ('%%PREFIX%%/share/pixmaps',	110	+ ('%%PREFIX%%/share/pixmaps',
111	glob(os.path.join(platform_dir, 'miro-*.png'))),	111	glob(os.path.join(platform_dir, 'miro-*.png'))),
		112	- ('/usr/share/pixmaps',
		113	+ ('%%PREFIX%%/share/pixmaps',
		114	glob(os.path.join(platform_dir, 'miro.xpm'))),
112	- ('/usr/share/applications',	115	- ('/usr/share/applications',
113	+ ('%%PREFIX%%/share/applications',	116	+ ('%%PREFIX%%/share/applications',
114	[os.path.join(platform_dir, 'miro.desktop')]),	117	[os.path.join(platform_dir, 'miro.desktop')]),
Lines 126-132 Link Here
126	[os.path.join(platform_dir, 'xine/xine_extractor')]),	129	[os.path.join(platform_dir, 'xine/xine_extractor')]),
127	]	130	]
128		131
129	@@ -684,7 +690,7 @@	132	@@ -683,7 +689,7 @@
130		133
131	def install_app_config(self):	134	def install_app_config(self):
132	source = os.path.join(resource_dir, 'app.config.template')	135	source = os.path.join(resource_dir, 'app.config.template')
Lines 135-141 Link Here
135		138
136	config_file = util.read_simple_config_file(source)	139	config_file = util.read_simple_config_file(source)
137	print "Trying to figure out the svn revision...."	140	print "Trying to figure out the svn revision...."
138	@@ -724,7 +730,7 @@	141	@@ -723,7 +729,7 @@
139		142
140	for source in glob (os.path.join (locale_dir, "*.mo")):	143	for source in glob (os.path.join (locale_dir, "*.mo")):
141	lang = os.path.basename(source)[:-3]	144	lang = os.path.basename(source)[:-3]
Lines 144-159 Link Here
144	if self.root:	147	if self.root:
145	dest = change_root(self.root, dest)	148	dest = change_root(self.root, dest)
146	self.mkpath(os.path.dirname(dest))	149	self.mkpath(os.path.dirname(dest))
147	@@ -753,7 +759,7 @@	150	@@ -752,7 +758,7 @@
148		151
149	#### install_theme installs a specifified theme .zip	152	#### install_theme installs a specified theme .zip
150	class install_theme(Command):	153	class install_theme(Command):
151	- description = 'Install a provided theme to /usr/share/miro/themes'	154	- description = 'Install a provided theme to /usr/share/miro/themes'
152	+ description = 'Install a provided theme to %%PREFIX%%/share/miro/themes'	155	+ description = 'Install a provided theme to %%PREFIX%%/share/miro/themes'
153	user_options = [("theme=", None, 'ZIP file containing the theme')]	156	user_options = [("theme=", None, 'ZIP file containing the theme')]
154		157
155	def initialize_options(self):	158	def initialize_options(self):
156	@@ -781,7 +787,7 @@	159	@@ -780,7 +786,7 @@
157	raise DistutilsOptionError, "invalid theme file"	160	raise DistutilsOptionError, "invalid theme file"
158	self.zipfile = zf	161	self.zipfile = zf
159	self.theme_name = themeName	162	self.theme_name = themeName

Lines 110-115 Link Here

(-)multimedia/miro/pkg-plist (-3 / +17 lines)
110	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.py	110	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.py
111	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyc	111	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyc
112	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyo	112	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/__init__.pyo
		113	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.py
		114	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.pyc
		115	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/application.pyo
113	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.py	116	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.py
114	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyc	117	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyc
115	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyo	118	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/clidialog.pyo
Lines 122-130 Link Here
122	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.py	125	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.py
123	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyc	126	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyc
124	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyo	127	%%PYTHON_SITELIBDIR%%/miro/frontends/cli/util.pyo
125	%%PYTHON_SITELIBDIR%%/miro/frontends/shell.py	128	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.py
126	%%PYTHON_SITELIBDIR%%/miro/frontends/shell.pyc	129	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.pyc
127	%%PYTHON_SITELIBDIR%%/miro/frontends/shell.pyo	130	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/__init__.pyo
		131	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.py
		132	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.pyc
		133	%%PYTHON_SITELIBDIR%%/miro/frontends/shell/application.pyo
128	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.py	134	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.py
129	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyc	135	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyc
130	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyo	136	%%PYTHON_SITELIBDIR%%/miro/frontends/widgets/__init__.pyo
Lines 734-745 Link Here
734	%%DATADIR%%/resources/images/pref-tab-general.png	740	%%DATADIR%%/resources/images/pref-tab-general.png
735	%%DATADIR%%/resources/images/pref-tab-playback.png	741	%%DATADIR%%/resources/images/pref-tab-playback.png
736	%%DATADIR%%/resources/images/resume-button.png	742	%%DATADIR%%/resources/images/resume-button.png
		743	%%DATADIR%%/resources/images/search_icon_5min.png
737	%%DATADIR%%/resources/images/search_icon_all.png	744	%%DATADIR%%/resources/images/search_icon_all.png
738	%%DATADIR%%/resources/images/search_icon_bliptv.png	745	%%DATADIR%%/resources/images/search_icon_bliptv.png
739	%%DATADIR%%/resources/images/search_icon_blogdigger.png	746	%%DATADIR%%/resources/images/search_icon_blogdigger.png
740	%%DATADIR%%/resources/images/search_icon_dailymotion.png	747	%%DATADIR%%/resources/images/search_icon_dailymotion.png
		748	%%DATADIR%%/resources/images/search_icon_everyzing.png
741	%%DATADIR%%/resources/images/search_icon_google.png	749	%%DATADIR%%/resources/images/search_icon_google.png
742	%%DATADIR%%/resources/images/search_icon_mefeedia.png	750	%%DATADIR%%/resources/images/search_icon_mefeedia.png
		751	%%DATADIR%%/resources/images/search_icon_metavid.png
743	%%DATADIR%%/resources/images/search_icon_revver.png	752	%%DATADIR%%/resources/images/search_icon_revver.png
744	%%DATADIR%%/resources/images/search_icon_veoh.png	753	%%DATADIR%%/resources/images/search_icon_veoh.png
745	%%DATADIR%%/resources/images/search_icon_yahoosearch.png	754	%%DATADIR%%/resources/images/search_icon_yahoosearch.png
Lines 776-785 Link Here
776	%%DATADIR%%/resources/images/volume_track.png	785	%%DATADIR%%/resources/images/volume_track.png
777	%%DATADIR%%/resources/images/wtexture.png	786	%%DATADIR%%/resources/images/wtexture.png
778	%%DATADIR%%/resources/images/wtexture_inactive.png	787	%%DATADIR%%/resources/images/wtexture_inactive.png
		788	%%DATADIR%%/resources/searchengines/5min.xml
779	%%DATADIR%%/resources/searchengines/bliptv.xml	789	%%DATADIR%%/resources/searchengines/bliptv.xml
780	%%DATADIR%%/resources/searchengines/blogdigger.xml	790	%%DATADIR%%/resources/searchengines/blogdigger.xml
781	%%DATADIR%%/resources/searchengines/dailymotion.xml	791	%%DATADIR%%/resources/searchengines/dailymotion.xml
		792	%%DATADIR%%/resources/searchengines/everyzing.xml
782	%%DATADIR%%/resources/searchengines/google.xml	793	%%DATADIR%%/resources/searchengines/google.xml
		794	%%DATADIR%%/resources/searchengines/metavid.xml
783	%%DATADIR%%/resources/searchengines/revver.xml	795	%%DATADIR%%/resources/searchengines/revver.xml
784	%%DATADIR%%/resources/searchengines/veoh.xml	796	%%DATADIR%%/resources/searchengines/veoh.xml
785	%%DATADIR%%/resources/searchengines/yahoosearch.xml	797	%%DATADIR%%/resources/searchengines/yahoosearch.xml
Lines 827-832 Link Here
827	share/pixmaps/miro-128x128.png	839	share/pixmaps/miro-128x128.png
828	share/pixmaps/miro-24x24.png	840	share/pixmaps/miro-24x24.png
829	share/pixmaps/miro-72x72.png	841	share/pixmaps/miro-72x72.png
		842	share/pixmaps/miro.xpm
830	@dirrm %%DATADIR%%/resources/testdata/stripperdata	843	@dirrm %%DATADIR%%/resources/testdata/stripperdata
831	@dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES	844	@dirrm %%DATADIR%%/resources/testdata/locale/fr/LC_MESSAGES
832	@dirrm %%DATADIR%%/resources/testdata/locale/fr	845	@dirrm %%DATADIR%%/resources/testdata/locale/fr
Lines 859-864 Link Here
859	@dirrm %%PYTHON_SITELIBDIR%%/miro/plat	872	@dirrm %%PYTHON_SITELIBDIR%%/miro/plat
860	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk	873	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets/gtk
861	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets	874	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/widgets
		875	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/shell
862	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/cli	876	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends/cli
863	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends	877	@dirrm %%PYTHON_SITELIBDIR%%/miro/frontends
864	@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/private	878	@dirrm %%PYTHON_SITELIBDIR%%/miro/dl_daemon/private