Ticket #18537: haiku_exr_3.patch

build/jam/BuildFeatures

@@ -566 +566 @@
 
 
 # openexr
-if [ IsPackageAvailable openexr_devel ] {
-       ExtractBuildFeatureArchives openexr :
-               file: base openexr
+if [ IsPackageAvailable openexr30_devel ] {
+       ExtractBuildFeatureArchives openexr30 :
+               file: base openexr30
                        runtime: lib
-               file: devel openexr_devel
+               file: devel openexr30_devel
                        depends: base
                        libraries:
-                               $(developLibDir)/libIlmImf.so
-                               $(developLibDir)/libIlmImfUtil.so
-                               $(developLibDir)/libHalf.so
                                $(developLibDir)/libIex.so
-                               $(developLibDir)/libIexMath.so
                                $(developLibDir)/libIlmThread.so
                                $(developLibDir)/libImath.so
-                       headers: $(developHeadersDir) $(developHeadersDir)/OpenEXR
+                               $(developLibDir)/libOpenEXR.so
+                               $(developLibDir)/libOpenEXRUtil.so
+                       headers: $(developHeadersDir) $(developHeadersDir)/OpenEXR $(developHeadersDir)/Imath
                ;
 
-       EnableBuildFeatures openexr ;
+       EnableBuildFeatures openexr30 ;
 } else {
-       unavailableBuildFeatures += openexr ;
+       unavailableBuildFeatures += openexr30 ;
 }
 
 

build/jam/repositories/HaikuPorts/x86_64

@@ -199 +199 @@
        nghttp2-1.43.0-1
        nghttp2_devel-1.43.0-1
        openexr-2.4.1-1
-       openexr_devel-2.4.1-1
        openexr30-3.0.5-1
+       openexr30_devel-3.0.5-1
        openjpeg-2.4.0-2
        openjpeg_devel-2.4.0-2
        openssh-9.3p1-1

src/add-ons/translators/exr/EXRGamma.cpp

@@ -16 +16 @@
 float
 knee(double x, double f)
 {
-       return float (Imath::Math<double>::log (x * f + 1) / f);
+       return float (log (x * f + 1) / f);
 }
 
 
@@ -54 +54 @@
        float kneeHigh)
 :
        g (gamma),
-       m (Imath::Math<float>::pow(2, exposure + 2.47393)),
+       m (pow(2, exposure + 2.47393)),
        d (defog),
-       kl (Imath::Math<float>::pow(2, kneeLow)),
-       f (findKneeF (Imath::Math<float>::pow(2, kneeHigh) - kl, 
-               Imath::Math<float>::pow(2, 3.5) - kl)),
-       s (255.0 * Imath::Math<float>::pow(2, -3.5 * g))
+       kl (pow(2, kneeLow)),
+       f (findKneeF (pow(2, kneeHigh) - kl,
+               pow(2, 3.5) - kl)),
+       s (255.0 * pow(2, -3.5 * g))
 {
 }
 
@@ -90 +90 @@
        // Gamma
        //
        
-       x = Imath::Math<float>::pow (x, g);
+       x = pow (x, g);
        
        //
        // Scale and clamp

src/add-ons/translators/exr/IStreamWrapper.cpp

@@ -29 +29 @@
 }
 
 
-Int64
+uint64_t
 IStreamWrapper::tellg()
 {
        return fStream.Position();
@@ -37 +37 @@
 
 
 void
-IStreamWrapper::seekg(Int64 pos)
+IStreamWrapper::seekg(uint64_t pos)
 {
        fStream.Seek(pos, SEEK_SET);
 }

src/add-ons/translators/exr/IStreamWrapper.h

@@ -18 +18 @@
                virtual ~IStreamWrapper();
 
                virtual bool        read(char c[/*n*/], int n);
-               virtual Int64       tellg();
-               virtual void        seekg(Int64 pos);
+               virtual uint64_t    tellg();
+               virtual void        seekg(uint64_t pos);
                
        private:
                StreamBuffer fStream;

src/add-ons/translators/exr/Jamfile

@@ -7 +7 @@
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
        on $(architectureObject) {
-               UseBuildFeatureHeaders openexr ;
+               UseBuildFeatureHeaders openexr30 ;
                Includes [ FGristFiles ConfigView.cpp EXRTranslator.cpp EXRGamma.cpp
                        IStreamWrapper.cpp ]
-                       : [ BuildFeatureAttribute openexr : headers ] ;
+                       : [ BuildFeatureAttribute openexr30 : headers ] ;
 
                Translator [ MultiArchDefaultGristFiles EXRTranslator ] :
                        main.cpp
@@ -20 +20 @@
                        IStreamWrapper.cpp
                        : be translation textencoding [ TargetLibstdc++ ]
                        [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
-                       [ BuildFeatureAttribute openexr : libraries ]
+                       [ BuildFeatureAttribute openexr30 : libraries ]
                        localestub
                        : true
                ;