[SCM] libva/master: Imported Upstream version 1.6.0

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jul 1 19:26:49 UTC 2015


The following commit has been merged in the master branch:
commit c24f9f2b27c9db3a2f9f0a0145060664924d9999
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jul 1 21:12:17 2015 +0200

    Imported Upstream version 1.6.0

diff --git a/NEWS b/NEWS
index 7cea3b7..842fb86 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
-libva NEWS -- summary of user visible changes.  2015-06-xx
+libva NEWS -- summary of user visible changes.  2015-07-01
 Copyright (C) 2009-2015 Intel Corporation
 
-Version 1.6.0 - DD.Jun.2015
+Version 1.6.0 - 01.Jul.2015
 * Bump VA API version to 0.38
 * Add support for HEVC encode API
 * Add support for VP9 decode API
diff --git a/configure b/configure
index cf69ab5..7a899d0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libva 1.6.0.pre1.
+# Generated by GNU Autoconf 2.69 for libva 1.6.0.
 #
 # Report bugs to <waldo.bastian at intel.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libva'
 PACKAGE_TARNAME='libva'
-PACKAGE_VERSION='1.6.0.pre1'
-PACKAGE_STRING='libva 1.6.0.pre1'
+PACKAGE_VERSION='1.6.0'
+PACKAGE_STRING='libva 1.6.0'
 PACKAGE_BUGREPORT='waldo.bastian at intel.com'
 PACKAGE_URL=''
 
@@ -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 1.6.0.pre1 to adapt to many kinds of systems.
+\`configure' configures libva 1.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1470,7 +1470,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libva 1.6.0.pre1:";;
+     short | recursive ) echo "Configuration of libva 1.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1614,7 +1614,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libva configure 1.6.0.pre1
+libva configure 1.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2104,7 +2104,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 $as_me 1.6.0.pre1, which was
+It was created by libva $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2969,7 +2969,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libva'
- VERSION='1.6.0.pre1'
+ VERSION='1.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3119,7 +3119,7 @@ VA_API_VERSION=0.38.0
 LIBVA_MAJOR_VERSION=1
 LIBVA_MINOR_VERSION=6
 LIBVA_MICRO_VERSION=0
-LIBVA_VERSION=1.6.0.pre1
+LIBVA_VERSION=1.6.0
 
 
 
@@ -18268,7 +18268,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 $as_me 1.6.0.pre1, which was
+This file was extended by libva $as_me 1.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18334,7 +18334,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 config.status 1.6.0.pre1
+libva config.status 1.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 557618a..57bb36c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ m4_define([va_api_version],
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
 m4_define([libva_micro_version], [0])
-m4_define([libva_pre_version],   [1])
+m4_define([libva_pre_version],   [0])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
diff --git a/debian.upstream/Makefile.in b/debian.upstream/Makefile.in
index 1a8f51f..d0a6f18 100644
--- a/debian.upstream/Makefile.in
+++ b/debian.upstream/Makefile.in
@@ -317,9 +317,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian.upstream/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian.upstream/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign debian.upstream/Makefile
+	  $(AUTOMAKE) --gnu debian.upstream/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/debian.upstream/changelog b/debian.upstream/changelog
index a29ef03..44a5c1d 100644
--- a/debian.upstream/changelog
+++ b/debian.upstream/changelog
@@ -1,5 +1,5 @@
-libva (1.6.0.pre1-1) unstable; urgency=low
+libva (1.6.0-1) unstable; urgency=low
 
   * Autogenerated package, see NEWS file for ChangeLog.
 
- -- Gwenole Beauchesne <gwenole.beauchesne at intel.com>  Thu, 04 Jun 2015 09:58:32 +0800
+ -- Gwenole Beauchesne <gwenole.beauchesne at intel.com>  Wed, 01 Jul 2015 15:56:16 +0800
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 11d9f42..6e058a0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -314,9 +314,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign doc/Makefile
+	  $(AUTOMAKE) --gnu doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/dummy_drv_video/Makefile.in b/dummy_drv_video/Makefile.in
index aa282ad..7caa198 100644
--- a/dummy_drv_video/Makefile.in
+++ b/dummy_drv_video/Makefile.in
@@ -396,9 +396,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dummy_drv_video/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dummy_drv_video/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dummy_drv_video/Makefile
+	  $(AUTOMAKE) --gnu dummy_drv_video/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index d34a0b4..504e15a 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -349,9 +349,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pkgconfig/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkgconfig/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign pkgconfig/Makefile
+	  $(AUTOMAKE) --gnu pkgconfig/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/Makefile.in b/test/Makefile.in
index 942e04f..fd3d756 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -361,9 +361,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/Makefile
+	  $(AUTOMAKE) --gnu test/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/basic/Makefile.in b/test/basic/Makefile.in
index 95428e8..4c618cd 100644
--- a/test/basic/Makefile.in
+++ b/test/basic/Makefile.in
@@ -427,9 +427,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/basic/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/basic/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/basic/Makefile
+	  $(AUTOMAKE) --gnu test/basic/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/common/Makefile.in b/test/common/Makefile.in
index 35edfef..38e99fb 100644
--- a/test/common/Makefile.in
+++ b/test/common/Makefile.in
@@ -398,9 +398,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/common/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/common/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/common/Makefile
+	  $(AUTOMAKE) --gnu test/common/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/decode/Makefile.in b/test/decode/Makefile.in
index 61ff0d6..2f3e07f 100644
--- a/test/decode/Makefile.in
+++ b/test/decode/Makefile.in
@@ -393,9 +393,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/decode/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/decode/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/decode/Makefile
+	  $(AUTOMAKE) --gnu test/decode/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/decode/tinyjpeg-internal.h b/test/decode/tinyjpeg-internal.h
index 9caead5..6801c31 100644
--- a/test/decode/tinyjpeg-internal.h
+++ b/test/decode/tinyjpeg-internal.h
@@ -48,6 +48,7 @@ struct jdec_private;
 #define COMPONENTS	   4
 #define JPEG_MAX_WIDTH	   2048
 #define JPEG_MAX_HEIGHT	   2048
+#define JPEG_SCAN_MAX	   4
 
 enum std_markers {
    DQT  = 0xDB, /* Define Quantization Table */
@@ -95,10 +96,10 @@ struct jpeg_sos
 struct jdec_private
 {
   /* Public variables */
-  unsigned int width, height;	/* Size of the image */
+  unsigned int width[JPEG_SCAN_MAX], height[JPEG_SCAN_MAX];	/* Size of the image */
 
   /* Private variables */
-  const unsigned char *stream_begin, *stream_end;
+  const unsigned char *stream_begin, *stream_end,*stream_scan;
   unsigned int stream_length;
 
   const unsigned char *stream;	/* Pointer to the current stream */
diff --git a/test/decode/tinyjpeg.c b/test/decode/tinyjpeg.c
index 045e79a..f53d083 100644
--- a/test/decode/tinyjpeg.c
+++ b/test/decode/tinyjpeg.c
@@ -79,7 +79,9 @@
    snprintf(error_string, sizeof(error_string), fmt, ## args); \
    return -1; \
 } while(0)
-
+/* The variables for different image scans */
+static int scan_num=0;
+static int next_image_found=0;
 /* Global variable to return the last error found while deconding */
 static char error_string[256];
 static VAHuffmanTableBufferJPEGBaseline default_huffman_table_param={
@@ -260,8 +262,8 @@ static int parse_SOF(struct jdec_private *priv, const unsigned char *stream)
            cid, c->Hfactor, c->Vfactor, Q_table );
 
   }
-  priv->width = width;
-  priv->height = height;
+  priv->width[scan_num] = width;
+  priv->height[scan_num] = height;
 
   trace("< SOF marker\n");
 
@@ -383,6 +385,32 @@ static int parse_DRI(struct jdec_private *priv, const unsigned char *stream)
   return 0;
 }
 
+static int findEOI(struct jdec_private *priv,const unsigned char *stream)
+{
+   while (stream<=priv->stream_end&& !(*stream == 0xff  && *(stream+1) == 0xd9 )) //searching for the end of image marker
+   {
+      stream++;
+      continue;
+   }
+  priv->stream_scan=stream;
+  return 0;
+}
+
+static int findSOI(struct jdec_private *priv,const unsigned char *stream)
+{
+   while (!(*stream == 0xff  && *(stream+1) == 0xd8 ) ) //searching for the start of image marker
+   {
+      if(stream<=priv->stream_end)
+        {
+           stream++;
+           continue;
+         }
+      else
+         return 0;  // No more images in the file.
+   }
+   priv->stream=stream+2;
+   return 1;
+}
 
 static int parse_JFIF(struct jdec_private *priv, const unsigned char *stream)
 {
@@ -393,15 +421,14 @@ static int parse_JFIF(struct jdec_private *priv, const unsigned char *stream)
   int dqt_marker_found = 0;
   const unsigned char *next_chunck;
 
-  /* Parse marker */
-  while (!sos_marker_found)
-   {
-     if (*stream++ != 0xff)
-       goto bogus_jpeg_format;
-     /* Skip any padding ff byte (this is normal) */
-     while (*stream == 0xff)
-       stream++;
+  next_image_found = findSOI(priv,stream);
+  stream=priv->stream;
 
+   while (!sos_marker_found  && stream<=priv->stream_end)
+   {
+     while((*stream == 0xff))
+        stream++;    
+            	    
      marker = *stream++;
      chuck_len = be16_to_cpu(stream);
      next_chunck = stream + chuck_len;
@@ -438,14 +465,15 @@ static int parse_JFIF(struct jdec_private *priv, const unsigned char *stream)
      stream = next_chunck;
    }
 
-  if (!dht_marker_found) {
-    trace("No Huffman table loaded, using the default one\n");
-    build_default_huffman_tables(priv);
-  }
-  if (!dqt_marker_found) {
-    error("ERROR:No Quantization table loaded, using the default one\n");
-  }
-
+   if(next_image_found){
+      if (!dht_marker_found) {
+        trace("No Huffman table loaded, using the default one\n");
+        build_default_huffman_tables(priv);
+      }
+      if (!dqt_marker_found) {
+        error("ERROR:No Quantization table loaded, using the default one\n");
+      }
+   } 
 #ifdef SANITY_CHECK
   if (   (priv->component_infos[cY].Hfactor < priv->component_infos[cCb].Hfactor)
       || (priv->component_infos[cY].Hfactor < priv->component_infos[cCr].Hfactor))
@@ -459,11 +487,8 @@ static int parse_JFIF(struct jdec_private *priv, const unsigned char *stream)
       || (priv->component_infos[cCr].Vfactor!=1))
     printf("ERROR:Sampling other than 1x1 for Cr and Cb is not supported");
 #endif
-
-  return 0;
-bogus_jpeg_format:
-  trace("Bogus jpeg format\n");
-  return -1;
+  findEOI(priv,stream);
+  return next_image_found;
 }
 
 /*******************************************************************************
@@ -516,12 +541,12 @@ int tinyjpeg_parse_header(struct jdec_private *priv, const unsigned char *buf, u
   if ((buf[0] != 0xFF) || (buf[1] != SOI))
     error("Not a JPG file ?\n");
 
-  priv->stream_begin = buf+2;
-  priv->stream_length = size-2;
+  priv->stream_begin = buf;
+  priv->stream_length = size;
   priv->stream_end = priv->stream_begin + priv->stream_length;
 
-  ret = parse_JFIF(priv, priv->stream_begin);
-
+  priv->stream = priv->stream_begin;
+  ret = parse_JFIF(priv, priv->stream);
   return ret;
 }
 
@@ -548,6 +573,16 @@ int tinyjpeg_decode(struct jdec_private *priv)
     int putsurface=1;
     unsigned int i, j;
 
+    int surface_type;
+    char *type;
+    int ChromaTypeIndex;
+
+    VASurfaceAttrib forcc;
+    forcc.type =VASurfaceAttribPixelFormat;
+    forcc.flags=VA_SURFACE_ATTRIB_SETTABLE;
+    forcc.value.type=VAGenericValueTypeInteger;
+     
+
     va_dpy = va_open_display();
     va_status = vaInitialize(va_dpy, &major_ver, &minor_ver);
     assert(va_status == VA_STATUS_SUCCESS);
@@ -578,169 +613,245 @@ int tinyjpeg_decode(struct jdec_private *priv)
                               &attrib, 1,&config_id);
     CHECK_VASTATUS(va_status, "vaQueryConfigEntrypoints");
 
-    va_status = vaCreateSurfaces(va_dpy,VA_RT_FORMAT_YUV420,
-                                 priv->width,priv->height, //alignment?
-                                 &surface_id, 1, NULL, 0);
-    CHECK_VASTATUS(va_status, "vaCreateSurfaces");
-
-    /* Create a context for this decode pipe */
-    va_status = vaCreateContext(va_dpy, config_id,
-                               priv->width, priv->height, // alignment?
-                               VA_PROGRESSIVE,
-                               &surface_id,
-                               1,
-                               &context_id);
-    CHECK_VASTATUS(va_status, "vaCreateContext");
-    
-    VAPictureParameterBufferJPEGBaseline pic_param;
-    memset(&pic_param, 0, sizeof(pic_param));
-    pic_param.picture_width = priv->width;
-    pic_param.picture_height = priv->height;
-    pic_param.num_components = priv->nf_components;
-
-    for (i=0; i<pic_param.num_components; i++) { // tinyjpeg support 3 components only, does it match va?
-        pic_param.components[i].component_id = priv->component_infos[i].cid;
-        pic_param.components[i].h_sampling_factor = priv->component_infos[i].Hfactor;
-        pic_param.components[i].v_sampling_factor = priv->component_infos[i].Vfactor;
-        pic_param.components[i].quantiser_table_selector = priv->component_infos[i].quant_table_index;
-    }
-
-    va_status = vaCreateBuffer(va_dpy, context_id,
-                              VAPictureParameterBufferType, // VAPictureParameterBufferJPEGBaseline?
-                              sizeof(VAPictureParameterBufferJPEGBaseline),
-                              1, &pic_param,
-                              &pic_param_buf);
-    CHECK_VASTATUS(va_status, "vaCreateBuffer");
-
-    VAIQMatrixBufferJPEGBaseline iq_matrix;
-    const unsigned int num_quant_tables =
-        MIN(COMPONENTS, ARRAY_ELEMS(iq_matrix.load_quantiser_table));
-    // todo, only mask it if non-default quant matrix is used. do we need build default quant matrix?
-    memset(&iq_matrix, 0, sizeof(VAIQMatrixBufferJPEGBaseline));
-    for (i = 0; i < num_quant_tables; i++) {
-        if (!priv->Q_tables_valid[i])
-            continue;
-        iq_matrix.load_quantiser_table[i] = 1;
-        for (j = 0; j < 64; j++)
-            iq_matrix.quantiser_table[i][j] = priv->Q_tables[i][j];
-    }
-    va_status = vaCreateBuffer(va_dpy, context_id,
-                              VAIQMatrixBufferType, // VAIQMatrixBufferJPEGBaseline?
-                              sizeof(VAIQMatrixBufferJPEGBaseline),
-                              1, &iq_matrix,
-                              &iqmatrix_buf );
-    CHECK_VASTATUS(va_status, "vaCreateBuffer");
-
-    VAHuffmanTableBufferJPEGBaseline huffman_table;
-    const unsigned int num_huffman_tables =
-        MIN(COMPONENTS, ARRAY_ELEMS(huffman_table.load_huffman_table));
-    memset(&huffman_table, 0, sizeof(VAHuffmanTableBufferJPEGBaseline));
-    assert(sizeof(huffman_table.huffman_table[0].num_dc_codes) ==
+    while (next_image_found){  
+       VAPictureParameterBufferJPEGBaseline pic_param;
+       memset(&pic_param, 0, sizeof(pic_param));
+       pic_param.picture_width = priv->width[scan_num];
+       pic_param.picture_height = priv->height[scan_num];
+       pic_param.num_components = priv->nf_components;
+
+
+       for (i=0; i<pic_param.num_components; i++) { // tinyjpeg support 3 components only, does it match va?
+           pic_param.components[i].component_id = priv->component_infos[i].cid;
+           pic_param.components[i].h_sampling_factor = priv->component_infos[i].Hfactor;
+           pic_param.components[i].v_sampling_factor = priv->component_infos[i].Vfactor;
+           pic_param.components[i].quantiser_table_selector = priv->component_infos[i].quant_table_index;
+       }
+       int h1, h2, h3, v1, v2, v3;
+       h1 = pic_param.components[0].h_sampling_factor;
+       h2 = pic_param.components[1].h_sampling_factor;
+       h3 = pic_param.components[2].h_sampling_factor;
+       v1 = pic_param.components[0].v_sampling_factor;
+       v2 = pic_param.components[1].v_sampling_factor;
+       v3 = pic_param.components[2].v_sampling_factor;
+
+       if (h1 == 2 && h2 == 1 && h3 == 1 &&
+               v1 == 2 && v2 == 1 && v3 == 1) {
+           //surface_type = VA_RT_FORMAT_IMC3;
+           surface_type = VA_RT_FORMAT_YUV420;
+           forcc.value.value.i = VA_FOURCC_IMC3;
+           ChromaTypeIndex = 1;
+           type = "VA_FOURCC_IMC3";
+       }
+       else if (h1 == 2 && h2 == 1 && h3 == 1 &&
+               v1 == 1 && v2 == 1 && v3 == 1) {
+           //surface_type = VA_RT_FORMAT_YUV422H;
+           surface_type = VA_RT_FORMAT_YUV422;
+           forcc.value.value.i = VA_FOURCC_422H;
+           ChromaTypeIndex = 2;
+           type = "VA_FOURCC_422H";
+       }
+       else if (h1 == 1 && h2 == 1 && h3 == 1 &&
+               v1 == 1 && v2 == 1 && v3 == 1) {
+           surface_type = VA_RT_FORMAT_YUV444;
+           forcc.value.value.i = VA_FOURCC_444P;
+           //forcc.value.value.i = VA_FOURCC_RGBP;
+           ChromaTypeIndex = 3;
+           type = "VA_FOURCC_444P";
+       }
+       else if (h1 == 4 && h2 == 1 && h3 == 1 &&
+               v1 == 1 && v2 == 1 && v3 == 1) {
+           surface_type = VA_RT_FORMAT_YUV411;
+           forcc.value.value.i = VA_FOURCC_411P;
+           ChromaTypeIndex = 4;
+           type = "VA_FOURCC_411P";
+       }
+       else if (h1 == 1 && h2 == 1 && h3 == 1 &&
+               v1 == 2 && v2 == 1 && v3 == 1) {
+           //surface_type = VA_RT_FORMAT_YUV422V;
+           surface_type = VA_RT_FORMAT_YUV422;
+           forcc.value.value.i = VA_FOURCC_422V;
+           ChromaTypeIndex = 5;
+           type = "VA_FOURCC_422V";
+       }
+       else if (h1 == 2 && h2 == 1 && h3 == 1 &&
+               v1 == 2 && v2 == 2 && v3 == 2) {
+           //surface_type = VA_RT_FORMAT_YUV422H;
+           surface_type = VA_RT_FORMAT_YUV422;
+           forcc.value.value.i = VA_FOURCC_422H;
+           ChromaTypeIndex = 6;
+           type = "VA_FOURCC_422H";
+       }
+       else if (h2 == 2 && h2 == 2 && h3 == 2 &&
+               v1 == 2 && v2 == 1 && v3 == 1) {
+           //surface_type = VA_RT_FORMAT_YUV422V;
+           surface_type = VA_RT_FORMAT_YUV422;
+           forcc.value.value.i = VA_FOURCC_422V;
+           ChromaTypeIndex = 7;
+           type = "VA_FOURCC_422V";
+       }
+       else
+       {
+           surface_type = VA_RT_FORMAT_YUV400;
+           forcc.value.value.i = VA_FOURCC('Y','8','0','0');
+           ChromaTypeIndex = 0;
+           type = "Format_400P";
+       }
+
+       va_status = vaCreateSurfaces(va_dpy,surface_type,
+                                    priv->width[scan_num],priv->height[scan_num], //alignment?
+                                    &surface_id, 1, &forcc, 1);
+       CHECK_VASTATUS(va_status, "vaCreateSurfaces");
+  
+       /* Create a context for this decode pipe */
+       va_status = vaCreateContext(va_dpy, config_id,
+                                  priv->width[scan_num], priv->height[scan_num], // alignment?
+                                  VA_PROGRESSIVE,
+                                  &surface_id,
+                                  1,
+                                  &context_id);
+       CHECK_VASTATUS(va_status, "vaCreateContext");
+
+       va_status = vaCreateBuffer(va_dpy, context_id,
+                                 VAPictureParameterBufferType, // VAPictureParameterBufferJPEGBaseline?
+                                 sizeof(VAPictureParameterBufferJPEGBaseline),
+                                 1, &pic_param,
+                                 &pic_param_buf);
+       CHECK_VASTATUS(va_status, "vaCreateBuffer");
+
+       VAIQMatrixBufferJPEGBaseline iq_matrix;
+       const unsigned int num_quant_tables =
+           MIN(COMPONENTS, ARRAY_ELEMS(iq_matrix.load_quantiser_table));
+       // todo, only mask it if non-default quant matrix is used. do we need build default quant matrix?
+       memset(&iq_matrix, 0, sizeof(VAIQMatrixBufferJPEGBaseline));
+       for (i = 0; i < num_quant_tables; i++) {
+           if (!priv->Q_tables_valid[i])
+               continue;
+           iq_matrix.load_quantiser_table[i] = 1;
+           for (j = 0; j < 64; j++)
+               iq_matrix.quantiser_table[i][j] = priv->Q_tables[i][j];
+       }
+       va_status = vaCreateBuffer(va_dpy, context_id,
+                                 VAIQMatrixBufferType, // VAIQMatrixBufferJPEGBaseline?
+                                 sizeof(VAIQMatrixBufferJPEGBaseline),
+                                 1, &iq_matrix,
+                                 &iqmatrix_buf );
+       CHECK_VASTATUS(va_status, "vaCreateBuffer");
+
+       VAHuffmanTableBufferJPEGBaseline huffman_table;
+       const unsigned int num_huffman_tables =
+           MIN(COMPONENTS, ARRAY_ELEMS(huffman_table.load_huffman_table));
+       memset(&huffman_table, 0, sizeof(VAHuffmanTableBufferJPEGBaseline));
+       assert(sizeof(huffman_table.huffman_table[0].num_dc_codes) ==
            sizeof(priv->HTDC[0].bits));
-    assert(sizeof(huffman_table.huffman_table[0].dc_values[0]) ==
+          assert(sizeof(huffman_table.huffman_table[0].dc_values[0]) ==
            sizeof(priv->HTDC[0].values[0]));
-    for (i = 0; i < num_huffman_tables; i++) {
-        if (!priv->HTDC_valid[i] || !priv->HTAC_valid[i])
-            continue;
-        huffman_table.load_huffman_table[i] = 1;
-        memcpy(huffman_table.huffman_table[i].num_dc_codes, priv->HTDC[i].bits,
-               sizeof(huffman_table.huffman_table[i].num_dc_codes));
-        memcpy(huffman_table.huffman_table[i].dc_values, priv->HTDC[i].values,
-               sizeof(huffman_table.huffman_table[i].dc_values));
-        memcpy(huffman_table.huffman_table[i].num_ac_codes, priv->HTAC[i].bits,
-               sizeof(huffman_table.huffman_table[i].num_ac_codes));
-        memcpy(huffman_table.huffman_table[i].ac_values, priv->HTAC[i].values,
-               sizeof(huffman_table.huffman_table[i].ac_values));
-        memset(huffman_table.huffman_table[i].pad, 0,
-               sizeof(huffman_table.huffman_table[i].pad));
-    }
-
-    va_status = vaCreateBuffer(va_dpy, context_id,
-                              VAHuffmanTableBufferType, // VAHuffmanTableBufferJPEGBaseline?
-                              sizeof(VAHuffmanTableBufferJPEGBaseline),
-                              1, &huffman_table,
-                              &huffmantable_buf );
-    CHECK_VASTATUS(va_status, "vaCreateBuffer");
-    
-    // one slice for whole image?
-    max_h_factor = priv->component_infos[0].Hfactor;
-    max_v_factor = priv->component_infos[0].Vfactor;
-    static VASliceParameterBufferJPEGBaseline slice_param;
-    slice_param.slice_data_size = priv->stream_end - priv->stream;
-    slice_param.slice_data_offset = 0;
-    slice_param.slice_data_flag = VA_SLICE_DATA_FLAG_ALL;
-    slice_param.slice_horizontal_position = 0;    
-    slice_param.slice_vertical_position = 0;    
-    slice_param.num_components = priv->cur_sos.nr_components;
-    for (i = 0; i < slice_param.num_components; i++) {
-        slice_param.components[i].component_selector = priv->cur_sos.components[i].component_id; /* FIXME: set to values specified in SOS  */
-        slice_param.components[i].dc_table_selector = priv->cur_sos.components[i].dc_selector;  /* FIXME: set to values specified in SOS  */
-        slice_param.components[i].ac_table_selector = priv->cur_sos.components[i].ac_selector;  /* FIXME: set to values specified in SOS  */
-    }
-    slice_param.restart_interval = priv->restart_interval;
-    slice_param.num_mcus = ((priv->width+max_h_factor*8-1)/(max_h_factor*8))*
-                          ((priv->height+max_v_factor*8-1)/(max_v_factor*8)); // ?? 720/16?
-
-    va_status = vaCreateBuffer(va_dpy, context_id,
-                              VASliceParameterBufferType, // VASliceParameterBufferJPEGBaseline?
-                              sizeof(VASliceParameterBufferJPEGBaseline),
-                              1,
-                              &slice_param, &slice_param_buf);
-    CHECK_VASTATUS(va_status, "vaCreateBuffer");
-
-    va_status = vaCreateBuffer(va_dpy, context_id,
-                              VASliceDataBufferType,
-                              priv->stream_end - priv->stream,
-                              1,
-                              (void*)priv->stream, // jpeg_clip,
-                              &slice_data_buf);
-    CHECK_VASTATUS(va_status, "vaCreateBuffer");
-
-    va_status = vaBeginPicture(va_dpy, context_id, surface_id);
-    CHECK_VASTATUS(va_status, "vaBeginPicture");
-
-    va_status = vaRenderPicture(va_dpy,context_id, &pic_param_buf, 1);
-    CHECK_VASTATUS(va_status, "vaRenderPicture");
-    
-    va_status = vaRenderPicture(va_dpy,context_id, &iqmatrix_buf, 1);
-    CHECK_VASTATUS(va_status, "vaRenderPicture");
-
-    va_status = vaRenderPicture(va_dpy,context_id, &huffmantable_buf, 1);
-    CHECK_VASTATUS(va_status, "vaRenderPicture");
+       for (i = 0; i < num_huffman_tables; i++) {
+           if (!priv->HTDC_valid[i] || !priv->HTAC_valid[i])
+               continue;
+           huffman_table.load_huffman_table[i] = 1;
+           memcpy(huffman_table.huffman_table[i].num_dc_codes, priv->HTDC[i].bits,
+                  sizeof(huffman_table.huffman_table[i].num_dc_codes));
+           memcpy(huffman_table.huffman_table[i].dc_values, priv->HTDC[i].values,
+                  sizeof(huffman_table.huffman_table[i].dc_values));
+           memcpy(huffman_table.huffman_table[i].num_ac_codes, priv->HTAC[i].bits,
+                  sizeof(huffman_table.huffman_table[i].num_ac_codes));   
+           memcpy(huffman_table.huffman_table[i].ac_values, priv->HTAC[i].values,
+                  sizeof(huffman_table.huffman_table[i].ac_values));
+           memset(huffman_table.huffman_table[i].pad, 0,
+                  sizeof(huffman_table.huffman_table[i].pad));
+       }
+       va_status = vaCreateBuffer(va_dpy, context_id,
+                                 VAHuffmanTableBufferType, // VAHuffmanTableBufferJPEGBaseline?
+                                 sizeof(VAHuffmanTableBufferJPEGBaseline),
+                                 1, &huffman_table,
+                                 &huffmantable_buf );
+       CHECK_VASTATUS(va_status, "vaCreateBuffer");
     
-    va_status = vaRenderPicture(va_dpy,context_id, &slice_param_buf, 1);
-    CHECK_VASTATUS(va_status, "vaRenderPicture");
+       // one slice for whole image?
+       max_h_factor = priv->component_infos[0].Hfactor;
+       max_v_factor = priv->component_infos[0].Vfactor;
+       static VASliceParameterBufferJPEGBaseline slice_param;
+       slice_param.slice_data_size = (priv->stream_scan - priv->stream);
+       slice_param.slice_data_offset = 0;
+       slice_param.slice_data_flag = VA_SLICE_DATA_FLAG_ALL;
+       slice_param.slice_horizontal_position = 0;    
+       slice_param.slice_vertical_position = 0;    
+       slice_param.num_components = priv->cur_sos.nr_components;
+       for (i = 0; i < slice_param.num_components; i++) {
+           slice_param.components[i].component_selector = priv->cur_sos.components[i].component_id; /* FIXME: set to values specified in SOS  */
+           slice_param.components[i].dc_table_selector = priv->cur_sos.components[i].dc_selector;  /* FIXME: set to values specified in SOS  */
+           slice_param.components[i].ac_table_selector = priv->cur_sos.components[i].ac_selector;  /* FIXME: set to values specified in SOS  */
+       }
+       slice_param.restart_interval = priv->restart_interval;
+       slice_param.num_mcus = ((priv->width[scan_num]+max_h_factor*8-1)/(max_h_factor*8))*
+                             ((priv->height[scan_num]+max_v_factor*8-1)/(max_v_factor*8)); // ?? 720/16? 
+ 
+       va_status = vaCreateBuffer(va_dpy, context_id,
+                                 VASliceParameterBufferType, // VASliceParameterBufferJPEGBaseline?
+                                 sizeof(VASliceParameterBufferJPEGBaseline),
+                                 1,
+                                 &slice_param, &slice_param_buf);
+       CHECK_VASTATUS(va_status, "vaCreateBuffer");
+
+       va_status = vaCreateBuffer(va_dpy, context_id,
+                                 VASliceDataBufferType,
+                                 priv->stream_scan - priv->stream,
+                                 1,
+                                 (void*)priv->stream, // jpeg_clip,
+                                 &slice_data_buf);
+       CHECK_VASTATUS(va_status, "vaCreateBuffer");
+
+       va_status = vaBeginPicture(va_dpy, context_id, surface_id);
+       CHECK_VASTATUS(va_status, "vaBeginPicture");   
+
+       va_status = vaRenderPicture(va_dpy,context_id, &pic_param_buf, 1);
+       CHECK_VASTATUS(va_status, "vaRenderPicture");
+   
+       va_status = vaRenderPicture(va_dpy,context_id, &iqmatrix_buf, 1);
+       CHECK_VASTATUS(va_status, "vaRenderPicture");
+
+       va_status = vaRenderPicture(va_dpy,context_id, &huffmantable_buf, 1);
+       CHECK_VASTATUS(va_status, "vaRenderPicture");
+   
+       va_status = vaRenderPicture(va_dpy,context_id, &slice_param_buf, 1);
+       CHECK_VASTATUS(va_status, "vaRenderPicture");
     
-    va_status = vaRenderPicture(va_dpy,context_id, &slice_data_buf, 1);
-    CHECK_VASTATUS(va_status, "vaRenderPicture");
+       va_status = vaRenderPicture(va_dpy,context_id, &slice_data_buf, 1);
+       CHECK_VASTATUS(va_status, "vaRenderPicture");
     
-    va_status = vaEndPicture(va_dpy,context_id);
-    CHECK_VASTATUS(va_status, "vaEndPicture");
-
-    va_status = vaSyncSurface(va_dpy, surface_id);
-    CHECK_VASTATUS(va_status, "vaSyncSurface");
+       va_status = vaEndPicture(va_dpy,context_id);
+       CHECK_VASTATUS(va_status, "vaEndPicture");
 
-    if (putsurface) {
-        VARectangle src_rect, dst_rect;
+       va_status = vaSyncSurface(va_dpy, surface_id);
+       CHECK_VASTATUS(va_status, "vaSyncSurface");
 
-        src_rect.x      = 0;
-        src_rect.y      = 0;
-        src_rect.width  = priv->width;
-        src_rect.height = priv->height;
-        dst_rect        = src_rect;
+       if (putsurface) {
+           VARectangle src_rect, dst_rect;
 
-        va_status = va_put_surface(va_dpy, surface_id, &src_rect, &dst_rect);
-        CHECK_VASTATUS(va_status, "vaPutSurface");
-    }
-    printf("press any key to exit\n");
-    getchar();
+           src_rect.x      = 0;
+           src_rect.y      = 0;
+           src_rect.width  = priv->width[scan_num];
+           src_rect.height = priv->height[scan_num];
+           dst_rect        = src_rect;
 
-    vaDestroySurfaces(va_dpy,&surface_id,1);
-    vaDestroyConfig(va_dpy,config_id);
-    vaDestroyContext(va_dpy,context_id);
+           va_status = va_put_surface(va_dpy, surface_id, &src_rect, &dst_rect);
+           CHECK_VASTATUS(va_status, "vaPutSurface");
+       }
+       scan_num++;
 
+       vaDestroySurfaces(va_dpy,&surface_id,1);
+       vaDestroyConfig(va_dpy,config_id);
+       vaDestroyContext(va_dpy,context_id);
+    
+       parse_JFIF(priv,priv->stream);
+       if(priv->width[scan_num] == 0 && priv->height[scan_num] == 0)
+          break;
+    }
+   // va_close_display(va_dpy);
     vaTerminate(va_dpy);
-    va_close_display(va_dpy);
+    printf("press any key to exit23\n");
+    getchar();
     return 0;
 }
 const char *tinyjpeg_get_errorstring(struct jdec_private *priv)
@@ -751,8 +862,8 @@ const char *tinyjpeg_get_errorstring(struct jdec_private *priv)
 }
 void tinyjpeg_get_size(struct jdec_private *priv, unsigned int *width, unsigned int *height)
 {
-  *width = priv->width;
-  *height = priv->height;
+  *width = priv->width[scan_num];
+  *height = priv->height[scan_num];
 }
 
 
diff --git a/test/encode/Makefile.in b/test/encode/Makefile.in
index c89129e..e9ce99a 100644
--- a/test/encode/Makefile.in
+++ b/test/encode/Makefile.in
@@ -417,9 +417,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/encode/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/encode/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/encode/Makefile
+	  $(AUTOMAKE) --gnu test/encode/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/putsurface/Makefile.in b/test/putsurface/Makefile.in
index 98ec256..ab587f0 100644
--- a/test/putsurface/Makefile.in
+++ b/test/putsurface/Makefile.in
@@ -397,9 +397,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/putsurface/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/putsurface/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/putsurface/Makefile
+	  $(AUTOMAKE) --gnu test/putsurface/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/test/vainfo/Makefile.in b/test/vainfo/Makefile.in
index 5ead9b7..4003e25 100644
--- a/test/vainfo/Makefile.in
+++ b/test/vainfo/Makefile.in
@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/vainfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/vainfo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign test/vainfo/Makefile
+	  $(AUTOMAKE) --gnu test/vainfo/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/Makefile.in b/va/Makefile.in
index c16e11c..1b23650 100644
--- a/va/Makefile.in
+++ b/va/Makefile.in
@@ -569,9 +569,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/Makefile
+	  $(AUTOMAKE) --gnu va/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/drm/Makefile.in b/va/drm/Makefile.in
index f7fc32d..7c8804e 100644
--- a/va/drm/Makefile.in
+++ b/va/drm/Makefile.in
@@ -409,9 +409,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/drm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/drm/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/drm/Makefile
+	  $(AUTOMAKE) --gnu va/drm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/egl/Makefile.in b/va/egl/Makefile.in
index accd931..6e4227e 100644
--- a/va/egl/Makefile.in
+++ b/va/egl/Makefile.in
@@ -401,9 +401,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/egl/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/egl/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/egl/Makefile
+	  $(AUTOMAKE) --gnu va/egl/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/glx/Makefile.in b/va/glx/Makefile.in
index f47ff79..e9814c7 100644
--- a/va/glx/Makefile.in
+++ b/va/glx/Makefile.in
@@ -410,9 +410,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/glx/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/glx/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/glx/Makefile
+	  $(AUTOMAKE) --gnu va/glx/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/wayland/Makefile.in b/va/wayland/Makefile.in
index 8ed6fcc..5a5c773 100644
--- a/va/wayland/Makefile.in
+++ b/va/wayland/Makefile.in
@@ -464,9 +464,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/wayland/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/wayland/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/wayland/Makefile
+	  $(AUTOMAKE) --gnu va/wayland/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/wayland/protocol/Makefile.in b/va/wayland/protocol/Makefile.in
index e29c423..e0c370f 100644
--- a/va/wayland/protocol/Makefile.in
+++ b/va/wayland/protocol/Makefile.in
@@ -305,9 +305,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/wayland/protocol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/wayland/protocol/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/wayland/protocol/Makefile
+	  $(AUTOMAKE) --gnu va/wayland/protocol/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/va/x11/Makefile.in b/va/x11/Makefile.in
index a44b797..5d236b4 100644
--- a/va/x11/Makefile.in
+++ b/va/x11/Makefile.in
@@ -418,9 +418,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/x11/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/x11/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign va/x11/Makefile
+	  $(AUTOMAKE) --gnu va/x11/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

-- 
libva packaging



More information about the pkg-multimedia-commits mailing list