| 1 |
tomwij 13/09/01 11:24:29 |
| 2 |
|
| 3 |
Modified: avidemux-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Preparation for 2.6.5, removed "Build Option" dialog because it doesn't reflect what the GUI can or has been built with, for bug #463628. Did some small cleanup. |
| 6 |
|
| 7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 media-video/avidemux/avidemux-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: avidemux-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- avidemux-9999.ebuild 31 Aug 2013 11:01:26 -0000 1.2 |
| 23 |
+++ avidemux-9999.ebuild 1 Sep 2013 11:24:28 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.2 2013/08/31 11:01:26 tomwij Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.3 2013/09/01 11:24:28 tomwij Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -36,7 +36,7 @@ |
| 33 |
video_cards_fglrx? ( x11-libs/xvba-video:0 ) |
| 34 |
" |
| 35 |
RDEPEND="$DEPEND" |
| 36 |
-PDEPEND="~media-libs/avidemux-plugins-${PV}" |
| 37 |
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" |
| 38 |
|
| 39 |
S="${WORKDIR}/${MY_P}" |
| 40 |
|
| 41 |
@@ -52,25 +52,25 @@ |
| 42 |
# The desktop file is broken. It uses avidemux2 instead of avidemux3 |
| 43 |
# so it will actually launch avidemux-2.5 if it is installed. |
| 44 |
sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed." |
| 45 |
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed." |
| 46 |
+ |
| 47 |
+ # Fix QA warnings that complain a trailing ; is missing and Application is deprecated. |
| 48 |
+ sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed." |
| 49 |
|
| 50 |
# Now rename the desktop file to not collide with 2.5. |
| 51 |
mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed." |
| 52 |
|
| 53 |
- # The desktop file is broken. It uses avidemux2 instead of avidemux3 |
| 54 |
- # so it will actually launch avidemux-2.5 if it is installed. |
| 55 |
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed." |
| 56 |
- |
| 57 |
- # Fix QA warnings that complain a trailing ; is missing and Application is deprecated. |
| 58 |
- sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6.desktop |
| 59 |
+ # Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628) |
| 60 |
+ sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog." |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
local mycmakeargs=" |
| 65 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
| 66 |
$(cmake-utils_use nls GETTEXT) |
| 67 |
- $(cmake-utils_use sdl SDL) |
| 68 |
+ $(cmake-utils_use sdl) |
| 69 |
$(cmake-utils_use vaapi LIBVA) |
| 70 |
- $(cmake-utils_use vdpau VDPAU) |
| 71 |
+ $(cmake-utils_use vdpau) |
| 72 |
$(cmake-utils_use video_cards_fglrx XVBA) |
| 73 |
$(cmake-utils_use xv XVIDEO) |
| 74 |
" |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.224 media-video/avidemux/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.224&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.224&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.223&r2=1.224 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v |
| 87 |
retrieving revision 1.223 |
| 88 |
retrieving revision 1.224 |
| 89 |
diff -u -r1.223 -r1.224 |
| 90 |
--- ChangeLog 31 Aug 2013 11:01:26 -0000 1.223 |
| 91 |
+++ ChangeLog 1 Sep 2013 11:24:28 -0000 1.224 |
| 92 |
@@ -1,6 +1,11 @@ |
| 93 |
# ChangeLog for media-video/avidemux |
| 94 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.223 2013/08/31 11:01:26 tomwij Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.224 2013/09/01 11:24:28 tomwij Exp $ |
| 97 |
+ |
| 98 |
+ 01 Sep 2013; Tom Wijsman <TomWij@g.o> avidemux-9999.ebuild: |
| 99 |
+ Preparation for 2.6.5, removed "Build Option" dialog because it doesn't |
| 100 |
+ reflect what the GUI can or has been built with, for bug #463628. Did some |
| 101 |
+ small cleanup. |
| 102 |
|
| 103 |
31 Aug 2013; Tom Wijsman <TomWij@g.o> avidemux-9999.ebuild, |
| 104 |
metadata.xml: |
Archives