Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
d36615ee
Commit
d36615ee
authored
Oct 19, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windowscodecs: Use the bundled libtiff.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
913dad52
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
148 deletions
+4
-148
configure
configure
+0
-118
configure.ac
configure.ac
+0
-14
Makefile.in
dlls/windowscodecs/Makefile.in
+2
-2
libtiff.c
dlls/windowscodecs/libtiff.c
+0
-0
main.c
dlls/windowscodecs/main.c
+2
-2
unix_lib.c
dlls/windowscodecs/unix_lib.c
+0
-6
config.h.in
include/config.h.in
+0
-6
No files found.
configure
View file @
d36615ee
...
...
@@ -639,8 +639,6 @@ NETAPI_CFLAGS
PROCSTAT_LIBS
MPG123_LIBS
MPG123_CFLAGS
TIFF_LIBS
TIFF_CFLAGS
JXRLIB_LIBS
JXRLIB_CFLAGS
JPEG_LIBS
...
...
@@ -888,7 +886,6 @@ with_pulse
with_quicktime
with_sane
with_sdl
with_tiff
with_udev
with_unwind
with_usb
...
...
@@ -1986,8 +1983,6 @@ JPEG_CFLAGS
JPEG_LIBS
JXRLIB_CFLAGS
JXRLIB_LIBS
TIFF_CFLAGS
TIFF_LIBS
MPG123_CFLAGS
MPG123_LIBS
NETAPI_CFLAGS
...
...
@@ -2677,7 +2672,6 @@ Optional Packages:
--without-quicktime do not use QuickTime support
--without-sane do not use SANE (scanner support)
--without-sdl do not use SDL
--without-tiff do not use TIFF
--without-udev do not use udev (plug and play support)
--without-unwind do not use the libunwind library (exception
handling)
...
...
@@ -2804,8 +2798,6 @@ Some influential environment variables:
JXRLIB_CFLAGS
C compiler flags for jxrlib, overriding pkg-config
JXRLIB_LIBS Linker flags for jxrlib, overriding pkg-config
TIFF_CFLAGS C compiler flags for libtiff-4, overriding pkg-config
TIFF_LIBS Linker flags for libtiff-4, overriding pkg-config
MPG123_CFLAGS
C compiler flags for libmpg123, overriding pkg-config
MPG123_LIBS Linker flags for libmpg123, overriding pkg-config
...
...
@@ -4217,12 +4209,6 @@ if test "${with_sdl+set}" = set; then :
fi
# Check whether --with-tiff was given.
if
test
"
${
with_tiff
+set
}
"
=
set
;
then
:
withval
=
$with_tiff
;
fi
# Check whether --with-udev was given.
if
test
"
${
with_udev
+set
}
"
=
set
;
then
:
withval
=
$with_udev
;
...
...
@@ -16053,108 +16039,6 @@ esac
fi
if
test
"x
$with_tiff
"
!=
"xno"
then
if
${
TIFF_CFLAGS
:+false
}
:
;
then
:
if
${
PKG_CONFIG
+
:
}
false
;
then
:
TIFF_CFLAGS
=
`
$PKG_CONFIG
--cflags
libtiff-4 2>/dev/null
`
fi
fi
if
${
TIFF_LIBS
:+false
}
:
;
then
:
if
${
PKG_CONFIG
+
:
}
false
;
then
:
TIFF_LIBS
=
`
$PKG_CONFIG
--libs
libtiff-4 2>/dev/null
`
fi
fi
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: libtiff-4 cflags:
$TIFF_CFLAGS
"
>
&5
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: libtiff-4 libs:
$TIFF_LIBS
"
>
&5
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$TIFF_CFLAGS
"
for
ac_header
in
tiffio.h
do
:
ac_fn_c_check_header_mongrel
"
$LINENO
"
"tiffio.h"
"ac_cv_header_tiffio_h"
"
$ac_includes_default
"
if
test
"x
$ac_cv_header_tiffio_h
"
=
xyes
;
then
:
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_TIFFIO_H 1
_ACEOF
fi
done
if
test
"
$ac_cv_header_tiffio_h
"
=
"yes"
then
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for -ltiff"
>
&5
$as_echo_n
"checking for -ltiff... "
>
&6
;
}
if
${
ac_cv_lib_soname_tiff
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_check_soname_save_LIBS
=
$LIBS
LIBS
=
"-ltiff
$TIFF_LIBS
$LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char TIFFClientOpen ();
int
main ()
{
return TIFFClientOpen ();
;
return 0;
}
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
case
"
$LIBEXT
"
in
dll
)
ac_cv_lib_soname_tiff
=
`
$ac_cv_path_LDD
conftest.exe |
grep
"tiff"
|
sed
-e
"s/dll.*/dll/"
';2,$d'
`
;;
dylib
)
ac_cv_lib_soname_tiff
=
`
$OTOOL
-L
conftest
$ac_exeext
|
grep
"libtiff
\\
.[0-9A-Za-z.]*dylib"
|
sed
-e
"s/^.*
\/\(
libtiff
\.
[0-9A-Za-z.]*dylib
\)
.*
$/
\1
/"
';2,$d'
`
;;
*
)
ac_cv_lib_soname_tiff
=
`
$READELF
-d
conftest
$ac_exeext
|
grep
"NEEDED.*libtiff
\\
.
$LIBEXT
"
|
sed
-e
"s/^.*
\\
[
\\
(libtiff
\\
.
$LIBEXT
[^ ]*
\\
)
\\
].*
$/
\1
/"
';2,$d'
`
if
${
ac_cv_lib_soname_tiff
:+false
}
:
;
then
:
ac_cv_lib_soname_tiff
=
`
$LDD
conftest
$ac_exeext
|
grep
"libtiff
\\
.
$LIBEXT
"
|
sed
-e
"s/^.*
\(
libtiff
\.
$LIBEXT
[^ ]*
\)
.*
$/
\1
/"
';2,$d'
`
fi
;;
esac
else
ac_cv_lib_soname_tiff
=
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_soname_save_LIBS
fi
if
${
ac_cv_lib_soname_tiff
:+false
}
:
;
then
:
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result: not found"
>
&5
$as_echo
"not found"
>
&6
;
}
else
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_lib_soname_tiff
"
>
&5
$as_echo
"
$ac_cv_lib_soname_tiff
"
>
&6
;
}
cat
>>
confdefs.h
<<
_ACEOF
#define SONAME_LIBTIFF "
$ac_cv_lib_soname_tiff
"
_ACEOF
fi
fi
CPPFLAGS
=
$ac_save_CPPFLAGS
fi
if
test
"x
$ac_cv_lib_soname_tiff
"
=
"x"
;
then
:
case
"x
$with_tiff
"
in
x
)
as_fn_append wine_notices
"|libtiff
${
notice_platform
}
development files not found, TIFF won't be supported."
;;
xno
)
;;
*
)
as_fn_error
$?
"libtiff
${
notice_platform
}
development files not found, TIFF won't be supported.
This is an error since --with-tiff was requested."
"
$LINENO
"
5
;;
esac
fi
if
test
"x
$with_mpg123
"
!=
"xno"
then
if
${
MPG123_CFLAGS
:+false
}
:
;
then
:
...
...
@@ -19670,8 +19554,6 @@ JPEG_CFLAGS = $JPEG_CFLAGS
JPEG_LIBS =
$JPEG_LIBS
JXRLIB_CFLAGS =
$JXRLIB_CFLAGS
JXRLIB_LIBS =
$JXRLIB_LIBS
TIFF_CFLAGS =
$TIFF_CFLAGS
TIFF_LIBS =
$TIFF_LIBS
MPG123_CFLAGS =
$MPG123_CFLAGS
MPG123_LIBS =
$MPG123_LIBS
PROCSTAT_LIBS =
$PROCSTAT_LIBS
...
...
configure.ac
View file @
d36615ee
...
...
@@ -81,7 +81,6 @@ AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio s
AC_ARG_WITH(quicktime, AS_HELP_STRING([--without-quicktime],[do not use QuickTime support]))
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL]))
AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]))
AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)]))
AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)]))
AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb library]))
...
...
@@ -1814,19 +1813,6 @@ fi
WINE_NOTICE_WITH(jxrlib,[test "x$ac_cv_lib_soname_jxrglue" = "x"],
[jxrlib ${notice_platform}development files not found, JPEG-XR won't be supported.])
dnl **** Check for libtiff ****
if test "x$with_tiff" != "xno"
then
WINE_PACKAGE_FLAGS(TIFF,[libtiff-4],,,,
[AC_CHECK_HEADERS([tiffio.h])
if test "$ac_cv_header_tiffio_h" = "yes"
then
WINE_CHECK_SONAME(tiff,TIFFClientOpen,,,[$TIFF_LIBS])
fi])
fi
WINE_NOTICE_WITH(tiff,[test "x$ac_cv_lib_soname_tiff" = "x"],
[libtiff ${notice_platform}development files not found, TIFF won't be supported.])
dnl **** Check for mpg123 ****
if test "x$with_mpg123" != "xno"
then
...
...
dlls/windowscodecs/Makefile.in
View file @
d36615ee
MODULE
=
windowscodecs.dll
IMPORTLIB
=
windowscodecs
IMPORTS
=
$(JPEG_PE_LIBS)
$(PNG_PE_LIBS)
windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
EXTRAINCL
=
$(
JPEG_PE_CFLAGS)
$(PNG_PE_CFLAGS)
$(TIFF
_CFLAGS)
IMPORTS
=
$(
TIFF_PE_LIBS)
$(
JPEG_PE_LIBS)
$(PNG_PE_LIBS)
windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
EXTRAINCL
=
$(
TIFF_PE_CFLAGS)
$(JPEG_PE_CFLAGS)
$(PNG_PE
_CFLAGS)
EXTRALIBS
=
$(APPLICATIONSERVICES_LIBS)
C_SRCS
=
\
...
...
dlls/windowscodecs/libtiff.c
View file @
d36615ee
This diff is collapsed.
Click to expand it.
dlls/windowscodecs/main.c
View file @
d36615ee
...
...
@@ -81,7 +81,7 @@ HRESULT TiffDecoder_CreateInstance(REFIID iid, void** ppv)
struct
decoder
*
decoder
;
struct
decoder_info
decoder_info
;
hr
=
get_unix_decoder
(
&
CLSID_WICTiffDecoder
,
&
decoder_info
,
&
decoder
);
hr
=
tiff_decoder_create
(
&
decoder_info
,
&
decoder
);
if
(
SUCCEEDED
(
hr
))
hr
=
CommonDecoder_CreateInstance
(
decoder
,
&
decoder_info
,
iid
,
ppv
);
...
...
@@ -95,7 +95,7 @@ HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv)
struct
encoder
*
encoder
;
struct
encoder_info
encoder_info
;
hr
=
get_unix_encoder
(
&
CLSID_WICTiffEncoder
,
&
encoder_info
,
&
encoder
);
hr
=
tiff_encoder_create
(
&
encoder_info
,
&
encoder
);
if
(
SUCCEEDED
(
hr
))
hr
=
CommonEncoder_CreateInstance
(
encoder
,
&
encoder_info
,
iid
,
ppv
);
...
...
dlls/windowscodecs/unix_lib.c
View file @
d36615ee
...
...
@@ -69,17 +69,11 @@ HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULO
HRESULT
CDECL
decoder_create
(
const
CLSID
*
decoder_clsid
,
struct
decoder_info
*
info
,
struct
decoder
**
result
)
{
if
(
IsEqualGUID
(
decoder_clsid
,
&
CLSID_WICTiffDecoder
))
return
tiff_decoder_create
(
info
,
result
);
return
E_NOTIMPL
;
}
HRESULT
CDECL
encoder_create
(
const
CLSID
*
encoder_clsid
,
struct
encoder_info
*
info
,
struct
encoder
**
result
)
{
if
(
IsEqualGUID
(
encoder_clsid
,
&
CLSID_WICTiffEncoder
))
return
tiff_encoder_create
(
info
,
result
);
if
(
IsEqualGUID
(
encoder_clsid
,
&
CLSID_WICIcnsEncoder
))
return
icns_encoder_create
(
info
,
result
);
...
...
include/config.h.in
View file @
d36615ee
...
...
@@ -827,9 +827,6 @@
/* Define to 1 if you have the `thr_kill2' function. */
#undef HAVE_THR_KILL2
/* Define to 1 if you have the <tiffio.h> header file. */
#undef HAVE_TIFFIO_H
/* Define to 1 if you have the `udev' library (-ludev). */
#undef HAVE_UDEV
...
...
@@ -1028,9 +1025,6 @@
/* Define to the soname of the libSDL2 library. */
#undef SONAME_LIBSDL2
/* Define to the soname of the libtiff library. */
#undef SONAME_LIBTIFF
/* Define to the soname of the libv4l2 library. */
#undef SONAME_LIBV4L2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment