| 1 |
idella4 15/04/30 16:44:32 |
| 2 |
|
| 3 |
Modified: vlc-2.2.0.ebuild vlc-2.2.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
add patch to address selection of qt4 vs qt5, patch by Karol Herbst, comment 19, bug #541678, tested and endorsed by users and proxy maintainer, limited to versioned ebuilds for now, finally closes said bug |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 media-video/vlc/vlc-2.2.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: vlc-2.2.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- vlc-2.2.0.ebuild 24 Apr 2015 05:48:12 -0000 1.10 |
| 23 |
+++ vlc-2.2.0.ebuild 30 Apr 2015 16:44:32 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.10 2015/04/24 05:48:12 idella4 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.11 2015/04/30 16:44:32 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -261,6 +261,9 @@ |
| 33 |
# Bug #541928 |
| 34 |
epatch "${FILESDIR}"/${P}-fix-xcb.patch |
| 35 |
|
| 36 |
+ # Bug #541678 |
| 37 |
+ epatch "${FILESDIR}"/qt4-select.patch |
| 38 |
+ |
| 39 |
# Don't use --started-from-file when not using dbus. |
| 40 |
if ! use dbus ; then |
| 41 |
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.5 media-video/vlc/vlc-2.2.1.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.5&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.5&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?r1=1.4&r2=1.5 |
| 50 |
|
| 51 |
Index: vlc-2.2.1.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v |
| 54 |
retrieving revision 1.4 |
| 55 |
retrieving revision 1.5 |
| 56 |
diff -u -r1.4 -r1.5 |
| 57 |
--- vlc-2.2.1.ebuild 24 Apr 2015 05:48:12 -0000 1.4 |
| 58 |
+++ vlc-2.2.1.ebuild 30 Apr 2015 16:44:32 -0000 1.5 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2015 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.4 2015/04/24 05:48:12 idella4 Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.5 2015/04/30 16:44:32 idella4 Exp $ |
| 64 |
|
| 65 |
EAPI="5" |
| 66 |
|
| 67 |
@@ -264,6 +264,9 @@ |
| 68 |
# Fix up broken audio when skipping using a fixed reversed bisected commit. |
| 69 |
epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
| 70 |
|
| 71 |
+ # Bug #541678 |
| 72 |
+ epatch "${FILESDIR}"/qt4-select.patch |
| 73 |
+ |
| 74 |
# Don't use --started-from-file when not using dbus. |
| 75 |
if ! use dbus ; then |
| 76 |
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.954 media-video/vlc/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.954&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.954&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.953&r2=1.954 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 89 |
retrieving revision 1.953 |
| 90 |
retrieving revision 1.954 |
| 91 |
diff -u -r1.953 -r1.954 |
| 92 |
--- ChangeLog 24 Apr 2015 05:48:12 -0000 1.953 |
| 93 |
+++ ChangeLog 30 Apr 2015 16:44:32 -0000 1.954 |
| 94 |
@@ -1,6 +1,12 @@ |
| 95 |
# ChangeLog for media-video/vlc |
| 96 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.953 2015/04/24 05:48:12 idella4 Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.954 2015/04/30 16:44:32 idella4 Exp $ |
| 99 |
+ |
| 100 |
+ 30 Apr 2015; Ian Delaney <idella4@g.o> +files/qt4-select.patch, |
| 101 |
+ vlc-2.2.0.ebuild, vlc-2.2.1.ebuild: |
| 102 |
+ add patch to address selection of qt4 vs qt5, patch by Karol Herbst, comment |
| 103 |
+ 19, bug #541678, tested and endorsed by users and proxy maintainer, limited to |
| 104 |
+ versioned ebuilds for now, finally closes said bug |
| 105 |
|
| 106 |
24 Apr 2015; Ian Delaney <idella4@g.o> vlc-2.2.0.ebuild, |
| 107 |
vlc-2.2.1.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild: |
Archives