Commit Graph

47 Commits

Author SHA1 Message Date
Andrew Childs
969ae819f9 libjpeg_turbo: fix race in tests
Fixes:

12/151 Test  #46: jpegtran-shared-icc ...............................***Failed    0.03 sec
Premature end of JPEG file
JPEG datastream contains no image

63/151 Test  #47: jpegtran-shared-icc-cmp ...........................***Failed    0.12 sec
Could not obtain MD5 sum: No such file or directory

The following tests FAILED:
         46 - jpegtran-shared-icc (Failed)
         47 - jpegtran-shared-icc-cmp (Failed)

Example build: https://hydra.nixos.org/build/117594627
2020-05-05 16:24:59 +09:00
Jan Tojnar
b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Cole Mickens
e24e8da336 libjpeg_turbo: 2.0.3 -> 2.0.4 2020-04-09 17:50:26 -07:00
Niklas Hambüchen
83dbd38821 libjpeg-turbo: Add flag to build static libraries as well 2019-11-03 19:59:18 +01:00
Orivej Desh
9ec4a264ed libjpeg-turbo: 2.0.2 -> 2.0.3 2019-09-05 00:16:52 +00:00
Jan Tojnar
0568b622d5
libjpeg_turbo: remove unneeded CMake flags
Not necessary since https://github.com/NixOS/nixpkgs/pull/52856
2019-07-30 20:19:23 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Frederik Rietdijk
840e530934 Merge staging into staging-next 2019-05-18 08:17:48 +02:00
Eelco Dolstra
ab1ac905b4 libjpeg-turbo: 2.0.1 -> 2.0.2 2019-05-16 08:25:41 +02:00
Will Dietz
64913466b7 libjpeg-turbo: 2.0.1 -> 2.0.2, cleanup
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.2

* patches included, drop
* use installCheck to avoid needing to set LD_LIBRARY_PATH
2019-04-17 13:45:35 -05:00
Orivej Desh
b0757da432 libjpeg-turbo: fix CVE-2018-20330 (#53950) 2019-01-16 01:21:03 +00:00
Orivej Desh
c55a42359a libjpeg-turbo: specify djpeg rgb-islow-icc-cmp test dependencies
Hydra failure: https://hydra.nixos.org/build/87096374/nixlog/1

Upstream issue: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
2019-01-12 07:35:45 +00:00
Vladimír Čunát
f603c1c52c
libjpeg(-turbo): patch CVE-2018-19664
Fixes #52972.
2019-01-02 09:50:54 +01:00
Vladimír Čunát
dd69374a63
libjpeg-turbo: don't change ABI, don't add *.a
(refers to the parent commit)
2018-11-23 15:47:06 +01:00
José Romildo Malaquias
1488f51f4b libjpeg-turbo: 1.5.3 -> 2.0.1 2018-11-16 09:59:33 -02:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Matthew Bauer
a9ac651764 libjpeg: always use libjpeg_turbo
libjpeg_turbo is consistently built on Darwin now. I have no way to
verify FreeBSD so if anyone can confirm libjpeg_turbo is still broken
please revert this!
2018-05-10 21:10:18 -05:00
John Ericson
133b4658df treewide: Simplify some doCheck calls
In anticipation of what I outline in #33599, I only simplify exactly those
`doCheck`s which are equal to `hostPlatform != buildPlatform`. I also stick a
comment next to them so I can grep for them later.
2018-01-09 12:37:38 -05:00
Vladimír Čunát
07d3bfc4b4
libjpeg(-turbo): 1.5.2 -> 1.5.3 2017-12-16 17:25:39 +01:00
Ben Gamari
0c0834f018 libjpeg-turbo: Don't run testsuite when cross-compiling 2017-10-27 20:41:52 -04:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
Vladimír Čunát
240313e251
libjpeg(-turbo): 1.5.1 -> 1.5.2 2017-07-15 11:34:52 +02:00
hsloan
737e344e50 libjpeg-turbo: Don't use stdenv.cross 2017-06-28 19:36:21 -04:00
Vladimír Čunát
386188692c
libjpeg(-turbo): 1.5.0 -> 1.5.1 2016-12-03 12:12:48 +01:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Vladimír Čunát
4e09623b6f libjpeg(-turbo): 1.4.2 -> 1.5.0 2016-07-09 11:42:35 +02:00
Vladimír Čunát
7d4ebb526c libjpeg(-turbo): fix on mingw
By porting a patch from msys2.
2016-04-23 10:52:04 +02:00
Vladimír Čunát
c9fe0d779c libjpeg(-turbo): drop unneeded autoreconf, fix cross 2016-04-20 16:45:58 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
9de8f95d4b libjpeg(-turbo): maintenance update 1.4.1 -> 1.4.2 2015-09-23 14:43:13 +02:00
William A. Kennington III
d8c746601e libjpeg-turbo: 1.4.0 -> 1.4.1 2015-06-18 21:17:36 -07:00
Vladimír Čunát
5b7837c0d3 libjpeg-turbo: make Hydra only build it on Linux
I don't know what's wrong with darwin.
Anyway, it's unused on darwin by default.
2015-05-18 13:46:09 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
51fdc6e238 libjpeg-turbo: major update, and populate meta
TODO: also some darwin packaging improvements were in the news.
Maybe it would be suitable to have this as the default libjpeg in there.
2015-01-13 16:57:18 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
02b85f5191 libjpeg(_turbo): minor update 1.3.0 -> .1
The security patch got incorporated into the release.
2014-03-23 12:25:20 +01:00
James Cook
f6b3e2ca54 libjpeg-turbo: Patch to fix CVE-2013-6629 and CVE-2013-6630.
Merge #1399.
2013-12-21 10:20:02 +01:00
Eelco Dolstra
bb990d8ad7 libjpeg-turbo: Split 2013-06-26 14:46:53 +02:00
Vladimír Čunát
777799eba6 libjpeg(_turbo): update, enable tests 2013-06-01 23:38:40 +02:00
Eelco Dolstra
866ed72060 libjpeg-turbo: Update to 1.2.1
CVE-2012-2806
2012-08-02 12:07:54 -04:00
Arie Middelkoop
3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11.
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
2012-02-05 00:51:35 +00:00
Lluís Batlle i Rossell
3ae506c409 Updating libjpeg-turbo
svn path=/nixpkgs/trunk/; revision=24427
2010-10-23 14:42:31 +00:00
Lluís Batlle i Rossell
a8c5534849 Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
2010-07-10 08:45:44 +00:00