Farkas Levente wrote:
> Richard W.M. Jones wrote:
>> On Tue, May 19, 2009 at 03:19:02PM +0200, Farkas Levente wrote:
>>> Fridrich Strba wrote:
>>>> I meant the install.doc document
>>> ok we rtfm:-) so we fix it.
>>> may i apply this patch to the fedora cvs?
>> I don't think this patch is correct or follows Fridrich's suggestion
>> to look at install.doc. This really needs to be discussed with
>> 'upstream' libjpeg -- whoever that is at the moment [see my other
>> email]. Please make some effort to contact them and have them make a
>> decision on this.
>
> we do what install.doc says,
> - replace jconfig.cfg with jconfig.vc which is the visual c compiler's
> config suggested by install.doc
> - for INT32 we define the same way in jconfig.vc as they did for boolean
> - and use HAVE_INT32 for jmorecfg.h as they used for HAVE_BOOLEAN
> what's the problem?
ohh i send a half patch last time.
--
Levente "Si vis pacem para bellum!"
Index: configure.in
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/configure.in,v
retrieving revision 1.1
diff -u -r1.1 configure.in
--- configure.in 30 Jan 2009 11:48:26 -0000 1.1
+++ configure.in 19 May 2009 14:16:40 -0000
@@ -1,7 +1,7 @@
dnl IJG auto-configuration source file.
dnl Process this file with autoconf to produce a configure script.
AC_INIT(jcmaster.c)
-AC_CONFIG_HEADER(jconfig.h:jconfig.cfg)
+AC_CONFIG_HEADER(jconfig.h:jconfig.vc)
dnl
dnl do these first since other macros rely on them
AC_PROG_CC
Index: jpeg-mingw32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/jpeg-mingw32.patch,v
retrieving revision 1.1
diff -u -r1.1 jpeg-mingw32.patch
--- jpeg-mingw32.patch 30 Jan 2009 11:48:26 -0000 1.1
+++ jpeg-mingw32.patch 19 May 2009 14:16:40 -0000
@@ -1,7 +1,6 @@
-diff -rup jpeg-6b/makefile.cfg jpeg-6b.new/makefile.cfg
---- jpeg-6b/makefile.cfg 2008-09-09 09:54:38.000000000 -0400
-+++ jpeg-6b.new/makefile.cfg 2008-09-09 09:55:03.000000000 -0400
-@@ -169,7 +169,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
+--- ./makefile.cfg.mingw32 2009-05-19 14:56:43.000000000 +0200
++++ ./makefile.cfg 2009-05-19 14:56:43.000000000 +0200
+@@ -169,7 +169,7 @@
# with libtool:
libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libjpeg.la $(LIBOBJECTS) \
@@ -10,3 +9,28 @@
# sample programs:
+--- ./jconfig.vc.mingw32 2009-05-19 15:02:19.000000000 +0200
++++ ./jconfig.vc 2009-05-19 15:03:51.000000000 +0200
+@@ -21,6 +21,11 @@
+ #endif
+ #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+
++/* Define "INT32" as int, not long, per Windows custom */
++#ifndef __BASETSD_H__ /* don't conflict if basetsd.h already read */
++typedef int INT32;
++#endif
++#define HAVE_INT32 /* prevent jmorecfg.h from redefining it */
+
+ #ifdef JPEG_INTERNALS
+
+--- ./jmorecfg.h.mingw32 2009-05-19 15:01:33.000000000 +0200
++++ ./jmorecfg.h 2009-05-19 15:02:07.000000000 +0200
+@@ -157,7 +157,7 @@
+
+ /* INT32 must hold at least signed 32-bit values. */
+
+-#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
++#ifndef HAVE_INT32
+ typedef long INT32;
+ #endif
+
Index: mingw32-libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libjpeg/devel/mingw32-libjpeg.spec,v
retrieving revision 1.3
diff -u -r1.3 mingw32-libjpeg.spec
--- mingw32-libjpeg.spec 26 Feb 2009 01:14:41 -0000 1.3
+++ mingw32-libjpeg.spec 19 May 2009 14:16:40 -0000
@@ -10,7 +10,7 @@
Name: mingw32-libjpeg
Version: 6b
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: MinGW Windows Libjpeg library
License: IJG
@@ -50,7 +50,7 @@
%patch5 -p1 -b .oflo
%patch6 -p1
-%patch100 -p1
+%patch100 -p1 -b .mingw32
# For long-obsolete reasons, libjpeg 6b doesn't ship with a configure.in.
# We need to re-autoconf though, in order to update libtool support,
@@ -137,6 +137,9 @@
%changelog
+* Tue May 19 2009 Zoltan Seress <[email protected]> - 6b-11.el5
+- modify jpeg-mingw32.patch to use correct typedefs on Windows
+
* Wed Feb 25 2009 Fedora Release Engineering <[email protected]>
- 6b-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
_______________________________________________
fedora-mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fedora-mingw
