jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-05 17:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdk-pixbuf: update to 2.42.2 and remove now incorporated crosscompile patch

Browse Source
This commit is contained in:
heitbaum 2020-12-30 04:00:10 +00:00
parent 91bdced820
commit 75f21e054c
2 changed files with 2 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="gdk-pixbuf" PKG_NAME="gdk-pixbuf"
PKG_VERSION="2.38.0" PKG_VERSION="2.42.2"
PKG_SHA256="dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47" PKG_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"
PKG_SITE="http://www.gtk.org/" PKG_SITE="http://www.gtk.org/"
PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz"

85
packages/addons/addon-depends/chrome-depends/gdk-pixbuf/patches/gdk-pixbuf-01-meson-crosscompile-fix.patch
View File

@ -1,85 +0,0 @@
diff -Naur a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
--- a/gdk-pixbuf/meson.build 2018-06-15 20:13:23.593361199 +0200
+++ b/gdk-pixbuf/meson.build 2018-06-15 20:13:42.601469091 +0200
@@ -232,15 +232,15 @@
# The 'loaders.cache' used for testing, so we don't accidentally
# load the installed cache; we always build it by default
-loaders_cache = custom_target('loaders.cache',
- output: 'loaders.cache',
- capture: true,
- command: [
- gdk_pixbuf_query_loaders,
- dynamic_loaders,
- ],
- build_by_default: true)
-loaders_dep = declare_dependency(sources: [ loaders_cache ])
+#loaders_cache = custom_target('loaders.cache',
+# output: 'loaders.cache',
+# capture: true,
+# command: [
+# gdk_pixbuf_query_loaders,
+# dynamic_loaders,
+# ],
+# build_by_default: true)
+#loaders_dep = declare_dependency(sources: [ loaders_cache ])
build_gir = get_option('gir')
if build_gir
diff -Naur a/meson.build b/meson.build
--- a/meson.build 2018-06-15 20:13:23.573361085 +0200
+++ b/meson.build 2018-06-15 20:13:32.761413236 +0200
@@ -398,7 +398,7 @@
# i18n
subdir('po')
-subdir('tests')
+#subdir('tests')
subdir('thumbnailer')
# Documentation
diff -Naur a/thumbnailer/meson.build b/thumbnailer/meson.build
--- a/thumbnailer/meson.build 2018-06-15 20:13:23.605361267 +0200
+++ b/thumbnailer/meson.build 2018-06-15 20:13:50.305512825 +0200
@@ -12,22 +12,22 @@
c_args: common_cflags,
dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
-custom_target('thumbnailer',
- input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
- output: 'gdk-pixbuf-thumbnailer.thumbnailer',
- command: [
- gen_thumbnailer,
- '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()),
- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
- '--loaders=@0@'.format(loaders_cache.full_path()),
- '--bindir=@0@'.format(gdk_pixbuf_bindir),
- '@INPUT@',
- '@OUTPUT@',
- ],
- depends: [
- gdk_pixbuf_print_mime_types,
- gdk_pixbuf_pixdata,
- loaders_cache,
- ],
- install: true,
- install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
+#custom_target('thumbnailer',
+# input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
+# output: 'gdk-pixbuf-thumbnailer.thumbnailer',
+# command: [
+# gen_thumbnailer,
+# '--printer=@0@'.format(gdk_pixbuf_print_mime_types.full_path()),
+# '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
+# '--loaders=@0@'.format(loaders_cache.full_path()),
+# '--bindir=@0@'.format(gdk_pixbuf_bindir),
+# '@INPUT@',
+# '@OUTPUT@',
+# ],
+# depends: [
+# gdk_pixbuf_print_mime_types,
+# gdk_pixbuf_pixdata,
+# loaders_cache,
+# ],
+# install: true,
+# install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))