Diego Biurrun <di...@biurrun.de> writes:
> ---
> Now without silly end-of-line-backslash error...
>
> configure | 63
> ++++++++++++++++++++++++++++++-------------------------------
> 1 files changed, 31 insertions(+), 32 deletions(-)
>
> diff --git a/configure b/configure
> index 9e09954..61310a0 100755
> --- a/configure
> +++ b/configure
> @@ -55,7 +55,7 @@ if test "$E1" != 0 || test "$E2" = 0; then
> fi
>
> show_help(){
> -cat <<EOF
> + cat <<EOF
> Usage: configure [options]
> Options: [defaults in brackets after descriptions]
>
> @@ -320,7 +320,7 @@ Rerun configure with logging enabled (do not use
> --disable-logging), and
> include the log this produces with your report.
> EOF
> else
> -cat <<EOF
> + cat <<EOF
> Include the log file "$logfile" produced by configure as this will help
> solving the problem.
> EOF
These two hunks OK.
> @@ -2696,9 +2696,10 @@ case $target_os in
> dlltool="${cross_prefix}dlltool"
> enable dos_paths
> check_cflags -fno-common
> - check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) ||
> (__MINGW32_MAJOR_VERSION > 3) \
> - || (__MINGW32_MAJOR_VERSION == 3 &&
> __MINGW32_MINOR_VERSION >= 15)" ||
> - die "ERROR: MinGW runtime version must be >= 3.15."
> + check_cpp_condition _mingw.h \
> + "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION >
> 3) \
> + || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >=
> 15)" ||
> + die "ERROR: MinGW runtime version must be >= 3.15."
> add_cppflags -U__STRICT_ANSI__
> ;;
> cygwin*)
> @@ -2743,14 +2744,15 @@ case $target_os in
> SLIBSUF=".dll"
> SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(shell echo $(NAME) | cut
> -c1-6)$(LIBMAJOR)$(SLIBSUF)'
> - SLIB_CREATE_DEF_CMD='echo LIBRARY $(SLIBNAME_WITH_MAJOR)
> INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
> - echo PROTMODE >> $(SUBDIR)$(NAME).def; \
> - echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
> - echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >>
> $(SUBDIR)$(NAME).def; \
> - echo EXPORTS >> $(SUBDIR)$(NAME).def; \
> - emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
> + SLIB_CREATE_DEF_CMD='
> + echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE >
> $(SUBDIR)$(NAME).def; \
> + echo PROTMODE >> $(SUBDIR)$(NAME).def; \
> + echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
> + echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >>
> $(SUBDIR)$(NAME).def; \
> + echo EXPORTS >> $(SUBDIR)$(NAME).def; \
> + emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
> SLIB_EXTRA_CMD='emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a
> $(SUBDIR)$(NAME).def; \
> - emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
> + emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib
> $(SUBDIR)$(NAME).def;'
> SLIB_INSTALL_EXTRA_LIB='$(LIBPREF)$(NAME)_dll.a
> $(LIBPREF)$(NAME)_dll.lib'
> enable dos_paths
> ;;
I'd prefer if these hunks were tested.
> @@ -2939,7 +2941,7 @@ elif enabled sparc; then
>
> enabled vis &&
> check_inline_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc &&
> - add_cflags -mcpu=ultrasparc -mtune=ultrasparc
> + add_cflags -mcpu=ultrasparc -mtune=ultrasparc
>
> elif enabled x86; then
>
OK
> @@ -2957,11 +2959,9 @@ elif enabled x86; then
> # if the base pointer is used to access it because the
> # base pointer is cleared in the inline assembly code.
> check_exec_crash <<EOF && enable ebp_available
> - volatile int i=0;
> - __asm__ volatile (
> - "xorl %%ebp, %%ebp"
> - ::: "%ebp");
> - return i;
> +volatile int i=0;
> +__asm__ volatile ("xorl %%ebp, %%ebp" ::: "%ebp");
> +return i;
> EOF
OK
> # check whether EBX is available on x86
> @@ -3267,10 +3267,9 @@ if ! disabled vda && check_header
> VideoDecodeAcceleration/VDADecoder.h; then
> fi
>
> if ! disabled vdpau && enabled vdpau_vdpau_h; then
> -check_cpp_condition \
> - vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
> - { echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau
> support." &&
> - disable vdpau; }
> + check_cpp_condition vdpau/vdpau.h "defined
> VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
> + { echolog "Please upgrade to libvdpau >= 0.2 if you would like vdpau
> support." &&
> + disable vdpau; }
> fi
I don't like the look of this before or after your change.
> enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
> @@ -3687,15 +3686,15 @@ test -n "$WARNINGS" && printf "\n$WARNINGS"
> # build pkg-config files
>
> pkgconfig_generate(){
> -name=$1
> -shortname=${name#lib}${build_suffix}
> -comment=$2
> -version=$3
> -libs=$4
> -requires=$5
> -enabled ${name#lib} || return 0
> -mkdir -p $name
> -cat <<EOF > $name/$name.pc
> + name=$1
> + shortname=${name#lib}${build_suffix}
> + comment=$2
> + version=$3
> + libs=$4
> + requires=$5
> + enabled ${name#lib} || return 0
> + mkdir -p $name
> + cat <<EOF > $name/$name.pc
> prefix=$prefix
> exec_prefix=\${prefix}
> libdir=$libdir
> @@ -3711,7 +3710,7 @@ Libs: -L\${libdir} -l${shortname} $(enabled shared ||
> echo $libs)
> Libs.private: $(enabled shared && echo $libs)
> Cflags: -I\${includedir}
> EOF
> -cat <<EOF > $name/$name-uninstalled.pc
> + cat <<EOF > $name/$name-uninstalled.pc
> prefix=
> exec_prefix=
> libdir=\${pcfiledir}
OK
--
Måns Rullgård
m...@mansr.com
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
