From: Aicaya <Aicaya@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] hugin: update to 2023.0.0
Date: Mon, 04 Dec 2023 17:15:58 +0100 [thread overview]
Message-ID: <20231204161558._po4JcQfY9ZTw-rgQ12ymGww1SEWi_is_OJM-kDsJF4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47572@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 977 bytes --]
There is an updated pull request by Aicaya against master on the void-packages repository
https://github.com/Aicaya/void-packages hugin
https://github.com/void-linux/void-packages/pull/47572
hugin: update to 2023.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
-
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
Switched from `glew-devel` to `libepoxy-devel` using [a flag introduced in this version][1] (`-DBUILD_WITH_EPOXY=on`) since the main program would not open anymore, both on the current package as well as this one. I also removed a patch that does not work with the new release.
Will test building the package on other architectures later today.
[1]: https://hugin.sourceforge.io/releases/2023.0.0/en.shtml
A patch file from https://github.com/void-linux/void-packages/pull/47572.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hugin-47572.patch --]
[-- Type: text/x-diff, Size: 5324 bytes --]
From 3036c10dfa27e6eb73d237c89876592773375d34 Mon Sep 17 00:00:00 2001
From: Aicaya Maro <aicaya@posteo.net>
Date: Mon, 4 Dec 2023 12:06:48 -0400
Subject: [PATCH] hugin: update to 2023.0.0
---
srcpkgs/hugin/patches/exiv2-0.28.patch | 77 --------------------------
srcpkgs/hugin/template | 9 +--
2 files changed, 5 insertions(+), 81 deletions(-)
delete mode 100644 srcpkgs/hugin/patches/exiv2-0.28.patch
diff --git a/srcpkgs/hugin/patches/exiv2-0.28.patch b/srcpkgs/hugin/patches/exiv2-0.28.patch
deleted file mode 100644
index 49f0518117020..0000000000000
--- a/srcpkgs/hugin/patches/exiv2-0.28.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/hugin/-/blob/main/exiv2-0.28.patch
-diff -r 79cd11a7a66f src/hugin_base/panodata/Exiv2Helper.cpp
---- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -40,7 +40,7 @@
- Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
- if (itr != exifData.end() && itr->count())
- {
-- value = itr->toLong();
-+ value = itr->toUint32();
- return true;
- }
- else
-@@ -165,7 +165,7 @@
- {
- if(it!=exifData.end() && it->count())
- {
-- return it->toLong();
-+ return it->toUint32();
- }
- return 0;
- };
-@@ -600,4 +600,4 @@
- };
-
- }; //namespace Exiv2Helper
--}; //namespace HuginBase
-\ No newline at end of file
-+}; //namespace HuginBase
-diff -r 79cd11a7a66f src/hugin_base/panodata/SrcPanoImage.cpp
---- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 24 19:13:20 2023 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Mon Jun 05 00:31:19 2023 +0200
-@@ -384,7 +384,7 @@
- pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
- if (pos != xmpData.end())
- {
-- croppedWidth = pos->toLong();
-+ croppedWidth = pos->toUint32();
- }
- else
- {
-@@ -394,7 +394,7 @@
- pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
- if (pos != xmpData.end())
- {
-- croppedHeight = pos->toLong();
-+ croppedHeight = pos->toUint32();
- }
- else
- {
-@@ -408,7 +408,7 @@
- double hfov = 0;
- if (pos != xmpData.end())
- {
-- hfov = 360 * croppedWidth / (double)pos->toLong();
-+ hfov = 360 * croppedWidth / (double)pos->toUint32();
- }
- else
- {
-@@ -419,7 +419,7 @@
- pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
- if (pos != xmpData.end())
- {
-- fullHeight = pos->toLong();
-+ fullHeight = pos->toUint32();
- }
- else
- {
-@@ -430,7 +430,7 @@
- pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
- if (pos != xmpData.end())
- {
-- cropTop = pos->toLong();
-+ cropTop = pos->toUint32();
- }
- else
- {
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 894876470ebde..31f5be4f0d323 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,14 +1,15 @@
# Template file for 'hugin'
pkgname=hugin
-version=2022.0.0
-revision=12
+version=2023.0.0
+revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
+configure_args="-DBUILD_WITH_EPOXY=on"
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
hostmakedepends="pkg-config exiftool swig gettext"
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
- lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
+ lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel
lcms2-devel lapack-devel"
depends="exiftool enblend-enfuse"
short_desc="Easy to use panoramic imaging toolchain"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://hugin.sourceforge.net/"
changelog="https://hugin.sourceforge.io/releases/${version}/en.shtml"
distfiles="${SOURCEFORGE_SITE}/hugin/hugin/hugin-${version%.*}/hugin-${version}.tar.bz2"
-checksum=97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
+checksum=04a39fccc6017e0544c639bd22309472c574d35b3455cbade1fc3870e631632b
python_version=3
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
next prev parent reply other threads:[~2023-12-04 16:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 16:00 [PR PATCH] " Aicaya
2023-12-04 16:01 ` Aicaya
2023-12-04 16:02 ` Aicaya
2023-12-04 16:03 ` Aicaya
2023-12-04 16:03 ` [PR PATCH] [Closed]: " Aicaya
2023-12-04 16:09 ` ahesford
2023-12-04 16:15 ` Aicaya [this message]
2023-12-04 16:17 ` Aicaya
2023-12-23 4:13 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231204161558._po4JcQfY9ZTw-rgQ12ymGww1SEWi_is_OJM-kDsJF4@z \
--to=aicaya@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).