diff --git a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.12.recipe b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe similarity index 59% rename from x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.12.recipe rename to x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe index 7d8c38ad5..ff85d8a47 100644 --- a/x11-libs/gdk-pixbuf/gdk_pixbuf-2.36.12.recipe +++ b/x11-libs/gdk-pixbuf/gdk_pixbuf-2.42.2.recipe @@ -7,31 +7,28 @@ GdkRGB buffers. * Fast scaling and compositing of pixbufs. * Simple animation loading (ie. animated GIFs)" HOMEPAGE="https://wiki.gnome.org/Projects/GdkPixbuf" -COPYRIGHT="1999-2018 Gnome Project" +COPYRIGHT="1999-2020 Gnome Project" LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-$portVersion.tar.xz" -CHECKSUM_SHA256="fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334" +REVISION="1" +SOURCE_URI="https://download.gnome.org/sources/gdk-pixbuf/${portVersion%.*}/gdk-pixbuf-$portVersion.tar.xz" +CHECKSUM_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15" SOURCE_DIR="gdk-pixbuf-$portVersion" -ARCHITECTURES="x86_gcc2 x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="0.3612.0" +libVersion="0.4200.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" gdk_pixbuf$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_csource$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_pixdata$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix = $portVersion - cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix = $portVersion lib:libgdk_pixbuf_2.0$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libffi$secondaryArchSuffix lib:libgio_2.0$secondaryArchSuffix + lib:libgirepository_1.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix @@ -51,60 +48,78 @@ REQUIRES_devel=" gdk_pixbuf$secondaryArchSuffix == $portVersion base " +PROVIDES_tools=" + gdk_pixbuf${secondaryArchSuffix}_tools = $portVersion + cmd:gdk_pixbuf_csource$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_pixdata$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_query_loaders$secondaryArchSuffix = $portVersion + cmd:gdk_pixbuf_thumbnailer$secondaryArchSuffix = $portVersion + " +REQUIRES_tools=" + gdk_pixbuf$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libgio_2.0$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libgmodule_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel shared_mime_info$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix >= 0.4800 + devel:libgirepository_1.0$secondaryArchSuffix + devel:libglib_2.0$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:autoheader - cmd:automake - cmd:awk cmd:gcc$secondaryArchSuffix - cmd:make + cmd:meson + cmd:ninja cmd:pkg_config$secondaryArchSuffix - cmd:python2 " defineDebugInfoPackage gdk_pixbuf$secondaryArchSuffix \ - "$binDir"/gdk-pixbuf-csource \ - "$binDir"/gdk-pixbuf-pixdata \ - "$binDir"/gdk-pixbuf-query-loaders \ - "$binDir"/gdk-pixbuf-thumbnailer \ + "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-csource \ + "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-pixdata \ + "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-query-loaders \ + "$(getPackagePrefix tools)/$relativeBinDir"/gdk-pixbuf-thumbnailer \ "$libDir"/libgdk_pixbuf-2.0.so.$libVersion BUILD() { - runConfigure ./configure - make $jobArgs + meson build \ + --prefix=$prefix \ + --bindir=$binDir \ + --datadir=$dataDir \ + --includedir=$includeDir \ + --libdir=$libDir \ + --libexecdir=$libDir \ + --localedir=$dataDir/locale \ + -D installed_tests=false + ninja -C build $jobArgs } INSTALL() { - make install + ninja -C build install - rm $libDir/libgdk_pixbuf-2.0.la - rm $libDir/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.la - - prepareInstalledDevelLibs \ + prepareInstalledDevelLib \ libgdk_pixbuf-2.0 fixPkgconfig - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $dataDir/gtk-doc $manDir - fi - packageEntries devel \ $developDir + + packageEntries tools \ + $binDir } TEST() { - make check + : + # tests fail/crash (also with previous version) + # meson test -C build --print-errorlogs }