diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rwxr-xr-x | pkgconf32 | 2 | ||||
| -rw-r--r-- | sdl2.pc | 15 | ||||
| -rw-r--r-- | x86-linux-gnu | 10 |
5 files changed, 61 insertions, 22 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri May 7 13:11:50 UTC 2021 +# Fri Oct 15 13:22:37 UTC 2021 pkgbase = lib32-gegl pkgdesc = Graph based image processing framework (32-bit) - pkgver = 0.4.30 + pkgver = 0.4.32 pkgrel = 2 url = https://www.gegl.org/ arch = x86_64 @@ -13,11 +13,14 @@ pkgbase = lib32-gegl makedepends = mesa makedepends = glu makedepends = exiv2 + makedepends = meson makedepends = vala + makedepends = xorgproto + makedepends = shared-mime-info makedepends = gobject-introspection - makedepends = meson + makedepends = lib32-sdl2 makedepends = python-gobject - depends = gegl=0.4.30 + depends = gegl=0.4.32 depends = lib32-babl depends = lib32-libspiro depends = lib32-json-glib @@ -34,12 +37,12 @@ pkgbase = lib32-gegl depends = lib32-ffmpeg source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=5ea11ee00d9061ca2cd61f83ece25dfcfe0e9596 source = x86-linux-gnu + source = sdl2.pc source = gegl-openexr3.patch - source = pkgconf32 sha512sums = SKIP - sha512sums = 3760e32b315d45494a7e1480a5b56f64d6fcf3eb99376bee21f499e9ea5b3e06a111d773a4223d258035fa8d89a94b4e19fbe9be92478084fef8d195d0f3a484 + sha512sums = 0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8 + sha512sums = 00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51 sha512sums = bc732c99026afd59aaa70bd98622bdedb2173ac3242d4648f6222bc966e60b9f9b2df7360fee3cbdb7240f6758d7382d6986d02a133b203c1e47af3782b7f475 - sha512sums = f704e11f3054312e35974194af845e00fdc795aa97e82d425fb52ff8e628702926551b583f0354f9f9e7eafeb71c7f348c288457ff19a8c4807c58f637d0d946 pkgname = lib32-gegl @@ -3,7 +3,7 @@ pkgname=lib32-gegl _pkgbase=gegl -pkgver=0.4.30 +pkgver=0.4.32 _commit=5ea11ee00d9061ca2cd61f83ece25dfcfe0e9596 # tags/GEGL_0_4_30 pkgrel=2 pkgdesc="Graph based image processing framework (32-bit)" @@ -18,28 +18,43 @@ depends=("gegl=$pkgver" 'lib32-lensfun' 'lib32-luajit' 'lib32-jasper' 'lib32-suitesparse' 'lib32-ffmpeg') -makedepends=('intltool' 'ruby' 'mesa' 'glu' 'exiv2' 'vala' 'gobject-introspection' 'meson' 'python-gobject') +makedepends=('intltool' 'ruby' 'mesa' 'glu' 'exiv2' 'meson' 'vala' + 'xorgproto' 'shared-mime-info' 'gobject-introspection' + 'lib32-sdl2' 'python-gobject') source=("git+https://gitlab.gnome.org/GNOME/$_pkgbase.git#commit=$_commit" "x86-linux-gnu" - "gegl-openexr3.patch" - "pkgconf32") + "sdl2.pc" + "gegl-openexr3.patch") sha512sums=('SKIP' - '3760e32b315d45494a7e1480a5b56f64d6fcf3eb99376bee21f499e9ea5b3e06a111d773a4223d258035fa8d89a94b4e19fbe9be92478084fef8d195d0f3a484' - 'bc732c99026afd59aaa70bd98622bdedb2173ac3242d4648f6222bc966e60b9f9b2df7360fee3cbdb7240f6758d7382d6986d02a133b203c1e47af3782b7f475' - 'f704e11f3054312e35974194af845e00fdc795aa97e82d425fb52ff8e628702926551b583f0354f9f9e7eafeb71c7f348c288457ff19a8c4807c58f637d0d946') + '0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8' + '00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51' + 'bc732c99026afd59aaa70bd98622bdedb2173ac3242d4648f6222bc966e60b9f9b2df7360fee3cbdb7240f6758d7382d6986d02a133b203c1e47af3782b7f475') prepare() { - cp "/usr/lib/pkgconfig/vapigen.pc" \ - "/usr/lib/pkgconfig/gobject-introspection-1.0.pc" \ - "/usr/lib/pkgconfig/pygobject-3.0.pc" \ - "$srcdir/" + for pkg in vapigen.pc gobject-introspection-1.0.pc pygobject-3.0.pc; do + cp "/usr/lib/pkgconfig/$pkg" "$srcdir/" + done + for pkg in xproto.pc kbproto.pc xextproto.pc renderproto.pc shared-mime-info.pc; do + cp "/usr/share/pkgconfig/$pkg" "$srcdir/" + done cd "$srcdir/$_pkgbase" patch -p1 < ../gegl-openexr3.patch } build() { mkdir -p "build" - arch-meson "${_pkgbase}" "build" -Dworkshop=true -Dmrg=disabled -Dmaxflow=disabled --cross-file x86-linux-gnu --libdir=/usr/lib32 + meson setup \ + "${_pkgbase}" "build" \ + --prefix /usr \ + --sbindir bin \ + --buildtype plain \ + --libexecdir lib32 \ + --libdir /usr/lib32 \ + --auto-features enabled \ + --wrap-mode nodownload \ + -Db_lto=true -Db_pie=true \ + -Dworkshop=true -Dmrg=disabled -Dmaxflow=disabled \ + --cross-file x86-linux-gnu ninja -C "build" } diff --git a/pkgconf32 b/pkgconf32 deleted file mode 100755 index 517eab087305..000000000000 --- a/pkgconf32 +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/bash -PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/share/pkgconfig:.' /usr/bin/pkgconf $@ diff --git a/sdl2.pc b/sdl2.pc new file mode 100644 index 000000000000..7cf068b8e6c8 --- /dev/null +++ b/sdl2.pc @@ -0,0 +1,15 @@ +# sdl pkg-config source file + +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib32 +includedir=/usr/include + +Name: sdl2 +Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. +Version: 2.0.16 +Requires: +Conflicts: +Libs: -L${libdir} -pthread -lSDL2 +Libs.private: -lrt -lunwind-generic -lunwind -ldbus-1 -ldl -lm -Wl,--no-undefined -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -pthread -lSDL2 +Cflags: -I${includedir}/SDL2 -D_REENTRANT diff --git a/x86-linux-gnu b/x86-linux-gnu index e81b9f980104..6b88a4fbd20e 100644 --- a/x86-linux-gnu +++ b/x86-linux-gnu @@ -3,7 +3,8 @@ c = '/usr/bin/gcc' cpp = '/usr/bin/g++' ar = '/usr/bin/gcc-ar' strip = '/usr/bin/strip' -pkgconfig = './pkgconf32' +pkgconfig = '/usr/bin/pkgconf' +llvm-config = '/usr/bin/llvm-config32' [built-in options] c_args = ['-m32'] @@ -11,6 +12,13 @@ c_link_args = ['-m32'] cpp_args = ['-m32'] cpp_link_args = ['-m32'] +prefix = '/usr' +libdir = 'lib32' +bindir = 'bin' + +[properties] +pkg_config_libdir = ['.', '/usr/lib32/pkgconfig'] + [host_machine] system = 'linux' cpu_family = 'x86' |