configs/imx6: updates for latest etnaviv deps plus more

Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

12 files changed, 110 insertions, 39 deletions

diff --git a/configs/imx6/env/armada.conf b/configs/imx6/env/armada.conf
new file mode 100644
index 0000000..691a5fa
--- /dev/null
+++ b/configs/imx6/env/armada.conf
@@ -0,0 +1 @@
+EXTRA_ECONF="--enable-glx=gallium-xlib --disable-dri"
diff --git a/configs/imx6/env/cxx-abi.conf b/configs/imx6/env/cxx-abi.conf
new file mode 100644
index 0000000..13b687f
--- /dev/null
+++ b/configs/imx6/env/cxx-abi.conf
@@ -0,0 +1,3 @@
+CFLAGS="${CFLAGS} -std=gnu11"
+CXXFLAGS="${CXXFLAGS} -std=gnu11"
+
diff --git a/configs/imx6/env/etnaviv.conf b/configs/imx6/env/etnaviv.conf
new file mode 100644
index 0000000..a30d750
--- /dev/null
+++ b/configs/imx6/env/etnaviv.conf
@@ -0,0 +1 @@
+CFLAGS="${CFLAGS} -fno-omit-frame-pointer"
diff --git a/configs/imx6/env/gcc-j2.conf b/configs/imx6/env/gcc-j2.conf
new file mode 100644
index 0000000..849c5c7
--- /dev/null
+++ b/configs/imx6/env/gcc-j2.conf
@@ -0,0 +1 @@
+MAKEOPTS="-j2"
diff --git a/configs/imx6/env/gcc-j3.conf b/configs/imx6/env/gcc-j3.conf
new file mode 100644
index 0000000..2ad5635
--- /dev/null
+++ b/configs/imx6/env/gcc-j3.conf
@@ -0,0 +1 @@
+MAKEOPTS="-j3"
diff --git a/configs/imx6/env/lto-warn.conf b/configs/imx6/env/lto-warn.conf
new file mode 100644
index 0000000..6aefda5
--- /dev/null
+++ b/configs/imx6/env/lto-warn.conf
@@ -0,0 +1,9 @@
+VECFLAGS="-ftree-vectorize -ftree-loop-distribution"
+WARNFLAGS="-Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override -Warray-bounds"
+CFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=neon-fp16 -mfp16-format=ieee -mfloat-abi=hard -O2 -flto ${VECFLAGS}"
+CXXFLAGS="${CFLAGS} ${WARNFLAGS}"
+LDFLAGS="-O2 -flto -fuse-linker-plugin"
+AR='/usr/local/bin/ar'
+RANLIB='/usr/local/bin/ranlib'
+NM='/usr/local/bin/nm'
+
diff --git a/configs/imx6/make.conf b/configs/imx6/make.conf
index c70352a..f824d81 100644
--- a/configs/imx6/make.conf
+++ b/configs/imx6/make.conf
@@ -1,22 +1,24 @@
 # basic armv7 machine config for imx6 wandboard/udoo (armv7 neon etnaviv)
 
-USE="acl apache2 -cups ipv6 logrotate sasl snmp udev
+USE="acl apache2 -cups ipv6 logrotate sasl snmp udev truetype
      gd gmp gs graphviz jpeg jbig png tiff unicode nls xpm
      spell bzip2 gpm imlib usb expat innodb pax hardened
      curl postgres jpeg2k dejavu tcpd fam sqlite dbus svg git
      subversion ccache fontconfig gudev hwdb distcc lzma
-     samba -avahi gdbm consolekit policykit xattr alsa caps
+     -samba -avahi gdbm consolekit policykit xattr alsa caps
 
      -gcj fortran -go lua java -perl python howl -ruby vala
      gnome-keyring gnutls glib wheel premount introspection
+     ccache lzma zip 7zip xml udisks zeroconf
 
-     nptl nptlonly threads pic dri drm neon imx armada etnaviv
+     nptl nptlonly threads pic neon
      wayland weston gbm vdpau openc eglfs evdev ibus kms lto
+     egl gles1 gles2 opengl glx dri drm imx armada etnaviv -dri3
 
      system-libvpx system-icu -bindist -gtkspell -tslib -phonon qml libav
-     egl gles1 gles2 opengl glx dri3
-
      X xorg gtk -qt -qt3 -qt4 -qt3support qt5 -kde -kde3 -kde4 -gnome
+     -kwallet
+
      -svga -apm -emacs -directfb -smartcard -nss -openct -clamav -systemd
      -modemmanager -networkmanager -xinerama -bonobo -gnome-online-accounts
      -php -hardenedphp
@@ -24,6 +26,8 @@ USE="acl apache2 -cups ipv6 logrotate sasl snmp udev
 
 # flto=jobserver might be too much
 LINK_OPTS="-flto=4"
+# switch from neon to vfp for trimslice
+#FPU_OPTS="-mfpu=vfpv3-d16-fp16 -mfp16-format=ieee -mfloat-abi=hard"
 FPU_OPTS="-mfpu=neon-fp16 -mfp16-format=ieee -mfloat-abi=hard"
 VEC_OPTS="-ftree-vectorize -ftree-loop-distribution -fvect-cost-model=cheap"
 TUNE_OPTS="-march=armv7-a -mtune=cortex-a9"
@@ -53,7 +57,7 @@ PORT_LOGDIR=/var/log/portage
 PORTAGE_ELOG_SYSTEM="save"
 PORTAGE_ELOG_CLASSES="warn error log qa"
 
-PORTDIR_OVERLAY="/usr/local/portage /usr/local/arm"
+#PORTDIR_OVERLAY="/usr/local/portage /usr/local/arm"
 
 PORTAGE_RSYNC_RETRIES="3"
 AUTOCLEAN="yes"
@@ -81,7 +85,7 @@ APACHE2_MODULES="actions alias auth_digest auth_basic authn_alias
   unique_id userdir usertrack vhost_alias"
 
 
-CCACHE_SIZE="2G"
+CCACHE_SIZE="512M"
 
 # Set PORTDIR for backward compatibility with various tools:
 #   gentoo-bashcomp - bug #478444
diff --git a/configs/imx6/package.accept_keywords b/configs/imx6/package.accept_keywords
index 87a5ad1..85ef276 100644
--- a/configs/imx6/package.accept_keywords
+++ b/configs/imx6/package.accept_keywords
@@ -79,7 +79,7 @@ lxqt-base/lxqt-session **
 >=x11-themes/gtk-theme-switch-2.1.0 **
 >=x11-themes/tango-icon-theme-extras-0.1.0-r1 **
 
->=x11-misc/sddm-9999 **
+#>=x11-misc/sddm-9999 **
 
 >=media-libs/libmpd-11.8.17-r1 **
 >=media-libs/x264-9999 **
@@ -92,7 +92,6 @@ lxqt-base/lxqt-session **
 >=x11-themes/light-themes-0.1.93-r3 **
 
 =sys-devel/llvm-9999 **
->=sys-block/zram-init-2.7 **
 
 >=dev-python/thunarx-python-0.3.0 **
 >=x11-themes/gentoo-artwork-0.4.2-r1 **
@@ -100,12 +99,13 @@ lxqt-base/lxqt-session **
 >=x11-themes/gentoo10-backgrounds-20110309 **
 
 >=x11-misc/arandr-0.1.7.1 **
->=x11-libs/libdrm-9999 **
->=media-libs/mesa-9999 **
->=x11-base/xorg-server-9999 **
->=x11-base/xorg-drivers-9999 **
+#>=x11-libs/libdrm-9999 **
+#>=media-libs/mesa-9999 **
+#>=x11-base/xorg-server-9999 **
+#>=x11-base/xorg-drivers-9999 **
+#>=x11-libs/libetnaviv-99999999 **
 # >= would pull in google chromeos version
-=x11-drivers/xf86-video-armsoc-9999 **
+#>=x11-drivers/xf86-video-armsoc-9999 **
 
 >=net-wireless/blueman-9999 **
 >=dev-python/fuse-python-0.2.1 **
diff --git a/configs/imx6/package.env b/configs/imx6/package.env
index d7e4062..de34086 100644
--- a/configs/imx6/package.env
+++ b/configs/imx6/package.env
@@ -3,15 +3,18 @@
 ## no-vector.conf on arm
 sys-devel/binutils gold.conf
 sys-libs/glibc plain-flags.conf
-sys-devel/llvm plain-flags.conf
+sys-devel/llvm plain-flags.conf gcc-j2.conf
 dev-lang/gnat-gcc plain-flags.conf
+
 dev-libs/gmp no-lto.conf
 dev-lang/ocaml no-lto.conf
 dev-lang/perl plain-flags.conf
+net-nds/openldap plain-flags.conf
 
+net-libs/libdmapsharing no-gold.conf
 dev-libs/boost no-lto.conf no-vector.conf
 dev-util/boost-build no-lto.conf no-vector.conf
-dev-util/cmake no-lto.conf no-vector.conf
+dev-util/cmake no-lto.conf no-vector.conf cxx-abi.conf
 app-editors/atom clang.conf
 
 dev-lang/spidermonkey no-lto.conf
@@ -28,11 +31,10 @@ dev-lang/ruby plain-flags.conf
 dev-vcs/cvs no-lto.conf
 dev-python/numpy no-lto.conf
 
-dev-qt/qtwebkit no-lto.conf
-net-libs/webkit-gtk no-lto.conf
-www-client/chromium no-lto.conf
-www-client/firefox no-lto.conf
-app-text/texlive-core no-lto.conf
+net-libs/webkit-gtk no-lto.conf gcc-j2.conf
+www-client/chromium no-lto.conf gcc-j2.conf
+www-client/firefox no-lto.conf gcc-j2.conf
+app-text/texlive-core no-lto.conf gcc-j2.conf
 
 sys-apps/kmod no-lto.conf
 app-crypt/pinentry no-lto.conf
@@ -49,6 +51,7 @@ msys-libs/ncurses no-lto.conf
 app-text/tesseract no-lto.conf
 app-accessibility/brltty no-lto.conf
 
+media-libs/libtheora no-vector.conf
 media-libs/x264 no-lto.conf
 media-libs/alsa-lib no-lto.conf
 media-sound/pulseaudio no-lto.conf
@@ -59,7 +62,26 @@ media-libs/libpostproc no-lto.conf
 dev-libs/weston no-lto.conf
 app-office/libreoffice no-lto.conf
 
-dev-qt/qtscript no-lto.conf
+dev-qt/linguist-tools no-lto.conf gcc-j2.conf
+dev-qt/qtchooser no-lto.conf gcc-j2.conf
+dev-qt/qtconcurrent no-lto.conf gcc-j2.conf
+dev-qt/qtcore no-lto.conf gcc-j2.conf
+dev-qt/qtdbus no-lto.conf gcc-j2.conf
+dev-qt/qtgui no-lto.conf gcc-j2.conf
+dev-qt/qtnetwork no-lto.conf gcc-j2.conf
+dev-qt/qtsql no-lto.conf gcc-j2.conf
+dev-qt/qtsvg no-lto.conf gcc-j2.conf
+dev-qt/qttest no-lto.conf gcc-j2.conf
+dev-qt/qtwidgets no-lto.conf gcc-j2.conf
+dev-qt/qtx11extras no-lto.conf gcc-j2.conf
+dev-qt/qtxml no-lto.conf gcc-j2.conf
+dev-qt/qtxmlpatterns no-lto.conf gcc-j2.conf
+dev-qt/qtdeclarative no-lto.conf gcc-j2.conf
+dev-qt/qtwebkit no-lto.conf gcc-j2.conf
+dev-qt/qtscript no-lto.conf gcc-j2.conf
+dev-qt/qtwayland no-lto.conf gcc-j2.conf
+kde-frameworks/solid no-lto.conf gcc-j2.conf
+
 media-gfx/graphviz no-lto.conf
 media-libs/netpbm no-lto.conf
 media-libs/urt no-lto.conf
@@ -70,7 +92,8 @@ app-crypt/heimdal no-lto.conf
 net-fs/samba no-lto.conf
 dev-libs/libclc no-lto.conf
 
-media-libs/mesa no-lto.conf
+media-libs/mesa no-lto.conf etnaviv.conf gcc-j3.conf
+x11-libs/gtk+:3 cxx-abi.conf
 x11-base/xorg-server no-lto.conf
 dev-lang/tk no-lto.conf
 dev-lang/tcl no-lto.conf
diff --git a/configs/imx6/package.keywords b/configs/imx6/package.keywords
index 45cc878..915746d 100644
--- a/configs/imx6/package.keywords
+++ b/configs/imx6/package.keywords
@@ -1,5 +1,14 @@
+#>=sys-block/zram-init-2.7 **
 =sys-boot/vboot-utils-1.0_p20130222 **
+#=x11-drivers/xf86-video-armada-9999 **
+
+=x11-misc/tintwizard-0.3.4-r2 **
 
 >=dev-libs/gom-0.3.1
 #>=media-libs/grilo-0.3.1
 >=media-plugins/grilo-plugins-0.3.1
+
+=app-portage/cpuid2cpuflags-3:0 **
+
+=x11-libs/libfm-qt-0.11.1 **
+
diff --git a/configs/imx6/package.mask b/configs/imx6/package.mask
index 06ee703..df4f533 100644
--- a/configs/imx6/package.mask
+++ b/configs/imx6/package.mask
@@ -1,4 +1,5 @@
->=sys-block/zram-init-3.0
+#>=sys-block/zram-init-3.0
+>=media-libs/speex-1.2.0
 
 #>=media-sound/exaile-9999
 #>=www-client/firefox-24.0
@@ -11,11 +12,14 @@
 #>=virtual/libudev-220
 #>=sys-fs/eudev-1.3
 
+>=media-libs/galcore-headers-4.6.9
+>=x11-libs/libetnaviv-20151011
 >=media-libs/mesa-9999
 >=sys-devel/llvm-9999
 >=x11-libs/cairo-9999
->=x11-base/xorg-drivers-9999
->=x11-base/xorg-server-9999
+
+#>=x11-base/xorg-drivers-9999
+>=x11-base/xorg-server-1.19
 >=x11-libs/libdrm-9999
 
 #>=sys-libs/glibc-2.22
diff --git a/configs/imx6/package.use b/configs/imx6/package.use
index 159637f..cb90b29 100644
--- a/configs/imx6/package.use
+++ b/configs/imx6/package.use
@@ -2,41 +2,55 @@ app-crypt/pinentry -gtk
 dev-vcs/git -gpg
 dev-util/cmake -qt5
 
+media-libs/grilo playlist
+media-plugins/grilo-plugins -dvd daap
+x11-wm/openbox startup-notification
+app-text/xmlto text
+media-plugins/alsa-plugins pulseaudio
+
 net-misc/ntp -samba -snmp
 app-pda/gtkpod -aac -cdr clutter
 www-client/epiphany jit -nss
-net-misc/openvpn iproute2 passwordsave pkcs11
+# move net-misc/openvpn net-vpn/openvpn
+net-vpn/openvpn iproute2 passwordsave pkcs11
 net-misc/ethercard-diag diag-only
 x11-drivers/xf86-video-fbturbo -gles2
 
 app-misc/mc samba sftp
 net-fs/nfs-utils nfsv4 -nfsv41 -tcpd
-x11-themes/gentoo-artwork kde
-x11-misc/lightdm gtk qt4
+media-libs/libmediaart gtk introspection -qt5 vala -qt4
+x11-misc/lightdm gtk -qt4
 www-client/chromium -proprietary-codecs
 dev-libs/libdbusmenu -gtk
 gnome-base/librsvg vala introspection -tools
 app-crypt/gcr gtk vala introspection
 
 dev-qt/qtcore:5 icu
+dev-qt/qtnetwork connman
 dev-qt/qtdeclarative localstorage
 dev-python/PyQt5 webkit widgets printsupport network
 dev-qt/qtwebkit printsupport -multimedia opengl qml webp
 dev-qt/qtprintsupport opengl
 dev-qt/qt-mobility multimedia
 dev-qt/qtmultimedia opengl qml widgets
+
+net-wireless/wpa_supplicant -ap eap-sim
+net-misc/connman -ethernet policykit wifi -examples -l2tp -ofono -openconnect openvpn -pptp tools
 www-client/qupzilla qt5 -qt4
 app-editors/tea aspell -hunspell
 >=kde-base/kdelibs-4.14.6-r1 opengl
 >=dev-python/PyQt4-4.11.3 sql webkit declarative script
-net-libs/jreen qt4
+
+net-libs/libgsasl gcrypt
+net-libs/jreen -qt4
 app-crypt/qca gcrypt gpg
 dev-python/PyQt4 opengl phonon
 dev-qt/designer -phonon webkit
 net-irc/quassel -crypt webkit
 media-video/mpv opengl
 
-sys-auth/polkit-qt qt4
+lxqt-base/lxqt-meta lightdm sudo
+sys-auth/polkit-qt -qt4
 dev-qt/qtwidgets:5 opengl
 app-i18n/ibus gtk3
 dev-libs/libpcre pcre16
@@ -81,7 +95,7 @@ www-client/midori granite jit webkit2 -deprecated -introspection zeitgeist
 media-libs/cogl opengl gles2
 x11-libs/cairo -drm -lto gles2 -opengl xcb xlib-xcb
 
-sys-devel/llvm -ncurses
+sys-devel/llvm -ncurses gold
 dev-libs/weston colord editor examples fbdev gles2 -opengl rdp -resize-optimization view wayland-compositor xwayland
 gnome-extra/zeitgeist downloads-monitor extensions -fts icu -plugins telepathy
 net-im/telepathy-mission-control -upower
@@ -127,24 +141,25 @@ x11-terms/xterm Xaw3d toolbar
 
 net-irc/hexchat -gtkspell libcanberra perl plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo sexy
 
-net-fs/samba -winbind
+net-fs/samba -winbind client
 net-fs/cifs-utils -acl -ads creds
 media-libs/gst-plugins-base theora
 media-libs/gst-plugins-bad -gles2
 
 media-video/vlc cddb egl fontconfig -opengl live matroska neon omxil alsa rtsp taglib theora wma-fixed
 
-x11-themes/gentoo-artwork -grub offensive
+x11-themes/gentoo-artwork -grub offensive kde
 x11-misc/tint2 battery tint2conf
 sys-libs/libunwind lzma
-x11-base/xorg-server drm -glx -minimal xvfb kdrive xorg -unwind -xephyr -extra-warn
+x11-base/xorg-server drm glx -minimal xvfb kdrive xorg -unwind -xephyr -extra-warn
 x11-apps/xinit -minimal
 
+x11-libs/libdrm-armada static-libs
 x11-libs/libdrm libkms -kernel-src
-=media-libs/mesa-10* -dri3 -llvm -pic -gallium
-# don't use dri3 interface for mali?
->=media-libs/mesa-9999 dri3 -llvm
-media-libs/mesa dri3 gallium egl gles1 gles2 -llvm nptl osmesa xa xvmc -bindist -classic
+=media-libs/mesa-10* -llvm -pic -gallium
+# don't use dri3 interface for etnaviv/mesa, not sure about mali?
+>=media-libs/mesa-9999 -dri3 -llvm
+media-libs/mesa gallium egl gles1 gles2 llvm nptl osmesa xa xvmc -bindist -classic
 x11-apps/mesa-progs egl gles1 gles2
 
 www-client/firefox -minimal -system-libvpx