Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/avidemux/files: avidemux-2.5.4-x264.patch avidemux-2.5.4-xvid.patch avidemux-2.5.4-openfileqt.patch avidemux-2.5.4-x264-build115.patch
Date: Fri, 29 Apr 2011 14:15:48
Message-Id: 20110429141538.CB69720054@flycatcher.gentoo.org
1 hwoarang 11/04/29 14:15:38
2
3 Added: avidemux-2.5.4-x264.patch avidemux-2.5.4-xvid.patch
4 avidemux-2.5.4-openfileqt.patch
5 avidemux-2.5.4-x264-build115.patch
6 Log:
7 Add gcc-4.6 patches thanks to Fabio Scaccabarozzi <fsvm88@×××××.com>. Add patch for latest x264 thanks to zimous <zimous@××××××.cz>. Bugs #364009 and #365153
8
9 (Portage version: 2.1.9.44/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-video/avidemux/files/avidemux-2.5.4-x264.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-x264.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-x264.patch?rev=1.1&content-type=text/plain
16
17 Index: avidemux-2.5.4-x264.patch
18 ===================================================================
19 diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
20 --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2010-09-29 22:20:48.000000000 +0200
21 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-18 12:26:34.482304155 +0200
22 @@ -343,7 +343,8 @@
23 delete [] xml;
24
25 fillConfigurationComboBox();
26 - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
27 + QString temporary = QFileInfo(configFileName).completeBaseName();
28 + selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
29 }
30
31 delete [] configDirectory;
32 @@ -580,7 +581,8 @@
33 disableGenericSlots = true;
34 options->getPresetConfiguration(&configurationName, &configurationType);
35
36 - bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
37 + QString temporary2 = QString(configurationName);
38 + bool foundConfig = selectConfiguration(&temporary2, configurationType);
39
40 if (!foundConfig)
41 printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);
42
43
44
45 1.1 media-video/avidemux/files/avidemux-2.5.4-xvid.patch
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-xvid.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-xvid.patch?rev=1.1&content-type=text/plain
49
50 Index: avidemux-2.5.4-xvid.patch
51 ===================================================================
52 diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp
53 --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp 2010-06-07 01:07:37.000000000 +0200
54 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp 2011-04-18 12:12:13.640562284 +0200
55 @@ -233,7 +233,8 @@
56 delete [] xml;
57
58 fillConfigurationComboBox();
59 - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
60 + QString temporary = QFileInfo(configFileName).completeBaseName();
61 + selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
62 }
63
64 delete [] configDirectory;
65 @@ -373,7 +374,8 @@
66 disableGenericSlots = true;
67 options->getPresetConfiguration(&configurationName, &configurationType);
68
69 - bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
70 + QString temporary2 = QString(configurationName);
71 + bool foundConfig = selectConfiguration(&temporary2, configurationType);
72
73 if (!foundConfig)
74 printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);
75
76
77
78 1.1 media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch?rev=1.1&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch?rev=1.1&content-type=text/plain
82
83 Index: avidemux-2.5.4-openfileqt.patch
84 ===================================================================
85 diff -Nuar avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp
86 --- avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-18 11:34:58.797593384 +0200
87 +++ avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-18 11:37:16.122645712 +0200
88 @@ -210,7 +210,9 @@
89 delete [] configData;
90
91 fillConfigurationComboBox();
92 - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);
93 +
94 + QString temporary = QFileInfo(configFileName).completeBaseName();
95 + selectConfiguration(&temporary, CONFIG_MENU_USER);
96 }
97 }
98 }
99 @@ -316,7 +318,8 @@
100 {
101 ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;
102
103 - configMenu->selectConfiguration(&QString(configName), *configType);
104 + QString temporary2 = QString(configName);
105 + configMenu->selectConfiguration(&temporary2, *configType);
106 }
107
108 void diaElemConfigMenu::finalize(void)
109 @@ -356,7 +359,8 @@
110 }
111 }
112
113 - configMenu->selectConfiguration(&QString(configName), *configType);
114 + QString temporary3 = QString(configName);
115 + configMenu->selectConfiguration(&temporary3, *configType);
116 }
117 }
118
119
120
121
122 1.1 media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
123
124 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch?rev=1.1&view=markup
125 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch?rev=1.1&content-type=text/plain
126
127 Index: avidemux-2.5.4-x264-build115.patch
128 ===================================================================
129 diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
130 --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200
131 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200
132 @@ -488,8 +488,10 @@
133 printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
134 printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
135 printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
136 -#if X264_BUILD > 101
137 +#if X264_BUILD > 101 && X264_BUILD < 115
138 printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
139 +#elif X264_BUILD > 114
140 + printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
141 #endif
142 printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
143 #if X264_BUILD > 88
144 diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
145 --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200
146 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200
147 @@ -417,7 +417,7 @@
148 _param.b_cabac = cabac;
149 }
150
151 -#if X264_BUILD > 101
152 +#if X264_BUILD > 101 && X264_BUILD < 115
153 unsigned int x264Options::getOpenGopMode(void)
154 {
155 return _param.i_open_gop;
156 @@ -428,6 +428,17 @@
157 if (openGopMode < 3)
158 _param.i_open_gop = openGopMode;
159 }
160 +#elif X264_BUILD > 114
161 +unsigned int x264Options::getOpenGopMode(void)
162 +{
163 + return _param.b_open_gop;
164 +}
165 +
166 +void x264Options::setOpenGopMode(unsigned int openGopMode)
167 +{
168 + if (openGopMode < 3)
169 + _param.b_open_gop = openGopMode;
170 +}
171 #endif
172
173 unsigned int x264Options::getInterlaced(void)
Report Message
Find on MARC Find on Google Groups