diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-08-21 11:07:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-21 11:07:28 +0000 |
| commit | d32e9f3f74b3ac5e879d4bdd3c3f179cb6d865e9 (patch) | |
| tree | 1aad68af4455a09d4708d0700333580973ebefad /net-misc/nx | |
| parent | Stable for ppc64, wrt bug #512012 (diff) | |
| download | gentoo-2-d32e9f3f74b3ac5e879d4bdd3c3f179cb6d865e9.tar.gz gentoo-2-d32e9f3f74b3ac5e879d4bdd3c3f179cb6d865e9.tar.bz2 gentoo-2-d32e9f3f74b3ac5e879d4bdd3c3f179cb6d865e9.zip | |
Fix building with media-libs/jpeg >= 9a wrt #481360 by Gabriel Marcano
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'net-misc/nx')
| -rw-r--r-- | net-misc/nx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch | 40 | ||||
| -rw-r--r-- | net-misc/nx/nx-3.5.0.27.ebuild | 3 |
3 files changed, 47 insertions, 2 deletions
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index 06e5e642b791..6f8e3c2f76f9 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nx # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.86 2014/08/05 09:11:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.87 2014/08/21 11:07:28 ssuominen Exp $ + + 21 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/nx-3.5.0.27-jpeg-9a.patch, nx-3.5.0.27.ebuild: + Fix building with media-libs/jpeg >= 9a wrt #481360 by Gabriel Marcano *nx-3.5.0.27 (05 Aug 2014) diff --git a/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch b/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch new file mode 100644 index 000000000000..4c0aeb2f4091 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.0.27-jpeg-9a.patch @@ -0,0 +1,40 @@ +http://bugs.gentoo.org/481360 + +--- nxcomp/Jpeg.cpp ++++ nxcomp/Jpeg.cpp +@@ -443,7 +443,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg16; + +@@ -584,7 +584,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg24; + +@@ -721,7 +721,7 @@ + + JpegSetSrcManager(&cinfo, compressedData, compressedLen); + +- jpeg_read_header(&cinfo, 1); ++ jpeg_read_header(&cinfo, TRUE); + + if (jpegError) goto AbortDecompressJpeg32; + +@@ -836,7 +836,7 @@ + jpegSrcManager.bytes_in_buffer = jpegBufferLen; + jpegSrcManager.next_input_byte = (JOCTET *)jpegBufferPtr; + +- return 1; ++ return TRUE; + } + + static void JpegSkipInputData(j_decompress_ptr cinfo, long num_bytes) diff --git a/net-misc/nx/nx-3.5.0.27.ebuild b/net-misc/nx/nx-3.5.0.27.ebuild index 9afb657b9006..7b4f7be3b356 100644 --- a/net-misc/nx/nx-3.5.0.27.ebuild +++ b/net-misc/nx/nx-3.5.0.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.27.ebuild,v 1.1 2014/08/05 09:11:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.27.ebuild,v 1.2 2014/08/21 11:07:28 ssuominen Exp $ EAPI=5 inherit autotools eutils multilib readme.gentoo @@ -38,6 +38,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch cd "${S}" + epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481360 # -fPIC epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch # Drop force -O3, set AR/RANLIB and |