[packages/hugin] - up to 2024.0.1

baggins baggins at pld-linux.org
Wed Dec 18 23:03:20 CET 2024


commit 2d05399e898e43aef24d63bd154f870a0aac2c3c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 18 23:02:44 2024 +0100

    - up to 2024.0.1

 hugin-cppflags.patch | 10 --------
 hugin-exiv2.patch    | 67 ----------------------------------------------------
 hugin.spec           |  9 +++----
 python-install.patch | 11 ---------
 4 files changed, 3 insertions(+), 94 deletions(-)
---
diff --git a/hugin.spec b/hugin.spec
index 04d8c74..f430776 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,12 +1,12 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	2022.0.0
-Release:	2
+Version:	2024.0.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	https://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5:	76bbd3d0debc8c8483192d832b9377fd
+# Source0-md5:	7e8ce50af10ace1a900e097ece206123
 Patch0:		%{name}-cppflags.patch
 Patch1:		python-install.patch
 Patch2:		%{name}-exiv2.patch
@@ -69,9 +69,6 @@ ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # Old, broken duplicate of the system cmake one
 %{__rm} CMakeModules/FindZLIB.cmake
diff --git a/hugin-cppflags.patch b/hugin-cppflags.patch
deleted file mode 100644
index 87462e8..0000000
--- a/hugin-cppflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hugin-2022.0.0/CMakeLists.txt.orig	2023-08-31 22:41:43.336520476 +0200
-+++ hugin-2022.0.0/CMakeLists.txt	2023-09-01 06:28:23.328243488 +0200
-@@ -59,6 +59,7 @@ include(CheckIncludeFiles)
- 
- ##  global setup
- project(hugin)
-+ADD_DEFINITIONS($ENV{CPPFLAGS})
- 
- # version
- set(V_MAJOR 2022)
diff --git a/hugin-exiv2.patch b/hugin-exiv2.patch
deleted file mode 100644
index 6bc49f9..0000000
--- a/hugin-exiv2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- hugin-2020.0.0/src/hugin_base/panodata/SrcPanoImage.cpp.orig	2020-09-12 12:46:03.000000000 +0200
-+++ hugin-2020.0.0/src/hugin_base/panodata/SrcPanoImage.cpp	2023-07-28 22:43:30.687904298 +0200
-@@ -362,7 +362,7 @@ bool SrcPanoImage::readEXIF()
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageWidthPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedWidth = pos->toLong();
-+                        croppedWidth = pos->toInt64();
-                     }
-                     else
-                     {
-@@ -372,7 +372,7 @@ bool SrcPanoImage::readEXIF()
-                     pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaImageHeightPixels"));
-                     if (pos != xmpData.end())
-                     {
--                        croppedHeight = pos->toLong();
-+                        croppedHeight = pos->toInt64();
-                     }
-                     else
-                     {
-@@ -386,7 +386,7 @@ bool SrcPanoImage::readEXIF()
-                         double hfov = 0;
-                         if (pos != xmpData.end())
-                         {
--                            hfov = 360 * croppedWidth / (double)pos->toLong();
-+                            hfov = 360 * croppedWidth / (double)pos->toInt64();
-                         }
-                         else
-                         {
-@@ -397,7 +397,7 @@ bool SrcPanoImage::readEXIF()
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.FullPanoHeightPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            fullHeight = pos->toLong();
-+                            fullHeight = pos->toInt64();
-                         }
-                         else
-                         {
-@@ -408,7 +408,7 @@ bool SrcPanoImage::readEXIF()
-                         pos = xmpData.findKey(Exiv2::XmpKey("Xmp.GPano.CroppedAreaTopPixels"));
-                         if (pos != xmpData.end())
-                         {
--                            cropTop = pos->toLong();
-+                            cropTop = pos->toInt64();
-                         }
-                         else
-                         {
---- hugin-2020.0.0/src/hugin_base/panodata/Exiv2Helper.cpp.orig	2019-05-15 17:30:47.000000000 +0200
-+++ hugin-2020.0.0/src/hugin_base/panodata/Exiv2Helper.cpp	2023-07-29 06:56:08.543554353 +0200
-@@ -40,7 +40,7 @@ namespace HuginBase
-             Exiv2::ExifData::iterator itr = exifData.findKey(Exiv2::ExifKey(keyName));
-             if (itr != exifData.end() && itr->count())
-             {
--                value = itr->toLong();
-+                value = itr->toInt64();
-                 return true;
-             }
-             else
-@@ -165,7 +165,7 @@ namespace HuginBase
-         {
-             if(it!=exifData.end() && it->count())
-             {
--                return it->toLong();
-+                return it->toInt64();
-             }
-             return 0;
-         };
diff --git a/python-install.patch b/python-install.patch
deleted file mode 100644
index ecf4560..0000000
--- a/python-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hugin-2014.0.0/src/hugin_script_interface/CMakeLists.txt~	2014-10-08 20:19:19.000000000 +0200
-+++ hugin-2014.0.0/src/hugin_script_interface/CMakeLists.txt	2015-12-18 21:44:50.807185809 +0100
-@@ -203,7 +203,7 @@
-     # Linux/MacOS
-     # install Python related files into folder depending on used Python version
- 
--    EXECUTE_PROCESS( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))"
-+    EXECUTE_PROCESS( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix='/usr'))"
-                      OUTPUT_VARIABLE pyinstalldir
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/2d05399e898e43aef24d63bd154f870a0aac2c3c



More information about the pld-cvs-commit mailing list