libxvmc: refactor, move to pkgs/by-name and rename from xorg.libXvMC

+74 -54
+68
pkgs/by-name/li/libxvmc/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libX11, 8 + libXext, 9 + libXv, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxvmc"; 15 + version = "1.0.14"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + "doc" 21 + ]; 22 + 23 + src = fetchurl { 24 + url = "mirror://xorg/individual/lib/libXvMC-${finalAttrs.version}.tar.xz"; 25 + hash = "sha256-5L6etra6/bv4H0f3FjBHIVN25F4tx4bQ6mGByTByXtk="; 26 + }; 27 + 28 + strictDeps = true; 29 + 30 + nativeBuildInputs = [ pkg-config ]; 31 + 32 + buildInputs = [ 33 + xorgproto 34 + libX11 35 + libXext 36 + libXv 37 + ]; 38 + 39 + propagatedBuildInputs = [ xorgproto ]; 40 + 41 + configureFlags = lib.optional ( 42 + stdenv.hostPlatform != stdenv.buildPlatform 43 + ) "--enable-malloc0returnsnull"; 44 + 45 + passthru = { 46 + updateScript = writeScript "update-${finalAttrs.pname}" '' 47 + #!/usr/bin/env nix-shell 48 + #!nix-shell -i bash -p common-updater-scripts 49 + version="$(list-directory-versions --pname libXvMC \ 50 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 51 + | sort -V | tail -n1)" 52 + update-source-version ${finalAttrs.pname} "$version" 53 + ''; 54 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 55 + }; 56 + 57 + meta = { 58 + description = "X-Video Motion Compensation API"; 59 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxvmc"; 60 + license = lib.licenses.mit; 61 + maintainers = [ ]; 62 + pkgConfigModules = [ 63 + "xvmc" 64 + "xvmc-wrapper" 65 + ]; 66 + platforms = lib.platforms.unix; 67 + }; 68 + })
+2 -43
pkgs/servers/x11/xorg/default.nix
··· 24 libxrandr, 25 libxrender, 26 libxv, 27 lndir, 28 luit, 29 makedepend, ··· 99 libXrandr = libxrandr; 100 libXrender = libxrender; 101 libXv = libxv; 102 utilmacros = util-macros; 103 xcbproto = xcb-proto; 104 xkeyboardconfig = xkeyboard-config; ··· 2540 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2541 meta = { 2542 pkgConfigModules = [ "xtst" ]; 2543 - platforms = lib.platforms.unix; 2544 - }; 2545 - }) 2546 - ) { }; 2547 - 2548 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2549 - libXvMC = callPackage ( 2550 - { 2551 - stdenv, 2552 - pkg-config, 2553 - fetchurl, 2554 - xorgproto, 2555 - libX11, 2556 - libXext, 2557 - libXv, 2558 - testers, 2559 - }: 2560 - stdenv.mkDerivation (finalAttrs: { 2561 - pname = "libXvMC"; 2562 - version = "1.0.14"; 2563 - builder = ./builder.sh; 2564 - src = fetchurl { 2565 - url = "mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz"; 2566 - sha256 = "1nayf8qck0b1xb88dirdbvj7clr18wq1dxs73zwbpzdsnsv9xgp4"; 2567 - }; 2568 - hardeningDisable = [ 2569 - "bindnow" 2570 - "relro" 2571 - ]; 2572 - strictDeps = true; 2573 - nativeBuildInputs = [ pkg-config ]; 2574 - buildInputs = [ 2575 - xorgproto 2576 - libX11 2577 - libXext 2578 - libXv 2579 - ]; 2580 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2581 - meta = { 2582 - pkgConfigModules = [ 2583 - "xvmc" 2584 - "xvmc-wrapper" 2585 - ]; 2586 platforms = lib.platforms.unix; 2587 }; 2588 })
··· 24 libxrandr, 25 libxrender, 26 libxv, 27 + libxvmc, 28 lndir, 29 luit, 30 makedepend, ··· 100 libXrandr = libxrandr; 101 libXrender = libxrender; 102 libXv = libxv; 103 + libXvMC = libxvmc; 104 utilmacros = util-macros; 105 xcbproto = xcb-proto; 106 xkeyboardconfig = xkeyboard-config; ··· 2542 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2543 meta = { 2544 pkgConfigModules = [ "xtst" ]; 2545 platforms = lib.platforms.unix; 2546 }; 2547 })
+4
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 55 $pcMap{"xrender"} = "libXrender"; 56 $pcMap{"xtrans"} = "xtrans"; 57 $pcMap{"xv"} = "libXv"; 58 $pcMap{"\$PIXMAN"} = "pixman"; 59 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 60 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 317 libxrandr, 318 libxrender, 319 libxv, 320 lndir, 321 luit, 322 makedepend, ··· 392 libXrandr = libxrandr; 393 libXrender = libxrender; 394 libXv = libxv; 395 utilmacros = util-macros; 396 xcbproto = xcb-proto; 397 xkeyboardconfig = xkeyboard-config;
··· 55 $pcMap{"xrender"} = "libXrender"; 56 $pcMap{"xtrans"} = "xtrans"; 57 $pcMap{"xv"} = "libXv"; 58 + $pcMap{"xvmc"} = "libXvMC"; 59 + $pcMap{"xvmc-wrapper"} = "libXvMC"; 60 $pcMap{"\$PIXMAN"} = "pixman"; 61 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 62 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 319 libxrandr, 320 libxrender, 321 libxv, 322 + libxvmc, 323 lndir, 324 luit, 325 makedepend, ··· 395 libXrandr = libxrandr; 396 libXrender = libxrender; 397 libXv = libxv; 398 + libXvMC = libxvmc; 399 utilmacros = util-macros; 400 xcbproto = xcb-proto; 401 xkeyboardconfig = xkeyboard-config;
-10
pkgs/servers/x11/xorg/overrides.nix
··· 354 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 355 }); 356 357 - libXvMC = super.libXvMC.overrideAttrs (attrs: { 358 - outputs = [ 359 - "out" 360 - "dev" 361 - "doc" 362 - ]; 363 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 364 - buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; 365 - }); 366 - 367 libXp = super.libXp.overrideAttrs (attrs: { 368 outputs = [ 369 "out"
··· 354 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 355 }); 356 357 libXp = super.libXp.overrideAttrs (attrs: { 358 outputs = [ 359 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 163 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 - mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz 167 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz 168 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 169 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz
··· 163 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz 167 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 168 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz