3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

34 commits

Author SHA1 Message Date
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Peter Hoeg ced800572b libva, libva-utils and vaapiIntel: 2.0.0 -> 2.1.0 (VA-API: 1.0.0 -> 1.1.0) 2018-02-21 11:35:40 +08:00
Vladimír Čunát 0990b2c7fd
Revert "Reverting #32599"
This reverts commit 15d3d68a5e.
The PR is moved from master to staging.
2017-12-15 22:10:12 +01:00
Rok Garbas 15d3d68a5e
Reverting #32599 2017-12-15 21:52:49 +01:00
Peter Hoeg 390dc930d6 libva: 1.7.3 -> 2.0.0 2017-12-15 20:57:17 +01:00
Franz Pletz 9c9e5bf25e
libva: 1.7.2 -> 1.7.3 2017-01-27 18:43:33 +01:00
Alexander Ried b49d147a05 libva: 1.7.0 -> 1.7.2 (#18847) 2016-09-25 02:22:13 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Gabriel Ebner 56300ee0f0 libva: set driver path correctly in minimal version
This does not introduce a dependency on mesa, as
mesa_noglu.driverLink == "/run/opengl-driver"

Fixes #17264.
2016-07-30 13:13:50 +02:00
Rok Garbas e5f20dc34d libva: 1.6.2 -> 1.7.0 2016-05-25 11:02:19 +02:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Vladimír Čunát 20c31e65ab libva: use a cleaner installation method
(cherry-picked from commit 8ea5563011)
Tweaked not to cause a mass rebuild ATM.
2016-02-15 17:05:31 +01:00
Vladimír Čunát 8ea5563011 libva: use a cleaner installation method 2016-02-06 16:45:21 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Nikolay Amiantov e1a734cee2 libva: fix likely problem on Darwin 2016-01-27 10:31:18 +03:00
Nikolay Amiantov 2c2497fc2e libva: 1.6.1 -> 1.6.2 2016-01-26 13:42:54 +03:00
Nikolay Amiantov 1b95212a69 libva: use OpenGL drivers link directory 2016-01-26 13:42:36 +03:00
Vladimír Čunát 17b86fef1e libva: build a lighter version by default
Mesa, X etc. are not very light dependencies.
This will also allow us to break the cycle with mesa.
2015-10-28 14:15:44 +01:00
Tobias Geerinckx-Rice a747216abd libva: 1.6.0 -> 1.6.1 2015-09-12 08:45:51 +02:00
William A. Kennington III 2054eea48a libva: 1.5.1 -> 1.6.0 2015-07-22 14:32:34 -07:00
William A. Kennington III 5fb86ada5a libva: Make mesa optional 2015-03-28 13:52:03 -07:00
William A. Kennington III 8c3dcb25b9 libva: 1.5.0 -> 1.5.1 2015-03-26 13:58:48 -07:00
Eduard Bachmakov 82f62af38e libva: 1.3.1 -> 1.5.0 2015-01-07 22:48:40 +01:00
William A. Kennington III 462146dbc5 libva: 1.1.1 -> 1.3.2 2014-08-07 01:32:43 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Domen Kožar aea043aec0 Revert "upgrade video-intel stack to 2.99.906"
This reverts commit 89f710f18e.

Reported by others for xorg-server to crash on different kernel
versions.
2014-02-19 12:37:49 +01:00
Domen Kožar 89f710f18e upgrade video-intel stack to 2.99.906 2014-02-16 20:36:44 +01:00
Lluís Batlle i Rossell 9a6d5bf9c6 Revert "libva: update (fix h264encode)"
It breaks the latest vlc, and I don't need the new libva that much.
http://hydra.nixos.org/build/5540612/nixlog/1/tail-reload

This reverts commit 6a13cd01ac.
2013-07-16 22:27:05 +02:00
Lluís Batlle i Rossell 6a13cd01ac libva: update (fix h264encode) 2013-07-14 22:27:51 +02:00
Jack Cummings 253ee6f6a3 update to 2013Q1 Intel Graphics Stack Release
This changeset updates to all of the versions in
https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release
(but does not regression from newer version).

I tried generating 'servers/x11/xorg/default.nix' with the perl script,
but unrelated packges changed, so I just manually updated the file.
2013-05-23 16:25:21 -07:00
Lluís Batlle i Rossell 675679f450 Fixes on VAAPI src packages.
The github 'snapshots' weren't stable on hashes, I think (at least as I saw
today trying to build vaapiVdpau in another computer).

Using released tarballs, pointer by vcunat.
2013-01-29 18:37:06 +01:00
Lluís Batlle i Rossell 111b203467 Updates related to VAAPI/VDPAU
Making ffmpeg link to libva.
Add the vdpau driver for vaapi.
2013-01-29 01:10:00 +01:00
Lluís Batlle i Rossell 61b07dc110 Adding libva, to get some possible video acceleration in intel video cards.
svn path=/nixpkgs/trunk/; revision=26854
2011-04-16 11:00:31 +00:00