summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD35
-rw-r--r--gegl-openexr3.patch12
-rw-r--r--libavcodec.pc14
-rw-r--r--libavdevice.pc14
-rw-r--r--libavfilter.pc14
-rw-r--r--libavformat.pc14
-rw-r--r--libavutil.pc14
-rw-r--r--libpostproc.pc14
-rw-r--r--libswresample.pc14
-rw-r--r--libswscale.pc14
-rw-r--r--sdl2.pc15
-rw-r--r--x86-linux-gnu2
13 files changed, 18 insertions, 190 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac12da6dbf6b..e69e2eeeb90b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 16 15:49:39 UTC 2022
+# Sun Aug 7 07:47:53 UTC 2022
pkgbase = lib32-gegl
pkgdesc = Graph based image processing framework (32-bit)
- pkgver = 0.4.36
- pkgrel = 2
+ pkgver = 0.4.38
+ pkgrel = 1
url = https://www.gegl.org/
arch = x86_64
license = GPL3
@@ -17,10 +17,10 @@ pkgbase = lib32-gegl
makedepends = vala
makedepends = xorgproto
makedepends = shared-mime-info
- makedepends = gobject-introspection
+ makedepends = lib32-gobject-introspection
makedepends = lib32-sdl2
makedepends = python-gobject
- depends = gegl>=0.4.36
+ depends = gegl>=0.4.38
depends = lib32-babl
depends = lib32-libspiro
depends = lib32-json-glib
@@ -36,28 +36,10 @@ pkgbase = lib32-gegl
depends = lib32-suitesparse
depends = lib32-ffmpeg
depends = ffmpeg
- source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=31763e39265adab1142418f6d5cedbd4d3581e06
+ source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=b7fbf39e8010a95977a1642b747b94205892ea57
source = x86-linux-gnu
- source = libavcodec.pc
- source = libavdevice.pc
- source = libavfilter.pc
- source = libavformat.pc
- source = libavutil.pc
- source = libpostproc.pc
- source = libswresample.pc
- source = libswscale.pc
- source = sdl2.pc
sha512sums = SKIP
- sha512sums = 0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8
- sha512sums = 69a2cff0db30b445dbf8adf80b7b63b5f28631bf02f43c3ed0d02e11d162a6f01b9a661a760af6542b21c1d393a61d317ad430c835a54353a778a22279bbc0bd
- sha512sums = 2874ebb198713a34f0859659c6e62872c8a5b87e25b61567395a4bb02530d321ddb0dd90cd00870c2ae0254ac797a835f8b4a70ba59aef55a2daa2d7ffb7e04c
- sha512sums = a4bee13b833b10c14032bbabcf2956e99ea998081020ef1e5228d9417d4c58fd69106d59c56dc26089529c2b9ab41cb6038947df2c325bda4479161e4f181543
- sha512sums = ecdf5a5bb36d5f5fabd26f44530664dfd65528e320642ebc0e2bb8d00d4849f0b3a6939693bf926d7f92a0b7cb868638c02ca21016e4f9cd0a9605fbe6693b03
- sha512sums = 19e2f5c180b74bbe267f4ce48f8be35d893d17c9f9d86d15e35a271e2b522fa9e1b26255fef27f10dbcca3678d499c7b9080823bfc63ee28c8159722d7f11a24
- sha512sums = 73de53df341355ea7a616eb8f81b301ac2273c24ba39973b26ae5793f82c1e1f10b9f615159a04b7c662251402c6b74d5cd4a237676bf0205f7a73bacb868e96
- sha512sums = d7497b7f4a009dd3219c0d2b5d6e67e8bb5bea3fb7efa63192d1b7853d48785ba94f6c0bd89756941e7bac992f5b9cadd0717386f73bf5c4529066c1f607d3df
- sha512sums = 17bc7a78872deef6f5cc5fe8110535070d5eecd6cd67f261c512d8b6922c0ab29e7b3ff0d4708db4c0643dd9e98e673cd745cfab6f6615ddf40f9eb7f47fec9d
- sha512sums = 00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51
+ sha512sums = 97c193bdf744a8853b4463dd9f995faea0e8b269b1b7ef3b9ffcf10c173aa44a0e6edcda5cb69be71af8a4a649332cb841ac5849ea8256f0cfeb5a3cedea251c
pkgname = lib32-gegl
diff --git a/PKGBUILD b/PKGBUILD
index d08567ff32f5..25865ac1e339 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
pkgname=lib32-gegl
_pkgbase=gegl
-pkgver=0.4.36
-_commit=31763e39265adab1142418f6d5cedbd4d3581e06 # tags/GEGL_0_4_36
-pkgrel=2
+pkgver=0.4.38
+_commit=b7fbf39e8010a95977a1642b747b94205892ea57 # tags/GEGL_0_4_38
+pkgrel=1
pkgdesc="Graph based image processing framework (32-bit)"
arch=('x86_64')
url="https://www.gegl.org/"
@@ -20,44 +20,27 @@ depends=("gegl>=$pkgver"
'lib32-suitesparse'
'lib32-ffmpeg' 'ffmpeg')
makedepends=('intltool' 'ruby' 'mesa' 'glu' 'exiv2' 'meson' 'vala'
- 'xorgproto' 'shared-mime-info' 'gobject-introspection'
+ 'xorgproto' 'shared-mime-info' 'lib32-gobject-introspection'
'lib32-sdl2' 'python-gobject')
source=("git+https://gitlab.gnome.org/GNOME/$_pkgbase.git#commit=$_commit"
- "x86-linux-gnu"
- "libavcodec.pc"
- "libavdevice.pc"
- "libavfilter.pc"
- "libavformat.pc"
- "libavutil.pc"
- "libpostproc.pc"
- "libswresample.pc"
- "libswscale.pc"
- "sdl2.pc")
+ "x86-linux-gnu")
sha512sums=('SKIP'
- '0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8'
- '69a2cff0db30b445dbf8adf80b7b63b5f28631bf02f43c3ed0d02e11d162a6f01b9a661a760af6542b21c1d393a61d317ad430c835a54353a778a22279bbc0bd'
- '2874ebb198713a34f0859659c6e62872c8a5b87e25b61567395a4bb02530d321ddb0dd90cd00870c2ae0254ac797a835f8b4a70ba59aef55a2daa2d7ffb7e04c'
- 'a4bee13b833b10c14032bbabcf2956e99ea998081020ef1e5228d9417d4c58fd69106d59c56dc26089529c2b9ab41cb6038947df2c325bda4479161e4f181543'
- 'ecdf5a5bb36d5f5fabd26f44530664dfd65528e320642ebc0e2bb8d00d4849f0b3a6939693bf926d7f92a0b7cb868638c02ca21016e4f9cd0a9605fbe6693b03'
- '19e2f5c180b74bbe267f4ce48f8be35d893d17c9f9d86d15e35a271e2b522fa9e1b26255fef27f10dbcca3678d499c7b9080823bfc63ee28c8159722d7f11a24'
- '73de53df341355ea7a616eb8f81b301ac2273c24ba39973b26ae5793f82c1e1f10b9f615159a04b7c662251402c6b74d5cd4a237676bf0205f7a73bacb868e96'
- 'd7497b7f4a009dd3219c0d2b5d6e67e8bb5bea3fb7efa63192d1b7853d48785ba94f6c0bd89756941e7bac992f5b9cadd0717386f73bf5c4529066c1f607d3df'
- '17bc7a78872deef6f5cc5fe8110535070d5eecd6cd67f261c512d8b6922c0ab29e7b3ff0d4708db4c0643dd9e98e673cd745cfab6f6615ddf40f9eb7f47fec9d'
- '00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51')
+ '97c193bdf744a8853b4463dd9f995faea0e8b269b1b7ef3b9ffcf10c173aa44a0e6edcda5cb69be71af8a4a649332cb841ac5849ea8256f0cfeb5a3cedea251c')
prepare() {
- for pkg in vapigen.pc gobject-introspection-1.0.pc pygobject-3.0.pc; do
+ for pkg in vapigen.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 "$_pkgbase"
- git cherry-pick -n 002f4807e511e65c885cb7c10643b6f44a514eb3..7e19debd83f0658b59fc86c214332ded4f935035
}
build() {
mkdir -p "build"
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
meson setup \
"${_pkgbase}" "build" \
--prefix /usr \
diff --git a/gegl-openexr3.patch b/gegl-openexr3.patch
deleted file mode 100644
index 6c5a41514ae5..000000000000
--- a/gegl-openexr3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
-index 1e8c09d96..87abed511 100644
---- a/operations/external/exr-save.cc
-+++ b/operations/external/exr-save.cc
-@@ -45,6 +45,7 @@ extern "C" {
- #include <ImfChromaticities.h>
- #include <ImfStandardAttributes.h>
- #include <ImfArray.h>
-+#include <ImfFrameBuffer.h>
- #include "ImathRandom.h"
-
-
diff --git a/libavcodec.pc b/libavcodec.pc
deleted file mode 100644
index 2b970f5ea5eb..000000000000
--- a/libavcodec.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libavcodec
-Description: FFmpeg codec library
-Version: 58.134.100
-Requires:
-Requires.private: libswresample >= 3.9.100, libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lavcodec
-Libs.private: -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lwebpmux -lwebp -pthread -lm -llzma -L/usr/lib32 -ldav1d -lopencore-amrwb -L/usr/lib32 -lrsvg-2 -lm -lgio-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lcairo -L/usr/lib32 -lz -L/usr/lib32 -laom -lgsm -lmp3lame -lm -lopencore-amrnb -L/usr/lib32 -lopenjp2 -L/usr/lib32 -lopus -L/usr/lib32 -lspeex -ltheoraenc -ltheoradec -logg -L/usr/lib32 -lvorbis -L/usr/lib32 -lvorbisenc -L/usr/lib32 -lwebp -L/usr/lib32 -lx264 -L/usr/lib32 -lx265 -lxvidcore -L/usr/lib32 -lva
-Cflags: -I${includedir}
diff --git a/libavdevice.pc b/libavdevice.pc
deleted file mode 100644
index b9fa22208ca5..000000000000
--- a/libavdevice.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libavdevice
-Description: FFmpeg device handling library
-Version: 58.13.100
-Requires:
-Requires.private: libavfilter >= 7.110.100, libswscale >= 5.9.100, libpostproc >= 55.9.100, libavformat >= 58.76.100, libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lavdevice
-Libs.private: -lm -lraw1394 -lavc1394 -lrom1394 -liec61883 -L/usr/lib32 -ljack -L/usr/lib32 -ldrm -L/usr/lib32 -lxcb -L/usr/lib32 -lxcb-shm -L/usr/lib32 -lxcb-shape -L/usr/lib32 -lxcb-xfixes -L/usr/lib32 -lasound -L/usr/lib32 -lpulse -pthread -L/usr/lib32 -pthread -lSDL2 -L/usr/lib32 -lv4l2 -lXv -lX11 -lXext
-Cflags: -I${includedir}
diff --git a/libavfilter.pc b/libavfilter.pc
deleted file mode 100644
index 5b16887499b2..000000000000
--- a/libavfilter.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libavfilter
-Description: FFmpeg audio/video filtering library
-Version: 7.110.100
-Requires:
-Requires.private: libswscale >= 5.9.100, libpostproc >= 55.9.100, libavformat >= 58.76.100, libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lavfilter
-Libs.private: -lm -L/usr/lib32 -lfribidi -L/usr/lib32 -lvmaf -pthread -L/usr/lib32 -lass -L/usr/lib32 -lva -L/usr/lib32 -lfontconfig -lfreetype -L/usr/lib32 -lfreetype
-Cflags: -I${includedir}
diff --git a/libavformat.pc b/libavformat.pc
deleted file mode 100644
index 32e3462c7246..000000000000
--- a/libavformat.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libavformat
-Description: FFmpeg container format library
-Version: 58.76.100
-Requires:
-Requires.private: libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lavformat
-Libs.private: -lm -L/usr/lib32 -lxml2 -lbz2 -L/usr/lib32 -lmodplug -L/usr/lib32 -lbluray -lgmp -L/usr/lib32 -lz -L/usr/lib32 -lgnutls -L/usr/lib32 -lsrt
-Cflags: -I${includedir}
diff --git a/libavutil.pc b/libavutil.pc
deleted file mode 100644
index 3c35bd2b35c0..000000000000
--- a/libavutil.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libavutil
-Description: FFmpeg utility library
-Version: 56.70.100
-Requires:
-Requires.private:
-Conflicts:
-Libs: -L${libdir} -lavutil
-Libs.private: -pthread -L/usr/lib32 -lva-drm -lva -L/usr/lib32 -lva-x11 -lva -lvdpau -lX11 -lm -L/usr/lib32 -ldrm -L/usr/lib32 -lva -lXv -lX11 -lXext
-Cflags: -I${includedir}
diff --git a/libpostproc.pc b/libpostproc.pc
deleted file mode 100644
index a6c78d6fb6d3..000000000000
--- a/libpostproc.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libpostproc
-Description: FFmpeg postprocessing library
-Version: 55.9.100
-Requires:
-Requires.private: libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lpostproc
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/libswresample.pc b/libswresample.pc
deleted file mode 100644
index 14a82de16b24..000000000000
--- a/libswresample.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libswresample
-Description: FFmpeg audio resampling library
-Version: 3.9.100
-Requires:
-Requires.private: libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lswresample
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/libswscale.pc b/libswscale.pc
deleted file mode 100644
index 112e09923beb..000000000000
--- a/libswscale.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib32
-includedir=/usr/include/ffmpeg4.4
-
-Name: libswscale
-Description: FFmpeg image rescaling library
-Version: 5.9.100
-Requires:
-Requires.private: libavutil >= 56.70.100
-Conflicts:
-Libs: -L${libdir} -lswscale
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/sdl2.pc b/sdl2.pc
deleted file mode 100644
index 7cf068b8e6c8..000000000000
--- a/sdl2.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 6b88a4fbd20e..f65912f1cc1d 100644
--- a/x86-linux-gnu
+++ b/x86-linux-gnu
@@ -5,6 +5,8 @@ ar = '/usr/bin/gcc-ar'
strip = '/usr/bin/strip'
pkgconfig = '/usr/bin/pkgconf'
llvm-config = '/usr/bin/llvm-config32'
+g-ir-scanner = '/usr/bin/g-ir-scanner-32'
+g-ir-compiler = '/usr/bin/g-ir-compiler-32'
[built-in options]
c_args = ['-m32']