wine-commits July 2013

2 participants
447 discussions

Alexandre Julliard : configure: Don' t use the alternate package config scripts when cross-compiling.

by Alexandre Julliard

Module: wine Branch: master Commit: 0a06ca2917ab2d558bb463a25519a6888cd8b55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a06ca2917ab2d558bb463a25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 21:31:02 2013 +0200 configure: Don't use the alternate package config scripts when cross-compiling. --- aclocal.m4 | 4 ++-- configure | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 15508d2..08ba797 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -92,12 +92,12 @@ AC_ARG_VAR(ac_cflags, [C compiler flags for $2, overriding pkg-config])dnl AS_IF([test -n "$ac_cflags"],[], [test -n "$PKG_CONFIG"], [ac_cflags=`$PKG_CONFIG --cflags [$2] 2>/dev/null`]) -m4_ifval([$4],[ac_cflags=[$]{ac_cflags:-[$4]}]) +m4_ifval([$4],[test "$cross_compiling" = yes || ac_cflags=[$]{ac_cflags:-[$4]}]) AC_ARG_VAR(ac_libs, [Linker flags for $2, overriding pkg-config])dnl AS_IF([test -n "$ac_libs"],[], [test -n "$PKG_CONFIG"], [ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null`]) -m4_ifval([$5],[ac_libs=[$]{ac_libs:-[$5]}]) +m4_ifval([$5],[test "$cross_compiling" = yes || ac_libs=[$]{ac_libs:-[$5]}]) m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}]) ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" diff --git a/configure b/configure index 2cb80f4..d102316 100755 --- a/configure +++ b/configure @@ -9593,13 +9593,13 @@ then elif test -n "$PKG_CONFIG"; then : XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null` fi -XML2_CFLAGS=${XML2_CFLAGS:-`xml2-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || XML2_CFLAGS=${XML2_CFLAGS:-`xml2-config --cflags 2>/dev/null`} if test -n "$XML2_LIBS"; then : elif test -n "$PKG_CONFIG"; then : XML2_LIBS=`$PKG_CONFIG --libs libxml-2.0 2>/dev/null` fi -XML2_LIBS=${XML2_LIBS:-`xml2-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || XML2_LIBS=${XML2_LIBS:-`xml2-config --libs 2>/dev/null`} XML2_LIBS=${XML2_LIBS:-"-lxml2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XML2_CFLAGS" @@ -9905,13 +9905,13 @@ then elif test -n "$PKG_CONFIG"; then : XSLT_CFLAGS=`$PKG_CONFIG --cflags libxslt 2>/dev/null` fi -XSLT_CFLAGS=${XSLT_CFLAGS:-`xslt-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || XSLT_CFLAGS=${XSLT_CFLAGS:-`xslt-config --cflags 2>/dev/null`} if test -n "$XSLT_LIBS"; then : elif test -n "$PKG_CONFIG"; then : XSLT_LIBS=`$PKG_CONFIG --libs libxslt 2>/dev/null` fi -XSLT_LIBS=${XSLT_LIBS:-`xslt-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || XSLT_LIBS=${XSLT_LIBS:-`xslt-config --libs 2>/dev/null`} XSLT_LIBS=${XSLT_LIBS:-"-lxml2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" @@ -10435,13 +10435,13 @@ then elif test -n "$PKG_CONFIG"; then : SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null` fi -SANE_CFLAGS=${SANE_CFLAGS:-`sane-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || SANE_CFLAGS=${SANE_CFLAGS:-`sane-config --cflags 2>/dev/null`} if test -n "$SANE_LIBS"; then : elif test -n "$PKG_CONFIG"; then : SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null` fi -SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} +test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`sane-config --ldflags 2>/dev/null`} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SANE_CFLAGS" @@ -10591,13 +10591,13 @@ then elif test -n "$PKG_CONFIG"; then : GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags libgphoto2 2>/dev/null` fi -GPHOTO2_CFLAGS=${GPHOTO2_CFLAGS:-`gphoto2-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_CFLAGS=${GPHOTO2_CFLAGS:-`gphoto2-config --cflags 2>/dev/null`} if test -n "$GPHOTO2_LIBS"; then : elif test -n "$PKG_CONFIG"; then : GPHOTO2_LIBS=`$PKG_CONFIG --libs libgphoto2 2>/dev/null` fi -GPHOTO2_LIBS=${GPHOTO2_LIBS:-`gphoto2-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_LIBS=${GPHOTO2_LIBS:-`gphoto2-config --libs 2>/dev/null`} GPHOTO2_LIBS=${GPHOTO2_LIBS:-"-lgphoto2"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_CFLAGS" @@ -10661,13 +10661,13 @@ test -z "$GPHOTO2_LIBS" || GPHOTO2_LIBS=`echo " $GPHOTO2_LIBS" | sed 's/ -L\([^/ elif test -n "$PKG_CONFIG"; then : GPHOTO2_PORT_CFLAGS=`$PKG_CONFIG --cflags libgphoto2_port 2>/dev/null` fi -GPHOTO2_PORT_CFLAGS=${GPHOTO2_PORT_CFLAGS:-`gphoto2-port-config --cflags 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_PORT_CFLAGS=${GPHOTO2_PORT_CFLAGS:-`gphoto2-port-config --cflags 2>/dev/null`} if test -n "$GPHOTO2_PORT_LIBS"; then : elif test -n "$PKG_CONFIG"; then : GPHOTO2_PORT_LIBS=`$PKG_CONFIG --libs libgphoto2_port 2>/dev/null` fi -GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-`gphoto2-port-config --libs 2>/dev/null`} +test "$cross_compiling" = yes || GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-`gphoto2-port-config --libs 2>/dev/null`} GPHOTO2_PORT_LIBS=${GPHOTO2_PORT_LIBS:-"-lgphoto2_port"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GPHOTO2_PORT_CFLAGS" @@ -10881,13 +10881,13 @@ then elif test -n "$PKG_CONFIG"; then : FREETYPE_CFLAGS=`$PKG_CONFIG --cflags freetype2 2>/dev/null` fi -FREETYPE_CFLAGS=${FREETYPE_CFLAGS:-`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`} +test "$cross_compiling" = yes || FREETYPE_CFLAGS=${FREETYPE_CFLAGS:-`(freetype-config --cflags || freetype2-config --cflags) 2>/dev/null`} if test -n "$FREETYPE_LIBS"; then : elif test -n "$PKG_CONFIG"; then : FREETYPE_LIBS=`$PKG_CONFIG --libs freetype2 2>/dev/null` fi -FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`} +test "$cross_compiling" = yes || FREETYPE_LIBS=${FREETYPE_LIBS:-`(freetype-config --libs || freetype2-config --libs) 2>/dev/null`} FREETYPE_LIBS=${FREETYPE_LIBS:-"-lfreetype"} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" @@ -11941,13 +11941,13 @@ then elif test -n "$PKG_CONFIG"; then : PNG_CFLAGS=`$PKG_CONFIG --cflags libpng 2>/dev/null` fi -PNG_CFLAGS=${PNG_CFLAGS:-$X_CFLAGS} +test "$cross_compiling" = yes || PNG_CFLAGS=${PNG_CFLAGS:-$X_CFLAGS} if test -n "$PNG_LIBS"; then : elif test -n "$PKG_CONFIG"; then : PNG_LIBS=`$PKG_CONFIG --libs libpng 2>/dev/null` fi -PNG_LIBS=${PNG_LIBS:-$X_LIBS} +test "$cross_compiling" = yes || PNG_LIBS=${PNG_LIBS:-$X_LIBS} ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PNG_CFLAGS"

10 years, 9 months

Alexandre Julliard : configure: Don' t use pkg-config without tool prefix when cross-compiling.

by Alexandre Julliard

Module: wine Branch: master Commit: b48ee74832259048b834742d406f94fc220ed9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48ee74832259048b834742d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 20:38:05 2013 +0200 configure: Don't use pkg-config without tool prefix when cross-compiling. --- aclocal.m4 | 17 ++++++++++++++++- configure | 37 +++++++++++++------------------------ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8aa81b2..15508d2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -22,6 +22,21 @@ dnl configuration script generated by Autoconf, you may include it dnl under the same distribution terms that you use for the rest of dnl that program. +dnl WINE_CHECK_HOST_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH]) +dnl +dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name +dnl +AC_DEFUN([WINE_CHECK_HOST_TOOL], +[if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4]) +fi +if test -n "$ac_cv_prog_$1"; then + $1="$ac_cv_prog_$1" +elif test "$cross_compiling" != yes; then + unset ac_cv_prog_$1 + AC_CHECK_PROG([$1],[$2],[$2],[$3],[$4]) +fi]) + dnl **** Initialize the programs used by other checks **** dnl dnl Usage: WINE_PATH_SONAME_TOOLS @@ -32,7 +47,7 @@ AC_DEFUN([WINE_PATH_SONAME_TOOLS], AC_CHECK_TOOL(READELF,[readelf],true)]) AC_DEFUN([WINE_PATH_PKG_CONFIG], -[AC_CHECK_TOOL(PKG_CONFIG,[pkg-config])]) +[WINE_CHECK_HOST_TOOL(PKG_CONFIG,[pkg-config])]) dnl **** Extract the soname of a library **** dnl diff --git a/configure b/configure index a7cd48e..2cb80f4 100755 --- a/configure +++ b/configure @@ -5217,17 +5217,19 @@ fi fi -if test -z "$ac_cv_prog_PKG_CONFIG"; then - ac_ct_PKG_CONFIG=$PKG_CONFIG +if test -n "$ac_cv_prog_PKG_CONFIG"; then + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +elif test "$cross_compiling" != yes; then + unset ac_cv_prog_PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : +if ${ac_cv_prog_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_PKG_CONFIG"; then - ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5236,7 +5238,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + ac_cv_prog_PKG_CONFIG="pkg-config" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5246,30 +5248,17 @@ IFS=$as_save_IFS fi fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -$as_echo "$ac_ct_PKG_CONFIG" >&6; } +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" -fi +fi if test "x$enable_maintainer_mode" != "xyes" then

10 years, 9 months

Alexandre Julliard : configure: Add pkg-config support for libmpg123.

by Alexandre Julliard

Module: wine Branch: master Commit: 8d8fdc5b3ae30ad10b7e49eb6c84506b5c993b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8fdc5b3ae30ad10b7e49eb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 19:57:39 2013 +0200 configure: Add pkg-config support for libmpg123. --- configure | 61 +++++++++++++++++++++++++++++++++++------ configure.ac | 16 +++++++--- dlls/winemp3.acm/Makefile.in | 3 +- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 29aad5b..a7cd48e 100755 --- a/configure +++ b/configure @@ -640,7 +640,8 @@ BUILTINFLAG EXTRACFLAGS LIBKSTAT LIBOPENAL -LIBMPG123 +MPG123_LIBS +MPG123_CFLAGS TIFF_LIBS TIFF_CFLAGS PNG_LIBS @@ -899,7 +900,9 @@ JPEG_LIBS PNG_CFLAGS PNG_LIBS TIFF_CFLAGS -TIFF_LIBS' +TIFF_LIBS +MPG123_CFLAGS +MPG123_LIBS' # Initialize some variables set by options. @@ -1628,6 +1631,9 @@ Some influential environment variables: PNG_LIBS Linker flags for libpng, overriding pkg-config TIFF_CFLAGS C compiler flags for libtiff, overriding pkg-config TIFF_LIBS Linker flags for libtiff, overriding pkg-config + MPG123_CFLAGS + C compiler flags for libmpg123, overriding pkg-config + MPG123_LIBS Linker flags for libmpg123, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2735,7 +2741,7 @@ fi # Check whether --with-mpg123 was given. if test "${with_mpg123+set}" = set; then : - withval=$with_mpg123; if test "x$withval" = "xno"; then ac_cv_header_mpg123_h=no; fi + withval=$with_mpg123; fi @@ -5994,7 +6000,6 @@ for ac_header in \ machine/limits.h \ machine/sysarch.h \ mntent.h \ - mpg123.h \ ncurses.h \ netdb.h \ netinet/in.h \ @@ -12156,15 +12161,44 @@ This is an error since --with-tiff was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_mpg123_h" = "yes" +if test "x$with_mpg123" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 + if test -n "$MPG123_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + MPG123_CFLAGS=`$PKG_CONFIG --cflags libmpg123 2>/dev/null` +fi + +if test -n "$MPG123_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + MPG123_LIBS=`$PKG_CONFIG --libs libmpg123 2>/dev/null` +fi + +MPG123_LIBS=${MPG123_LIBS:-"-lmpg123"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $MPG123_CFLAGS" +for ac_header in mpg123.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default" +if test "x$ac_cv_header_mpg123_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MPG123_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_mpg123_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpg123_feed in -lmpg123" >&5 $as_echo_n "checking for mpg123_feed in -lmpg123... " >&6; } if ${ac_cv_lib_mpg123_mpg123_feed+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpg123 $LIBS" +LIBS="-lmpg123 $MPG123_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12195,10 +12229,19 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpg123_mpg123_feed" >&5 $as_echo "$ac_cv_lib_mpg123_mpg123_feed" >&6; } if test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes; then : - LIBMPG123="-lmpg123" - + : +else + MPG123_LIBS="" fi + else + MPG123_CFLAGS="" + MPG123_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$MPG123_CFLAGS" || MPG123_CFLAGS=`echo " $MPG123_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$MPG123_LIBS" || MPG123_LIBS=`echo " $MPG123_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes; then : case "x$with_mpg123" in diff --git a/configure.ac b/configure.ac index 0f28987..0e3df61 100644 --- a/configure.ac +++ b/configure.ac @@ -56,8 +56,7 @@ AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic d AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) -AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library]), - [if test "x$withval" = "xno"; then ac_cv_header_mpg123_h=no; fi]) +AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), @@ -451,7 +450,6 @@ AC_CHECK_HEADERS(\ machine/limits.h \ machine/sysarch.h \ mntent.h \ - mpg123.h \ ncurses.h \ netdb.h \ netinet/in.h \ @@ -1688,9 +1686,17 @@ 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 "$ac_cv_header_mpg123_h" = "yes" +if test "x$with_mpg123" != "xno" then - AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")]) + WINE_PACKAGE_FLAGS(MPG123,[libmpg123],[-lmpg123],,, + [AC_CHECK_HEADERS([mpg123.h]) + if test "$ac_cv_header_mpg123_h" = "yes" + then + AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS]) + else + MPG123_CFLAGS="" + MPG123_LIBS="" + fi]) fi WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.]) diff --git a/dlls/winemp3.acm/Makefile.in b/dlls/winemp3.acm/Makefile.in index 2c372a6..bceb26f 100644 --- a/dlls/winemp3.acm/Makefile.in +++ b/dlls/winemp3.acm/Makefile.in @@ -1,6 +1,7 @@ MODULE = winemp3.acm IMPORTS = winmm user32 -EXTRALIBS = @LIBMPG123@ @COREAUDIO@ +EXTRAINCL = @MPG123_CFLAGS@ +EXTRALIBS = @MPG123_LIBS@ @COREAUDIO@ C_SRCS = \ mpegl3.c

10 years, 9 months

Alexandre Julliard : configure: Add pkg-config support for libcapi20.

by Alexandre Julliard

Module: wine Branch: master Commit: 621377f4920a4942274acb9005708f3e8cf522fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=621377f4920a4942274acb900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 19:49:37 2013 +0200 configure: Add pkg-config support for libcapi20. --- configure | 67 +++++++++++++++++++++++++++++++------------- configure.ac | 18 ++++++------ dlls/capi2032/Makefile.in | 1 + 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 6b868fc..29aad5b 100755 --- a/configure +++ b/configure @@ -649,6 +649,8 @@ JPEG_LIBS JPEG_CFLAGS FONTCONFIGINCL CUPSINCL +CAPI20_LIBS +CAPI20_CFLAGS OSS4INCL ALSALIBS GSTREAMER_LIBS @@ -890,6 +892,8 @@ FREETYPE_CFLAGS FREETYPE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS +CAPI20_CFLAGS +CAPI20_LIBS JPEG_CFLAGS JPEG_LIBS PNG_CFLAGS @@ -1615,6 +1619,9 @@ Some influential environment variables: C compiler flags for gstreamer-app-0.10, overriding pkg-config GSTREAMER_LIBS Linker flags for gstreamer-app-0.10, overriding pkg-config + CAPI20_CFLAGS + C compiler flags for capi20, overriding pkg-config + CAPI20_LIBS Linker flags for capi20, overriding pkg-config JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config @@ -2620,7 +2627,7 @@ fi # Check whether --with-capi was given. if test "${with_capi+set}" = set; then : - withval=$with_capi; if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi + withval=$with_capi; fi @@ -5946,7 +5953,6 @@ for ac_header in \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ - capi20.h \ curses.h \ direct.h \ dirent.h \ @@ -6379,20 +6385,6 @@ fi done -for ac_header in linux/capi.h -do : - ac_fn_c_check_header_compile "$LINENO" "linux/capi.h" "ac_cv_header_linux_capi_h" "#define __user -" -if test "x$ac_cv_header_linux_capi_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_CAPI_H 1 -_ACEOF - -fi - -done - - DLLEXT="" @@ -11457,16 +11449,46 @@ fi fi fi - -if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes" +if test "x$with_capi" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcapi20" >&5 + if test -n "$CAPI20_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + CAPI20_CFLAGS=`$PKG_CONFIG --cflags capi20 2>/dev/null` +fi + +if test -n "$CAPI20_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + CAPI20_LIBS=`$PKG_CONFIG --libs capi20 2>/dev/null` +fi + + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $CAPI20_CFLAGS" + for ac_header in capi20.h linux/capi.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#define __user +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcapi20" >&5 $as_echo_n "checking for -lcapi20... " >&6; } if ${ac_cv_lib_soname_capi20+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lcapi20 $LIBS" +LIBS="-lcapi20 $CAPI20_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11513,6 +11535,11 @@ _ACEOF fi + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$CAPI20_CFLAGS" || CAPI20_CFLAGS=`echo " $CAPI20_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$CAPI20_LIBS" || CAPI20_LIBS=`echo " $CAPI20_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_capi20" = "x"; then : case "x$with_capi" in diff --git a/configure.ac b/configure.ac index 34ef0a3..0f28987 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,7 @@ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi]) -AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]), - [if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi]) +AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)])) AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi]) @@ -411,7 +410,6 @@ AC_CHECK_HEADERS(\ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ - capi20.h \ curses.h \ direct.h \ dirent.h \ @@ -663,9 +661,6 @@ AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,, #include <asm/types.h> #endif]) -dnl Check for broken kernel header that doesn't define __user -AC_CHECK_HEADERS([linux/capi.h],,,[#define __user]) - dnl **** Check for working dll **** AC_SUBST(DLLEXT,"") @@ -1587,10 +1582,15 @@ then fi dnl **** Check for capi4linux **** - -if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes" +if test "x$with_capi" != "xno" then - WINE_CHECK_SONAME(capi20,capi20_register) + WINE_PACKAGE_FLAGS(CAPI20,[capi20],,,, + dnl Check for broken kernel header that doesn't define __user + [AC_CHECK_HEADERS([capi20.h linux/capi.h],,,[#define __user]) + if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes" + then + WINE_CHECK_SONAME(capi20,capi20_register,,,[$CAPI20_LIBS]) + fi]) fi WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.]) diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index c343f5d..ea30e22 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -1,5 +1,6 @@ MODULE = capi2032.dll IMPORTLIB = capi2032 +EXTRAINCL = @CAPI20_CFLAGS@ C_SRCS = cap20wxx.c

10 years, 9 months

Alexandre Julliard : configure: Add pkg-config support for libtiff.

by Alexandre Julliard

Module: wine Branch: master Commit: 079f8aee1820d6409b48bb63c8560d6b70d070c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079f8aee1820d6409b48bb63c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 15:02:13 2013 +0200 configure: Add pkg-config support for libtiff. --- configure | 51 +++++++++++++++++++++++++++++++++++---- configure.ac | 13 ++++++---- dlls/windowscodecs/Makefile.in | 2 +- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 531fbb3..6b868fc 100755 --- a/configure +++ b/configure @@ -641,6 +641,8 @@ EXTRACFLAGS LIBKSTAT LIBOPENAL LIBMPG123 +TIFF_LIBS +TIFF_CFLAGS PNG_LIBS PNG_CFLAGS JPEG_LIBS @@ -891,7 +893,9 @@ GSTREAMER_LIBS JPEG_CFLAGS JPEG_LIBS PNG_CFLAGS -PNG_LIBS' +PNG_LIBS +TIFF_CFLAGS +TIFF_LIBS' # Initialize some variables set by options. @@ -1615,6 +1619,8 @@ Some influential environment variables: JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config PNG_LIBS Linker flags for libpng, overriding pkg-config + TIFF_CFLAGS C compiler flags for libtiff, overriding pkg-config + TIFF_LIBS Linker flags for libtiff, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2776,7 +2782,7 @@ fi # Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then : - withval=$with_tiff; if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi + withval=$with_tiff; fi @@ -6043,7 +6049,6 @@ for ac_header in \ sys/wait.h \ syscall.h \ termios.h \ - tiffio.h \ unistd.h \ utime.h \ valgrind/memcheck.h \ @@ -12025,15 +12030,44 @@ This is an error since --with-png was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_tiffio_h" = "yes" +if test "x$with_tiff" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ltiff" >&5 + if test -n "$TIFF_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + TIFF_CFLAGS=`$PKG_CONFIG --cflags libtiff 2>/dev/null` +fi + +if test -n "$TIFF_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + TIFF_LIBS=`$PKG_CONFIG --libs libtiff 2>/dev/null` +fi + + +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 $LIBS" +LIBS="-ltiff $TIFF_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12080,6 +12114,11 @@ _ACEOF fi + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$TIFF_CFLAGS" || TIFF_CFLAGS=`echo " $TIFF_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$TIFF_LIBS" || TIFF_LIBS=`echo " $TIFF_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_tiff" = "x"; then : case "x$with_tiff" in diff --git a/configure.ac b/configure.ac index b69c9ab..34ef0a3 100644 --- a/configure.ac +++ b/configure.ac @@ -70,8 +70,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) -AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]), - [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi]) +AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -515,7 +514,6 @@ AC_CHECK_HEADERS(\ sys/wait.h \ syscall.h \ termios.h \ - tiffio.h \ unistd.h \ utime.h \ valgrind/memcheck.h \ @@ -1677,9 +1675,14 @@ WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng ${notice_platform}development files not found, PNG won't be supported.]) dnl **** Check for libtiff **** -if test "$ac_cv_header_tiffio_h" = "yes" +if test "x$with_tiff" != "xno" then - WINE_CHECK_SONAME(tiff,TIFFClientOpen) + WINE_PACKAGE_FLAGS(TIFF,[libtiff],,,, + [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.]) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index eab1c62..78caf00 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 -EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ +EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ @TIFF_CFLAGS@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@

10 years, 9 months

Alexandre Julliard : configure: Add pkg-config support for libjpeg.

by Alexandre Julliard

Module: wine Branch: master Commit: 6b1a96991c986014a8ac11dc6446b715efb5e6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1a96991c986014a8ac11dc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 31 14:19:08 2013 +0200 configure: Add pkg-config support for libjpeg. --- configure | 53 +++++++++++++++++++++++++++++++++++---- configure.ac | 15 +++++++---- dlls/gphoto2.ds/Makefile.in | 2 +- dlls/windowscodecs/Makefile.in | 2 +- 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 5b1e50f..531fbb3 100755 --- a/configure +++ b/configure @@ -643,6 +643,8 @@ LIBOPENAL LIBMPG123 PNG_LIBS PNG_CFLAGS +JPEG_LIBS +JPEG_CFLAGS FONTCONFIGINCL CUPSINCL OSS4INCL @@ -886,6 +888,8 @@ FREETYPE_CFLAGS FREETYPE_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS +JPEG_CFLAGS +JPEG_LIBS PNG_CFLAGS PNG_LIBS' @@ -1607,6 +1611,8 @@ Some influential environment variables: C compiler flags for gstreamer-app-0.10, overriding pkg-config GSTREAMER_LIBS Linker flags for gstreamer-app-0.10, overriding pkg-config + JPEG_CFLAGS C compiler flags for libjpeg, overriding pkg-config + JPEG_LIBS Linker flags for libjpeg, overriding pkg-config PNG_CFLAGS C compiler flags for libpng, overriding pkg-config PNG_LIBS Linker flags for libpng, overriding pkg-config @@ -2704,7 +2710,7 @@ fi # Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then : - withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi + withval=$with_jpeg; fi @@ -5951,7 +5957,6 @@ for ac_header in \ ieeefp.h \ inet/mib2.h \ io.h \ - jpeglib.h \ kstat.h \ lber.h \ ldap.h \ @@ -11802,15 +11807,44 @@ This is an error since --with-gsm was requested." "$LINENO" 5 ;; esac fi -if test "$ac_cv_header_jpeglib_h" = "yes" +if test "x$with_jpeg" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5 + if test -n "$JPEG_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + JPEG_CFLAGS=`$PKG_CONFIG --cflags libjpeg 2>/dev/null` +fi + +if test -n "$JPEG_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + JPEG_LIBS=`$PKG_CONFIG --libs libjpeg 2>/dev/null` +fi + + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" +for ac_header in jpeglib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" +if test "x$ac_cv_header_jpeglib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_JPEGLIB_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_jpeglib_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5 $as_echo_n "checking for -ljpeg... " >&6; } if ${ac_cv_lib_soname_jpeg+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" +LIBS="-ljpeg $JPEG_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11846,7 +11880,7 @@ fi if test "x$ac_cv_lib_soname_jpeg" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + JPEG_CFLAGS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_jpeg" >&5 $as_echo "$ac_cv_lib_soname_jpeg" >&6; } @@ -11857,6 +11891,13 @@ _ACEOF fi + else + JPEG_CFLAGS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$JPEG_CFLAGS" || JPEG_CFLAGS=`echo " $JPEG_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$JPEG_LIBS" || JPEG_LIBS=`echo " $JPEG_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_jpeg" = "x"; then : case "x$with_jpeg" in diff --git a/configure.ac b/configure.ac index f9e35e6..b69c9ab 100644 --- a/configure.ac +++ b/configure.ac @@ -54,8 +54,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06 [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)])) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) -AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]), - [if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi]) +AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library]), @@ -430,7 +429,6 @@ AC_CHECK_HEADERS(\ ieeefp.h \ inet/mib2.h \ io.h \ - jpeglib.h \ kstat.h \ lber.h \ ldap.h \ @@ -1646,9 +1644,16 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) dnl **** Check for libjpeg **** -if test "$ac_cv_header_jpeglib_h" = "yes" +if test "x$with_jpeg" != "xno" then - WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) + WINE_PACKAGE_FLAGS(JPEG,[libjpeg],,,, + [AC_CHECK_HEADERS([jpeglib.h]) + if test "$ac_cv_header_jpeglib_h" = "yes" + then + WINE_CHECK_SONAME(jpeg,jpeg_start_decompress,,[JPEG_CFLAGS=""],[$JPEG_LIBS]) + else + JPEG_CFLAGS="" + fi]) fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) diff --git a/dlls/gphoto2.ds/Makefile.in b/dlls/gphoto2.ds/Makefile.in index 1e716fc..ffde0ae 100644 --- a/dlls/gphoto2.ds/Makefile.in +++ b/dlls/gphoto2.ds/Makefile.in @@ -1,7 +1,7 @@ MODULE = gphoto2.ds IMPORTS = comctl32 user32 gdi32 advapi32 EXTRALIBS = @GPHOTO2_LIBS@ @GPHOTO2_PORT_LIBS@ -EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ +EXTRAINCL = @GPHOTO2_CFLAGS@ @GPHOTO2_PORT_CFLAGS@ @JPEG_CFLAGS@ C_SRCS = \ capability.c \ diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 61f02c4..eab1c62 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,7 +1,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 -EXTRAINCL = @PNG_CFLAGS@ +EXTRAINCL = @JPEG_CFLAGS@ @PNG_CFLAGS@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL EXTRALIBS = @APPLICATIONSERVICESLIB@

10 years, 9 months

Piotr Caban : oleaut32: Fix ICreateTypeInfo2_fnAddVarDesc implementation.

by Alexandre Julliard

Module: wine Branch: master Commit: c43bf14569cc2c76ad1c62bc81166667ab89ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43bf14569cc2c76ad1c62bc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 31 13:10:14 2013 +0200 oleaut32: Fix ICreateTypeInfo2_fnAddVarDesc implementation. --- dlls/oleaut32/typelib.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a8916d8..973f453 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -101,6 +101,7 @@ typedef struct static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); +static void TLB_FreeVarDesc(VARDESC*); /**************************************************************************** * FromLExxx @@ -1118,8 +1119,9 @@ typedef struct tagTLBFuncDesc /* internal Variable data */ typedef struct tagTLBVarDesc { - VARDESC vardesc; /* lots of info on the variable and its attributes. */ - const TLBString *Name; /* the name of this variable */ + VARDESC vardesc; /* lots of info on the variable and its attributes. */ + VARDESC *vardesc_create; /* additional data needed for storing VARDESC */ + const TLBString *Name; /* the name of this variable */ int HelpContext; int HelpStringContext; const TLBString *HelpString; @@ -5453,8 +5455,9 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for(i = 0; i < This->cVars; ++i) { TLBVarDesc *pVInfo = &This->vardescs[i]; - if (pVInfo->vardesc.varkind == VAR_CONST) - { + if (pVInfo->vardesc_create) { + TLB_FreeVarDesc(pVInfo->vardesc_create); + } else if (pVInfo->vardesc.varkind == VAR_CONST) { VariantClear(pVInfo->vardesc.u.lpvarValue); heap_free(pVInfo->vardesc.u.lpvarValue); } @@ -5720,6 +5723,14 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return S_OK; } +static void TLB_FreeVarDesc(VARDESC *var_desc) +{ + TLB_FreeElemDesc(&var_desc->elemdescVar); + if (var_desc->varkind == VAR_CONST) + VariantClear(var_desc->u.lpvarValue); + SysFreeString((BSTR)var_desc); +} + HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) { ITypeInfoImpl *This = impl_from_ITypeInfo(iface); @@ -7690,10 +7701,7 @@ static void WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); TRACE("(%p)->(%p)\n", This, pVarDesc); - TLB_FreeElemDesc(&pVarDesc->elemdescVar); - if (pVarDesc->varkind == VAR_CONST) - VariantClear(pVarDesc->u.lpvarValue); - SysFreeString((BSTR)pVarDesc); + TLB_FreeVarDesc(pVarDesc); } /* ITypeInfo2::GetTypeKind @@ -10430,11 +10438,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, } } } else - var_desc = This->vardescs = heap_alloc(sizeof(TLBVarDesc)); + var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); - memset(var_desc, 0, sizeof(TLBVarDesc)); TLBVarDesc_Constructor(var_desc); - var_desc->vardesc = *varDesc; + TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + var_desc->vardesc = *var_desc->vardesc_create; ++This->cVars;

10 years, 9 months

Alistair Leslie-Hughes : oleacc: Add typelib.

by Alexandre Julliard

Module: wine Branch: master Commit: a1e4af2d1e0f35395e44b5e916a326c6a3ffefed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4af2d1e0f35395e44b5e91… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 31 12:29:21 2013 +1000 oleacc: Add typelib. --- dlls/oleacc/Makefile.in | 2 ++ dlls/oleacc/oleacc_classes.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 29a0e83..c098386 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -5,6 +5,8 @@ IMPORTS = user32 C_SRCS = \ main.c +IDL_TLB_SRCS = oleacc_classes.idl + RC_SRCS = oleacc.rc PO_SRCS = oleacc.rc diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl new file mode 100644 index 0000000..28cb93e --- /dev/null +++ b/dlls/oleacc/oleacc_classes.idl @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2013 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "oleacc.idl"

10 years, 9 months

Alistair Leslie-Hughes : oleacc: Add missing interfaces.

by Alexandre Julliard

Module: wine Branch: master Commit: 6ff047d126f595e50404f34e7f5583ddc9d4e200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff047d126f595e50404f34e7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 31 11:34:51 2013 +1000 oleacc: Add missing interfaces. --- include/oleacc.idl | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 5333285..241eb00 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -100,6 +100,14 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +typedef GUID MSAAPROPID; + +typedef enum AnnoScope +{ + ANNO_THIS, + ANNO_CONTAINER +} AnnoScope; + [ local, object, @@ -154,6 +162,114 @@ interface IAccessible : IDispatch [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); } +[ + object, + uuid(03022430-ABC4-11d0-BDE2-00AA001A1953), + hidden, + oleautomation, + pointer_default(unique) +] +interface IAccessibleHandler : IUnknown +{ + typedef [unique] IAccessibleHandler *LPACCESSIBLEHANDLER; + + HRESULT AccessibleObjectFromID( [in] long hwnd, [in] long lObjectID, [out] LPACCESSIBLE *pIAccessible ); +} + +[ + object, + uuid(7852b78d-1cfd-41c1-a615-9c0c85960b5f), + pointer_default(unique) +] +interface IAccIdentity : IUnknown +{ + HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); +} + +[ + object, + uuid(76c0dbbb-15e0-4e7b-b61b-20eeea2001e0), + pointer_default(unique) +] +interface IAccPropServer: IUnknown +{ + HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, + [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); +} + +[ + object, + uuid(6e26e776-04f0-495d-80e4-3330352e3169), + pointer_default(unique) +] +interface IAccPropServices : IUnknown +{ + HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, + [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] MSAAPROPID idProp, [in] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, + [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); + + HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, + [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + + HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); + + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, + [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, + [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + + HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, + [out] HMENU *phmenu, [out] DWORD *pidChild); +} + +[ + uuid(1ea4dbf0-3c3b-11cf-810c-00aa00389b71), + lcid(0), + version(1.1), + hidden +] +library Accessibility +{ + importlib ("stdole2.tlb"); + interface IAccessible; + interface IAccessibleHandler; + + interface IAccIdentity; + interface IAccPropServer; + interface IAccPropServices; + + [ + uuid(b5f8350b-0548-48b1-a6ee-88bd00b4a5e7) + ] + coclass CAccPropServices + { + interface IAccPropServices; + } +}; + cpp_quote("DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);") cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);")

10 years, 9 months

Alistair Leslie-Hughes : oledb32: Add IErrorInfo Support.

by Alexandre Julliard

Module: wine Branch: master Commit: 325b824de586552ed9af9eedfe80d81df51ee2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325b824de586552ed9af9eedf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 10:23:43 2013 +1000 oledb32: Add IErrorInfo Support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/errorinfo.c | 359 ++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 8 + dlls/oledb32/oledb32_classes.idl | 11 ++ dlls/oledb32/oledb_private.h | 1 + dlls/oledb32/tests/database.c | 10 +- 6 files changed, 389 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=325b824de586552ed9af9…

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013