diff options
24 files changed, 227 insertions, 59 deletions
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest index bf224349d2c9..7c1f81b89318 100644 --- a/dev-python/phonenumbers/Manifest +++ b/dev-python/phonenumbers/Manifest @@ -1 +1 @@ -DIST phonenumbers-8.10.18.tar.gz 2307397 BLAKE2B 13e39a6fbb1a3d08dfbd373f1e425a8dd7fc7199e9cf0eb4386bf9cf1dcdaa6e90ff9cf1aa5ae9296397f827e8db1f02d740bcffba40810f4e6d74563b398dc5 SHA512 001c549d561770d1e0cbe6c8b15b091fad0eb362d5893b4d066f773ef497ed3b2b27c3a85f7114c1d8b41a16614005b8947ee5189b5bebfc6ee044cd3f0fa30b +DIST phonenumbers-8.10.22.tar.gz 2307815 BLAKE2B 397711a4cca97be68986cbb21ab971710c213a74fbb0e2c79de67b98ab44c3e25e95f6bfc2c469c1abfaf0d1c3848114a0be47d08650c7ac57a01240b7a79270 SHA512 f7c540276324a373bc0caa9aa3b87da31b98bfd24fbffab2f9137f0c6f72bba88022d9820193dfe482ee621fc3c90126bd93cb51bb4715dcbd1c3fa689e055b5 diff --git a/dev-python/phonenumbers/phonenumbers-8.10.18.ebuild b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild index 6504f27a128f..6504f27a128f 100644 --- a/dev-python/phonenumbers/phonenumbers-8.10.18.ebuild +++ b/dev-python/phonenumbers/phonenumbers-8.10.22.ebuild diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest index b309ec2ca249..80e9508daef8 100644 --- a/dev-python/python-stdnum/Manifest +++ b/dev-python/python-stdnum/Manifest @@ -1 +1 @@ -DIST python-stdnum-1.11.tar.gz 835905 BLAKE2B e6a65d9bc96879a7c39fc1c9c0d4442f475cd01b21a325274d98e237f4edf0bf8d5b27ef91696a5465492cee006e87d4d7969c5b8c531c6e8a6c7d839c302b10 SHA512 1369c38c93575aefdf727f831f68f7858390d9d29d5f1c1caba0de12afd994a5c6e9b89f76cff30a694ae056b19816c813e9c42f8a7a882f5b9257c374dcbad1 +DIST python-stdnum-1.12.tar.gz 882778 BLAKE2B 49b0b83b8a76cf8963b35729b8acb1bb7f6cc8071cfee5490ba8f60fb2b74df28e11e65d9dafe6c717d297382628fe924ab5e193d8a39597cc214b98f12fa5dd SHA512 7eefc997494f538cddda8a6ca60d60c52e35f53023edd69b540c3f1aded00d795741ef429f84be6637e737e031b0ca771d4c1a060c94c90d7aa4144cdb0a536f diff --git a/dev-python/python-stdnum/python-stdnum-1.11.ebuild b/dev-python/python-stdnum/python-stdnum-1.12.ebuild index 18bda3addee0..18bda3addee0 100644 --- a/dev-python/python-stdnum/python-stdnum-1.11.ebuild +++ b/dev-python/python-stdnum/python-stdnum-1.12.ebuild diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.3.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.3.1.ebuild index 288732cad020..49e7cc922ba4 100644 --- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.3.1.ebuild +++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.3.1.ebuild @@ -84,7 +84,7 @@ src_install() { exeinto "/opt/${MY_PN}" doexe *.so "${MY_PN}" - dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" + dosym "../../opt/${MY_PN}/${MY_PN}" "${EROOT}/usr/bin/${MY_PN}" newicon "${S}/icon.svg" "${MY_PN}.svg" make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}" diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask index c143bc4ea264..3ab6baaf2f23 100644 --- a/profiles/arch/m68k/package.use.mask +++ b/profiles/arch/m68k/package.use.mask @@ -7,8 +7,7 @@ net-libs/gnutls test-full # Matt Turner <mattst88@gentoo.org> (2017-02-25) # Needs libepoxy keywording, bug #510940 -x11-base/xorg-server glamor wayland -x11-drivers/xf86-video-ati glamor +x11-base/xorg-server wayland # Mike Frysinger <vapier@gentoo.org> (2015-03-16) # Needs sci-physics/bullet tested #499974 diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask index 413a3a14b041..f1f9dab66c11 100644 --- a/profiles/arch/s390/package.use.mask +++ b/profiles/arch/s390/package.use.mask @@ -56,11 +56,6 @@ dev-libs/efl physics # Not tested app-portage/layman g-sorcery -# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2014-09-16) -# Needs libepoxy keywording, bug #510940 -x11-base/xorg-server glamor wayland -x11-drivers/xf86-video-ati glamor - # Mikle Kolyada <zlogene@gentoo.org> (2014-01-11) # too much unkeyworded dependencies (bug #497068) dev-vcs/git mediawiki mediawiki-experimental diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask index 61a2417200c7..9f38a48d1ff6 100644 --- a/profiles/arch/sh/package.use.mask +++ b/profiles/arch/sh/package.use.mask @@ -19,8 +19,7 @@ media-sound/pulseaudio native-headset ofono-headset # Matt Turner <mattst88@gentoo.org> (2017-02-25) # Needs libepoxy keywording, bug #510940 -x11-base/xorg-server glamor wayland -x11-drivers/xf86-video-ati glamor +x11-base/xorg-server wayland # Sergey Popov <pinkbyte@gentoo.org> (2015-10-24) # Not tested diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults index 5724093fcefd..0d420b3b94ec 100644 --- a/profiles/targets/desktop/make.defaults +++ b/profiles/targets/desktop/make.defaults @@ -1,4 +1,4 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif glamor gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid" +USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam flac gif gpm gtk icu jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid" diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest index 106266fe01b9..57c13c48af82 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -1,2 +1,4 @@ DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5 DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea +DIST ngspice-31-manual.pdf 2149244 BLAKE2B 155f7299cbb6d7c7953d8488e11f0bffc3c18097f02194c491174a9af387cda9e87cb79b13a37f402616386e7e82230eb4d41909fe37d900792e48f2f49c71dd SHA512 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 +DIST ngspice-31.tar.gz 7250057 BLAKE2B dabc8e1084eba957d6dad06e74f878b51e97dc8bc49b04ee612a6f9eaadde7302450c9ab93e943c4af42197b6bbdca7cae534464ccd2fcd4869b8a48b6f3140d SHA512 448024f398d267911d5d2a48da03eb0d87ba1133ce39d5132bd318dde8ad359d19c7f85f6b4ec88c08b081c9140f7b931334d84173019a22aa2ac98482bd7d5d diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml index ed47ec5f1705..293e59a7c77f 100644 --- a/sci-electronics/ngspice/metadata.xml +++ b/sci-electronics/ngspice/metadata.xml @@ -10,6 +10,7 @@ three open source software packages: Spice3f5, Cider1b1 and Xspice. </longdescription> <use> + <flag name="deprecated">Build old and deprecated apps</flag> <flag name="shared">Build ngspice as a shared library</flag> </use> <upstream> diff --git a/sci-electronics/ngspice/ngspice-31.ebuild b/sci-electronics/ngspice/ngspice-31.ebuild new file mode 100644 index 000000000000..b29be4149ffc --- /dev/null +++ b/sci-electronics/ngspice/ngspice-31.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multibuild toolchain-funcs virtualx + +DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" +SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz + doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" +HOMEPAGE="http://ngspice.sourceforge.net" +LICENSE="BSD GPL-2" + +SLOT="0" +IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos" + +DEPEND="sys-libs/ncurses:0= + X? ( x11-libs/libXaw + x11-libs/libXt + x11-libs/libX11 ) + fftw? ( sci-libs/fftw:3.0 ) + readline? ( sys-libs/readline:0= ) + tcl? ( dev-lang/tcl:0 + dev-tcltk/blt )" +RDEPEND="${DEPEND} + X? ( sci-visualization/xgraph )" + +DOCS=( + ANALYSES + AUTHORS + BUGS + ChangeLog + DEVICES + FAQ + NEWS + README + README.vdmos + Stuarts_Poly_Notes +) + +pkg_setup() { + MULTIBUILD_VARIANTS=( "binaries" ) + use shared && MULTIBUILD_VARIANTS+=( "shared" ) + use tcl && MULTIBUILD_VARIANTS+=( "tcl" ) + use openmp && tc-check-openmp +} + +src_prepare() { + if use tcl; then + if use examples; then + find examples/tclspice -type f -iname \*tcl -or -iname \*.sh | + while read s + do + sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \ + -e 's@package require BLT@package require Tk\npackage require BLT@g' \ + -e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \ + "${s}" || die "sed failed" + done + fi + fi + + eapply_user + eautoreconf + multibuild_copy_sources +} + +src_configure() { + multibuild_foreach_variant ngspice_configure +} + +ngspice_configure() { + pushd "${BUILD_DIR}" + + local myconf + if use debug; then + myconf="--enable-debug \ + --enable-ftedebug \ + --enable-cpdebug \ + --enable-sensdebug \ + --enable-asdebug \ + --enable-stepdebug \ + --enable-pzdebug" + else + myconf="--disable-debug \ + --disable-ftedebug \ + --disable-cpdebug \ + --disable-sensdebug \ + --disable-asdebug \ + --disable-stepdebug \ + --disable-pzdebug" + fi + # As of December 2017, these do not compile + myconf="${myconf} \ + --disable-blktmsdebug \ + --disable-smltmsdebug" + + myconf="${myconf} \ + --enable-xspice \ + --enable-cider \ + --disable-dependency-tracking \ + --disable-rpath \ + $(use_enable openmp) \ + $(use_with fftw fftw3) \ + $(use_with readline)" + + if [ "${MULTIBUILD_VARIANT}" == "shared" ]; then + myconf="${myconf} \ + --with-ngshared" + elif [ "${MULTIBUILD_VARIANT}" == "tcl" ]; then + myconf="${myconf} \ + --with-tcl" + else + myconf="${myconf} \ + $(use_enable deprecated oldapps) \ + $(use_with X x)" + fi + + econf ${myconf} +} + +src_compile() { + multibuild_foreach_variant ngspice_compile +} + +ngspice_compile() { + pushd "${BUILD_DIR}" + default +} + +src_install() { + multibuild_foreach_variant ngspice_install + + # merge the installations of all variants + for v in "${MULTIBUILD_VARIANTS[@]}" ; do + cp -a "${D}_${v}"/* "${D}" || die "Failed to combine multibuild installations" + rm -rf "${D}_${v}" + done + + use tcl && DOCS+=( README.tcl ) + use shared && DOCS+=( README.shared-xspice ) + use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf ) + + default + + if use examples; then + use tcl || rm -rf examples/tclspice + + insinto /usr/share/${PN} + doins -r examples + fi +} + +ngspice_install() { + pushd "${BUILD_DIR}" + + emake DESTDIR="${D}_${MULTIBUILD_VARIANT}" install + + # Strip shared-library and Tcl-module builds to the bare minimum; + # all the support files will have been handled by the 'binaries' build. + if [ "${MULTIBUILD_VARIANT}" != "binaries" ]; then + rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/bin{,.debug} + rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/share + rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la + rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} + fi +} + +src_test() { + if ! use debug; then + # tests can be only executed for the binaries variant + pushd "${WORKDIR}/${P}-binaries" + virtx default + popd + else + # https://sourceforge.net/p/ngspice/bugs/353/ + ewarn + ewarn "Skipping tests because they are known to fail in debug mode" + ewarn + fi +} diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild index fc0fa18b37a8..e11cd07feb38 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild @@ -72,11 +72,11 @@ PDEPEND=" video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) - video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) - video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) @@ -86,10 +86,10 @@ PDEPEND=" video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) - video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) + video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) - video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_tegra? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_vc4? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index 10daad342d79..cd83934c3ef3 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -72,11 +72,11 @@ PDEPEND=" video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) - video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) - video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) @@ -86,10 +86,10 @@ PDEPEND=" video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) - video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] ) + video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) - video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) + video_cards_tegra? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_vc4? ( >=x11-base/xorg-server-${PV}[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index b3f0d6f2cdee..2e8d8799f905 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="dmx">Build the Distributed Multiheaded X server</flag> <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag> - <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> <flag name="kdrive">Build the kdrive X servers</flag> <flag name="libglvnd">Use libglvnd for dispatch.</flag> <flag name="unwind">Enable libunwind usage for backtraces</flag> diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild index 601e6ae7a361..8f859c2eaf57 100644 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" CDEPEND="libglvnd? ( media-libs/libglvnd @@ -52,11 +52,6 @@ CDEPEND="libglvnd? ( >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) - glamor? ( - media-libs/libepoxy[X,egl(+)] - >=media-libs/mesa-18[egl,gbm] - !x11-libs/glamor - ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv @@ -72,7 +67,8 @@ CDEPEND="libglvnd? ( !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+)] + >=media-libs/mesa-18[X(+),egl,gbm] + media-libs/libepoxy[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) @@ -119,7 +115,7 @@ REQUIRED_USE="!minimal? ( ) elogind? ( udev ) ?? ( elogind systemd ) - minimal? ( !glamor !wayland ) + minimal? ( !wayland ) xephyr? ( kdrive )" UPSTREAMED_PATCHES=( @@ -136,9 +132,10 @@ PATCHES=( ) pkg_setup() { - if use wayland && ! use glamor; then + if use wayland && use minimal; then ewarn "glamor is necessary for acceleration under Xwayland." ewarn "Performance may be unacceptable without it." + ewarn "Build with USE=-minimal to enable glamor." fi # localstatedir is used for the log location; we need to override the default @@ -150,7 +147,6 @@ pkg_setup() { $(use_enable ipv6) $(use_enable debug) $(use_enable dmx) - $(use_enable glamor) $(use_enable kdrive) $(use_enable unwind libunwind) $(use_enable wayland xwayland) @@ -159,6 +155,7 @@ pkg_setup() { $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal dri3) + $(use_enable !minimal glamor) $(use_enable !minimal glx) $(use_enable xcsecurity) $(use_enable xephyr) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index e9c4e0045348..25dac9a8620a 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 XORG_DOC=doc +XORG_EAUTORECONF="yes" inherit xorg-3 multilib flag-o-matic EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" @@ -14,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" CDEPEND="libglvnd? ( media-libs/libglvnd @@ -51,11 +52,6 @@ CDEPEND="libglvnd? ( >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) - glamor? ( - media-libs/libepoxy[X,egl(+)] - >=media-libs/mesa-18[egl,gbm] - !x11-libs/glamor - ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv @@ -71,7 +67,8 @@ CDEPEND="libglvnd? ( !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+)] + >=media-libs/mesa-18[X(+),egl,gbm] + media-libs/libepoxy[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) @@ -118,7 +115,7 @@ REQUIRED_USE="!minimal? ( ) elogind? ( udev ) ?? ( elogind systemd ) - minimal? ( !glamor !wayland ) + minimal? ( !wayland ) xephyr? ( kdrive )" UPSTREAMED_PATCHES=( @@ -132,9 +129,10 @@ PATCHES=( ) pkg_setup() { - if use wayland && ! use glamor; then + if use wayland && use minimal; then ewarn "glamor is necessary for acceleration under Xwayland." ewarn "Performance may be unacceptable without it." + ewarn "Build with USE=-minimal to enable glamor." fi # localstatedir is used for the log location; we need to override the default @@ -146,7 +144,6 @@ pkg_setup() { $(use_enable ipv6) $(use_enable debug) $(use_enable dmx) - $(use_enable glamor) $(use_enable kdrive) $(use_enable unwind libunwind) $(use_enable wayland xwayland) @@ -155,6 +152,7 @@ pkg_setup() { $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal dri3) + $(use_enable !minimal glamor) $(use_enable !minimal glx) $(use_enable xcsecurity) $(use_enable xephyr) diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild index 195ac3dbba1e..d1d64a0c5d99 100644 --- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild +++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu] - x11-base/xorg-server[glamor(-)] + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND}" diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild index dc1d719f2898..726d5faa862f 100644 --- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild +++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.1.0.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu] - x11-base/xorg-server[glamor(-)] + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND}" diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild index dc1d719f2898..726d5faa862f 100644 --- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild +++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Accelerated Open Source driver for AMDGPU cards" IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu] - x11-base/xorg-server[glamor(-)] + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND}" diff --git a/x11-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml index 38cf49862d0f..e943b72b8a48 100644 --- a/x11-drivers/xf86-video-ati/metadata.xml +++ b/x11-drivers/xf86-video-ati/metadata.xml @@ -5,7 +5,4 @@ <email>x11@gentoo.org</email> <name>X11</name> </maintainer> -<use> - <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> -</use> </pkgmetadata> diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild index 489c9927db8a..7b2f0601420c 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild @@ -15,11 +15,11 @@ fi DESCRIPTION="ATI video driver" HOMEPAGE="https://www.x.org/wiki/ati/" -IUSE="+glamor udev" +IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 - glamor? ( x11-base/xorg-server[glamor] ) + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" @@ -37,7 +37,7 @@ pkg_pretend() { pkg_setup() { XORG_CONFIGURE_OPTIONS=( - $(use_enable glamor) + --enable-glamor $(use_enable udev) ) } diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild index 252dd5e7f9c1..2aab4b2d7290 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild @@ -15,11 +15,11 @@ fi DESCRIPTION="ATI video driver" HOMEPAGE="https://www.x.org/wiki/ati/" -IUSE="+glamor udev" +IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 - glamor? ( x11-base/xorg-server[glamor] ) + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" @@ -37,7 +37,7 @@ pkg_pretend() { pkg_setup() { XORG_CONFIGURE_OPTIONS=( - $(use_enable glamor) + --enable-glamor $(use_enable udev) ) } diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild index 252dd5e7f9c1..2aab4b2d7290 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild @@ -15,11 +15,11 @@ fi DESCRIPTION="ATI video driver" HOMEPAGE="https://www.x.org/wiki/ati/" -IUSE="+glamor udev" +IUSE="udev" RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 - glamor? ( x11-base/xorg-server[glamor] ) + x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" @@ -37,7 +37,7 @@ pkg_pretend() { pkg_setup() { XORG_CONFIGURE_OPTIONS=( - $(use_enable glamor) + --enable-glamor $(use_enable udev) ) } |