1 |
commit: 6a53f8b7f210b462c1b23c2404ae2d9545b2721f |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 30 20:42:19 2013 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 30 20:42:19 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=6a53f8b7 |
7 |
|
8 |
tools-uclibc/desktop: several improvements |
9 |
|
10 |
1) Fix circular dependency wrt avahi and directfb |
11 |
2) Add CFLAGS=-fcheck-stack to global build |
12 |
3) Address breakage under check-stack for ffmpeg, bug #471756 |
13 |
4) Clean up desktop |
14 |
|
15 |
--- |
16 |
tools-uclibc/desktop/config | 7 +-- |
17 |
.../desktop/gentoo/.config/Thunar/accels.scm | 72 ---------------------- |
18 |
.../xfce4/panel/launcher-12/13698963011.desktop | 11 ++++ |
19 |
.../xfce4/panel/launcher-22/136796191211.desktop | 18 ------ |
20 |
.../xfce4/panel/launcher-22/13699065271.desktop | 11 ++++ |
21 |
.../xfconf/xfce-perchannel-xml/xfce4-mixer.xml | 13 ++++ |
22 |
.../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 31 +++++++--- |
23 |
tools-uclibc/desktop/portage/env/ffmpeg.conf | 1 + |
24 |
tools-uclibc/desktop/portage/make.conf.1 | 4 +- |
25 |
tools-uclibc/desktop/portage/make.conf.2 | 8 +-- |
26 |
tools-uclibc/desktop/portage/make.conf.3 | 6 +- |
27 |
.../desktop/portage/package.accept_keywords/elfix | 2 + |
28 |
.../portage/package.accept_keywords/xorg-cf-files | 1 + |
29 |
tools-uclibc/desktop/portage/package.env | 1 + |
30 |
tools-uclibc/desktop/{build.sh => run.sh} | 3 +- |
31 |
tools-uclibc/desktop/world | 1 + |
32 |
16 files changed, 76 insertions(+), 114 deletions(-) |
33 |
|
34 |
diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config |
35 |
index 2bacd54..f9f79f6 100644 |
36 |
--- a/tools-uclibc/desktop/config |
37 |
+++ b/tools-uclibc/desktop/config |
38 |
@@ -130,7 +130,8 @@ CONFIG_RCU_FANOUT_LEAF=16 |
39 |
CONFIG_RCU_FAST_NO_HZ=y |
40 |
# CONFIG_TREE_RCU_TRACE is not set |
41 |
# CONFIG_RCU_NOCB_CPU is not set |
42 |
-# CONFIG_IKCONFIG is not set |
43 |
+CONFIG_IKCONFIG=y |
44 |
+CONFIG_IKCONFIG_PROC=y |
45 |
CONFIG_LOG_BUF_SHIFT=17 |
46 |
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y |
47 |
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y |
48 |
@@ -6824,10 +6825,6 @@ CONFIG_KEYS=y |
49 |
# CONFIG_SECURITY is not set |
50 |
CONFIG_SECURITYFS=y |
51 |
# CONFIG_INTEL_TXT is not set |
52 |
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set |
53 |
-# CONFIG_DEFAULT_SECURITY_SMACK is not set |
54 |
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set |
55 |
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set |
56 |
CONFIG_DEFAULT_SECURITY_DAC=y |
57 |
CONFIG_DEFAULT_SECURITY="" |
58 |
CONFIG_XOR_BLOCKS=m |
59 |
|
60 |
diff --git a/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm b/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm |
61 |
index edb95f2..4f9adb8 100644 |
62 |
--- a/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm |
63 |
+++ b/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm |
64 |
@@ -1,75 +1,3 @@ |
65 |
; Thunar GtkAccelMap rc-file -*- scheme -*- |
66 |
; this file is an automated accelerator map dump |
67 |
; |
68 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/sendto-desktop" "") |
69 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/create-folder" "<Primary><Shift>n") |
70 |
-; (gtk_accel_path "<Actions>/ThunarShortcutsPane/sendto-shortcuts" "") |
71 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-menu" "") |
72 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/paste-into-folder" "<Primary>v") |
73 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-home" "<Alt>Home") |
74 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-menu" "") |
75 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open" "<Primary>o") |
76 |
-; (gtk_accel_path "<Actions>/ThunarWindow/go-menu" "") |
77 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-file-system" "") |
78 |
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-out" "<Primary>minus") |
79 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/paste" "<Primary>v") |
80 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-menu" "") |
81 |
-; (gtk_accel_path "<Actions>/ThunarWindow/help-menu" "") |
82 |
-; (gtk_accel_path "<Actions>/ThunarWindow/file-menu" "") |
83 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other-in-menu" "") |
84 |
-; (gtk_accel_path "<Actions>/ThunarWindow/detach-tab" "") |
85 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-tab" "<Primary><Shift>p") |
86 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-name" "") |
87 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-menubar" "<Primary>m") |
88 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/back" "<Alt>Left") |
89 |
-; (gtk_accel_path "<Actions>/ThunarWindow/close-tab" "<Primary>w") |
90 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-compact-list" "<Primary>3") |
91 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "<Primary>e") |
92 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/restore" "") |
93 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-network" "") |
94 |
-; (gtk_accel_path "<Actions>/ThunarWindow/new-tab" "<Primary>t") |
95 |
-; (gtk_accel_path "<Actions>/ThunarWindow/preferences" "") |
96 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/rename" "F2") |
97 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-size" "") |
98 |
-; (gtk_accel_path "<Actions>/ThunarWindow/sendto-menu" "") |
99 |
-; (gtk_accel_path "<Actions>/ThunarWindow/edit-menu" "") |
100 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other" "") |
101 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-toolbar" "") |
102 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/invert-selection" "") |
103 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/make-link" "") |
104 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-icons" "<Primary>1") |
105 |
-; (gtk_accel_path "<Actions>/ThunarWindow/new-window" "<Primary>n") |
106 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/forward" "<Alt>Right") |
107 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/move-to-trash" "") |
108 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/select-by-pattern" "<Primary>s") |
109 |
-; (gtk_accel_path "<Actions>/ThunarWindow/about" "") |
110 |
-; (gtk_accel_path "<Actions>/ThunarWindow/contents" "F1") |
111 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-desktop" "") |
112 |
-; (gtk_accel_path "<Actions>/ThunarWindow/close-all-windows" "<Primary><Shift>w") |
113 |
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in" "<Primary>plus") |
114 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/duplicate" "") |
115 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-parent" "<Alt>Up") |
116 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-shortcuts" "<Primary>b") |
117 |
-; (gtk_accel_path "<Actions>/ThunarWindow/reload" "<Primary>r") |
118 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-templates" "") |
119 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/copy" "<Primary>c") |
120 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-pathbar" "") |
121 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-trash" "") |
122 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-descending" "") |
123 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/properties" "<Alt>Return") |
124 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-type" "") |
125 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/delete" "") |
126 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-ascending" "") |
127 |
-; (gtk_accel_path "<Actions>/ThunarWindow/empty-trash" "") |
128 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-menu" "") |
129 |
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-window" "<Primary><Shift>o") |
130 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/arrange-items-menu" "") |
131 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/cut" "<Primary>x") |
132 |
-; (gtk_accel_path "<Actions>/ThunarWindow/close-window" "<Primary>q") |
133 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/select-all-files" "") |
134 |
-; (gtk_accel_path "<Actions>/ThunarWindow/open-location" "<Primary>l") |
135 |
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-mtime" "") |
136 |
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-reset" "<Primary>0") |
137 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-statusbar" "") |
138 |
-; (gtk_accel_path "<Actions>/ThunarWindow/show-hidden" "<Primary>h") |
139 |
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-detailed-list" "<Primary>2") |
140 |
|
141 |
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop |
142 |
new file mode 100644 |
143 |
index 0000000..29e4c72 |
144 |
--- /dev/null |
145 |
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop |
146 |
@@ -0,0 +1,11 @@ |
147 |
+[Desktop Entry] |
148 |
+Version=1.0 |
149 |
+Name=Audio Mixer |
150 |
+Comment=Adjust volume levels |
151 |
+Icon=multimedia-volume-control |
152 |
+Exec=xfce4-mixer |
153 |
+Type=Application |
154 |
+StartupNotify=true |
155 |
+Terminal=false |
156 |
+Categories=X-XFCE;Audio;Mixer;AudioVideo; |
157 |
+X-XFCE-Source=file:///usr/share/applications/xfce4-mixer.desktop |
158 |
|
159 |
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop |
160 |
deleted file mode 100644 |
161 |
index b280b6d..0000000 |
162 |
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop |
163 |
+++ /dev/null |
164 |
@@ -1,18 +0,0 @@ |
165 |
-[Desktop Entry] |
166 |
-Name=Movie Player |
167 |
-Comment=Play movies and songs |
168 |
-Exec=totem %U |
169 |
-Icon=totem |
170 |
-Terminal=false |
171 |
-Type=Application |
172 |
-Categories=GTK;GNOME;AudioVideo;Player;Video; |
173 |
-X-GNOME-DocPath=totem/totem.xml |
174 |
-X-GNOME-Bugzilla-Bugzilla=GNOME |
175 |
-X-GNOME-Bugzilla-Product=totem |
176 |
-X-GNOME-Bugzilla-Component=general |
177 |
-X-GNOME-Bugzilla-Version=2.32.0 |
178 |
-X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview; |
179 |
-X-GNOME-Bugzilla-ExtraInfoScript=/usr/libexec/totem/totem-bugreport.py |
180 |
-StartupNotify=true |
181 |
-MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc; |
182 |
audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-scheme-handler/pnm;x-scheme-handler/mms;x-scheme-handler/net;x-scheme-handler/rtp;x-scheme-handler/rtsp;x-scheme-handler/mmsh;x-scheme-handler/uvox;x-scheme-handler/icy;x-scheme-handler/icyx; |
183 |
-X-XFCE-Source=file:///usr/share/applications/totem.desktop |
184 |
|
185 |
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop |
186 |
new file mode 100644 |
187 |
index 0000000..926c37f |
188 |
--- /dev/null |
189 |
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop |
190 |
@@ -0,0 +1,11 @@ |
191 |
+[Desktop Entry] |
192 |
+Categories=Qt;KDE;AudioVideo;Player;Video; |
193 |
+Comment=A great MPlayer front-end |
194 |
+Exec=smplayer %U |
195 |
+GenericName=Media Player |
196 |
+Icon=smplayer |
197 |
+MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora; |
198 |
+Name=SMPlayer |
199 |
+Type=Application |
200 |
+X-KDE-StartupNotify=false |
201 |
+X-XFCE-Source=file:///usr/share/applications/smplayer.desktop |
202 |
|
203 |
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml |
204 |
index 7d7ae9a..60e5fd8 100644 |
205 |
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml |
206 |
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml |
207 |
@@ -2,4 +2,17 @@ |
208 |
|
209 |
<channel name="xfce4-mixer" version="1.0"> |
210 |
<property name="volume-step-size" type="uint" value="5"/> |
211 |
+ <property name="active-card" type="string" value="HDAIntelAlsamixer"/> |
212 |
+ <property name="sound-card" type="string" value="HDAIntelAlsamixer"/> |
213 |
+ <property name="sound-cards" type="empty"> |
214 |
+ <property name="HDAIntelAlsamixer" type="array"> |
215 |
+ <value type="string" value="IEC958 Default PCM"/> |
216 |
+ <value type="string" value="PCM"/> |
217 |
+ <value type="string" value="Speaker"/> |
218 |
+ <value type="string" value="Headphone"/> |
219 |
+ <value type="string" value="Master"/> |
220 |
+ </property> |
221 |
+ </property> |
222 |
+ <property name="window-height" type="int" value="468"/> |
223 |
+ <property name="window-width" type="int" value="501"/> |
224 |
</channel> |
225 |
|
226 |
diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml |
227 |
index 2b51b10..57ea34e 100644 |
228 |
--- a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml |
229 |
+++ b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml |
230 |
@@ -15,7 +15,7 @@ |
231 |
<value type="int" value="3"/> |
232 |
<value type="int" value="15"/> |
233 |
<value type="int" value="4"/> |
234 |
- <value type="int" value="11"/> |
235 |
+ <value type="int" value="12"/> |
236 |
<value type="int" value="5"/> |
237 |
<value type="int" value="6"/> |
238 |
<value type="int" value="2"/> |
239 |
@@ -43,7 +43,21 @@ |
240 |
</property> |
241 |
<property name="plugins" type="empty"> |
242 |
<property name="plugin-1" type="string" value="applicationsmenu"/> |
243 |
- <property name="plugin-2" type="string" value="actions"/> |
244 |
+ <property name="plugin-2" type="string" value="actions"> |
245 |
+ <property name="items" type="array"> |
246 |
+ <value type="string" value="+lock-screen"/> |
247 |
+ <value type="string" value="-switch-user"/> |
248 |
+ <value type="string" value="+separator"/> |
249 |
+ <value type="string" value="-suspend"/> |
250 |
+ <value type="string" value="-hibernate"/> |
251 |
+ <value type="string" value="-separator"/> |
252 |
+ <value type="string" value="+shutdown"/> |
253 |
+ <value type="string" value="-restart"/> |
254 |
+ <value type="string" value="+separator"/> |
255 |
+ <value type="string" value="+logout"/> |
256 |
+ <value type="string" value="-logout-dialog"/> |
257 |
+ </property> |
258 |
+ </property> |
259 |
<property name="plugin-3" type="string" value="tasklist"/> |
260 |
<property name="plugin-15" type="string" value="separator"> |
261 |
<property name="expand" type="bool" value="true"/> |
262 |
@@ -99,15 +113,14 @@ |
263 |
</property> |
264 |
<property name="plugin-22" type="string" value="launcher"> |
265 |
<property name="items" type="array"> |
266 |
- <value type="string" value="136796191211.desktop"/> |
267 |
+ <value type="string" value="13699065271.desktop"/> |
268 |
</property> |
269 |
</property> |
270 |
- <property name="plugin-11" type="string" value="mixer"> |
271 |
- <property name="sound-card" type="string" value=""/> |
272 |
- <property name="track" type="string" value=""/> |
273 |
- <property name="command" type="string" value="xfce4-mixer"/> |
274 |
- <property name="enable-keyboard-shortcuts" type="bool" value="true"/> |
275 |
- </property> |
276 |
<property name="plugin-23" type="string" value="thunar-tpa"/> |
277 |
+ <property name="plugin-12" type="string" value="launcher"> |
278 |
+ <property name="items" type="array"> |
279 |
+ <value type="string" value="13698963011.desktop"/> |
280 |
+ </property> |
281 |
+ </property> |
282 |
</property> |
283 |
</channel> |
284 |
|
285 |
diff --git a/tools-uclibc/desktop/portage/env/ffmpeg.conf b/tools-uclibc/desktop/portage/env/ffmpeg.conf |
286 |
new file mode 100644 |
287 |
index 0000000..0a288e8 |
288 |
--- /dev/null |
289 |
+++ b/tools-uclibc/desktop/portage/env/ffmpeg.conf |
290 |
@@ -0,0 +1 @@ |
291 |
+CFLAGS="-fno-stack-check" |
292 |
|
293 |
diff --git a/tools-uclibc/desktop/portage/make.conf.1 b/tools-uclibc/desktop/portage/make.conf.1 |
294 |
index ddc37ae..597e28e 100644 |
295 |
--- a/tools-uclibc/desktop/portage/make.conf.1 |
296 |
+++ b/tools-uclibc/desktop/portage/make.conf.1 |
297 |
@@ -1,10 +1,10 @@ |
298 |
-CFLAGS="-O2 -pipe" |
299 |
+CFLAGS="-O2 -fstack-check -pipe" |
300 |
CXXFLAGS="${CFLAGS}" |
301 |
CHOST="x86_64-gentoo-linux-uclibc" |
302 |
MAKEOPTS="-j9" |
303 |
|
304 |
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig" |
305 |
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X" |
306 |
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X" |
307 |
USE="${USE_BASE} ${USE_GCC}" |
308 |
|
309 |
source "/var/lib/layman/make.conf" |
310 |
|
311 |
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2 |
312 |
index a5cf90f..3f5879d 100644 |
313 |
--- a/tools-uclibc/desktop/portage/make.conf.2 |
314 |
+++ b/tools-uclibc/desktop/portage/make.conf.2 |
315 |
@@ -1,10 +1,10 @@ |
316 |
-CFLAGS="-O2 -pipe" |
317 |
+CFLAGS="-fstack-check -O2 -pipe" |
318 |
CXXFLAGS="${CFLAGS}" |
319 |
CHOST="x86_64-gentoo-linux-uclibc" |
320 |
MAKEOPTS="-j9" |
321 |
|
322 |
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig" |
323 |
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X" |
324 |
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X" |
325 |
USE_ENC="gmp gnutls pkcs11 X509" |
326 |
USE_ACL="acl caps" |
327 |
USE_DBS="berkdb gdbm sqlite" |
328 |
@@ -14,7 +14,7 @@ USE_UDEV="gudev hwdb keymap kmod" |
329 |
USE_VCS="git" |
330 |
USE_CHAR="fontforge icu idn" |
331 |
|
332 |
-USE_SERVERS="avahi cups dbus sasl mbox zeroconf" |
333 |
+USE_SERVERS="cups dbus sasl mbox zeroconf" |
334 |
USE_PAX="xtpax -ptpax" |
335 |
|
336 |
USE_AUDIO="openal" |
337 |
@@ -24,10 +24,10 @@ USE_DISPLAY="cairo xinerama xscreensaver" |
338 |
USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi" |
339 |
USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran" |
340 |
|
341 |
-USE_XFCE4="session thunar" |
342 |
USE_BROWSE="curl webkit -libproxy" |
343 |
USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect" |
344 |
USE_GAMES="artworkextra" |
345 |
+USE_XFCE4="session thunar" |
346 |
|
347 |
USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog" |
348 |
|
349 |
|
350 |
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3 |
351 |
index c796887..cc980af 100644 |
352 |
--- a/tools-uclibc/desktop/portage/make.conf.3 |
353 |
+++ b/tools-uclibc/desktop/portage/make.conf.3 |
354 |
@@ -1,10 +1,10 @@ |
355 |
-CFLAGS="-O2 -pipe" |
356 |
+CFLAGS="-fstack-check -O2 -pipe" |
357 |
CXXFLAGS="${CFLAGS}" |
358 |
CHOST="x86_64-gentoo-linux-uclibc" |
359 |
MAKEOPTS="-j9" |
360 |
|
361 |
USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig" |
362 |
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X" |
363 |
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X" |
364 |
USE_ENC="gmp gnutls pkcs11 X509" |
365 |
USE_ACL="acl caps" |
366 |
USE_DBS="berkdb gdbm sqlite" |
367 |
@@ -24,10 +24,10 @@ USE_DISPLAY="cairo xinerama xscreensaver" |
368 |
USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi" |
369 |
USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran" |
370 |
|
371 |
-USE_XFCE4="session thunar" |
372 |
USE_BROWSE="curl webkit -libproxy" |
373 |
USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect" |
374 |
USE_GAMES="artworkextra" |
375 |
+USE_XFCE4="session thunar" |
376 |
|
377 |
USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog" |
378 |
|
379 |
|
380 |
diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/elfix b/tools-uclibc/desktop/portage/package.accept_keywords/elfix |
381 |
new file mode 100644 |
382 |
index 0000000..b070d6a |
383 |
--- /dev/null |
384 |
+++ b/tools-uclibc/desktop/portage/package.accept_keywords/elfix |
385 |
@@ -0,0 +1,2 @@ |
386 |
+=dev-python/pypax-0.8.3 ~amd64 |
387 |
+=sys-apps/elfix-0.8.3 ~amd64 |
388 |
|
389 |
diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files b/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files |
390 |
new file mode 100644 |
391 |
index 0000000..90e6d12 |
392 |
--- /dev/null |
393 |
+++ b/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files |
394 |
@@ -0,0 +1 @@ |
395 |
+=x11-misc/xorg-cf-files-1.0.4-r1 ~amd64 |
396 |
|
397 |
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env |
398 |
index ea62511..ccd169a 100644 |
399 |
--- a/tools-uclibc/desktop/portage/package.env |
400 |
+++ b/tools-uclibc/desktop/portage/package.env |
401 |
@@ -2,3 +2,4 @@ sys-apps/coreutils coreutils.conf |
402 |
dev-vcs/git git.conf |
403 |
media-gfx/fontforge fontforge.conf |
404 |
media-libs/libquicktime libquicktime.conf |
405 |
+media-video/ffmpeg ffmpeg.conf |
406 |
|
407 |
diff --git a/tools-uclibc/desktop/build.sh b/tools-uclibc/desktop/run.sh |
408 |
old mode 100755 |
409 |
new mode 100644 |
410 |
similarity index 96% |
411 |
rename from tools-uclibc/desktop/build.sh |
412 |
rename to tools-uclibc/desktop/run.sh |
413 |
index abc2e80..642a5d1 |
414 |
--- a/tools-uclibc/desktop/build.sh |
415 |
+++ b/tools-uclibc/desktop/run.sh |
416 |
@@ -106,6 +106,7 @@ setup_usergroups() { |
417 |
|
418 |
rm -rf "${ROOTFS}"/home/gentoo |
419 |
cp -a gentoo "${ROOTFS}"/home/ |
420 |
+ mkdir "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos} |
421 |
chroot "${ROOTFS}"/ chown -R gentoo:gentoo /home/gentoo |
422 |
sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers |
423 |
} |
424 |
@@ -137,7 +138,7 @@ unmount_dirs() { |
425 |
|
426 |
bundle_it() { |
427 |
cd "${ROOTFS}" |
428 |
- tar jcvf ../"${ROOTFS}".tar.bz2 . |
429 |
+ tar -j -c -f ../"${ROOTFS}".tar.bz2 . |
430 |
} |
431 |
|
432 |
main() { |
433 |
|
434 |
diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world |
435 |
index c485f52..de1fcc4 100644 |
436 |
--- a/tools-uclibc/desktop/world |
437 |
+++ b/tools-uclibc/desktop/world |
438 |
@@ -42,6 +42,7 @@ net-misc/tor |
439 |
net-misc/vinagre |
440 |
net-p2p/transmission |
441 |
sys-apps/dbus |
442 |
+sys-apps/elfix |
443 |
sys-apps/gradm |
444 |
sys-apps/less |
445 |
sys-apps/paxctl |