PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

exempi: update to 2.6.4.

Browse Source
This commit is contained in:
Mohammed Anas 2023-12-11 21:10:09 +00:00 committed by Duncan Overbruck
parent 8b6b767c7c
commit 15c8fa1f0d
3 changed files with 3 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
View File

@ -1,29 +0,0 @@
Source: https://src.fedoraproject.org/rpms/exempi/blob/f37/f/exempi-e23c213-typeinfos.patch
From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Tue, 12 Oct 2021 14:15:17 +0200
Subject: [PATCH] Avoid multiple definitions of typeinfos
---
XMPFiles/source/XMPFiles_Impl.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
index 2f918ac..ff45040 100644
--- a/XMPFiles/source/XMPFiles_Impl.cpp
+++ b/XMPFiles/source/XMPFiles_Impl.cpp
@@ -47,7 +47,9 @@ using namespace std;
/// This file ...
///
// =================================================================================================
-#include "public/include/XMP.incl_cpp"
+#if ! XMP_StaticBuild
+ #include "public/include/XMP.incl_cpp"
+#endif
#if XMP_WinBuild
#pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
--
2.33.0

51
srcpkgs/exempi/patches/nullptr.patch
View File

@ -1,51 +0,0 @@
src: https://raw.githubusercontent.com/chimera-linux/cports/01ab74ecd61e21095db32f37e16b6c285d93183e/main/exempi/patches/nullptr.patch
commit d1e8054014adeafc606885844c1df65918ee7511
Author: Daniel Kolesa <daniel@octaforge.org>
Date: Fri Apr 8 05:26:02 2022 +0200
fix up some invalid nullptr assignments
C++11 onwards permits NULL to be of type nullptr_t, which prevents
assignment of NULL values to integer types.
diff --git a/samples/source/common/DumpFile.cpp b/samples/source/common/DumpFile.cpp
index e3d8888..5d86bbb 100644
--- a/samples/source/common/DumpFile.cpp
+++ b/samples/source/common/DumpFile.cpp
@@ -2471,7 +2471,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
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
@@ -2489,7 +2489,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
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;
@@ -2641,7 +2641,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
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
@@ -2659,7 +2659,7 @@ DumpISOBoxes(LFA_FileRef file, XMP_Uns32 maxBoxLen, std::string _isoPath)
DumpXMP(xmpContent, xmpLength, offset, "XMP");
LFA_Seek(file, keep, SEEK_SET, &ok);
assertMsg("seek failed", ok);
- mime_item_id = NULL;
+ mime_item_id = 0;
}
}

6
srcpkgs/exempi/template
View File

@ -1,6 +1,6 @@
# Template file for 'exempi' # Template file for 'exempi'
pkgname=exempi pkgname=exempi
version=2.6.2 version=2.6.4
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest" configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest"
@ -9,8 +9,8 @@ short_desc="Library for easy parsing of XMP metadata"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://libopenraw.freedesktop.org/exempi/" homepage="https://libopenraw.freedesktop.org/exempi/"
distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2" distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.xz"
checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d checksum=fa9c2456bf570172f0877c4eb13cd204c62ae1fdf65c3d6b71b41d88e1066f84
post_install() { post_install() {
vlicense COPYING vlicense COPYING