Regression: Allow co-install of 32-bit/64-bit RPMs

Fix a regression introduced in 1.4.1 that prevented 32-bit and 64-bit
libjpeg-turbo RPMs from being installed simultaneously on recent Red
Hat/Fedora distributions.  This was due to the addition of the
SIZEOF_SIZE_T macro in jconfig.h, which allows the Huffman codec to
determine the word size at compile time.  Since that macro differs
between 32-bit and 64-bit builds, this caused a conflict between the
i386 and x86_64 RPMs (any differing files, other than executables, are
not allowed when 32-bit and 64-bit RPMs are installed simultaneously.)
Since the macro is used only internally, it has been moved into
jconfigint.h.

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3b6b8444b5928645dfb2a11b84a8d4c4081c1228..b126bd1919fc44d2f63116c46aea2f61fd82f3ac 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+1.4.3
+=====
+
+[1] Fixed a regression caused by 1.4.1[6] that prevented 32-bit and 64-bit
+libjpeg-turbo RPMs from being installed simultaneously on recent Red Hat/Fedora
+distributions.  This was due to the addition of a macro in jconfig.h that
+allows the Huffman codec to determine the word size at compile time.  Since
+that macro differs between 32-bit and 64-bit builds, this caused a conflict
+between the i386 and x86_64 RPMs (any differing files, other than executables,
+are not allowed when 32-bit and 64-bit RPMs are installed simultaneously.)
+Since the macro is used only internally, it has been moved into jconfigint.h.
+
 1.4.2
 =====
 

diff --git a/jchuff.c b/jchuff.c
index 4ecc18d61b886499dd2e5543e2a0b910f4996657..7e91fde11ad82dbc3ad6e24892526137ba2cfbe4 100644 (file)
--- a/jchuff.c
+++ b/jchuff.c
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1997, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2009-2011, 2014-2015 D. R. Commander.
+ * Copyright (C) 2009-2011, 2014-2016 D. R. Commander.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains Huffman entropy encoding routines.
@@ -20,6 +20,7 @@
 #include "jinclude.h"
 #include "jpeglib.h"
 #include "jchuff.h"             /* Declarations shared with jcphuff.c */
+#include "jconfigint.h"
 #include <limits.h>
 
 /*

diff --git a/jconfig.h.in b/jconfig.h.in
index b99a87e1cfe93678cb24dcc801d255611c696f3e..42d86f244373adde9708dd392ae7c657a5301a99 100644 (file)
--- a/jconfig.h.in
+++ b/jconfig.h.in
@@ -68,6 +68,3 @@
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T

diff --git a/jconfigint.h.in b/jconfigint.h.in
index 8f216eb61cfd033a4c6f873da353f2035577a71c..940424ea2d681148dcfdec0633384064e2e78843 100644 (file)
--- a/jconfigint.h.in
+++ b/jconfigint.h.in
@@ -9,3 +9,6 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* The size of `size_t', as computed by sizeof. */
+#undef SIZEOF_SIZE_T

diff --git a/jdhuff.h b/jdhuff.h
index c7f3d500867913ef9b8dce237390340b5a39d8f0..db71067f4375f31a3358bbe864ab910107529b99 100644 (file)
--- a/jdhuff.h
+++ b/jdhuff.h
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1997, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010-2011, D. R. Commander.
+ * Copyright (C) 2010-2011, 2015-2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains declarations for Huffman entropy decoding routines
@@ -12,6 +12,8 @@
  * progressive decoder (jdphuff.c).  No other modules need to see these.
  */
 
+#include "jconfigint.h"
+
 
 /* Derived data constructed for each Huffman table */
 

diff --git a/jversion.h b/jversion.h
index 949b4f4dcc44a782cd7ec39490fd6a369c95b76f..92a1b67c012d752805791f39d8e91970dacb7d08 100644 (file)
--- a/jversion.h
+++ b/jversion.h
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2012-2015, D. R. Commander.
+ * Copyright (C) 2010, 2012-2016, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains software version identification.
@@ -28,9 +28,9 @@
 #define JCOPYRIGHT      "Copyright (C) 1991-2012 Thomas G. Lane, Guido Vollbeding\n" \
                         "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
                         "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \
-                        "Copyright (C) 2009-2015 D. R. Commander\n" \
+                        "Copyright (C) 2009-2016 D. R. Commander\n" \
                         "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)\n" \
                         "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
                         "Copyright (C) 2013 Linaro Limited"
 
-#define JCOPYRIGHT_SHORT "Copyright (C) 1991-2015 The libjpeg-turbo Project and many others"
+#define JCOPYRIGHT_SHORT "Copyright (C) 1991-2016 The libjpeg-turbo Project and many others"