From nobody Sat Jun 24 00:46:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QnwQr4tC0z4gQc9; Sat, 24 Jun 2023 00:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QnwQr4SFtz4Lhh; Sat, 24 Jun 2023 00:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687567588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bOT2Tq3a2sE+3imV8t8cJjfHjJ8cvCqxWYFhKs7pIk=; b=yl/xZHjcG9/6jDjF+H4RlrgFEtwxpv4/ahCQ/qpFIjfFHDVr6pu12DSWLUrOcRmgK+u+wd VFYFXFv6J3zU5g/yVcjjUtGXyWLfCpM4NVUyHVrcDAAQdRvhms17MT6jfyCS514TusyoX6 69YoMCtlqN50B0NfBsluv0cohmVJQ46HlYlTFN8E7xi5XKrvX1DTBHB4ROM1zdNY667W+U fYvxDSNcNcPRi/VuGV1hOXTHBbNgw8woPgYno+ioIE/kNl9RIC8jA3c/6CuXuN0PEvRttj xYkqv0+h8wy5Gr7XtsjjfEJ1naZRpZLD2sGNi3CKNtQT9MtVxqAsy+Wktos0gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687567588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bOT2Tq3a2sE+3imV8t8cJjfHjJ8cvCqxWYFhKs7pIk=; b=Iipw9SeJmJJtUgAkPX04cXUc8DDEUvO4lmI11ZQ/D+UisvhIONPES0wBi9Pmxudxbwx7Zd IH0vO5gu9ZcrAsrIX+q3VM48Lb3QeSJylL9noi8bq5EpRzChOhDOeflvsSZHBGGeuM2B5E EVBZ4zcpzLhNfLqaQPaC/yuOxoExq328rG6BjZpAJy2wi1B5Txbi6L0S73xWCbHYPn8X3f bkJ+Dq/J0bt+Sw5777G3mH2O+57i6XtE9HEnXmzd7WiSYwQcZ9T4j965CKrTVKMxJ5CW5B nSRafFoZDTot+uUEOzG6uSrfOBiRWCV6SGt1ZIj5emfClI9xfjcpM5pFv/b1mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687567588; a=rsa-sha256; cv=none; b=JpnoEqPIm4WmkjdAt+W1yMlcQa09/YmnWGKbp242dLL0DOF3Oyh02VdiEy5iFW/+eOpbGX cy2itEVvq1dDd003Pej1JQVvovkIR5nWdzZDQkDO1IDr5upcyg9BTzzPOYIqnrea/BVD6I Kax1NjjDQNpkPIfZuU/dC4vwcLiTYMg5WAjxXVw0zsEAV+7oDpEtwZILxvp5L5dVAYjpIb 6C5k3Gj0MZK+ZwFP2ByzwbK9OKGrOXe4/787wntyh6JLFRmKmO1Nqx9I8nQieF0iyZz4Ik bJMPMdLBOQNYM9j1c7yOksKgbe6SkcudCyw9QM016S+Uc1VjuqbY44fwH5uh5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QnwQr3Xf5zQGR; Sat, 24 Jun 2023 00:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35O0kSTF090903; Sat, 24 Jun 2023 00:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O0kSpr090902; Sat, 24 Jun 2023 00:46:28 GMT (envelope-from git) Date: Sat, 24 Jun 2023 00:46:28 GMT Message-Id: <202306240046.35O0kSpr090902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: aee82b5bb539 - main - textproc/exempi: update to 2.6.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aee82b5bb5393798c8312d259de78ca97fe9995c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=aee82b5bb5393798c8312d259de78ca97fe9995c commit aee82b5bb5393798c8312d259de78ca97fe9995c Author: Charlie Li AuthorDate: 2023-06-24 00:41:49 +0000 Commit: Charlie Li CommitDate: 2023-06-24 00:41:49 +0000 textproc/exempi: update to 2.6.3 Previous patches incorporated into the release or obviated. While here: - force C++11, as the project expects it, and to override clang 16's default C++17 - add LICENSE{,_FILE} --- textproc/exempi/Makefile | 12 +++---- textproc/exempi/distinfo | 6 ++-- textproc/exempi/files/patch-exempi_Makefile.in | 19 ----------- .../exempi/files/patch-samples_source_Makefile.in | 19 ----------- .../files/patch-samples_source_common_DumpFile.cpp | 38 ---------------------- textproc/exempi/pkg-plist | 2 +- 6 files changed, 10 insertions(+), 86 deletions(-) diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index a4a8e6649b04..9a876bc4d7aa 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -1,6 +1,5 @@ PORTNAME= exempi -DISTVERSION= 2.6.2 -PORTREVISION= 1 +DISTVERSION= 2.6.3 CATEGORIES= textproc MASTER_SITES= http://libopenraw.freedesktop.org/download/ @@ -8,17 +7,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Port of Adobe XMP SDK to work on UNIX WWW= http://libopenraw.freedesktop.org/wiki/Exempi +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= cpe gmake iconv libtool localbase pathfix tar:bzip2 +USES= cpe compiler:c++11-lang gmake iconv libtool localbase pathfix tar:xz CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= yes INSTALL_TARGET= install-strip GNU_CONFIGURE= yes - -pre-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} NOCONFIGURE=1 ./autogen.sh +USE_CXXSTD= c++11 post-patch: @${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ diff --git a/textproc/exempi/distinfo b/textproc/exempi/distinfo index 71962d2f3145..d52cd001e737 100644 --- a/textproc/exempi/distinfo +++ b/textproc/exempi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659086948 -SHA256 (exempi-2.6.2.tar.bz2) = 4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d -SIZE (exempi-2.6.2.tar.bz2) = 3709476 +TIMESTAMP = 1687564983 +SHA256 (exempi-2.6.3.tar.xz) = 80b3aa0b7f54978c6a49cc5f5f1d3b6e9524b59de74ef92b3bf0abeba4c28fb1 +SIZE (exempi-2.6.3.tar.xz) = 2842408 diff --git a/textproc/exempi/files/patch-exempi_Makefile.in b/textproc/exempi/files/patch-exempi_Makefile.in deleted file mode 100644 index a644ce876a26..000000000000 --- a/textproc/exempi/files/patch-exempi_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- exempi/Makefile.in.orig 2022-07-29 09:33:18 UTC -+++ exempi/Makefile.in -@@ -128,7 +128,6 @@ bin_PROGRAMS = exempi$(EXEEXT) - build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = exempi$(EXEEXT) --@UNIX_ENV_TRUE@am__append_1 = -lrt - @WITH_UNIT_TEST_TRUE@check_PROGRAMS = testexempicore$(EXEEXT) \ - @WITH_UNIT_TEST_TRUE@ testserialise$(EXEEXT) \ - @WITH_UNIT_TEST_TRUE@ testwritenewprop$(EXEEXT) \ -@@ -801,7 +800,7 @@ libexempi_la_LIBADD = $(top_builddir)/source/libxmpcom - $(top_builddir)/XMPCore/source/libXMPCore.la \ - $(top_builddir)/XMPFiles/source/libXMPFiles.la \ - $(top_builddir)/third-party/zuid/interfaces/libmd5.la -lexpat \ -- -lz -ldl $(am__append_1) -+ -lz $(am__append_1) - libexempi_la_LDFLAGS = -version-info @EXEMPI_VERSION_INFO@ - dist_man1_MANS = exempi.1 - diff --git a/textproc/exempi/files/patch-samples_source_Makefile.in b/textproc/exempi/files/patch-samples_source_Makefile.in deleted file mode 100644 index 9afce776b44c..000000000000 --- a/textproc/exempi/files/patch-samples_source_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- samples/source/Makefile.in.orig 2022-07-29 09:33:18 UTC -+++ samples/source/Makefile.in -@@ -129,7 +129,6 @@ noinst_PROGRAMS = xmpcoverage$(EXEEXT) xmpfilescoverag - dumpxmp$(EXEEXT) dumpmainxmp$(EXEEXT) customschema$(EXEEXT) \ - modifyingxmp$(EXEEXT) readingxmp$(EXEEXT) \ - xmpcommandtool$(EXEEXT) --@UNIX_ENV_TRUE@am__append_1 = -lrt - subdir = samples/source - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ -@@ -438,7 +437,7 @@ XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la - XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la \ - $(top_builddir)/XMPFiles/source/libXMPFiles.la \ - $(top_builddir)/source/libxmpcommon.la -lexpat -lz \ -- $(top_builddir)/third-party/zuid/interfaces/libmd5.la -ldl \ -+ $(top_builddir)/third-party/zuid/interfaces/libmd5.la \ - $(am__append_1) - noinst_LTLIBRARIES = libsamplescommon.la - libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \ diff --git a/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp b/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp deleted file mode 100644 index 1587cd397d00..000000000000 --- a/textproc/exempi/files/patch-samples_source_common_DumpFile.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- samples/source/common/DumpFile.cpp.orig 2022-06-25 21:43:18 UTC -+++ samples/source/common/DumpFile.cpp -@@ -2476,7 +2476,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st - DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif"); - LFA_Seek(file, keep, SEEK_SET, &ok); - assertMsg("seek failed", ok); -- exif_item_id = NULL; -+ exif_item_id = 0; - } - } - //Get the data for xmp - using value from mime_item_id -@@ -2494,7 +2494,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st - DumpXMP(xmpContent, xmpLength, offset, "XMP"); - LFA_Seek(file, keep, SEEK_SET, &ok); - assertMsg("seek failed", ok); -- mime_item_id = NULL; -+ mime_item_id = 0; - } - } - break; -@@ -2646,7 +2646,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st - DumpTIFF(tiffContent, tiffLength, offset, "HEIF Exif", "HEIF:Exif"); - LFA_Seek(file, keep, SEEK_SET, &ok); - assertMsg("seek failed", ok); -- exif_item_id = NULL; -+ exif_item_id = 0; - } - } - //Get the data for xmp - using value from mime_item_id -@@ -2664,7 +2664,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, st - DumpXMP(xmpContent, xmpLength, offset, "XMP"); - LFA_Seek(file, keep, SEEK_SET, &ok); - assertMsg("seek failed", ok); -- mime_item_id = NULL; -+ mime_item_id = 0; - } - } - diff --git a/textproc/exempi/pkg-plist b/textproc/exempi/pkg-plist index 4fe1dcf8844c..a60ddd8d4ea5 100644 --- a/textproc/exempi/pkg-plist +++ b/textproc/exempi/pkg-plist @@ -6,6 +6,6 @@ include/exempi-2.0/exempi/xmperrors.h lib/libexempi.a lib/libexempi.so lib/libexempi.so.8 -lib/libexempi.so.8.1.2 +lib/libexempi.so.8.1.3 libdata/pkgconfig/exempi-2.0.pc man/man1/exempi.1.gz