git: 08273846dd22 - main - deskutils/calibre: Fix build with build with FFmpeg 9.0
Guido Falsi <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=08273846dd22b668a9594aaf0ea6b10a73f198be commit 08273846dd22b668a9594aaf0ea6b10a73f198be Author: Guido Falsi <[email protected]> AuthorDate: 2026-08-16 18:40:45 +0000 Commit: Guido Falsi <[email protected]> CommitDate: 2026-08-16 18:40:45 +0000 deskutils/calibre: Fix build with build with FFmpeg 9.0 Import upstream patch to fix the issue. While here, fix some portclippy/portfmt warnings. PR: 297387 Obtained from: https://github.com/kovidgoyal/calibre/commit/49af1f0904e00351ffbf9ad430a37bfe66226bae --- deskutils/calibre/Makefile | 19 +++++++++++-------- deskutils/calibre/distinfo | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 56be2df8fed0..75d7b623177b 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,11 +1,15 @@ PORTNAME= calibre PORTVERSION= 8.16.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python MASTER_SITES= https://download.calibre-ebook.com/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= https://github.com/kovidgoyal/calibre/commit/ +PATCHFILES= 49af1f0904e00351ffbf9ad430a37bfe66226bae.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= [email protected] COMMENT= Ebook management application WWW= https://calibre-ebook.com/ @@ -19,12 +23,12 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/cmake:devel/cmake-core \ ${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=6.0.1:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=2023.8.8:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>3.3.0:devel/py-xxhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0.115.0:net/py-zeroconf@${PY_FLAVOR} \ @@ -43,7 +47,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=2.6.1:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.10:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \ @@ -55,6 +58,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}netifaces>=0.11.0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.19.1:security/py-pycryptodome@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=2023.8.8:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>=3.3.0:devel/py-xxhash@${PY_FLAVOR} \ @@ -64,9 +68,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVO pdftohtml:graphics/poppler-utils \ xdg-open:devel/xdg-utils -USES= cpe desktop-file-utils gettext-runtime:build gl localbase:ldflags \ - pkgconfig pyqt:6 python:3.11+ qt:6 shared-mime-info shebangfix sqlite ssl \ - tar:xz xorg +USES= cpe desktop-file-utils gettext-runtime:build gl \ + localbase:ldflags pkgconfig pyqt:6 python:3.11+ qt:6 \ + shared-mime-info shebangfix sqlite ssl tar:xz xorg +CPE_VENDOR= calibre-ebook USE_GITHUB= nodefault GH_TUPLE= kovidgoyal:calibre-translations:94d8062:translations \ LibreOffice:dictionaries:fe49c66:hypenation @@ -97,8 +102,6 @@ SUB_LIST= PYTHON_VERSION=${PYTHON_VERSION} ISOCODESWRKSRC_CMD= ${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC -CPE_VENDOR= calibre-ebook - post-extract: @${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index e64d450fbc93..c952b271ae88 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1765058628 +TIMESTAMP = 1786655654 SHA256 (calibre/calibre-8.16.2.tar.xz) = 0187d04354f53cc0741141da026977ee30a77efa0c37b1839bde0588222c1c6c SIZE (calibre/calibre-8.16.2.tar.xz) = 46126644 SHA256 (calibre/kovidgoyal-calibre-translations-94d8062_GH0.tar.gz) = 168a59ba5a65abb2de13e6b8e0fe9c0b057c5c82d518a843787418e18daa23da SIZE (calibre/kovidgoyal-calibre-translations-94d8062_GH0.tar.gz) = 76565313 SHA256 (calibre/LibreOffice-dictionaries-fe49c66_GH0.tar.gz) = 853820725a77733d89eecfcda412e2bf40d416a477e6b4e67ff40f0cf369bd59 SIZE (calibre/LibreOffice-dictionaries-fe49c66_GH0.tar.gz) = 117703774 +SHA256 (calibre/49af1f0904e00351ffbf9ad430a37bfe66226bae.patch) = ec609872b37da3c6135440555ea17da8f3ebe3effee1ac5bd63821298e756051 +SIZE (calibre/49af1f0904e00351ffbf9ad430a37bfe66226bae.patch) = 1430