1 |
commit: e21e1400690c5582e6a581eaa4a78a35b303dc57 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 27 07:52:35 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 27 07:52:35 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e21e1400 |
7 |
|
8 |
tools-uclibc/desktop: remove pulseaudio from amd64 uclibc desktop |
9 |
|
10 |
--- |
11 |
tools-uclibc/desktop/config | 3 ++- |
12 |
tools-uclibc/desktop/portage/env/pulseaudio.conf | 1 - |
13 |
tools-uclibc/desktop/portage/make.conf.2 | 2 +- |
14 |
tools-uclibc/desktop/portage/make.conf.3 | 2 +- |
15 |
tools-uclibc/desktop/portage/package.env | 1 - |
16 |
5 files changed, 4 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config |
19 |
index 705bbb2..6810fdb 100644 |
20 |
--- a/tools-uclibc/desktop/config |
21 |
+++ b/tools-uclibc/desktop/config |
22 |
@@ -1,6 +1,6 @@ |
23 |
# |
24 |
# Automatically generated file; DO NOT EDIT. |
25 |
-# Linux/x86 3.16.2-hardened-r2 Kernel Configuration |
26 |
+# Linux/x86 3.16.3-hardened Kernel Configuration |
27 |
# |
28 |
CONFIG_64BIT=y |
29 |
CONFIG_X86_64=y |
30 |
@@ -4476,6 +4476,7 @@ CONFIG_VIDEO_SAA7146=m |
31 |
CONFIG_VIDEO_SAA7146_VV=m |
32 |
CONFIG_SMS_SIANO_MDTV=m |
33 |
CONFIG_SMS_SIANO_RC=y |
34 |
+# CONFIG_SMS_SIANO_DEBUGFS is not set |
35 |
|
36 |
# |
37 |
# Media ancillary drivers (tuners, sensors, i2c, frontends) |
38 |
|
39 |
diff --git a/tools-uclibc/desktop/portage/env/pulseaudio.conf b/tools-uclibc/desktop/portage/env/pulseaudio.conf |
40 |
deleted file mode 100644 |
41 |
index be0ccc4..0000000 |
42 |
--- a/tools-uclibc/desktop/portage/env/pulseaudio.conf |
43 |
+++ /dev/null |
44 |
@@ -1 +0,0 @@ |
45 |
-CFLAGS="-lintl" |
46 |
|
47 |
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2 |
48 |
index 78472e4..0768eb4 100644 |
49 |
--- a/tools-uclibc/desktop/portage/make.conf.2 |
50 |
+++ b/tools-uclibc/desktop/portage/make.conf.2 |
51 |
@@ -21,7 +21,7 @@ USE_AUDIO="openal" |
52 |
USE_IMG="aalib apng exif gif jpeg jpeg2k lcms mng png svg tiff xmp" |
53 |
USE_GRAPH="gbm opengl xcb" |
54 |
USE_DISPLAY="cairo xinerama xscreensaver" |
55 |
-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" |
56 |
+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 quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi" |
57 |
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" |
58 |
|
59 |
USE_BROWSE="curl webkit -libproxy" |
60 |
|
61 |
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3 |
62 |
index 65eea07..6cd5652 100644 |
63 |
--- a/tools-uclibc/desktop/portage/make.conf.3 |
64 |
+++ b/tools-uclibc/desktop/portage/make.conf.3 |
65 |
@@ -21,7 +21,7 @@ USE_AUDIO="openal" |
66 |
USE_IMG="aalib apng exif gif jpeg jpeg2k lcms mng png svg tiff xmp" |
67 |
USE_GRAPH="directfb gbm opengl xcb" |
68 |
USE_DISPLAY="cairo xinerama xscreensaver" |
69 |
-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" |
70 |
+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 quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi" |
71 |
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" |
72 |
|
73 |
USE_BROWSE="curl webkit -libproxy" |
74 |
|
75 |
diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env |
76 |
index 87cb7bd..03eec81 100644 |
77 |
--- a/tools-uclibc/desktop/portage/package.env |
78 |
+++ b/tools-uclibc/desktop/portage/package.env |
79 |
@@ -8,7 +8,6 @@ dev-vcs/git git.conf |
80 |
gnome-base/gnome-desktop gnome-desktop.conf |
81 |
media-gfx/fontforge fontforge.conf |
82 |
media-libs/libquicktime libquicktime.conf |
83 |
-media-sound/pulseaudio pulseaudio.conf |
84 |
media-video/ffmpeg ffmpeg.conf |
85 |
media-video/libav libav.conf |
86 |
media-video/mplayer2 mplayer2.conf |