Commit Graph

28 Commits

Author SHA1 Message Date
Frederik Rietdijk
419bc0a4cd Revert "Revert "Merge master into staging-next""
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master.

This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
2020-02-05 19:41:25 +01:00
Frederik Rietdijk
0be87c7979 Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8.

This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing
changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
2020-02-05 19:18:35 +01:00
Samuel Dionne-Riel
968d075bd9 imlib2: Add webp support
And better document why id3 is there

In addition, review function signature formatting.
2020-02-05 10:46:34 +01:00
Samuel Dionne-Riel
b0f9922f37 imlib2: Fix license, remove global with 2020-02-05 10:46:34 +01:00
Samuel Dionne-Riel
2a8df18591 imlib2: 1.5.1 -> 1.6.1 2020-02-05 10:46:34 +01:00
Will Dietz
13be3ef7f5 imlib2: 1.5.0 -> 1.5.1
https://sourceforge.net/p/enlightenment/mailman/message/36265281/
2018-10-18 11:15:52 -05:00
Ryan Mulligan
08165b23af imlib2: 1.4.10 -> 1.5.0
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/extresso help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/genresscript help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/icotool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/wrestool --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped -h` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped --help` got 0 exit code
- ran `/nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2/bin/.genresscript-wrapped help` got 0 exit code
- found 1.5.0 in filename of file in /nix/store/bkabiqznkhmpz32pnm7kpb7gnkrwjcl3-icoutils-0.32.2
2018-03-09 07:59:31 -08:00
Herwig Hochleitner
59b35013bc imlib2: enable libid3tag support 2017-10-28 14:51:58 +02:00
Tuomas Tynkkynen
3ee733aafb imlib2: Make 'bin' the first output 2017-09-27 00:15:27 +03:00
romildo
0b80179b03 imlib2: 1.4.9 -> 1.4.10 2017-04-21 09:27:53 -03:00
Franz Pletz
d64bf1fdad
imlib2: use multiple outputs 2016-11-23 02:24:12 +01:00
Franz Pletz
5a184be96f
imlib2: add version without X11 2016-11-23 02:24:12 +01:00
José Romildo Malaquias
3e401a8d01 imlib2: 1.4.8 -> 1.4.9 2016-05-03 22:34:47 -03:00
Franz Pletz
94396b8d91 imlib2: 1.4.6 -> 1.4.8 (security)
Fixes:

 * CVE-2014-9762
 * CVE-2014-9763
 * CVE-2014-9764
2016-04-02 00:01:14 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Spencer Whitt
52f619ae1f imlib2: fix Darwin build 2015-04-07 18:49:22 -04:00
Mateusz Kowalczyk
de96fb7cc7 sxiv: update to 1.3-git and fix runtime behaviour
The fix involves using imlib2 built with giflib instead of a libungif.
Initially I split imlib2 into two but other distros seem to build imlib2
with giflib already and everything still builds with giflib version so I
migrated imlib2 to giflib all together.

Closes #4622
2014-11-03 23:03:51 +00:00
Moritz Ulrich
56cf2cb396 imlib2: Remove @my_libs@ from config.in. 2014-03-04 13:03:08 +01:00
Peter Simons
691df2ab83 imlib2: update from 1.4.5 to 1.4.6 2014-03-03 11:10:24 +01:00
Peter Simons
48f24712dc Fix a lots of evaluation errors on Hydra. 2013-12-10 23:20:23 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Yury G. Kudryashov
5da4cd69fc imlib2-1.4.5
svn path=/nixpkgs/trunk/; revision=29496
2011-09-26 13:13:45 +00:00
Lluís Batlle i Rossell
ba31e62e5a Making imlib2 know about libpng, and then feh showing pngs fine.
svn path=/nixpkgs/trunk/; revision=27489
2011-06-17 13:18:27 +00:00
Lluís Batlle i Rossell
6dd9fd054e updating imlib2. This makes feh load tiffs correctly.
svn path=/nixpkgs/trunk/; revision=27467
2011-06-15 10:30:08 +00:00
Eelco Dolstra
6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Yury G. Kudryashov
711180395a Added bzip2 to imlib2
svn path=/nixpkgs/trunk/; revision=9629
2007-11-11 15:49:28 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra
e9178614a9 * Added feh to set the root image.
* Compiz extra plugins.

svn path=/nixpkgs/trunk/; revision=8178
2007-03-05 13:44:27 +00:00