Update for 8.15.0-rc1

- Add highway to 'web' group dependencies. - Remove liborc in favor of highway.
libvips · Oct 18, 2023 · d6b4934 · d6b4934
1 parent d7d804a
commit d6b4934
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 1,900 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [gdk-pixbuf]    | 2.42.10   | LGPLv3                                                       |
 | [glib]          | 2.78.0    | LGPLv3                                                       |
 | [harfbuzz]      | 8.2.1     | MIT Licence                                                  |
+| [highway]       | 1.0.7     | Apache-2.0 License, BSD 3-Clause                             |
 | [lcms]          | 2.15      | MIT Licence                                                  |
 | [libarchive]    | 3.7.2     | BSD 2-Clause                                                 |
 | [libexif]       | 0.6.24    | LGPLv3                                                       |
@@ -37,17 +38,18 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.57.0    | LGPLv3                                                       |
 | [libspng]       | 0.7.4     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.6.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.14.5    | LGPLv3                                                       |
+| [libvips]       | 8.15.0²   | LGPLv3                                                       |
 | [libwebp]       | 1.3.2     | New BSD License                                              |
 | [libxml2]       | 2.11.5    | MIT Licence                                                  |
 | [mozjpeg]       | 4.1.5     | [zlib License, IJG License, BSD-3-Clause]                    |
-| [orc]           | 0.4.34    | [orc License] (BSD-like)                                     |
 | [pango]         | 1.51.0    | LGPLv3                                                       |
 | [pixman]        | 0.42.2    | MIT Licence                                                  |
 | [proxy-libintl] | 0.4       | LGPLv3                                                       |
 | [zlib-ng]       | 2.1.3     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
+² libvips is built from the [`v8.15.0-rc1`](https://github.com/libvips/libvips/tree/v8.15.0-rc1) tag, see:
+https://github.com/libvips/libvips/releases/tag/v8.15.0-rc1
 
 [aom]: https://aomedia.googlesource.com/aom/
 [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -62,6 +64,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 [gdk-pixbuf]: https://gitlab.gnome.org/GNOME/gdk-pixbuf
 [glib]: https://gitlab.gnome.org/GNOME/glib
 [harfbuzz]: https://github.com/harfbuzz/harfbuzz
+[highway]: https://github.com/google/highway
 [lcms]: https://github.com/mm2/Little-CMS
 [libarchive]: https://github.com/libarchive/libarchive
 [libexif]: https://github.com/libexif/libexif
@@ -79,8 +82,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 [libxml2]: https://gitlab.gnome.org/GNOME/libxml2
 [mozjpeg]: https://github.com/mozilla/mozjpeg
 [zlib License, IJG License, BSD-3-Clause]: https://github.com/mozilla/mozjpeg/blob/master/LICENSE.md
-[orc]: https://gitlab.freedesktop.org/gstreamer/orc
-[orc License]: https://gitlab.freedesktop.org/gstreamer/orc/blob/master/COPYING
 [pango]: https://gitlab.gnome.org/GNOME/pango
 [pixman]: https://gitlab.freedesktop.org/pixman/pixman
 [proxy-libintl]: https://github.com/frida/proxy-libintl
@@ -96,7 +97,6 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.1.0     | MIT Licence                                                  |
 | [cfitsio]       | 4.3.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 1.0.7     | Apache-2.0 License, BSD 3-Clause                             |
 | [imagemagick]   | 6.9.12-98 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.9     | BSD 3-Clause                                                 |
 | [libdicom]      | 1.0.5     | MIT Licence                                                  |
@@ -112,7 +112,6 @@ Same as libvips-web + these extra dependencies:
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
 [fftw]: https://github.com/FFTW/fftw3
-[highway]: https://github.com/google/highway
 [imagemagick]: https://github.com/ImageMagick/ImageMagick6
 [ImageMagick License]: https://imagemagick.org/script/license.php
 [imath]: https://github.com/AcademySoftwareFoundation/Imath

diff --git a/build/orc.mk b/build/orc.mk
diff --git a/build/patches/orc-0.4-fixes.patch b/build/patches/orc-0.4-fixes.patch
diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch
@@ -9,35 +9,35 @@ diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h
 index 1111111..2222222 100644
 --- a/libvips/include/vips/util.h
 +++ b/libvips/include/vips/util.h
-@@ -392,6 +392,7 @@ guint32 vips__random( guint32 seed );
- guint32 vips__random_add( guint32 seed, int value );
+@@ -437,6 +437,7 @@ guint32 vips__random(guint32 seed);
+ guint32 vips__random_add(guint32 seed, int value);
 
- const char *vips__icc_dir( void );
-+const char *vips__dll_dir( void );
- const char *vips__windows_prefix( void );
+ const char *vips__icc_dir(void);
++const char *vips__dll_dir(void);
+ const char *vips__windows_prefix(void);
 
- char *vips__get_iso8601( void );
+ char *vips__get_iso8601(void);
 diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
 index 1111111..2222222 100644
 --- a/libvips/iofuncs/init.c
 +++ b/libvips/iofuncs/init.c
-@@ -1200,6 +1200,12 @@ vips_guess_prefix( const char *argv0, const char *env_name )
+@@ -1166,6 +1166,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
  const char *
- vips_guess_libdir( const char *argv0, const char *env_name )
+ vips_guess_libdir(const char *argv0, const char *env_name)
  {
 +#if defined(G_OS_WIN32) && defined(VIPS_DLLDIR_AS_LIBDIR)
-+	/* Sometimes users want to use the DLL directory where the libvips DLL 
++	/* Sometimes users want to use the DLL directory where the libvips DLL
 +	 * resides as libdir.
 +	 */
-+	return( vips__dll_dir() );
-+#else /*!G_OS_WIN32 || !VIPS_DLLDIR_AS_LIBDIR*/
- 	const char *prefix = vips_guess_prefix( argv0, env_name );
++	return vips__dll_dir();
++#else  /*!G_OS_WIN32 || !VIPS_DLLDIR_AS_LIBDIR*/
+ 	const char *prefix = vips_guess_prefix(argv0, env_name);
  	static char *libdir = NULL;
 
-@@ -1224,6 +1230,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
- 		libdir = g_strdup_printf( "%s/lib", prefix );
+@@ -1190,6 +1196,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
+ 		libdir = g_strdup_printf("%s/lib", prefix);
 
- 	return( libdir );
+ 	return libdir;
 +#endif /*G_OS_WIN32 && VIPS_DLLDIR_AS_LIBDIR*/
  }
 
@@ -46,14 +46,14 @@ diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c
 index 1111111..2222222 100644
 --- a/libvips/iofuncs/util.c
 +++ b/libvips/iofuncs/util.c
-@@ -1993,6 +1993,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
- 	return( TRUE );
+@@ -1999,6 +1999,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+ 	return TRUE;
  }
  #endif
 +
 +#ifdef VIPS_DLLDIR_AS_LIBDIR
 +static void *
-+vips__dll_dir_once( void *null )
++vips__dll_dir_once(void *null)
 +{
 +	/* From glib _glib_get_dll_directory()
 +	 */
@@ -62,7 +62,7 @@ index 1111111..2222222 100644
 +	wchar_t wc_fn[MAX_PATH];
 +
 +#ifdef DLL_EXPORT
-+	if( vips__dll == NULL )
++	if (vips__dll == NULL)
 +		return NULL;
 +#endif
 +
@@ -75,27 +75,27 @@ index 1111111..2222222 100644
 +	 * In a statically built libvips, vips__dll will be NULL and we will
 +	 * thus look up the application's .exe file's location.
 +	 */
-+	if( !GetModuleFileNameW( vips__dll, wc_fn, MAX_PATH ) )
++	if (!GetModuleFileNameW(vips__dll, wc_fn, MAX_PATH))
 +		return NULL;
 +
-+	dll_dir = g_utf16_to_utf8( wc_fn, -1, NULL, NULL, NULL );
++	dll_dir = g_utf16_to_utf8(wc_fn, -1, NULL, NULL, NULL);
 +
-+	p = strrchr( dll_dir, G_DIR_SEPARATOR );
-+	if( p == NULL )
++	p = strrchr(dll_dir, G_DIR_SEPARATOR);
++	if (p == NULL)
 +		return NULL;
-+  
++
 +	*p = '\0';
 +
-+	return( (void *) dll_dir );
++	return (void *) dll_dir;
 +}
 +
 +const char *
-+vips__dll_dir( void )
++vips__dll_dir(void)
 +{
 +	static GOnce once = G_ONCE_INIT;
 +
-+	return( (const char *) g_once( &once, 
-+		vips__dll_dir_once, NULL ) );
++	return (const char *) g_once(&once,
++		vips__dll_dir_once, NULL);
 +}
 +#endif /*VIPS_DLLDIR_AS_LIBDIR*/
  #endif /*G_OS_WIN32*/