diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-07 00:22:56 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-07 00:22:56 +0000 |
commit | 392c9017a3f6947ca15839d511e3af69a3185f0c (patch) | |
tree | 8b1aae5f4e32345673572ebe093c4efdfc3998d4 /media-gfx/argyllcms/files | |
parent | Stable on amd64 wrt bug #414823 (diff) | |
download | gentoo-2-392c9017a3f6947ca15839d511e3af69a3185f0c.tar.gz gentoo-2-392c9017a3f6947ca15839d511e3af69a3185f0c.tar.bz2 gentoo-2-392c9017a3f6947ca15839d511e3af69a3185f0c.zip |
Version bump; remove old
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/argyllcms/files')
-rw-r--r-- | media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch new file mode 100644 index 000000000000..d523481e3326 --- /dev/null +++ b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch @@ -0,0 +1,21 @@ +diff -ruN Argyll_V1.4.0.orig/Jamtop Argyll_V1.4.0/Jamtop +--- Argyll_V1.4.0.orig/Jamtop 2012-04-19 09:50:31.000000000 +0200 ++++ Argyll_V1.4.0/Jamtop 2012-05-07 02:18:37.000000000 +0200 +@@ -113,13 +113,13 @@ + # See if we have a system JPEG library. + if ! $(BUILTIN_JPEG) && $(UNIX) { + if [ GLOB /usr/include : jpeglib.h ] { +- if ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB /usr/lib : libjpg.a ] ) +- || $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [ GLOB /usr/lib64 : libjpg.a ] ) +- || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) { ++ if ! $(HOST64) && ( [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ] ) ++ || $(HOST64) && ( [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ] ) ++ || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ) { + echo "Using system JPEG library" ; + JPEGLIB = ; + JPEGINC = ; +- LINKFLAGS += $(LINKFLAG)tiff ; ++ LINKFLAGS += $(LINKFLAG)jpeg ; + HAVE_JPEG = true ; + } + } |