Update ilmbase & OpenEXR to 2.3.0 release
Resolves: rhbz#1736147 - msitools: changed DLL versions in ilmbase Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio
parent
01f42930f7
commit
c7669bc3f0
68
0001-ilmbase-Update-to-2.3.0-release.patch
Normal file
68
0001-ilmbase-Update-to-2.3.0-release.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From 3cbc5d8f37f9beda6cadb5940fb923eedb45a5b0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
|
||||
Date: Tue, 6 Aug 2019 10:15:18 +0200
|
||||
Subject: [PATCH 1/2] ilmbase: Update to 2.3.0 release
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
|
||||
---
|
||||
data/wixl/ilmbase.wxi | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/data/wixl/ilmbase.wxi b/data/wixl/ilmbase.wxi
|
||||
index 11ef258..5083be2 100644
|
||||
--- a/data/wixl/ilmbase.wxi
|
||||
+++ b/data/wixl/ilmbase.wxi
|
||||
@@ -4,20 +4,20 @@
|
||||
<Fragment>
|
||||
<DirectoryRef Id="INSTALLDIR">
|
||||
<Directory Id="dirFEE7741CD6956C044C54657F0DD3C9C6" Name="bin">
|
||||
- <Component Win64="$(var.Win64)" Id="cmp8841D4AC98BB4E355DEE95693C106E5B" Guid="*">
|
||||
- <File Id="fil382657303208BFBA98F9C3DE9CB8C5D0" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-12.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmp49032B593A9BDF7943A16C679B6064B2" Guid="*">
|
||||
+ <File Id="fil787174B51DF1BE93A0239955863C72FF" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-24.dll"/>
|
||||
</Component>
|
||||
- <Component Win64="$(var.Win64)" Id="cmpEC4003EB0BAB5B71778B265B6FE8D5E6" Guid="*">
|
||||
- <File Id="fil50B918F718DFACCC85E1977288C940EB" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_2-12.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmpE94B4B037392585281516E3184369B52" Guid="*">
|
||||
+ <File Id="filEA13CCB16F8A7A448980B093DC653D05" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_3-24.dll"/>
|
||||
</Component>
|
||||
- <Component Win64="$(var.Win64)" Id="cmp08C10599C5D28DC6E93BADB2E08B4759" Guid="*">
|
||||
- <File Id="fil3ED3E5ADDD2D4B102259ED171F7949FE" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_2-12.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmp0054B3C0B8B7B470B50527958678189F" Guid="*">
|
||||
+ <File Id="filFD41AFF06C58E24D166C1552FC612BE1" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_3-24.dll"/>
|
||||
</Component>
|
||||
- <Component Win64="$(var.Win64)" Id="cmpD45077DA5966C826352D469D3D67A369" Guid="*">
|
||||
- <File Id="fil90E18D2986B4B955393BA9BA853F2C1C" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_2-12.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmpCE5584F830B91965B9E59E141529BB0E" Guid="*">
|
||||
+ <File Id="fil1852EFB6E5AEF1D07CAB79ED27F0DD74" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_3-24.dll"/>
|
||||
</Component>
|
||||
- <Component Win64="$(var.Win64)" Id="cmp4F1AA02BD44B255C23DE60651C7E4E96" Guid="*">
|
||||
- <File Id="fil372983D1CA835F65581D8AED56538FD7" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_2-12.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmp8510F7023D50444985A90AB94DFEDD96" Guid="*">
|
||||
+ <File Id="filE53EBCCD25A262F9346BBF8E4A6AB74B" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_3-24.dll"/>
|
||||
</Component>
|
||||
</Directory>
|
||||
</DirectoryRef>
|
||||
@@ -25,11 +25,11 @@
|
||||
<Fragment>
|
||||
<ComponentGroup Id="CG.ilmbase">
|
||||
<ComponentGroupRef Id="CG.gcc-c++"/>
|
||||
- <ComponentRef Id="cmp8841D4AC98BB4E355DEE95693C106E5B"/>
|
||||
- <ComponentRef Id="cmpEC4003EB0BAB5B71778B265B6FE8D5E6"/>
|
||||
- <ComponentRef Id="cmp08C10599C5D28DC6E93BADB2E08B4759"/>
|
||||
- <ComponentRef Id="cmpD45077DA5966C826352D469D3D67A369"/>
|
||||
- <ComponentRef Id="cmp4F1AA02BD44B255C23DE60651C7E4E96"/>
|
||||
+ <ComponentRef Id="cmp49032B593A9BDF7943A16C679B6064B2"/>
|
||||
+ <ComponentRef Id="cmpE94B4B037392585281516E3184369B52"/>
|
||||
+ <ComponentRef Id="cmp0054B3C0B8B7B470B50527958678189F"/>
|
||||
+ <ComponentRef Id="cmpCE5584F830B91965B9E59E141529BB0E"/>
|
||||
+ <ComponentRef Id="cmp8510F7023D50444985A90AB94DFEDD96"/>
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Include>
|
||||
--
|
||||
2.21.0
|
||||
|
||||
47
0002-OpenEXR-Update-to-2.3.0-release.patch
Normal file
47
0002-OpenEXR-Update-to-2.3.0-release.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From 613f24640a183496029258a4fa437c25a61dde8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
|
||||
Date: Tue, 6 Aug 2019 10:16:06 +0200
|
||||
Subject: [PATCH 2/2] OpenEXR: Update to 2.3.0 release
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
|
||||
---
|
||||
data/wixl/OpenEXR.wxi | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/data/wixl/OpenEXR.wxi b/data/wixl/OpenEXR.wxi
|
||||
index 875a117..fe3acdd 100644
|
||||
--- a/data/wixl/OpenEXR.wxi
|
||||
+++ b/data/wixl/OpenEXR.wxi
|
||||
@@ -5,11 +5,11 @@
|
||||
<Fragment>
|
||||
<DirectoryRef Id="INSTALLDIR">
|
||||
<Directory Id="dirD82453D760D75AFEACE0B4CFFB66E47F" Name="bin">
|
||||
- <Component Win64="$(var.Win64)" Id="cmp39DCE49DE4A353350AA34EBE151E9B49" Guid="*">
|
||||
- <File Id="fil94EEE61B3837913095A8CC538CFC1A79" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_2-23.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmpAF01A198C634A806766802238548688B" Guid="*">
|
||||
+ <File Id="fil42091A46F9AA74BB113E15D274AED537" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_3-24.dll"/>
|
||||
</Component>
|
||||
- <Component Win64="$(var.Win64)" Id="cmpBDB6207CD5F4526C7214BA5157BC89C1" Guid="*">
|
||||
- <File Id="fil67D61065DF8D7678ACFADDC20B009AAD" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_2-23.dll"/>
|
||||
+ <Component Win64="$(var.Win64)" Id="cmp7FD83EB5B344D2CA1DE250C9877ABF62" Guid="*">
|
||||
+ <File Id="fil0C364885851B102522705CC5D4F97F18" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_3-24.dll"/>
|
||||
</Component>
|
||||
</Directory>
|
||||
</DirectoryRef>
|
||||
@@ -18,8 +18,8 @@
|
||||
<ComponentGroup Id="CG.OpenEXR">
|
||||
<ComponentGroupRef Id="CG.ilmbase"/>
|
||||
<ComponentGroupRef Id="CG.zlib"/>
|
||||
- <ComponentRef Id="cmp39DCE49DE4A353350AA34EBE151E9B49"/>
|
||||
- <ComponentRef Id="cmpBDB6207CD5F4526C7214BA5157BC89C1"/>
|
||||
+ <ComponentRef Id="cmpAF01A198C634A806766802238548688B"/>
|
||||
+ <ComponentRef Id="cmp7FD83EB5B344D2CA1DE250C9877ABF62"/>
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Include>
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -30,6 +30,10 @@ License: GPLv2+
|
||||
URL: http://ftp.gnome.org/pub/GNOME/sources/%{name}
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
|
||||
|
||||
### Patches ###
|
||||
Patch0001: 0001-ilmbase-Update-to-2.3.0-release.patch
|
||||
Patch0002: 0002-OpenEXR-Update-to-2.3.0-release.patch
|
||||
|
||||
Requires: libgsf >= 1.14.24-2
|
||||
|
||||
BuildRequires: glib2-devel
|
||||
@ -229,6 +233,8 @@ The libmsi1-devel package includes the header files for libmsi.
|
||||
|
||||
%prep
|
||||
%setup -q -n msitools-%{version}%{?_version_suffix}
|
||||
%patch0001 -p1
|
||||
%patch0002 -p1
|
||||
|
||||
%build
|
||||
%configure --enable-fast-install
|
||||
@ -279,6 +285,7 @@ make -C data check-wxi
|
||||
* Mon Aug 12 2019 Fabiano Fidêncio <fidencio@redhat.com> - 0.99-4
|
||||
- Remove mingw*-gtk-vnc dependency
|
||||
- Temporarily disable wxi validation
|
||||
- Update ilmbase and OpenEXR to 2.3.0 release, rhbz#1736147
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
Loading…
Reference in New Issue
Block a user