haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libexif: bump version

Browse Source
This commit is contained in:
Jerome Duval
2021-06-09 19:12:22 +02:00
parent 1f9df083d6
commit 62c613a63d
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media-libs/libexif/libexif-0.6.21.recipe → media-libs/libexif/libexif-0.6.22.recipe
View File

@@ -2,16 +2,17 @@ SUMMARY="Library for parsing, editing, and saving EXIF data"
DESCRIPTION="Most digital cameras produce EXIF files, which are JPEG files \
with extra tags that contain information about the image. The EXIF library \
allows you to parse an EXIF file and read the data from those tags."
HOMEPAGE="http://libexif.sourceforge.net"
HOMEPAGE="https://github.com/libexif/libexif/"
COPYRIGHT="2012 Lutz Mueller
Jan Patera
Hans Ulrich Niedermann
Hubert Figuiere
"
LICENSE="GNU LGPL v2.1"
REVISION="2"
SOURCE_URI="https://sf.net/projects/libexif/files/libexif/0.6.21/libexif-$portVersion.tar.gz"
CHECKSUM_SHA256="edb7eb13664cf950a6edd132b75e99afe61c5effe2f16494e6d27bc404b287bf"
REVISION="1"
SOURCE_URI="$HOMEPAGE/archive/libexif-${portVersion//./_}-release.tar.gz"
CHECKSUM_SHA256="46498934b7b931526fdee8fd8eb77a1dddedd529d5a6dbce88daf4384baecc54"
SOURCE_DIR="libexif-libexif-${portVersion//./_}-release"
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
PATCHES="libexif-$portVersion.patchset"
fi
@@ -19,7 +20,7 @@ fi
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion=12.3.3
libVersion="12.3.4"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -68,7 +69,7 @@ INSTALL()
{
make install
rm "$libDir"/libexif.la
rm "$libDir"/libexif.*a
prepareInstalledDevelLib libexif
fixPkgconfig

31
media-libs/libexif/patches/libexif-0.6.21.patchset
View File

@@ -1,31 +0,0 @@
From 3ee1412e7c9d070c2a4392be40400f38b8526ac3 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 1 May 2017 17:13:01 +0200
Subject: fix gcc2 parse error
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
index 54a90a2..b008358 100644
--- a/libexif/exif-entry.c
+++ b/libexif/exif-entry.c
@@ -1380,7 +1380,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
/* The tag may not be U+0000-terminated , so make a local
U+0000-terminated copy before converting it */
- unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
+ {
+ unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
if (!utf16) break;
memcpy(utf16, e->data, e->size);
utf16[e->size/sizeof(unsigned short)] = 0;
@@ -1391,6 +1392,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
exif_mem_free(e->priv->mem, utf16);
break;
}
+ }
default:
/* Use a generic value formatting */
--
2.7.0

27
media-libs/libexif/patches/libexif-0.6.22.patchset Normal file
View File

@@ -0,0 +1,27 @@
From 51d7bd23e186043fcd2a3a5e598aef43958baf18 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 9 Jun 2021 19:11:23 +0200
Subject: gcc2 build fix
diff --git a/libexif/canon/exif-mnote-data-canon.c b/libexif/canon/exif-mnote-data-canon.c
index ef4fcc6..ec29e35 100644
--- a/libexif/canon/exif-mnote-data-canon.c
+++ b/libexif/canon/exif-mnote-data-canon.c
@@ -388,11 +388,13 @@ exif_mnote_data_canon_identify (const ExifData *ed, const ExifEntry *e)
char value[8];
(void) e; /* unused */
+{
ExifEntry *em = exif_data_get_entry (ed, EXIF_TAG_MAKE);
if (!em)
return 0;
return !strcmp (exif_entry_get_value (em, value, sizeof (value)), "Canon");
}
+}
ExifMnoteData *
exif_mnote_data_canon_new (ExifMem *mem, ExifDataOption o)
--
2.30.0