From c56dd53092ab5774e81de0f478812203dd2e113b Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 11 Jul 2018 20:40:16 +0300 Subject: [PATCH 1/4] mesa, mesa-darwin: free up floating point textures (patents expired) https://cgit.freedesktop.org/mesa/mesa/commit/?id=66673bef941af344314fe9c91cad8cd330b245eb https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed --- pkgs/development/libraries/mesa-darwin/default.nix | 6 ++++++ pkgs/development/libraries/mesa/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index f18c1e693cb..2bfdb679156 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -50,6 +50,12 @@ let configurePhase = ":"; + configureFlags = [ + # NOTE: Patents expired on June 17 2018. + # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed + "texture-float" + ]; + makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 480afcf607a..2dfa6275a41 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,9 +6,6 @@ , libglvnd , grsecEnabled ? false , enableRadv ? true -# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. -# It's overridden for mesa_drivers. -, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -115,7 +112,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add4e0f4e23..cb15b0d9f34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,7 +10962,6 @@ with pkgs; mesa_drivers = let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - enableTextureFloats = true; }; in mo.drivers; From 8f101cce83fe5357814268e4ab6337262ec6730c Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 00:22:57 +0300 Subject: [PATCH 2/4] rm maintainer eduarrrd from packages, no activity > year --- pkgs/applications/audio/pianobar/default.nix | 1 - pkgs/applications/graphics/photoqt/default.nix | 1 - pkgs/applications/misc/dfilemanager/default.nix | 1 - pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/servers/http/pshs/default.nix | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e21815574d1..1518ed9b794 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 01affbbbd94..7571bb29bec 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 6cbdc8ece0c..eeb7a8ccf52 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation { description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2dfa6275a41..93354dc9a71 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -268,7 +268,7 @@ let self = stdenv.mkDerivation { homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.linux; - maintainers = with maintainers; [ eduarrrd vcunat ]; + maintainers = with maintainers; [ vcunat ]; }; }; in self diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index a0a1addeeeb..2205c91789f 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = https://github.com/mgorny/pshs; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; platforms = stdenv.lib.platforms.linux; }; } From 4c77fdef4ada69da7ae09b867ee8e98c575cc8ee Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 00:39:47 +0300 Subject: [PATCH 3/4] mesa_drivers: reduced to alias of mesa_noglu --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb15b0d9f34..a1d9799ad45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10959,11 +10959,12 @@ with pkgs; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa_drivers = - let mo = mesa_noglu.override { - grsecEnabled = config.grsecurity or false; - }; - in mo.drivers; + + # NOTE: 2018-07-12: legacy alias: + # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ + # floating point textures patents are expired, + # so package reduced to alias + mesa_drivers = mesa_noglu; ## End libGL/libGLU/Mesa stuff From 7ebc3ab2a62b7099a5d67b13ba94a2f6574fe90d Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Thu, 12 Jul 2018 12:34:45 +0300 Subject: [PATCH 4/4] mesa: cleanup: rm defunct glx-rts & sysfs flags, grsec/PaX patch Config log: ``` configure: WARNING: unrecognized options: --disable-glx-rts, --enable-sysfs ``` --- pkgs/development/libraries/mesa/default.nix | 4 --- .../libraries/mesa/glx_ro_text_segm.patch | 25 ------------------- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/glx_ro_text_segm.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 93354dc9a71..ab2aa0ce3ae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,7 +4,6 @@ , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau, valgrind-light, python2 , libglvnd -, grsecEnabled ? false , enableRadv ? true , galliumDrivers ? null , driDrivers ? null @@ -87,7 +86,6 @@ let self = stdenv.mkDerivation { # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - ./glx_ro_text_segm.patch # fix for grsecurity/PaX ./symlink-drivers.patch ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ]; @@ -112,7 +110,6 @@ let self = stdenv.mkDerivation { ("--with-vulkan-drivers=" + builtins.concatStringsSep "," vulkanDrivers)) ++ [ - (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine "--enable-libglvnd" @@ -131,7 +128,6 @@ let self = stdenv.mkDerivation { "--enable-xvmc" "--enable-vdpau" "--enable-shared-glapi" - "--enable-sysfs" "--enable-llvm-shared-libs" "--enable-omx-bellagio" "--enable-va" diff --git a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch b/pkgs/development/libraries/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 95f01ba9e52..00000000000 --- a/pkgs/development/libraries/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5068913..3d4271e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -429,6 +429,20 @@ AC_SUBST([GLESv2_LIB_GLOB]) - AC_SUBST([VG_LIB_GLOB]) - AC_SUBST([GLAPI_LIB_GLOB]) - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl Arch/platform-specific settings - dnl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d9799ad45..ae3c4dc5ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10952,9 +10952,6 @@ with pkgs; libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; mesa_noglu = callPackage ../development/libraries/mesa { - # makes it slower, but during runtime we link against just mesa_drivers - # through /run/opengl-driver*, which is overriden according to config.grsecurity - # grsecEnabled = true; # no more support in nixpkgs ATM llvmPackages = llvmPackages_6; };