aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGabriel Marcano <gabemarcano@yahoo.com>2015-02-09 15:19:12 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:19:39 +0100
commit78efa8bf9889a006cd5c0a34a22d458de59ee60a (patch)
treea6773fbe43349b8430195c5c7473c5e1cfdc3289 /debian
parent236ee4ffa8e4fa92bb748301986307841ef060ab (diff)
downloadnx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.tar.gz
nx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.tar.bz2
nx-libs-78efa8bf9889a006cd5c0a34a22d458de59ee60a.zip
Fix FTBFS against libjpeg9a (025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch).
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch40
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 41 deletions
diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
deleted file mode 100644
index 66ca8c33e..000000000
--- a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix FTBFS when built against libjpeg9a
-Author: Gabriel Marcano <gabemarcano@yahoo.com>
---- a/nxcomp/Jpeg.cpp 2014-08-19 22:23:36.139072400 -0400
-+++ b/nxcomp/Jpeg.cpp 2014-08-19 22:25:24.323182800 -0400
-@@ -440,7 +440,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg16;
-
-@@ -581,7 +581,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg24;
-
-@@ -718,7 +718,7 @@
-
- JpegSetSrcManager(&cinfo, compressedData, compressedLen);
-
-- jpeg_read_header(&cinfo, 1);
-+ jpeg_read_header(&cinfo, TRUE);
-
- if (jpegError) goto AbortDecompressJpeg32;
-
-@@ -833,7 +833,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/debian/patches/series b/debian/patches/series
index 63bc3dc43..6eadd7bd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
026_nxcompext_honour-optflags.full.patch
026_nxcomp_honour-optflags.full+lite.patch
026_nxcompshad_honour-optflags.full.patch