Merge branch 'RB-2.3' of https://github.com/NatronGitHub/Natron into …

…RB-2.3
NatronGitHub · May 7, 2018 · fe372c9 · fe372c9
2 parents 81c7e11 + cfeeed8
commit fe372c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tools/MacPorts/graphics/libraw/Portfile b/tools/MacPorts/graphics/libraw/Portfile
@@ -42,14 +42,14 @@ post-destroot {
 
 variant gpl2 description {Enable GPL demosaic pack, license will be GPL-2+} {
     distfiles-append \
-        LibRaw-demosaic-pack-GPL2-${version}${extract.suffix} \
+        LibRaw-demosaic-pack-GPL2-${demosaicversion}${extract.suffix} \
 
     license                 GPL-2+
 }
 
 variant gpl3 requires gpl2 description {Enable GPL demosaic pack, license will be GPL-3+} {
     distfiles-append \
-        LibRaw-demosaic-pack-GPL3-${version}${extract.suffix}
+        LibRaw-demosaic-pack-GPL3-${demosaicversion}${extract.suffix}
 
     license                 GPL-3+
 }

diff --git a/tools/MacPorts/graphics/libraw/Portfile.patch b/tools/MacPorts/graphics/libraw/Portfile.patch
@@ -26,14 +26,14 @@
 
 +variant gpl2 description {Enable GPL demosaic pack, license will be GPL-2+} {
 +    distfiles-append \
-+        LibRaw-demosaic-pack-GPL2-${version}${extract.suffix} \
++        LibRaw-demosaic-pack-GPL2-${demosaicversion}${extract.suffix} \
 +
 +    license                 GPL-2+
 +}
 +
 +variant gpl3 requires gpl2 description {Enable GPL demosaic pack, license will be GPL-3+} {
 +    distfiles-append \
-+        LibRaw-demosaic-pack-GPL3-${version}${extract.suffix}
++        LibRaw-demosaic-pack-GPL3-${demosaicversion}${extract.suffix}
 +
 +    license                 GPL-3+
 +}