Merge in fixes from stable branch.
This commit is contained in:
commit
5a89b2a70b
|
@ -1,3 +1,5 @@
|
||||||
|
|
||||||
# Settings for TeamPlayer
|
# Settings for TeamPlayer
|
||||||
NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi"
|
NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi"
|
||||||
|
USE_PYTHON="3.4"
|
||||||
|
PYTHON_TARGETS="python3_4"
|
||||||
|
|
|
@ -9,10 +9,13 @@ media-video/ffmpeg avx cpudetection mmx mmxext mp3 network ssse3 x264
|
||||||
sys-apps/hwids udev
|
sys-apps/hwids udev
|
||||||
sys-apps/kmod openrc tools
|
sys-apps/kmod openrc tools
|
||||||
sys-apps/openrc netifrc
|
sys-apps/openrc netifrc
|
||||||
sys-apps/portage python3 ipc
|
sys-apps/portage ipc
|
||||||
sys-devel/gcc cxx nptl
|
sys-devel/gcc cxx nptl
|
||||||
sys-fs/udev openrc
|
sys-fs/udev openrc
|
||||||
sys-kernel/gentoo-sources symlink
|
sys-kernel/gentoo-sources symlink
|
||||||
sys-libs/ncurses minimal
|
sys-libs/ncurses minimal
|
||||||
virtual/ffmpeg x264 mp3
|
virtual/ffmpeg x264 mp3
|
||||||
www-servers/nginx http
|
www-servers/nginx http
|
||||||
|
|
||||||
|
# needed by ntp (bug #533548)
|
||||||
|
dev-libs/libevent threads
|
||||||
|
|
|
@ -127,6 +127,7 @@ TEAMPLAYER = {
|
||||||
'CROSSFADE': 5,
|
'CROSSFADE': 5,
|
||||||
'SHAKE_THINGS_UP': 10,
|
'SHAKE_THINGS_UP': 10,
|
||||||
'ALWAYS_SHAKE_THINGS_UP': True,
|
'ALWAYS_SHAKE_THINGS_UP': True,
|
||||||
|
'AUTOFILL_STRATEGY': 'mood',
|
||||||
'HTTP_PORT': 8000,
|
'HTTP_PORT': 8000,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ CFLAGS="-Os -Qn -s"
|
||||||
CXXFLAGS="-Os -Qn -s"
|
CXXFLAGS="-Os -Qn -s"
|
||||||
CHOST="x86_64-pc-linux-gnu"
|
CHOST="x86_64-pc-linux-gnu"
|
||||||
MAKEOPTS="-j2"
|
MAKEOPTS="-j2"
|
||||||
USE="-* nptl pam unicode"
|
USE="-* nptl pam unicode bindist"
|
||||||
ALSA_PCM_PLUGINS="*"
|
ALSA_PCM_PLUGINS="*"
|
||||||
CLEAN_DELAY="0"
|
CLEAN_DELAY="0"
|
||||||
EMERGE_WARNING_DELAY="0"
|
EMERGE_WARNING_DELAY="0"
|
||||||
|
|
|
@ -2,7 +2,7 @@ CFLAGS="-Os -Qn -s"
|
||||||
CXXFLAGS="-Os -Qn -s"
|
CXXFLAGS="-Os -Qn -s"
|
||||||
CHOST="i686-pc-linux-gnu"
|
CHOST="i686-pc-linux-gnu"
|
||||||
MAKEOPTS="-j2"
|
MAKEOPTS="-j2"
|
||||||
USE="-* nptl pam unicode"
|
USE="-* nptl pam unicode bindist"
|
||||||
ALSA_PCM_PLUGINS="*"
|
ALSA_PCM_PLUGINS="*"
|
||||||
CLEAN_DELAY="0"
|
CLEAN_DELAY="0"
|
||||||
EMERGE_WARNING_DELAY="0"
|
EMERGE_WARNING_DELAY="0"
|
||||||
|
|
Loading…
Reference in New Issue