libjpeg-turbo no longer defined macros like JPP (#1164815)
This commit is contained in:
parent
4e1c91b499
commit
403a5a16e3
46
libjpeg-turbo-JPP-FAR-macros.patch
Normal file
46
libjpeg-turbo-JPP-FAR-macros.patch
Normal file
@ -0,0 +1,46 @@
|
||||
diff --git a/jmorecfg.h b/jmorecfg.h
|
||||
index 36fe971..1cec1e4 100644
|
||||
--- a/jmorecfg.h
|
||||
+++ b/jmorecfg.h
|
||||
@@ -179,6 +179,22 @@ typedef unsigned int JDIMENSION;
|
||||
/* a reference to a GLOBAL function: */
|
||||
#define EXTERN(type) extern type
|
||||
|
||||
+/* Originally, this macro was used as a way of defining function prototypes
|
||||
+ * for both modern compilers as well as older compilers that did not support
|
||||
+ * prototype parameters. libjpeg-turbo has never supported these older,
|
||||
+ * non-ANSI compilers, but the macro is still included because there is some
|
||||
+ * software out there that uses it.
|
||||
+ */
|
||||
+
|
||||
+#define JMETHOD(type,methodname,arglist) type (*methodname) arglist
|
||||
+
|
||||
+
|
||||
+/* libjpeg-turbo no longer supports platforms that have far symbols (MS-DOS),
|
||||
+ * but again, some software relies on this macro.
|
||||
+ */
|
||||
+
|
||||
+#undef FAR
|
||||
+#define FAR
|
||||
|
||||
/*
|
||||
* On a few systems, type boolean and/or its values FALSE, TRUE may appear
|
||||
diff --git a/jpeglib.h b/jpeglib.h
|
||||
index 27045a4..e8b8b45 100644
|
||||
--- a/jpeglib.h
|
||||
+++ b/jpeglib.h
|
||||
@@ -874,6 +874,14 @@ struct jpeg_memory_mgr {
|
||||
*/
|
||||
typedef boolean (*jpeg_marker_parser_method) (j_decompress_ptr cinfo);
|
||||
|
||||
+/* Originally, this macro was used as a way of defining function prototypes
|
||||
+ * for both modern compilers as well as older compilers that did not support
|
||||
+ * prototype parameters. libjpeg-turbo has never supported these older,
|
||||
+ * non-ANSI compilers, but the macro is still included because there is some
|
||||
+ * software out there that uses it.
|
||||
+ */
|
||||
+
|
||||
+#define JPP(arglist) arglist
|
||||
|
||||
/* Default error-management setup */
|
||||
EXTERN(struct jpeg_error_mgr *) jpeg_std_error (struct jpeg_error_mgr * err);
|
||||
@ -1,6 +1,6 @@
|
||||
Name: libjpeg-turbo
|
||||
Version: 1.3.90
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
||||
License: IJG
|
||||
URL: http://sourceforge.net/projects/libjpeg-turbo
|
||||
@ -11,6 +11,7 @@ Patch0: libjpeg-turbo12-noinst.patch
|
||||
Patch1: libjpeg-turbo-header-files.patch
|
||||
Patch2: libjpeg-turbo-second-arch.patch
|
||||
Patch3: libjpeg-turbo-remove-test.patch
|
||||
Patch4: libjpeg-turbo-JPP-FAR-macros.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -79,6 +80,7 @@ manipulate JPEG files using the TurboJPEG library.
|
||||
%patch1 -p1 -b .header-files
|
||||
%patch2 -p1 -b .second-arch
|
||||
%patch3 -p1 -b .remove-test
|
||||
%patch4 -p1 -b .JPP-FAR-macros
|
||||
|
||||
cp %SOURCE1 .
|
||||
|
||||
@ -137,6 +139,9 @@ make test
|
||||
%{_libdir}/libturbojpeg.so
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2014 Petr Hracek <phracek@redhat.com> - 1.3.90-3
|
||||
- libjpeg-turbo no longer defined macros like JPP (#1164815)
|
||||
|
||||
* Wed Nov 19 2014 Petr Hracek <phracek@redhat.com> - 1.3.90-2
|
||||
- Resolves #1161585 Add suport for secondary arches
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user