From: | "Alexis Ballier (aballier)" <aballier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-video/vlc/files: embeddedvideo.patch |
Date: | Wed, 15 Oct 2008 16:41:20 |
Message-Id: | E1Kq9Qy-0006R1-P8@stork.gentoo.org |
1 | aballier 08/10/15 16:41:16 |
2 | |
3 | Added: embeddedvideo.patch |
4 | Log: |
5 | Backport a change from upstream to reenable the qt embedded video output due to numerous requests and jb's explanations. Bug #240714. |
6 | (Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.1 media-video/vlc/files/embeddedvideo.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/files/embeddedvideo.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/files/embeddedvideo.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: embeddedvideo.patch |
15 | =================================================================== |
16 | Re-enable the embedded video; Patch ported from this commit: |
17 | |
18 | commit 9c26b8e2a04468aa4b4a158f072d760a991932db |
19 | Author: Rémi Denis-Courmont <rdenis@××××××××××××.com> |
20 | Date: Thu Oct 9 23:06:21 2008 +0300 |
21 | |
22 | Enable embedded video with Qt >= 4.3 - hopefully fixes #2136 |
23 | |
24 | Index: vlc-0.9.4/modules/gui/qt4/qt4.cpp |
25 | =================================================================== |
26 | --- vlc-0.9.4.orig/modules/gui/qt4/qt4.cpp |
27 | +++ vlc-0.9.4/modules/gui/qt4/qt4.cpp |
28 | @@ -213,7 +213,7 @@ vlc_module_begin(); |
29 | |
30 | set_callbacks( OpenDialogs, Close ); |
31 | |
32 | -#ifdef WIN32 |
33 | +#if !defined (Q_WS_X11) || HAS_QT43 |
34 | add_submodule(); |
35 | set_capability( "vout window", 50 ); |
36 | set_callbacks( WindowOpen, WindowClose ); |