mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Strip configure changes from winepulse patches.
These changes will be done automatically by autoreconf, keeping them in increases chances to get conflicts.
This commit is contained in:
Sebastian Lackner
parent
d49ca49848
commit
df034abacb
@ -7,7 +7,6 @@ Subject: [PATCH 09/43] winepulse: Add initial stub for pulseaudio support
|
||||
Just the basic of initialization and pulseaudio mainloop support is
|
||||
added here.
|
||||
---
|
||||
configure | 99 +++++++++++-
|
||||
configure.ac | 32 +++-
|
||||
dlls/mmdevapi/main.c | 2 +-
|
||||
dlls/winepulse.drv/Makefile.in | 7 +
|
||||
@ -18,169 +17,6 @@ added here.
|
||||
create mode 100644 dlls/winepulse.drv/mmdevdrv.c
|
||||
create mode 100644 dlls/winepulse.drv/winepulse.drv.spec
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index edc03ea..0e31555 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -653,6 +653,8 @@ OSS4_CFLAGS
|
||||
ALSA_LIBS
|
||||
GSTREAMER_LIBS
|
||||
GSTREAMER_CFLAGS
|
||||
+PULSEINCL
|
||||
+PULSELIBS
|
||||
GETTEXTPO_LIBS
|
||||
Z_LIBS
|
||||
FREETYPE_LIBS
|
||||
@@ -824,6 +826,7 @@ with_osmesa
|
||||
with_oss
|
||||
with_png
|
||||
with_pthread
|
||||
+with_pulse
|
||||
with_sane
|
||||
with_tiff
|
||||
with_v4l
|
||||
@@ -1262,6 +1265,7 @@ enable_winemapi
|
||||
enable_winemp3_acm
|
||||
enable_wineoss_drv
|
||||
enable_wineps_drv
|
||||
+enable_winepulse_drv
|
||||
enable_wineqtdecoder
|
||||
enable_winex11_drv
|
||||
enable_wing32
|
||||
@@ -2091,6 +2095,7 @@ Optional Packages:
|
||||
--without-oss do not use the OSS sound support
|
||||
--without-png do not use PNG
|
||||
--without-pthread do not use the pthread library
|
||||
+ --without-pulse do not use PulseAudio sound support
|
||||
--without-sane do not use SANE (scanner support)
|
||||
--without-tiff do not use TIFF
|
||||
--without-v4l do not use v4l1 (v4l support)
|
||||
@@ -3332,6 +3337,12 @@ if test "${with_pthread+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
+# Check whether --with-pulse was given.
|
||||
+if test "${with_pulse+set}" = set; then :
|
||||
+ withval=$with_pulse;
|
||||
+fi
|
||||
+
|
||||
+
|
||||
# Check whether --with-sane was given.
|
||||
if test "${with_sane+set}" = set; then :
|
||||
withval=$with_sane;
|
||||
@@ -12102,6 +12113,87 @@ esac
|
||||
fi
|
||||
fi
|
||||
|
||||
+PULSELIBS=""
|
||||
+
|
||||
+PULSEINCL=""
|
||||
+
|
||||
+if test "x$with_pulse" != "xno";
|
||||
+then
|
||||
+ ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
+ if test "$PKG_CONFIG" != "false";
|
||||
+ then
|
||||
+ ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
|
||||
+ ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
|
||||
+
|
||||
+ CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
|
||||
+ for ac_header in pulse/pulseaudio.h
|
||||
+do :
|
||||
+ ac_fn_c_check_header_mongrel "$LINENO" "pulse/pulseaudio.h" "ac_cv_header_pulse_pulseaudio_h" "$ac_includes_default"
|
||||
+if test "x$ac_cv_header_pulse_pulseaudio_h" = xyes; then :
|
||||
+ cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_PULSE_PULSEAUDIO_H 1
|
||||
+_ACEOF
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_stream_is_corked in -lpulse" >&5
|
||||
+$as_echo_n "checking for pa_stream_is_corked in -lpulse... " >&6; }
|
||||
+if ${ac_cv_lib_pulse_pa_stream_is_corked+:} false; then :
|
||||
+ $as_echo_n "(cached) " >&6
|
||||
+else
|
||||
+ ac_check_lib_save_LIBS=$LIBS
|
||||
+LIBS="-lpulse $ac_pulse_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 pa_stream_is_corked ();
|
||||
+int
|
||||
+main ()
|
||||
+{
|
||||
+return pa_stream_is_corked ();
|
||||
+ ;
|
||||
+ return 0;
|
||||
+}
|
||||
+_ACEOF
|
||||
+if ac_fn_c_try_link "$LINENO"; then :
|
||||
+ ac_cv_lib_pulse_pa_stream_is_corked=yes
|
||||
+else
|
||||
+ ac_cv_lib_pulse_pa_stream_is_corked=no
|
||||
+fi
|
||||
+rm -f core conftest.err conftest.$ac_objext \
|
||||
+ conftest$ac_exeext conftest.$ac_ext
|
||||
+LIBS=$ac_check_lib_save_LIBS
|
||||
+fi
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_pa_stream_is_corked" >&5
|
||||
+$as_echo "$ac_cv_lib_pulse_pa_stream_is_corked" >&6; }
|
||||
+if test "x$ac_cv_lib_pulse_pa_stream_is_corked" = xyes; then :
|
||||
+
|
||||
+$as_echo "#define HAVE_PULSEAUDIO 1" >>confdefs.h
|
||||
+
|
||||
+ PULSELIBS="$ac_pulse_libs"
|
||||
+ PULSEINCL="$ac_pulse_cflags"
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+done
|
||||
+
|
||||
+ fi
|
||||
+ CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
+fi
|
||||
+if test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"; then :
|
||||
+ case "x$with_pulse" in
|
||||
+ x) as_fn_append wine_warnings "|libpulse ${notice_platform}development files not found or too old, Pulse won't be supported." ;;
|
||||
+ xno) ;;
|
||||
+ *) as_fn_error $? "libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.
|
||||
+This is an error since --with-pulse was requested." "$LINENO" 5 ;;
|
||||
+esac
|
||||
+fi
|
||||
+
|
||||
if test "x$with_gstreamer" != "xno"
|
||||
then
|
||||
if ${GSTREAMER_CFLAGS:+false} :; then :
|
||||
@@ -13413,12 +13505,14 @@ fi
|
||||
|
||||
test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
|
||||
test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
|
||||
+test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no}
|
||||
test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
|
||||
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
|
||||
|
||||
-if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
|
||||
+if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \
|
||||
+if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \
|
||||
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
|
||||
- "x$with_alsa$with_coreaudio$with_oss" != xnonono
|
||||
+ "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
|
||||
then
|
||||
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
|
||||
fi
|
||||
@@ -17260,6 +17354,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm
|
||||
wine_fn_config_dll wineoss.drv enable_wineoss_drv
|
||||
wine_fn_config_dll wineps.drv enable_wineps_drv clean,po
|
||||
wine_fn_config_dll wineps16.drv16 enable_win16
|
||||
+wine_fn_config_dll winepulse.drv enable_winepulse_drv
|
||||
wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
|
||||
wine_fn_config_dll winex11.drv enable_winex11_drv
|
||||
wine_fn_config_dll wing.dll16 enable_win16
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index eccf19c..d4939c7 100644
|
||||
--- a/configure.ac
|
||||
|
||||
@ -143,7 +143,7 @@ abort:
|
||||
# | wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.21-0ubuntu1~ppa1.debian.tar.gz. [rev 4, by Maarten Lankhorst]
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure, configure.ac, dlls/mmdevapi/main.c, dlls/mmdevapi/tests/render.c, dlls/winepulse.drv/Makefile.in,
|
||||
# | * configure.ac, dlls/mmdevapi/main.c, dlls/mmdevapi/tests/render.c, dlls/winepulse.drv/Makefile.in,
|
||||
# | dlls/winepulse.drv/mmdevdrv.c, dlls/winepulse.drv/winepulse.drv.spec, dlls/winmm/lolvldrv.c
|
||||
# |
|
||||
06-winepulse.ok: 02-ACL_Extended_Attributes.ok
|
||||
|
||||
Loading…
Reference in New Issue
Block a user