Commit 47262382 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 1.8.3+ds1

parent 34222394
libva-utils NEWS -- summary of changes. 2017-05-22
libva-utils NEWS -- summary of changes. 2017-06-28
Copyright (C) 2009-2017 Intel Corporation
Version 1.8.3 - 28.Jun.2017
* Bump version to 1.8.3
* Switch AC_PROG_LIBTOOL to LT_INIT
* putsurface: include wayland-client.h instead of wayland-server.h
* avcenc: add AUD NAL unit at the beginning of pic
* avcenc: enable direct_spatial_mv_pred_flag for B frame
* avcenc: add the frame number as the command line input parameter
Version 1.8.2 - 22.May.2017
* Bump version to 1.8.2
......
......@@ -411,9 +411,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu common/Makefile
$(AUTOMAKE) --foreign common/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libva_utils 1.8.2.
# Generated by GNU Autoconf 2.69 for libva_utils 1.8.3.
#
# Report bugs to <https://github.com/01org/libva-utils/issues/new>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libva_utils'
PACKAGE_TARNAME='libva-utils'
PACKAGE_VERSION='1.8.2'
PACKAGE_STRING='libva_utils 1.8.2'
PACKAGE_VERSION='1.8.3'
PACKAGE_STRING='libva_utils 1.8.3'
PACKAGE_BUGREPORT='https://github.com/01org/libva-utils/issues/new'
PACKAGE_URL='https://github.com/01org/libva-utils'
......@@ -804,8 +804,8 @@ enable_drm
enable_x11
enable_wayland
enable_tests
enable_static
enable_shared
enable_static
with_pic
enable_fast_install
with_aix_soname
......@@ -1400,7 +1400,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libva_utils 1.8.2 to adapt to many kinds of systems.
\`configure' configures libva_utils 1.8.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1471,7 +1471,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libva_utils 1.8.2:";;
short | recursive ) echo "Configuration of libva_utils 1.8.3:";;
esac
cat <<\_ACEOF
......@@ -1485,8 +1485,8 @@ Optional Features:
--enable-x11 build with VA/X11 API support [default=yes]
--enable-wayland build with VA/Wayland API support [default=yes]
--enable-tests build unit tests [default=no]
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--enable-dependency-tracking
......@@ -1623,7 +1623,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libva_utils configure 1.8.2
libva_utils configure 1.8.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2022,7 +2022,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libva_utils $as_me 1.8.2, which was
It was created by libva_utils $as_me 1.8.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2887,7 +2887,7 @@ fi
# Define the identity of the package.
PACKAGE='libva-utils'
VERSION='1.8.2'
VERSION='1.8.3'
cat >>confdefs.h <<_ACEOF
......@@ -3028,8 +3028,8 @@ TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
LIBVA_UTILS_MAJOR_VERSION=1
LIBVA_UTILS_MINOR_VERSION=8
LIBVA_UTILS_MICRO_VERSION=2
LIBVA_UTILS_VERSION=1.8.2
LIBVA_UTILS_MICRO_VERSION=3
LIBVA_UTILS_VERSION=1.8.3
......@@ -3068,37 +3068,6 @@ fi
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else
enable_static=no
fi
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
......@@ -7952,6 +7921,36 @@ fi
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else
enable_static=yes
fi
# Check whether --with-pic was given.
......@@ -12193,6 +12192,34 @@ CC=$lt_save_CC
# Only expand once:
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
IFS=$lt_save_ifs
;;
esac
else
enable_static=no
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
......@@ -18482,7 +18509,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libva_utils $as_me 1.8.2, which was
This file was extended by libva_utils $as_me 1.8.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18549,7 +18576,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libva_utils config.status 1.8.2
libva_utils config.status 1.8.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -18678,10 +18705,10 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
......@@ -19773,7 +19800,6 @@ $as_echo X"$file" |
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
......@@ -19810,9 +19836,6 @@ available_tags='CXX '
# ### BEGIN LIBTOOL CONFIG
# Whether or not to build static libraries.
build_old_libs=$enable_static
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
......@@ -19820,6 +19843,9 @@ macro_revision=$macro_revision
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
# Whether or not to build static libraries.
build_old_libs=$enable_static
# What type of objects to build.
pic_mode=$pic_mode
......
......@@ -30,7 +30,7 @@
# - pre version is libva_pre_version, usually development version
m4_define([libva_utils_major_version], [1])
m4_define([libva_utils_minor_version], [8])
m4_define([libva_utils_micro_version], [2])
m4_define([libva_utils_micro_version], [3])
m4_define([libva_utils_pre_version], [0])
m4_define([libva_utils_version],
......@@ -95,8 +95,8 @@ AC_ARG_ENABLE([tests],
[], [enable_tests="no"])
LT_INIT
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
......
......@@ -403,9 +403,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu decode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign decode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu decode/Makefile
$(AUTOMAKE) --foreign decode/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
......@@ -441,9 +441,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu encode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign encode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu encode/Makefile
$(AUTOMAKE) --foreign encode/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -57,7 +57,9 @@
#define NAL_IDR 5
#define NAL_SPS 7
#define NAL_PPS 8
#define NAL_SEI 6
#define NAL_SEI 6
#define NAL_DELIMITER 9
#define SLICE_TYPE_P 0
#define SLICE_TYPE_B 1
......@@ -92,6 +94,7 @@ static int frame_bit_rate = -1;
static int frame_rate = 30;
static int ip_period = 1;
static int roi_test_enable = 0;
static int aud_nal_enable = 1;
static VAEntrypoint select_entrypoint = VAEntrypointEncSlice;
......@@ -108,6 +111,7 @@ static const struct option longopts[] = {
{"mode", required_argument, 0, 3},
{"low-power", no_argument, 0, 4},
{"roi-test", no_argument, 0, 5},
{"frames", required_argument, 0, 6},
{ NULL, 0, NULL, 0}
};
......@@ -117,6 +121,9 @@ build_packed_pic_buffer(unsigned char **header_buffer);
static int
build_packed_seq_buffer(unsigned char **header_buffer);
static int
build_nal_delimiter(unsigned char **header_buffer);
static int
build_packed_sei_pic_timing(unsigned int cpb_removal_length,
unsigned int dpb_output_length,
......@@ -157,6 +164,8 @@ static struct {
VABufferID packed_sei_buf_id;
VABufferID misc_parameter_hrd_buf_id;
VABufferID misc_parameter_roi_buf_id;
VABufferID packed_aud_header_param_buf_id;
VABufferID packed_aud_buf_id;
int num_slices;
int codedbuf_i_size;
......@@ -634,7 +643,7 @@ static void avcenc_update_slice_parameter(int slice_type)
slice_param->num_macroblocks = picture_height_in_mbs * picture_width_in_mbs;
slice_param->pic_parameter_set_id = 0;
slice_param->slice_type = slice_type;
slice_param->direct_spatial_mv_pred_flag = 0;
slice_param->direct_spatial_mv_pred_flag = 1;
slice_param->num_ref_idx_l0_active_minus1 = 0; /* FIXME: ??? */
slice_param->num_ref_idx_l1_active_minus1 = 0;
slice_param->cabac_init_idc = 0;
......@@ -754,6 +763,32 @@ static int begin_picture(FILE *yuv_fp, int frame_num, int display_num, int slice
else
avcenc_context.current_input_surface = SID_INPUT_PICTURE_0;
if(aud_nal_enable) {
VAEncPackedHeaderParameterBuffer packed_header_param_buffer;
unsigned int length_in_bits;
unsigned char *packed_buffer = NULL;
length_in_bits = build_nal_delimiter(&packed_buffer);
packed_header_param_buffer.type = VAEncPackedHeaderRawData;
packed_header_param_buffer.bit_length = length_in_bits;
packed_header_param_buffer.has_emulation_bytes = 1;
va_status = vaCreateBuffer(va_dpy,
avcenc_context.context_id,
VAEncPackedHeaderParameterBufferType,
sizeof(packed_header_param_buffer), 1, &packed_header_param_buffer,
&avcenc_context.packed_aud_header_param_buf_id);
CHECK_VASTATUS(va_status,"vaCreateBuffer");
va_status = vaCreateBuffer(va_dpy,
avcenc_context.context_id,
VAEncPackedHeaderDataBufferType,
(length_in_bits + 7) / 8, 1, packed_buffer,
&avcenc_context.packed_aud_buf_id);
CHECK_VASTATUS(va_status,"vaCreateBuffer");
free(packed_buffer);
}
if (is_idr) {
VAEncPackedHeaderParameterBuffer packed_header_param_buffer;
unsigned int length_in_bits;
......@@ -901,6 +936,12 @@ int avcenc_render_picture()
unsigned int num_va_buffers = 0;
int i;
if (avcenc_context.packed_aud_header_param_buf_id != VA_INVALID_ID)
va_buffers[num_va_buffers++] = avcenc_context.packed_aud_header_param_buf_id;
if (avcenc_context.packed_aud_buf_id != VA_INVALID_ID)
va_buffers[num_va_buffers++] = avcenc_context.packed_aud_buf_id;
va_buffers[num_va_buffers++] = avcenc_context.seq_param_buf_id;
va_buffers[num_va_buffers++] = avcenc_context.pic_param_buf_id;
......@@ -928,6 +969,7 @@ int avcenc_render_picture()
if (avcenc_context.misc_parameter_roi_buf_id != VA_INVALID_ID)
va_buffers[num_va_buffers++] = avcenc_context.misc_parameter_roi_buf_id;
va_status = vaBeginPicture(va_dpy,
avcenc_context.context_id,
surface_ids[avcenc_context.current_input_surface]);
......@@ -985,6 +1027,8 @@ static void end_picture()
avcenc_destroy_buffers(&avcenc_context.codedbuf_buf_id, 1);
avcenc_destroy_buffers(&avcenc_context.misc_parameter_hrd_buf_id, 1);
avcenc_destroy_buffers(&avcenc_context.misc_parameter_roi_buf_id, 1);
avcenc_destroy_buffers(&avcenc_context.packed_aud_header_param_buf_id, 1);
avcenc_destroy_buffers(&avcenc_context.packed_aud_buf_id, 1);
memset(avcenc_context.slice_param, 0, sizeof(avcenc_context.slice_param));
avcenc_context.num_slices = 0;
......@@ -1320,6 +1364,34 @@ build_header(FILE *avc_fp)
}
#endif
static void nal_delimiter(bitstream *bs,int slice_type)
{
if(slice_type == SLICE_TYPE_I || slice_type == FRAME_IDR)
bitstream_put_ui(bs, 0, 3);
else if(slice_type == SLICE_TYPE_P)
bitstream_put_ui(bs, 1, 3);
else if(slice_type == SLICE_TYPE_B)
bitstream_put_ui(bs, 2, 3);
else
assert(0);
bitstream_put_ui(bs, 1, 1);
bitstream_put_ui(bs, 0, 4);
}
static int build_nal_delimiter(unsigned char **header_buffer)
{
bitstream bs;
bitstream_start(&bs);
nal_start_code_prefix(&bs);
nal_header(&bs, NAL_REF_IDC_NONE, NAL_DELIMITER);
nal_delimiter(&bs,current_frame_type);
bitstream_end(&bs);
*header_buffer = (unsigned char *)bs.buffer;
return bs.bit_offset;
}
static int
build_packed_pic_buffer(unsigned char **header_buffer)
{
......@@ -1774,7 +1846,7 @@ encode_picture(FILE *yuv_fp, FILE *avc_fp,
static void show_help()
{
printf("Usage: avnenc <width> <height> <input_yuvfile> <output_avcfile> [--qp=qpvalue|--fb=framebitrate] [--mode=0(I frames only)/1(I and P frames)/2(I, P and B frames)] [--low-power] [--roi-test]\n");
printf("Usage: avnenc <width> <height> <input_yuvfile> <output_avcfile> [--qp=qpvalue|--fb=framebitrate] [--mode=0(I frames only)/1(I and P frames)/2(I, P and B frames)] [--low-power] [--roi-test] [--frames=0(ignore when < 0)/N(number)] \n");
}
static void avcenc_context_seq_param_init(VAEncSequenceParameterBufferH264 *seq_param,
......@@ -1915,6 +1987,8 @@ static void avcenc_context_init(int width, int height)
avcenc_context.packed_sei_header_param_buf_id = VA_INVALID_ID;
avcenc_context.packed_sei_buf_id = VA_INVALID_ID;
avcenc_context.misc_parameter_roi_buf_id = VA_INVALID_ID;
avcenc_context.packed_aud_header_param_buf_id = VA_INVALID_ID;
avcenc_context.packed_aud_buf_id = VA_INVALID_ID;
if (qp_value == -1)
avcenc_context.rate_control_method = VA_RC_CBR;
......@@ -1944,6 +2018,7 @@ int main(int argc, char *argv[])
int mode_value;
struct timeval tpstart,tpend;
float timeuse;
int frame_num_value = 0;
va_init_display_args(&argc, argv);
......@@ -2014,6 +2089,9 @@ int main(int argc, char *argv[])
roi_test_enable = 1;
break;
case 6: // Frames number
frame_num_value = atoi(optarg);
break;
default:
show_help();
return -1;
......@@ -2051,7 +2129,10 @@ int main(int argc, char *argv[])
alloc_encode_resource(yuv_fp);
enc_frame_number = 0;
for ( f = 0; f < frame_number; f++) { //picture level loop
if(frame_num_value <= 0)
frame_num_value = frame_number;
for ( f = 0; f < frame_num_value; f++) { //picture level loop
unsigned long long next_frame_display;
int next_frame_type;
......
This diff is collapsed.
......@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.6 Debian-2.4.6-0.1"
VERSION="2.4.6 Debian-2.4.6-2"
package_revision=2.4.6
......@@ -2068,7 +2068,7 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
version: $progname (GNU libtool) 2.4.6
version: $progname $scriptversion Debian-2.4.6-2
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
......
......@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
......
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
......@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
# Autoconf-2.59 which quotes differently.
# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
......@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
......
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
......@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
......@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
......
......@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......
......@@ -402,9 +402,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu putsurface/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign putsurface/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu putsurface/Makefile
$(AUTOMAKE) --foreign putsurface/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -31,7 +31,7 @@
#else
# include <va/va_wayland.h>
#endif
#include <wayland-server.h>
#include <wayland-client.h>
static void *open_display(void);
static void close_display(void *win_display);
......
......@@ -457,9 +457,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/Makefile
$(AUTOMAKE) --foreign test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
......@@ -384,9 +384,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vainfo/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign vainfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu vainfo/Makefile
$(AUTOMAKE) --foreign vainfo/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment