这是indexloc提供的服务，不要输入任何密码
Skip to content

bump(main/gmic): 3.4.3 -> 3.5.0 #22745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bump(main/gmic): 3.4.3 -> 3.5.0 #22745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions packages/gmic/CImg.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
diff -uNr gmic-2.6.7/src/CImg.h gmic-2.6.7.mod/src/CImg.h
--- gmic-2.6.7/src/CImg.h 2019-06-28 09:56:12.000000000 +0300
+++ gmic-2.6.7.mod/src/CImg.h 2019-06-29 18:45:02.595895578 +0300
@@ -9838,8 +9838,10 @@
--- gmic-3.5.0/src/CImg.h 2024-12-31 19:11:35.000000000 +0800
+++ gmic-3.5.0.mod/src/CImg.h 2025-01-04 03:25:46.407412118 +0800
@@ -3274,7 +3274,11 @@

~X11_attr() {
if (events_thread) {
+#ifndef __ANDROID__
pthread_cancel(*events_thread);
+#else
+ pthread_kill(*events_thread, SIGUSR1);
+#endif
delete events_thread;
}
pthread_cond_destroy(&wait_event);
@@ -9897,8 +9901,10 @@
static void* _events_thread(void *arg) { // Thread to manage events for all opened display windows
Display *const dpy = cimg::X11_attr().display;
Display *const dpy = cimg::X11_attr::ref().display;
XEvent event;
+#ifndef __ANDROID__
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED,0);
Expand All @@ -12,17 +23,17 @@ diff -uNr gmic-2.6.7/src/CImg.h gmic-2.6.7.mod/src/CImg.h
if (!arg) for ( ; ; ) {
cimg_lock_display();
bool event_flag = XCheckTypedEvent(dpy,ClientMessage,&event);
@@ -9852,7 +9854,9 @@
if (!cimg::X11_attr().wins[i]->_is_closed && event.xany.window==cimg::X11_attr().wins[i]->_window)
cimg::X11_attr().wins[i]->_handle_events(&event);
@@ -9911,7 +9917,9 @@
if (!cimg::X11_attr::ref().wins[i]->_is_closed && event.xany.window==cimg::X11_attr::ref().wins[i]->_window)
cimg::X11_attr::ref().wins[i]->_handle_events(&event);
cimg_unlock_display();
+#ifndef __ANDROID__
pthread_testcancel();
+#endif
cimg::sleep(8);
}
return 0;
@@ -60774,8 +60774,8 @@
@@ -68269,8 +68277,8 @@
_cimg_test_temporary_path("D:\\Temp");
_cimg_test_temporary_path("D:");
#else
Expand Down
4 changes: 2 additions & 2 deletions packages/gmic/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu
TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
TERMUX_PKG_LICENSE="CeCILL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.4.3"
TERMUX_PKG_VERSION="3.5.0"
TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=79951d06db2928c68bad1d352e536af3f454e9a3c09beefc2c1049d8b4084507
TERMUX_PKG_SHA256=847ddf438bbe73ec1447a8d98916571c75664bed050ac11212e45b2eb4c1cad0
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="fftw, imath, libc++, libcurl, libjpeg-turbo, libpng, libtiff, libx11, openexr, zlib"
TERMUX_PKG_BUILD_DEPENDS="graphicsmagick"
Expand Down
Loading