Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
luminancehdr


Commits:
c3c27fa9 by Antonio Rojas at 2024-11-10T00:39:05+01:00
upgpkg: 2.6.1.1-2: openexr 3.3.1 rebuild

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + clamp.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = luminancehdr
        pkgdesc = Open source graphical user interface application that aims to 
provide a workflow for HDR imaging
        pkgver = 2.6.1.1
-       pkgrel = 1
+       pkgrel = 2
        url = http://qtpfsgui.sourceforge.net/
        changelog = luminancehdr.changelog
        arch = x86_64
@@ -30,10 +30,12 @@ pkgbase = luminancehdr
        source = fix-headers.patch
        source = exiv2-0.28.patch
        source = 
https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f7.patch
+       source = clamp.patch
        sha512sums = 
9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
        sha512sums = 
78da713154042f125511ddc7ad184f961c92fa679ff0aa5d33700b619a0eed973722ea9f51c44c58595043ea308f4f3c44f6613b88fbb41e5159849bc0f8741e
        sha512sums = 
6d7ae3df647ffb67a27ef2729c8e8fd04e2b400bd960744dd0172406bc27773156a2b0bd67a7b71157cc59d0f528fbe00882085baa42f503dd506baa2826d0e9
        sha512sums = 
711e64209cba59b218b09715451ddcca3084b020da9bd1baa7decc71e5d3ad7375cba5703bc042e2371e9465c01436a67d0162731718dbef158e207de5266615
        sha512sums = 
eb4d32d279eab7658e38007ae9e8680fdce36abb6e0f3c1864de2163dcb5ec2dbba9c19341f23aebd799124dc64338f34570b041ac995249941b2ac4ba718e30
+       sha512sums = 
f7db0507be5f9c9f83c3fa07fa017922094b5adf9d5c0d4c036f9b13f52a250d135a04191bac4cdcf82ebb31428ee9e5f551fadabf89f05226a5fa5cff2e2b9f
 
 pkgname = luminancehdr


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=luminancehdr
 pkgver=2.6.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source graphical user interface application that aims to provide 
a workflow for HDR imaging'
 arch=('x86_64')
 url='http://qtpfsgui.sourceforge.net/'
@@ -19,18 +19,21 @@ 
source=(https://sourceforge.net/projects/qtpfsgui/files/luminance/$pkgver/lumina
         luminancehdr-openexr3.patch
         fix-headers.patch
         exiv2-0.28.patch
-        https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f7.patch)
+        https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f7.patch
+        clamp.patch)
 
sha512sums=('9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e'
             
'78da713154042f125511ddc7ad184f961c92fa679ff0aa5d33700b619a0eed973722ea9f51c44c58595043ea308f4f3c44f6613b88fbb41e5159849bc0f8741e'
             
'6d7ae3df647ffb67a27ef2729c8e8fd04e2b400bd960744dd0172406bc27773156a2b0bd67a7b71157cc59d0f528fbe00882085baa42f503dd506baa2826d0e9'
             
'711e64209cba59b218b09715451ddcca3084b020da9bd1baa7decc71e5d3ad7375cba5703bc042e2371e9465c01436a67d0162731718dbef158e207de5266615'
-            
'eb4d32d279eab7658e38007ae9e8680fdce36abb6e0f3c1864de2163dcb5ec2dbba9c19341f23aebd799124dc64338f34570b041ac995249941b2ac4ba718e30')
+            
'eb4d32d279eab7658e38007ae9e8680fdce36abb6e0f3c1864de2163dcb5ec2dbba9c19341f23aebd799124dc64338f34570b041ac995249941b2ac4ba718e30'
+            
'f7db0507be5f9c9f83c3fa07fa017922094b5adf9d5c0d4c036f9b13f52a250d135a04191bac4cdcf82ebb31428ee9e5f551fadabf89f05226a5fa5cff2e2b9f')
 
 prepare() {
   patch -d luminance-hdr-$pkgver -p1 < luminancehdr-openexr3.patch
   patch -d luminance-hdr-$pkgver -p1 < fix-headers.patch
   patch -d luminance-hdr-$pkgver -p1 < exiv2-0.28.patch # Fix build with exiv2 
0.28
   patch -d luminance-hdr-$pkgver -p1 < 33b364f7.patch # Fix build with boost 
1.85
+  patch -d luminance-hdr-$pkgver -p1 < clamp.patch # Remove clamp redefinition
 }
 
 build() {


=====================================
clamp.patch
=====================================
@@ -0,0 +1,18 @@
+diff --git a/src/Libpfs/manip/gamma_levels.cpp 
b/src/Libpfs/manip/gamma_levels.cpp
+index 67975111..c0fb1798 100644
+--- a/src/Libpfs/manip/gamma_levels.cpp
++++ b/src/Libpfs/manip/gamma_levels.cpp
+@@ -31,13 +31,6 @@
+ 
+ namespace {
+ 
+-template <typename T>
+-inline T clamp(const T &v, const T &lower_bound, const T &upper_bound) {
+-    if (v <= lower_bound) return lower_bound;
+-    if (v >= upper_bound) return upper_bound;
+-    return v;
+-}
+-
+ ////! \note I assume that *in* contains only value between [0,1]
+ // void gamma_levels_array(const pfs::Array2D* in, pfs::Array2D* out,
+ //                        float black_in, float white_in,



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/commit/c3c27fa957fb99ad175e8202809ea08f3204f0b7

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/commit/c3c27fa957fb99ad175e8202809ea08f3204f0b7
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to