[PATCH v4 0/2] MR3061: libs/jxr: Compile with ansi flag to avoid typedef redefinitions (gcc 4.3)
Signed-off-by: Fabian Maurer dark.shadow4@web.de
-- v4: libs/jxr: Compile with ansi flag to avoid typedef redefinitions (gcc 4.3) wmphoto: Define ansi flag for JXRGlue to avoid typedef redefinitions (gcc 4.3)
From: Fabian Maurer dark.shadow4@web.de
Signed-off-by: Fabian Maurer dark.shadow4@web.de --- dlls/wmphoto/jxrlib.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dlls/wmphoto/jxrlib.c b/dlls/wmphoto/jxrlib.c index d4ac02e5918..e5b1bc99dcf 100644 --- a/dlls/wmphoto/jxrlib.c +++ b/dlls/wmphoto/jxrlib.c @@ -28,7 +28,9 @@ #include "winbase.h" #include "objbase.h" #define ERR JXR_ERR +#define __ANSI__ #include "JXRGlue.h" +#undef __ANSI__ #undef ERR
#include "wincodecs_private.h"
From: Fabian Maurer dark.shadow4@web.de
Signed-off-by: Fabian Maurer dark.shadow4@web.de --- configure | 38 ++++++++++++++++--- configure.ac | 4 +- dlls/wmphoto/Makefile.in | 4 +- libs/jxr/Makefile.in | 6 +-- libs/jxrglue/LICENSE | 23 +++++++++++ libs/jxrglue/Makefile.in | 9 +++++ libs/{jxr => jxrglue}/jxrgluelib/JXRGlue.c | 0 libs/{jxr => jxrglue}/jxrgluelib/JXRGlue.h | 0 libs/{jxr => jxrglue}/jxrgluelib/JXRGlueJxr.c | 0 libs/{jxr => jxrglue}/jxrgluelib/JXRGluePFC.c | 0 libs/{jxr => jxrglue}/jxrgluelib/JXRMeta.c | 0 libs/{jxr => jxrglue}/jxrgluelib/JXRMeta.h | 0 12 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 libs/jxrglue/LICENSE create mode 100644 libs/jxrglue/Makefile.in rename libs/{jxr => jxrglue}/jxrgluelib/JXRGlue.c (100%) rename libs/{jxr => jxrglue}/jxrgluelib/JXRGlue.h (100%) rename libs/{jxr => jxrglue}/jxrgluelib/JXRGlueJxr.c (100%) rename libs/{jxr => jxrglue}/jxrgluelib/JXRGluePFC.c (100%) rename libs/{jxr => jxrglue}/jxrgluelib/JXRMeta.c (100%) rename libs/{jxr => jxrglue}/jxrgluelib/JXRMeta.h (100%)
diff --git a/configure b/configure index 9f06d6193eb..0785016c784 100755 --- a/configure +++ b/configure @@ -734,6 +734,8 @@ LDAP_PE_LIBS LDAP_PE_CFLAGS LCMS2_PE_LIBS LCMS2_PE_CFLAGS +JXRGLUE_PE_LIBS +JXRGLUE_PE_CFLAGS JXR_PE_LIBS JXR_PE_CFLAGS JPEG_PE_LIBS @@ -1578,6 +1580,7 @@ enable_faudio enable_gsm enable_jpeg enable_jxr +enable_jxrglue enable_lcms2 enable_ldap enable_mfuuid @@ -1734,6 +1737,8 @@ JPEG_PE_CFLAGS JPEG_PE_LIBS JXR_PE_CFLAGS JXR_PE_LIBS +JXRGLUE_PE_CFLAGS +JXRGLUE_PE_LIBS LCMS2_PE_CFLAGS LCMS2_PE_LIBS LDAP_PE_CFLAGS @@ -2520,6 +2525,11 @@ Some influential environment variables: JXR_PE_CFLAGS C compiler flags for the PE jxr, overriding the bundled version JXR_PE_LIBS Linker flags for the PE jxr, overriding the bundled version + JXRGLUE_PE_CFLAGS + C compiler flags for the PE jxrglue, overriding the bundled + version + JXRGLUE_PE_LIBS + Linker flags for the PE jxrglue, overriding the bundled version LCMS2_PE_CFLAGS C compiler flags for the PE lcms2, overriding the bundled version @@ -5911,11 +5921,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} +if test ${ac_cv_prog_cxx_11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx11=no + ac_cv_prog_cxx_11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5957,11 +5967,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} +if test ${ac_cv_prog_cxx_98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_cxx98=no + ac_cv_prog_cxx_98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13152,7 +13162,7 @@ then : JXR_PE_LIBS=jxr if ${JXR_PE_CFLAGS:+false} : then : - JXR_PE_CFLAGS="-I$(top_srcdir)/libs/jxr/jxrgluelib -I$(top_srcdir)/libs/jxr/image/sys" + JXR_PE_CFLAGS="-I$(top_srcdir)/libs/jxr/image/sys" else $as_nop enable_jxr=no fi @@ -13162,6 +13172,21 @@ fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr cflags: $JXR_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr libs: $JXR_PE_LIBS" >&5
+if ${JXRGLUE_PE_LIBS:+false} : +then : + JXRGLUE_PE_LIBS=jxrglue + if ${JXRGLUE_PE_CFLAGS:+false} : +then : + JXRGLUE_PE_CFLAGS="-I$(top_srcdir)/libs/jxrglue/jxrgluelib" +else $as_nop + enable_jxrglue=no +fi +else $as_nop + enable_jxrglue=no +fi +printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxrglue cflags: $JXRGLUE_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxrglue libs: $JXRGLUE_PE_LIBS" >&5 + if ${LCMS2_PE_LIBS:+false} : then : LCMS2_PE_LIBS=lcms2 @@ -22083,6 +22108,7 @@ wine_fn_config_makefile libs/faudio enable_faudio wine_fn_config_makefile libs/gsm enable_gsm wine_fn_config_makefile libs/jpeg enable_jpeg wine_fn_config_makefile libs/jxr enable_jxr +wine_fn_config_makefile libs/jxrglue enable_jxrglue wine_fn_config_makefile libs/lcms2 enable_lcms2 wine_fn_config_makefile libs/ldap enable_ldap wine_fn_config_makefile libs/mfuuid enable_mfuuid @@ -23236,6 +23262,8 @@ JPEG_PE_CFLAGS = $JPEG_PE_CFLAGS JPEG_PE_LIBS = $JPEG_PE_LIBS JXR_PE_CFLAGS = $JXR_PE_CFLAGS JXR_PE_LIBS = $JXR_PE_LIBS +JXRGLUE_PE_CFLAGS = $JXRGLUE_PE_CFLAGS +JXRGLUE_PE_LIBS = $JXRGLUE_PE_LIBS LCMS2_PE_CFLAGS = $LCMS2_PE_CFLAGS LCMS2_PE_LIBS = $LCMS2_PE_LIBS LDAP_PE_CFLAGS = $LDAP_PE_CFLAGS diff --git a/configure.ac b/configure.ac index 7a4af2d454e..ac2e8627329 100644 --- a/configure.ac +++ b/configure.ac @@ -1125,7 +1125,8 @@ fi WINE_EXTLIB_FLAGS(FAUDIO, faudio, "faudio mfplat mfreadwrite mfuuid propsys", "-I$(top_srcdir)/libs/faudio/include") WINE_EXTLIB_FLAGS(GSM, gsm, gsm, "-I$(top_srcdir)/libs/gsm/inc") WINE_EXTLIB_FLAGS(JPEG, jpeg, jpeg, "-I$(top_srcdir)/libs/jpeg") -WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I$(top_srcdir)/libs/jxr/jxrgluelib -I$(top_srcdir)/libs/jxr/image/sys") +WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I$(top_srcdir)/libs/jxr/image/sys") +WINE_EXTLIB_FLAGS(JXRGLUE, jxrglue, jxrglue, "-I$(top_srcdir)/libs/jxrglue/jxrgluelib") WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(LDAP, ldap, ldap, "-I$(top_srcdir)/libs/ldap/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I$(top_srcdir)/libs/mpg123/src/libmpg123") @@ -3294,6 +3295,7 @@ WINE_CONFIG_MAKEFILE(libs/faudio) WINE_CONFIG_MAKEFILE(libs/gsm) WINE_CONFIG_MAKEFILE(libs/jpeg) WINE_CONFIG_MAKEFILE(libs/jxr) +WINE_CONFIG_MAKEFILE(libs/jxrglue) WINE_CONFIG_MAKEFILE(libs/lcms2) WINE_CONFIG_MAKEFILE(libs/ldap) WINE_CONFIG_MAKEFILE(libs/mfuuid) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index cb095120e94..51869665d46 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,6 +1,6 @@ MODULE = wmphoto.dll -IMPORTS = $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi -EXTRAINCL = $(JXR_PE_CFLAGS) +IMPORTS = $(JXRGLUE_PE_LIBS) $(JXR_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi +EXTRAINCL = $(JXRGLUE_PE_CFLAGS) $(JXR_PE_CFLAGS) PARENTSRC = ../windowscodecs
EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/libs/jxr/Makefile.in b/libs/jxr/Makefile.in index 3162cfca263..24977898b06 100644 --- a/libs/jxr/Makefile.in +++ b/libs/jxr/Makefile.in @@ -19,8 +19,4 @@ C_SRCS = \ image/sys/image.c \ image/sys/strPredQuant.c \ image/sys/strTransform.c \ - image/sys/strcodec.c \ - jxrgluelib/JXRGlue.c \ - jxrgluelib/JXRGlueJxr.c \ - jxrgluelib/JXRGluePFC.c \ - jxrgluelib/JXRMeta.c + image/sys/strcodec.c diff --git a/libs/jxrglue/LICENSE b/libs/jxrglue/LICENSE new file mode 100644 index 00000000000..77322d90c23 --- /dev/null +++ b/libs/jxrglue/LICENSE @@ -0,0 +1,23 @@ +Copyright © Microsoft Corp. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +• Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +• Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/libs/jxrglue/Makefile.in b/libs/jxrglue/Makefile.in new file mode 100644 index 00000000000..9c6dcaaf6b4 --- /dev/null +++ b/libs/jxrglue/Makefile.in @@ -0,0 +1,9 @@ +EXTLIB = libjxrglue.a +EXTRAINCL = $(JXR_PE_CFLAGS) $(JXRGLUE_PE_CFLAGS) +EXTRADEFS = -DDISABLE_PERF_MEASUREMENT -D__ANSI__ + +C_SRCS = \ + jxrgluelib/JXRGlue.c \ + jxrgluelib/JXRGlueJxr.c \ + jxrgluelib/JXRGluePFC.c \ + jxrgluelib/JXRMeta.c diff --git a/libs/jxr/jxrgluelib/JXRGlue.c b/libs/jxrglue/jxrgluelib/JXRGlue.c similarity index 100% rename from libs/jxr/jxrgluelib/JXRGlue.c rename to libs/jxrglue/jxrgluelib/JXRGlue.c diff --git a/libs/jxr/jxrgluelib/JXRGlue.h b/libs/jxrglue/jxrgluelib/JXRGlue.h similarity index 100% rename from libs/jxr/jxrgluelib/JXRGlue.h rename to libs/jxrglue/jxrgluelib/JXRGlue.h diff --git a/libs/jxr/jxrgluelib/JXRGlueJxr.c b/libs/jxrglue/jxrgluelib/JXRGlueJxr.c similarity index 100% rename from libs/jxr/jxrgluelib/JXRGlueJxr.c rename to libs/jxrglue/jxrgluelib/JXRGlueJxr.c diff --git a/libs/jxr/jxrgluelib/JXRGluePFC.c b/libs/jxrglue/jxrgluelib/JXRGluePFC.c similarity index 100% rename from libs/jxr/jxrgluelib/JXRGluePFC.c rename to libs/jxrglue/jxrgluelib/JXRGluePFC.c diff --git a/libs/jxr/jxrgluelib/JXRMeta.c b/libs/jxrglue/jxrgluelib/JXRMeta.c similarity index 100% rename from libs/jxr/jxrgluelib/JXRMeta.c rename to libs/jxrglue/jxrgluelib/JXRMeta.c diff --git a/libs/jxr/jxrgluelib/JXRMeta.h b/libs/jxrglue/jxrgluelib/JXRMeta.h similarity index 100% rename from libs/jxr/jxrgluelib/JXRMeta.h rename to libs/jxrglue/jxrgluelib/JXRMeta.h
On Wed Jun 14 18:29:56 2023 +0000, Alex Henrie wrote:
As far as I can tell, jxrlib is abandonware, and C89/C99 conformance isn't the only problem with it (scan-build identified others). My guess is that at some point Wine is just going to have to fork jxrlib, but I don't think it's worth it to fork just for the sake of GCC 4.3. If you have to compile Wine with GCC 4.3, I suggest running `./configure --disable-wmphoto`.
Well, I wanted to avoid forking, that's why I didn't want to touch the lib files themselves.
I pushed a new version, would something like that be okay?
On Wed Jun 14 19:14:15 2023 +0000, Fabian Maurer wrote:
Well, I wanted to avoid forking, that's why I didn't want to touch the lib files themselves. I pushed a new version, would something like that be okay?
It's fine by me to split jxrglue into a separate library, but Esme is the one who has to sign off on it.
On Wed Jun 14 19:23:04 2023 +0000, Alex Henrie wrote:
It's fine by me to split jxrglue into a separate library, but Esme is the one who has to sign off on it.
I don't think I understand this aspect of it well enough to decide that so I can't really review the patch. From wmphoto's perspective it's just a library and I don't really care.
This merge request was closed by Fabian Maurer.
I decided to give up on this and focus my time on more important things.
-
Alex Henrie (＠alexhenrie) -
Esme Povirk (＠madewokherd)
-
Fabian Maurer
-
Fabian Maurer (＠DarkShadow44)