Commit graph

1781 commits

Author SHA1 Message Date
Jan Tojnar 105abdd52c
Merge branch 'master' into staging-next 2019-09-18 22:40:03 +02:00
Peter Simons cde50a4fab shotcut: use vaapi_device /dev/dri/renderD128 instead of ":0"
This fixes the auto-detection of VAAPI hardware encoders
provided by Intel chipsets. Be sure to define

  hardware.opengl.extraPackages = [pkgs.vaapiIntel];

in configuration.nix to make the necessary OpenGL drivers
available.
2019-09-18 21:58:12 +02:00
Jan Tojnar f5ef80b46d
Merge branch 'staging-next' into staging 2019-09-18 21:16:01 +02:00
Jan Tojnar 62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Mario Rodas fa64037b99
mkvtoolnix: fix build with clang 2019-09-17 22:41:28 -05:00
volth 8276314608 treewide: fix string escapes 2019-09-16 22:15:38 +00:00
Peter Simons a41a49aa64 shotcut: fix bogus path to ffmpeg binary 2019-09-16 20:12:12 +02:00
Peter Simons 409ff06407
Merge pull request #67790 from ivan/mpv-ffmpeg-runpath
mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
2019-09-16 20:10:18 +02:00
Vladimír Čunát fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Peter Simons b558ca80e4 shotcut: update version 19.08.16 to 19.09.14
Changelog is at https://shotcut.org/blog/new-release-190914/.
2019-09-16 17:05:22 +02:00
Vladimír Čunát 48af02a402
Merge #63643: handbrake: fix build on Darwin 2019-09-16 08:28:04 +02:00
Vladimír Čunát aaf3881a80
handbrake: enableParallelBuilding = false
It doesn't build too long anyway, so let's prefer reliability.
2019-09-16 08:26:51 +02:00
Jan Tojnar a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
Vincent Laporte bf759337fa
Merge pull request #67544 from vbgl/qarte+fix-qt-platform
qarte: use qt5’s mkDerivation and an other fix
2019-09-12 15:31:17 +00:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Ivan Kozik 46cbb8453a mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback
This fixes #67780.

Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```

With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```

With both mpv and ffmpeg patched, it works:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
2019-09-06 23:18:26 +00:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
Daniël de Kok 0910b661eb makemkv: 1.14.4 -> 1.14.5
Changelog:

- Some small miscellaneous improvements
2019-09-06 19:12:38 +02:00
Jan Tojnar cdf426488b
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Jan Tojnar ed54a5b51d
Merge branch 'gtk-no-plus' 2019-09-06 02:57:51 +02:00
Jan Tojnar 72e7d569a7
tree-wide: s/GTK+/GTK/g
GTK was renamed.
2019-09-06 02:54:53 +02:00
Vladimír Čunát 7eb2a3b1cd
evtest, mplayer: fixup missing rec after the merge 2019-09-04 11:02:42 +02:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Will Dietz 6d1b2761d0
mkvtoolnix: 36.0.0 -> 37.0.0
https://www.bunkus.org/blog/2019/08/mkvtoolnix-v37-0-0-released/
2019-09-03 19:27:54 -05:00
Carles Pagès 7547a7a1d4 kodi: 19.3 -> 19.4 2019-09-04 00:40:07 +02:00
averelld ec57a12e66 mplayer: 1.3.0 -> 1.4 (#67733) 2019-09-03 22:51:04 +02:00
Peter Simons d7bbcdf274 openshot-qt: fix title generator
@ferdnyc has kindly provided a patch for our Nix-specific permission
issue https://github.com/OpenShot/openshot-qt/issues/2972.

Fixes https://github.com/NixOS/nixpkgs/issues/32898.
Fixes https://github.com/NixOS/nixpkgs/issues/48591.
Related to https://github.com/NixOS/nixpkgs/issues/55683.
2019-09-03 17:49:49 +02:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
luz.paz aaad52ba7a olive-editor: 0.1.0 -> 0.1.1
Commit updated according to #65399
2019-08-30 21:18:37 -04:00
Vladyslav M 73bc17f04a
Merge pull request #67721 from averelld/pmp-upgrade
plex-media-player: 2.36.0.988 -> 2.40.0.1007
2019-08-30 09:44:41 +03:00
Averell Dalton 3162cc1320 plex-media-player: 2.36.0.988 -> 2.40.0.1007 2019-08-29 21:23:12 +02:00
Peter Simons 40cb97d944 simplescreenrecorder: fix Qt runtime error
| qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
 |
 | This application failed to start because no Qt platform plugin could be
 | initialized. Reinstalling the application may fix this problem.
2019-08-29 20:38:27 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Vincent Laporte ef15478313
qarte: use pyqt5_with_qtmultimedia
Otherwise, qarte fails at run-time with:

>     from PyQt5.QtMultimedia import QMediaPlayer
> ModuleNotFoundError: No module named 'PyQt5.QtMultimedia'
2019-08-27 06:00:08 +00:00
Vincent Laporte e063d084de
qarte: use qt5’s mkDerivation
See #65399
2019-08-27 05:57:23 +00:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Peter Hoeg 83fe813941
Merge pull request #64383 from peterhoeg/u/kodi
kodi: 18.1 -> 18.3
2019-08-26 14:41:12 +08:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Jan Tojnar 0c20b6a9df
Merge pull request #67256 from jtojnar/celluloid-0.17
celluloid: 0.16 → 0.17
2019-08-22 20:23:12 +02:00
Jan Tojnar 991c1ebeb1
celluloid: 0.16 → 0.17
Renamed from gnome-mpv.

https://github.com/celluloid-player/celluloid/releases/tag/v0.17
2019-08-22 19:47:07 +02:00
Marek Mahut e17822c853
Merge pull request #67143 from r-ryantm/auto-update/shotcut
shotcut: 19.07.15 -> 19.08.16
2019-08-21 22:36:25 +02:00
Vladimír Čunát a887feda74
vlc: 3.0.7.1 -> 3.0.8 (security)
https://www.videolan.org/security/sb-vlc308.html
I've been using it briefly without any issues; the NEWS seem fairly safe:
https://www.videolan.org/developers/vlc-branch/NEWS
2019-08-21 21:43:46 +02:00
R. RyanTM 91c187fb6c shotcut: 19.07.15 -> 19.08.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
2019-08-20 17:40:07 -07:00
Robin Gloster 8c0786babe
Merge pull request #67103 from mayflower/globin-maintainership
treewide: update globin's maintained drvs
2019-08-20 17:57:47 +00:00
Marek Mahut c834dc9b2a
Merge pull request #66991 from r-ryantm/auto-update/mkvtoolnix
mkvtoolnix: 35.0.0 -> 36.0.0
2019-08-20 19:38:38 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
R. RyanTM 7fae3a2460 mkvtoolnix: 35.0.0 -> 36.0.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mkvtoolnix/versions
2019-08-19 16:00:59 -07:00
Marek Mahut c9d957afc1
Merge pull request #66875 from r-ryantm/auto-update/dvdstyler
dvdstyler: 3.1 -> 3.1.2
2019-08-19 10:01:04 +02:00
R. RyanTM 4db5a101e8 dvdstyler: 3.1 -> 3.1.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dvdstyler/versions
2019-08-18 23:32:26 -07:00
worldofpeace 27dbf754e3
Merge pull request #66684 from vbgl/mkvtoolnix-qt-mkDerivation
mkvtoolnix: use wrapQtApp
2019-08-18 17:58:06 -04:00
Vincent Laporte b43c368bda mkvtoolnix: use wrapQtApp
See #65399
2019-08-18 17:56:37 -04:00
Marek Mahut fcacab714d
Merge pull request #66804 from r-ryantm/auto-update/clipgrab
clipgrab: 3.8.3 -> 3.8.4
2019-08-18 22:24:03 +02:00
Marek Mahut f39b94cb71 clipgrab: use qt5’s mkDerivation 2019-08-18 13:59:27 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
R. RyanTM 2784331d15 clipgrab: 3.8.3 -> 3.8.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions
2019-08-17 15:34:15 -07:00
R. RyanTM 5b8f8a6177 avidemux: 2.7.3 -> 2.7.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/avidemux/versions
2019-08-17 10:33:37 -07:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Vincent Laporte 6bb07c80bf smtube: use qt5’s mkDerivation
See #65399
2019-08-14 14:43:11 +00:00
Vincent Laporte 95ec53813a smplayer: use qt5’s mkDerivation
See #65399
2019-08-14 14:43:11 +00:00
worldofpeace 248791870f
Merge pull request #65785 from rawkode/feature/qtwrap-shotcut
shotcut: use qt5's mkDerivation
2019-08-09 10:31:01 -04:00
David McKay cc1f808891 shotcut: use qt5's mkDerivation 2019-08-09 10:27:39 -04:00
Bjørn Forsman a920c2aabd v4l-utils: align attr with pkg name 2019-08-07 20:44:13 +02:00
Emmanuel Rosa f6b4c024cd openshot: use wrapQtAppsHook
See #65399
2019-08-06 09:37:44 -04:00
Frederik Rietdijk d20a59d2e5 Merge master into staging-next 2019-08-02 23:27:18 +02:00
David McKay 0a54b3eeb0
vokoscreen: use qt5's mkDerivation 2019-08-02 13:58:00 +01:00
Frederik Rietdijk 55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
Jörg Thalheim 33c6b28a78
makemkv: modernize derivation (#65608)
makemkv: modernize derivation
2019-07-31 09:25:47 +01:00
Daniël de Kok 2240ddcf8c makemkv: modernize derivation
- Use libsForQt5.callPackage
- Replace separate builder.sh script
- Replace patchelf call by autoPatchElfHook
- Use ffmpeg in place of libav
2019-07-31 08:11:40 +02:00
Michael Weiss 14ce4947b2
k9copy, kpmcore: Mark as broken
See: https://github.com/NixOS/nixpkgs/pull/63260#pullrequestreview-251601561

The build for kpmcore is only broken when the Qt version is older than
5.12.
2019-07-30 19:53:58 +02:00
Graham Christensen c547924878
obs-studio: use qt's mkDerivation to fix xcb plugin abort 2019-07-30 08:26:00 -04:00
Peter Hoeg e712667ffd kodi: 18.1 -> 18.3 2019-07-29 15:07:26 +08:00
worldofpeace d06d718264
Merge pull request #65518 from jokogr/f/vlc_use_wrapqtappshook
vlc: use wrapQtAppsHook
2019-07-28 22:21:50 -04:00
worldofpeace 22f8aa4b90
Merge pull request #65458 from ck3d/svdrpsend-fix
vdr: fix shebang of svdrpsend
2019-07-28 17:35:14 -04:00
Ioannis Koutras 20b09bee14 vlc: use wrapQtAppsHook 2019-07-28 20:19:11 +02:00
Christian Kögler 09a6b262c4 vdr: fix shebang of svdrpsend 2019-07-28 11:37:57 +02:00
Frederik Rietdijk cca5ee9c07 Merge staging-next into staging 2019-07-28 09:10:03 +02:00
Aaron Andersen d01fa1dc36
Merge pull request #65450 from titanous/ccextractor
ccextractor: init at 0.88
2019-07-27 21:41:42 -04:00
Jonathan Rudenberg 467b92cf32 ccextractor: init at 0.88 2019-07-27 21:09:12 -04:00
Averell Dalton 8b401ea18a plex-media-player: fix startup using wrapQtAppsHook 2019-07-25 23:44:20 +02:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
R. RyanTM 0890e94321 dvdstyler: 3.0.4 -> 3.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dvdstyler/versions
2019-07-20 12:59:15 +02:00
Bart Brouns ca90de12ef shotcut: 19.02.28 -> 19.07.15 2019-07-20 12:54:53 +02:00
Benjamin Esham 765cd8c2ed handbrake: fix Darwin build by turning off GUI support
This involved several pieces:

- Always disable GTK GUI support under Darwin. The gtk3 package depends
  transitively on dbus, which depends transitively on systemd, which is
  not currently supported on Darwin. (I gather that it may be possible
  to work around this in the future.)
- Also disable the native GUI support under Darwin (using the
  --disable-xcode flag). Building this GUI would require using the Xcode
  build system, which I was not able to figure out how to do; for now,
  all builds on Darwin are command-line-only.
- Add the lzma package as a dependency on all platforms.
- Add dependencies on the AudioToolbox, Foundation, libobjc, and
  VideoToolbox packages on Darwin.
2019-07-19 13:16:11 -04:00
Vladimír Čunát 3686036e02
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1530372
2019-07-15 09:39:03 +02:00
Mario Rodas 5bcc6cecb3
Merge pull request #64041 from r-ryantm/auto-update/gpac
gpac: 0.7.1 -> 0.8.0
2019-07-14 21:29:26 -05:00
Frederik Rietdijk 79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Frederik Rietdijk 74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Gabriel Ebner f674ead30f mjpg-streamer: 2016-03-08 -> unstable-2019-05-24 2019-07-07 16:02:55 +02:00
Vladimír Čunát 0746c4dbb4
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
2019-07-06 13:44:40 +02:00
Thomas Tuegel 56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Ryan Mulligan 83143ac4c2
Merge pull request #64084 from r-ryantm/auto-update/mkvtoolnix
mkvtoolnix: 34.0.0 -> 35.0.0
2019-07-03 05:48:39 -07:00
Frederik Rietdijk 25a77b7210 Merge staging-next into staging 2019-07-03 08:59:42 +02:00