From 907472ac8d30c904e4dbb052b09d02a72995a034 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 10 Oct 2025 16:03:42 +0300 Subject: [PATCH] Update package version to 0.4.64 --- pkg.info | 45 ++++++++++++++++++++++++++---- source-files/ffmpeg8-fix.patch | 50 ---------------------------------- source.sh | 13 --------- 3 files changed, 40 insertions(+), 68 deletions(-) delete mode 100644 source-files/ffmpeg8-fix.patch diff --git a/pkg.info b/pkg.info index 258c4cf..35b59d3 100644 --- a/pkg.info +++ b/pkg.info @@ -1,11 +1,46 @@ name: gegl description: Data flow based image processing framework -version: 0.4.62 -revision: 2 +version: 0.4.64 +revision: 1 url: https://www.gegl.org/ license: GPL3-or-later OR LGPL3-or-later architecture: any -depends: ["babl", "cairo", "gcc-libs", "gdk-pixbuf", "glib", "glibc", "jasper", "json-glib", "lcms2", "lensfun", "libjpeg-turbo", "libpng", "libraw", "librsvg", "libspiro", "libtiff", "libwebp", "luajit", "pango", "poppler"] -optional_depends: ["ffmpeg", "graphviz", "sdl2-compat"] -make_depends: ["ffmpeg", "gexiv2", "gobject-introspection", "meson", "python-pygobject", "sdl2-compat","vala"] type: source +depends: + - babl + - cairo + - gcc-libs + - gdk-pixbuf + - glib + - glibc + - jasper + - json-glib + - lcms2 + - lensfun + - libjpeg-turbo + - libpng + - libraw + - librsvg + - libspiro + - libtiff + - libwebp + - luajit + - pango + - poppler +optional_depends: + - ffmpeg + - graphviz + - sdl2-compat +make_depends: + - ffmpeg + - gexiv2 + - gobject-introspection + - meson + - python-pygobject + - sdl2-compat + - vala +downloads: + - url: https://download.gimp.org/pub/gegl/${BPM_PKG_VERSION%.*}/gegl-${BPM_PKG_VERSION}.tar.xz + extract_to: ${BPM_SOURCE} + extract_strip_components: 1 + checksum: 0de1c9dd22c160d5e4bdfc388d292f03447cca6258541b9a12fed783d0cf7c60 diff --git a/source-files/ffmpeg8-fix.patch b/source-files/ffmpeg8-fix.patch deleted file mode 100644 index 3fe3dd9..0000000 --- a/source-files/ffmpeg8-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -Submitted By: Rahul Chandra -Date: 2025-09-05 -Initial Package Version: 0.4.62 -Upstream Status: Applied eda8ba51786f197b72265eafcdab407d91ec9c70 -Origin: Gnome Gitlab -Description: Fixes building against FFMPEG 8.0 - -From eda8ba51786f197b72265eafcdab407d91ec9c70 Mon Sep 17 00:00:00 2001 -From: Bruno Lopes -Date: Fri, 5 Sep 2025 19:46:24 -0300 -Subject: [PATCH] operations: Support FFMPEG 8 on ff-load - -Closes #428 - -Patch from https://github.com/msys2/MINGW-packages/pull/25335 ---- - operations/external/ff-load.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c -index a8c266827..babd7f6d6 100644 ---- a/operations/external/ff-load.c -+++ b/operations/external/ff-load.c -@@ -349,7 +349,11 @@ decode_frame (GeglOperation *operation, - if (frame < 2 || frame > prevframe + 64 || frame < prevframe ) - { - int64_t seek_target = av_rescale_q (((frame) * AV_TIME_BASE * 1.0) / o->frame_rate -+#if LIBAVCODEC_VERSION_MAJOR < 60 - , AV_TIME_BASE_Q, p->video_stream->time_base) / p->video_ctx->ticks_per_frame; -+#else -+, AV_TIME_BASE_Q, p->video_stream->time_base) / (p->video_ctx->codec_descriptor->props & AV_CODEC_PROP_FIELDS ? 2 : 1); -+#endif - - if (av_seek_frame (p->video_fcontext, p->video_index, seek_target, (AVSEEK_FLAG_BACKWARD )) < 0) - fprintf (stderr, "video seek error!\n"); -@@ -403,7 +407,11 @@ decode_frame (GeglOperation *operation, - break; - } - got_picture = 1; -+#if LIBAVUTIL_VERSION_MAJOR < 58 - if ((pkt.dts == pkt.pts) || (p->lavc_frame->key_frame!=0)) -+#else -+ if ((pkt.dts == pkt.pts) || (p->lavc_frame->flags & AV_FRAME_FLAG_KEY)) -+#endif - { - // cur_dts and first_dts are moved to libavformat/internal.h - /* --- -GitLab - diff --git a/source.sh b/source.sh index ce72e20..71dd939 100644 --- a/source.sh +++ b/source.sh @@ -2,19 +2,6 @@ # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT -DOWNLOAD="https://download.gimp.org/pub/gegl/${BPM_PKG_VERSION%.*}/gegl-${BPM_PKG_VERSION}.tar.xz" -FILENAME="${DOWNLOAD##*/}" - -# The prepare function is executed in the root of the temp directory -# This function is used for downloading files and putting them into the correct location -prepare() { - wget "$DOWNLOAD" - tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE" - - cd "$BPM_SOURCE" - patch -Np1 -i "$BPM_WORKDIR"/ffmpeg8-fix.patch -} - # The build function is executed in the source directory # This function is used to compile the source code build() {