/[pkgs]/devel/Miro/Miro-2.5.2-fhs.patch
ViewVC logotype

Contents of /devel/Miro/Miro-2.5.2-fhs.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Aug 4 05:55:03 2009 UTC (3 months, 3 weeks ago) by alexlan
Branch: MAIN
CVS Tags: Miro-2_5_2-2_fc12, F-12-split, Miro-2_5_3-2_fc13, Miro-2_5_2-1_fc12, Miro-2_5_2-4_fc12, Miro-2_5_3-1_fc13, Miro-2_5_2-5_fc13, Miro-2_5_2-3_fc12, HEAD
File MIME type: text/x-patch 
* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
1 diff -up Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py
2 --- Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig 2009-08-04 01:32:18.000000000 -0400
3 +++ Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-08-04 01:36:20.000000000 -0400
4 @@ -247,8 +247,8 @@ class AudioRenderer(Renderer):
5 Renderer.on_eos(self)
6
7 def movie_data_program_info(movie_path, thumbnail_path):
8 - if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
9 - path = resources.path('../../../lib/miro/xine_extractor')
10 + if os.path.exists(resources.path('/usr/libexec/xine_extractor')):
11 + path = resources.path('/usr/libexec/xine_extractor')
12 return ((path, movie_path, thumbnail_path), None)
13 else:
14 logging.error("xine_extractor cannot be found.")
15 diff -up Miro-2.5.2/platform/gtk-x11/setup.py.orig Miro-2.5.2/platform/gtk-x11/setup.py
16 --- Miro-2.5.2/platform/gtk-x11/setup.py.orig 2009-08-04 01:32:05.000000000 -0400
17 +++ Miro-2.5.2/platform/gtk-x11/setup.py 2009-08-04 01:35:39.000000000 -0400
18 @@ -673,7 +673,7 @@ data_files += [
19 [os.path.join(platform_dir, 'miro.1.gz')]),
20 ('/usr/share/man/man1',
21 [os.path.join(platform_dir, 'miro.real.1.gz')]),
22 - ('/usr/lib/miro/',
23 + ('/usr/libexec//',
24 [os.path.join(platform_dir, 'xine/xine_extractor')]),
25 ]
26
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2