@img/sharp-libvips-dev 1.1.0-rc3 → 1.1.0-rc5

package/include/aom/aom_codec.h

@@ -223,10 +223,27 @@ typedef long aom_codec_caps_t;
  *  Certain codec features must be known at initialization time, to allow for
  *  proper memory allocation.
  *
- *  The available flags are specified by AOM_CODEC_USE_* defines.
+ *  The available flags are specified by AOM_CODEC_USE_* defines. The bits are
+ *  allocated as follows:
+ *      0x1 -     0x80: codec (common to decoder and encoder)
+ *    0x100 -   0x8000: decoder
+ *  0x10000 - 0x800000: encoder
  */
 typedef long aom_codec_flags_t;
 
+// Experimental feature policy
+//
+// New features may be marked as experimental. Experimental features are not
+// part of the stable API and may be modified or removed in a future release.
+// Experimental features are made available only if you pass the
+// AOM_CODEC_USE_EXPERIMENTAL flag to the codec init function.
+//
+// If you use experimental features, you must rebuild your code whenever you
+// update to a new libaom release, and you must be prepared to modify your code
+// when an experimental feature you use is modified or removed. If you are not
+// sure, DO NOT use experimental features.
+#define AOM_CODEC_USE_EXPERIMENTAL 0x1 /**< Enables experimental features */
+
 /*!\brief Time Stamp Type
  *
  * An integer, which when multiplied by the stream's time base, provides

package/include/aom/aom_encoder.h

@@ -78,6 +78,8 @@ extern "C" {
  */
 #define AOM_CODEC_USE_PSNR 0x10000         /**< Calculate PSNR on each frame */
 #define AOM_CODEC_USE_HIGHBITDEPTH 0x40000 /**< Use high bitdepth */
+// 0x80000 was used for the experimental feature AOM_CODEC_USE_PRESET during
+// libaom v3.11.0 development but was removed before the release.
 
 /*!\brief Generic fixed size buffer structure
  *

package/include/aom/aom_image.h

@@ -278,7 +278,9 @@ aom_image_t *aom_img_alloc(aom_image_t *img, aom_img_fmt_t fmt,
  *                         (2^27).
  * \param[in]    align     Alignment, in bytes, of each row in the image
  *                         (stride). Must not exceed 65536.
- * \param[in]    img_data  Storage to use for the image
+ * \param[in]    img_data  Storage to use for the image. The storage must
+ *                         outlive the returned image descriptor; it can be
+ *                         disposed of after calling aom_img_free().
  *
  * \return Returns a pointer to the initialized image descriptor. If the img
  *         parameter is non-null, the value of the img parameter will be

package/include/aom/aomcx.h

@@ -233,10 +233,16 @@ enum aome_enc_control_id {
    * unsigned int parameter.
    *
    * This parameter controls the level at which rate-distortion optimization of
-   * transform coefficients favours sharpness in the block.
+   * transform coefficients favors sharpness in the block.
    *
-   * Valid range: 0..7. The default is 0. Values 1-7 will avoid eob and skip
-   * block optimization and will change rdmult in favour of block sharpness.
+   * Valid range: 0..7. The default is 0.
+   *
+   * Values 1-7 will avoid eob and skip block optimization and will change
+   * rdmult in favor of block sharpness.
+   *
+   * In all-intra mode: it also sets the `loop_filter_sharpness` syntax element
+   * in the bitstream. Larger values increasingly reduce how much the filtering
+   * can change the sample values on block edges to favor perceived sharpness.
    */
   AOME_SET_SHARPNESS = AOME_SET_ENABLEAUTOALTREF + 2,  // 16
 
@@ -666,6 +672,7 @@ enum aome_enc_control_id {
    * - 0 = disable
    * - 1 = enable for all frames (default)
    * - 2 = disable for non-reference frames
+   * - 3 = enable adaptively based on frame qindex
    */
   AV1E_SET_ENABLE_CDEF = 58,
 
@@ -725,8 +732,8 @@ enum aome_enc_control_id {
    * control sets the minimum level of flatness from which the matrices
    * are determined.
    *
-   * By default, the encoder sets this minimum at half the available
-   * range.
+   * By default, the encoder sets this minimum at level 5 (4 in all intra
+   * mode).
    */
   AV1E_SET_QM_MIN = 64,
 
@@ -737,8 +744,8 @@ enum aome_enc_control_id {
    * As quantisation levels increase, the matrices get flatter. This
    * control sets the maximum level of flatness possible.
    *
-   * By default, the encoder sets this maximum at the top of the
-   * available range.
+   * By default, the encoder sets this maximum at level 9 (10 in all intra
+   * mode)
    */
   AV1E_SET_QM_MAX = 65,
 
@@ -1127,6 +1134,8 @@ enum aome_enc_control_id {
    * - 2 = use modulation for local test
    * - 3 = use modulation for key frame perceptual quality optimization
    * - 4 = use modulation for user rating based perceptual quality optimization
+   * - 5 = use modulation for HDR video
+   * - 6 = use modulation for all intra using Variance Boost
    */
   AV1E_SET_DELTAQ_MODE = 107,
 
@@ -1280,8 +1289,7 @@ enum aome_enc_control_id {
    */
   AV1E_SET_SVC_PARAMS = 132,
 
-  /*!\brief Codec control function to set reference frame config:
-   * the ref_idx and the refresh flags for each buffer slot.
+  /*!\brief Codec control function to set the reference frame config,
    * aom_svc_ref_frame_config_t* parameter
    */
   AV1E_SET_SVC_REF_FRAME_CONFIG = 133,
@@ -1660,6 +1668,18 @@ typedef enum {
  *
  * Changes the encoder to tune for certain types of input material.
  *
+ * \note
+ * AOM_TUNE_IQ is restricted to all intra mode (AOM_USAGE_ALL_INTRA). Setting
+ * the tuning option to AOM_TUNE_IQ causes the following options to be set
+ * (expressed as command-line options):
+ *   * --enable-qm=1
+ *   * --qm-min=2
+ *   * --qm-max=10
+ *   * --sharpness=7
+ *   * --dist-metric=qm-psnr
+ *   * --enable-cdef=3
+ *   * --enable-chroma-deltaq=1
+ *   * --deltaq-mode=6
  */
 typedef enum {
   AOM_TUNE_PSNR = 0,
@@ -1671,6 +1691,13 @@ typedef enum {
   AOM_TUNE_VMAF_NEG_MAX_GAIN = 7,
   AOM_TUNE_BUTTERAUGLI = 8,
   AOM_TUNE_VMAF_SALIENCY_MAP = 9,
+/*!\brief Allows detection of the presence of AOM_TUNE_IQ at compile time. */
+#define AOM_HAVE_TUNE_IQ 1
+  /* Image quality (or intra quality). Increases image quality and consistency,
+   * guided by the SSIMULACRA 2 metric and subjective quality checks. Shares
+   * the rdmult code with AOM_TUNE_SSIM.
+   */
+  AOM_TUNE_IQ = 10,
 } aom_tune_metric;
 
 /*!\brief Distortion metric to use for RD optimization.
@@ -1721,12 +1748,25 @@ typedef struct aom_svc_params {
 
 /*!brief Parameters for setting ref frame config */
 typedef struct aom_svc_ref_frame_config {
-  // 7 references: The index 0 - 6 refers to the references:
+  // Three arrays need to be set: reference[], ref_id[], refresh[].
+  // reference[i]: is a boolean flag to indicate which of the 7 possible
+  // references are used for prediction. Values are 0 (not used as reference)
+  // or 1 (use as reference). The index 0 - 6 refers to the references:
   // last(0), last2(1), last3(2), golden(3), bwdref(4), altref2(5), altref(6).
+  // ref_idx[i]: maps a reference to one of the 8 buffers slots, values are
+  // 0 - 7. The ref_idx for a unused reference (reference[i] = 1, and not used
+  // for refresh, see below) can be set to the ref_idx of the first reference
+  // used (usually LAST).
+  // refresh[i] is a boolean flag to indicate if a buffer is updated/refreshed
+  // with the current encoded frame. Values are 0 (no refresh) or 1 (refresh).
+  // The refresh is done internally by looking at the ref_idx[j], for j = 0 - 6,
+  // so to refresh a buffer slot (i) a reference must be mapped to that slot
+  // (i = ref_idx[j]).
+  // Examples for usage (for RTC encoding) are in: examples/svc_encoder_rtc.c.
   int reference[7]; /**< Reference flag for each of the 7 references. */
-  /*! Buffer slot index for each of 7 references indexed above. */
+  /*! Buffer slot index (0..7) for each of 7 references indexed above. */
   int ref_idx[7];
-  int refresh[8]; /**< Refresh flag for each of the 8 slots. */
+  int refresh[8]; /**< Refresh flag for each of the 8 buffer slots. */
 } aom_svc_ref_frame_config_t;
 
 /*!brief Parameters for setting ref frame compound prediction */

package/include/archive.h

@@ -34,7 +34,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007007
+#define	ARCHIVE_VERSION_NUMBER 3007009
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -132,7 +132,7 @@ typedef ssize_t la_ssize_t;
 #define	__LA_PRINTF(fmtarg, firstvararg)	/* nothing */
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 # define __LA_DEPRECATED __attribute__((deprecated))
 #else
 # define __LA_DEPRECATED
@@ -155,7 +155,7 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_ONLY_STRING "3.7.7"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.7.9"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

package/include/archive_entry.h

@@ -28,7 +28,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007007
+#define	ARCHIVE_VERSION_NUMBER 3007009
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the
@@ -127,7 +127,8 @@ typedef ssize_t la_ssize_t;
 # define __LA_DECL
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
+#if defined(__GNUC__) && (__GNUC__ > 3 || \
+    (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 # define __LA_DEPRECATED __attribute__((deprecated))
 #else
 # define __LA_DEPRECATED

package/include/cairo/cairo-version.h

@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 18
-#define CAIRO_VERSION_MICRO 2
+#define CAIRO_VERSION_MICRO 4
 
 #endif

package/include/expat.h

@@ -11,7 +11,7 @@
    Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
    Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
    Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-   Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
+   Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
    Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
    Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
    Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
@@ -130,7 +130,9 @@ enum XML_Error {
   /* Added in 2.3.0. */
   XML_ERROR_NO_BUFFER,
   /* Added in 2.4.0. */
-  XML_ERROR_AMPLIFICATION_LIMIT_BREACH
+  XML_ERROR_AMPLIFICATION_LIMIT_BREACH,
+  /* Added in 2.6.4. */
+  XML_ERROR_NOT_STARTED,
 };
 
 enum XML_Content_Type {
@@ -1065,8 +1067,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
    See https://semver.org
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 6
-#define XML_MICRO_VERSION 3
+#define XML_MINOR_VERSION 7
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }

package/include/expat_config.h

@@ -83,7 +83,7 @@
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.6.3"
+#define PACKAGE_STRING "expat 2.7.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -92,7 +92,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6.3"
+#define PACKAGE_VERSION "2.7.1"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -100,7 +100,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.6.3"
+#define VERSION "2.7.1"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

package/include/ffi.h

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.6
+   libffi 3.4.7
      - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 

package/include/fontconfig/fcfreetype.h

@@ -28,7 +28,7 @@
 #include FT_FREETYPE_H
 
 #ifndef FcPublic
-#define FcPublic
+#  define FcPublic
 #endif
 
 _FCFUNCPROTOBEGIN
@@ -38,7 +38,7 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4);
 
 FcPublic FcCharSet *
 FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing);
-    
+
 FcPublic FcCharSet *
 FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks);
 
@@ -50,9 +50,9 @@ FcPatternAddFTFace (FcPattern *p, const char *object, const FT_Face f);
 
 FcPublic FcPattern *
 FcFreeTypeQueryFace (const FT_Face  face,
-		     const FcChar8  *file,
-		     unsigned int   id,
-		     FcBlanks	    *blanks);
+                     const FcChar8 *file,
+                     unsigned int   id,
+                     FcBlanks      *blanks);
 
 _FCFUNCPROTOEND
 

package/include/fontconfig/fcprivate.h

@@ -31,104 +31,98 @@
  * into macros (sigh).
  */
 
-#define FcPatternVapBuild(result, orig, va)			    \
-{								    \
-    FcPattern	*__p__ = (orig);				    \
-    const char	*__o__;						    \
-    FcValue	__v__;						    \
-								    \
-    if (!__p__)							    \
-    {								    \
-	__p__ = FcPatternCreate ();				    \
-	if (!__p__)		    				    \
-	    goto _FcPatternVapBuild_bail0;			    \
-    }				    				    \
-    for (;;)			    				    \
-    {				    				    \
-	__o__ = va_arg (va, const char *);			    \
-	if (!__o__)		    				    \
-	    break;		    				    \
-	__v__.type = va_arg (va, int);				    \
-	switch (__v__.type) {	    				    \
-	case FcTypeUnknown:					    \
-	case FcTypeVoid:					    \
-	    goto _FcPatternVapBuild_bail1;       		    \
-	case FcTypeInteger:	    				    \
-	    __v__.u.i = va_arg (va, int);			    \
-	    break;						    \
-	case FcTypeDouble:					    \
-	    __v__.u.d = va_arg (va, double);			    \
-	    break;						    \
-	case FcTypeString:					    \
-	    __v__.u.s = va_arg (va, const FcChar8 *);		    \
-	    break;						    \
-	case FcTypeBool:					    \
-	    __v__.u.b = va_arg (va, FcBool);			    \
-	    break;						    \
-	case FcTypeMatrix:					    \
-	    __v__.u.m = va_arg (va, const FcMatrix *);		    \
-	    break;						    \
-	case FcTypeCharSet:					    \
-	    __v__.u.c = va_arg (va, const FcCharSet *); 	    \
-	    break;						    \
-	case FcTypeFTFace:					    \
-	    __v__.u.f = va_arg (va, FT_Face);			    \
-	    break;						    \
-	case FcTypeLangSet:					    \
-	    __v__.u.l = va_arg (va, const FcLangSet *);		    \
-	    break;						    \
-	case FcTypeRange:					    \
-	    __v__.u.r = va_arg (va, const FcRange *);		    \
-	    break;						    \
-	}							    \
-	if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))	    \
-	    goto _FcPatternVapBuild_bail1;			    \
-    }								    \
-    result = __p__;						    \
-    goto _FcPatternVapBuild_return;				    \
-								    \
-_FcPatternVapBuild_bail1:					    \
-    if (!orig)							    \
-	FcPatternDestroy (__p__);				    \
-_FcPatternVapBuild_bail0:					    \
-    result = (void*)0;						    \
-								    \
-_FcPatternVapBuild_return:					    \
-    ;								    \
-}
+#define FcPatternVapBuild(result, orig, va)                  \
+    {                                                        \
+	FcPattern  *__p__ = (orig);                          \
+	const char *__o__;                                   \
+	FcValue     __v__;                                   \
+                                                             \
+	if (!__p__) {                                        \
+	    __p__ = FcPatternCreate();                       \
+	    if (!__p__)                                      \
+		goto _FcPatternVapBuild_bail0;               \
+	}                                                    \
+	for (;;) {                                           \
+	    __o__ = va_arg (va, const char *);               \
+	    if (!__o__)                                      \
+		break;                                       \
+	    __v__.type = va_arg (va, int);                   \
+	    switch (__v__.type) {                            \
+	    case FcTypeUnknown:                              \
+	    case FcTypeVoid:                                 \
+		goto _FcPatternVapBuild_bail1;               \
+	    case FcTypeInteger:                              \
+		__v__.u.i = va_arg (va, int);                \
+		break;                                       \
+	    case FcTypeDouble:                               \
+		__v__.u.d = va_arg (va, double);             \
+		break;                                       \
+	    case FcTypeString:                               \
+		__v__.u.s = va_arg (va, const FcChar8 *);    \
+		break;                                       \
+	    case FcTypeBool:                                 \
+		__v__.u.b = va_arg (va, FcBool);             \
+		break;                                       \
+	    case FcTypeMatrix:                               \
+		__v__.u.m = va_arg (va, const FcMatrix *);   \
+		break;                                       \
+	    case FcTypeCharSet:                              \
+		__v__.u.c = va_arg (va, const FcCharSet *);  \
+		break;                                       \
+	    case FcTypeFTFace:                               \
+		__v__.u.f = va_arg (va, FT_Face);            \
+		break;                                       \
+	    case FcTypeLangSet:                              \
+		__v__.u.l = va_arg (va, const FcLangSet *);  \
+		break;                                       \
+	    case FcTypeRange:                                \
+		__v__.u.r = va_arg (va, const FcRange *);    \
+		break;                                       \
+	    }                                                \
+	    if (!FcPatternAdd (__p__, __o__, __v__, FcTrue)) \
+		goto _FcPatternVapBuild_bail1;               \
+	}                                                    \
+	result = __p__;                                      \
+	goto _FcPatternVapBuild_return;                      \
+                                                             \
+    _FcPatternVapBuild_bail1:                                \
+	if (!orig)                                           \
+	    FcPatternDestroy (__p__);                        \
+    _FcPatternVapBuild_bail0:                                \
+	result = (void *)0;                                  \
+                                                             \
+    _FcPatternVapBuild_return:;                              \
+    }
 
-
-#define FcObjectSetVapBuild(__ret__, __first__, __va__) 		\
-{									\
-    FcObjectSet    *__os__;						\
-    const char	    *__ob__;						\
-									\
-    __ret__ = 0;						    	\
-    __os__ = FcObjectSetCreate ();					\
-    if (!__os__)							\
-	goto _FcObjectSetVapBuild_bail0;				\
-    __ob__ = __first__;							\
-    while (__ob__)							\
-    {									\
-	if (!FcObjectSetAdd (__os__, __ob__))				\
-	    goto _FcObjectSetVapBuild_bail1;				\
-	__ob__ = va_arg (__va__, const char *);				\
-    }									\
-    __ret__ = __os__;							\
-									\
-_FcObjectSetVapBuild_bail1:						\
-    if (!__ret__ && __os__)					    	\
-	FcObjectSetDestroy (__os__);					\
-_FcObjectSetVapBuild_bail0:						\
-    ;									\
-}
+#define FcObjectSetVapBuild(__ret__, __first__, __va__) \
+    {                                                   \
+	FcObjectSet *__os__;                            \
+	const char  *__ob__;                            \
+                                                        \
+	__ret__ = 0;                                    \
+	__os__ = FcObjectSetCreate();                   \
+	if (!__os__)                                    \
+	    goto _FcObjectSetVapBuild_bail0;            \
+	__ob__ = __first__;                             \
+	while (__ob__) {                                \
+	    if (!FcObjectSetAdd (__os__, __ob__))       \
+		goto _FcObjectSetVapBuild_bail1;        \
+	    __ob__ = va_arg (__va__, const char *);     \
+	}                                               \
+	__ret__ = __os__;                               \
+                                                        \
+    _FcObjectSetVapBuild_bail1:                         \
+	if (!__ret__ && __os__)                         \
+	    FcObjectSetDestroy (__os__);                \
+    _FcObjectSetVapBuild_bail0:;                        \
+    }
 
 #ifndef FC_ATTRIBUTE_VISIBILITY_HIDDEN
-#define FC_ATTRIBUTE_VISIBILITY_HIDDEN __attribute((visibility("hidden")))
+#  define FC_ATTRIBUTE_VISIBILITY_HIDDEN __attribute ((visibility ("hidden")))
 #endif
 
 #ifndef FC_ATTRIBUTE_VISIBILITY_EXPORT
-#define FC_ATTRIBUTE_VISIBILITY_EXPORT __attribute((visibility("default")))
+#  define FC_ATTRIBUTE_VISIBILITY_EXPORT __attribute ((visibility ("default")))
 #endif
 
 #endif /* _FCPRIVATE_H_ */