Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc7bd322dfcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 701d63a42bfb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2021

  1. libdrm: 2.4.103 -> 2.4.104 

    Announcement:
https://lists.freedesktop.org/archives/dri-devel/2021-January/293654.html

Additional changes:
- docutils is a new bild-time dependency for rst2man.
- Fix the license (BSD -> MIT). The licensing is a bit complicated but
  at least the main license is MIT [0],[1],[2].
- Add myself as maintainer.
- Extend the meta information.
- Some minor cleanups and style improvements.

[0]: https://pkgs.alpinelinux.org/packages?name=libdrm
[1]: https://www.freshports.org/graphics/libdrm
[2]: https://src.fedoraproject.org/rpms/libdrm/blob/master/f/libdrm.spec
    @primeos
    primeos committed Jan 19, 2021
    Copy the full SHA
    fe12a99 View commit details

  2. Merge pull request #109956 from primeos/libdrm 

    libdrm: 2.4.103 -> 2.4.104
    @primeos
    primeos authored Jan 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    701d63a View commit details
Showing with 25 additions and 12 deletions.
  1. +25 −12 pkgs/development/libraries/libdrm/default.nix
37 changes: 25 additions & 12 deletions pkgs/development/libraries/libdrm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libpthreadstubs, libpciaccess
, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
{ stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils
, libpthreadstubs, libpciaccess
, withValgrind ? valgrind-light.meta.available, valgrind-light
}:

stdenv.mkDerivation rec {
pname = "libdrm";
version = "2.4.103";
version = "2.4.104";

src = fetchurl {
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "08h2nnf4w96b4ql7485mvjgbbsb8rwc0qa93fdm1cq34pbyszq1z";
sha256 = "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn";
};

outputs = [ "out" "dev" "bin" ];

nativeBuildInputs = [ pkg-config meson ninja ];
nativeBuildInputs = [ pkg-config meson ninja docutils ];
buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light;

@@ -34,12 +35,24 @@ stdenv.mkDerivation rec {
"-Detnaviv=true"
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false";

enableParallelBuilding = true;

meta = {
homepage = "https://dri.freedesktop.org/libdrm/";
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
platforms = lib.platforms.unix;
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/mesa/drm";
downloadPage = "https://dri.freedesktop.org/libdrm/";
description = "Direct Rendering Manager library and headers";
longDescription = ''
A userspace library for accessing the DRM (Direct Rendering Manager) on
Linux, BSD and other operating systems that support the ioctl interface.
The library provides wrapper functions for the ioctls to avoid exposing
the kernel interface directly, and for chipsets with drm memory manager,
support for tracking relocations and buffers.
New functionality in the kernel DRM drivers typically requires a new
libdrm, but a new libdrm will always work with an older kernel.
libdrm is a low-level library, typically used by graphics drivers such as
the Mesa drivers, the X drivers, libva and similar projects.
'';
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ primeos ];
};
}