[arch-commits] Commit in freeimage/repos (3 files)

2020-05-12 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 12, 2020 @ 10:18:25
  Author: arojas
Revision: 626719

archrelease: copy trunk to community-staging-x86_64

Added:
  freeimage/repos/community-staging-x86_64/
  freeimage/repos/community-staging-x86_64/PKGBUILD
(from rev 626718, freeimage/trunk/PKGBUILD)
  freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch
(from rev 626718, freeimage/trunk/freeimage-unbundle.patch)

--+
 PKGBUILD |   46 ++
 freeimage-unbundle.patch |  750 +
 2 files changed, 796 insertions(+)

Copied: freeimage/repos/community-staging-x86_64/PKGBUILD (from rev 626718, 
freeimage/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-12 10:18:25 UTC (rev 626719)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Stefan Husmann 
+# Contributor: Mihai Militaru 
+# Contributor: scippio 
+
+pkgname=freeimage
+pkgver=3.18.0
+pkgrel=5
+pkgdesc="Library project for developers who would like to support popular 
graphics image formats"
+arch=('x86_64')
+license=('GPL' 'custom:FIPL')
+url="http://freeimage.sourceforge.net/;
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+makedepends=('mesa' 'glu')
+source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip;
+freeimage-unbundle.patch)
+sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
+
'605fd28aaaf3b0ad225d04dd7de5e34d825bb7aa4b1f3a3b4219657c51b2f1507512916e95ba1a731ca5fc8b704f03b83371ab9ad066d74fd49feee735cf13b5')
+
+prepare() {
+  cd FreeImage
+
+  # TODO: This will only compile against libjpeg-turbo 2 but we will wait for 
that :D
+  patch -p1 -i ../freeimage-unbundle.patch # Unbundle libraries (Fedora)
+  rm -r Source/Lib* Source/ZLib Source/OpenEXR
+  # can't be built due to private headers
+  > Source/FreeImage/PluginG3.cpp
+  > Source/FreeImageToolkit/JPEGTransform.cpp
+}
+
+build() {
+  cd FreeImage
+  sh gensrclist.sh
+  sh genfipsrclist.sh
+  make -f Makefile.gnu
+  make -f Makefile.fip
+}
+
+package() {
+  cd FreeImage
+  make -f Makefile.gnu DESTDIR=${pkgdir} install
+  make -f Makefile.fip DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch (from 
rev 626718, freeimage/trunk/freeimage-unbundle.patch)
===
--- community-staging-x86_64/freeimage-unbundle.patch   
(rev 0)
+++ community-staging-x86_64/freeimage-unbundle.patch   2020-05-12 10:18:25 UTC 
(rev 626719)
@@ -0,0 +1,750 @@
+diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
+--- FreeImage/genfipsrclist.sh 2018-07-28 18:53:18.0 +0200
 FreeImage-new/genfipsrclist.sh 2018-07-31 23:37:58.552953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib 
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+ 
+ 
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+   echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+ 
+diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
+--- FreeImage/gensrclist.sh2018-07-28 18:52:50.0 +0200
 FreeImage-new/gensrclist.sh2018-07-31 23:37:58.555953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+ 
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 18.0" >>

[arch-commits] Commit in freeimage/repos (3 files)

2020-05-09 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 9, 2020 @ 16:36:14
  Author: arojas
Revision: 626005

archrelease: copy trunk to community-staging-x86_64

Added:
  freeimage/repos/community-staging-x86_64/
  freeimage/repos/community-staging-x86_64/PKGBUILD
(from rev 626004, freeimage/trunk/PKGBUILD)
  freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch
(from rev 626004, freeimage/trunk/freeimage-unbundle.patch)

--+
 PKGBUILD |   46 ++
 freeimage-unbundle.patch |  750 +
 2 files changed, 796 insertions(+)

Copied: freeimage/repos/community-staging-x86_64/PKGBUILD (from rev 626004, 
freeimage/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-09 16:36:14 UTC (rev 626005)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Stefan Husmann 
+# Contributor: Mihai Militaru 
+# Contributor: scippio 
+
+pkgname=freeimage
+pkgver=3.18.0
+pkgrel=4
+pkgdesc="Library project for developers who would like to support popular 
graphics image formats"
+arch=('x86_64')
+license=('GPL' 'custom:FIPL')
+url="http://freeimage.sourceforge.net/;
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+makedepends=('mesa' 'glu')
+source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip;
+freeimage-unbundle.patch)
+sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
+
'605fd28aaaf3b0ad225d04dd7de5e34d825bb7aa4b1f3a3b4219657c51b2f1507512916e95ba1a731ca5fc8b704f03b83371ab9ad066d74fd49feee735cf13b5')
+
+prepare() {
+  cd FreeImage
+
+  # TODO: This will only compile against libjpeg-turbo 2 but we will wait for 
that :D
+  patch -p1 -i ../freeimage-unbundle.patch # Unbundle libraries (Fedora)
+  rm -r Source/Lib* Source/ZLib Source/OpenEXR
+  # can't be built due to private headers
+  > Source/FreeImage/PluginG3.cpp
+  > Source/FreeImageToolkit/JPEGTransform.cpp
+}
+
+build() {
+  cd FreeImage
+  sh gensrclist.sh
+  sh genfipsrclist.sh
+  make -f Makefile.gnu
+  make -f Makefile.fip
+}
+
+package() {
+  cd FreeImage
+  make -f Makefile.gnu DESTDIR=${pkgdir} install
+  make -f Makefile.fip DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch (from 
rev 626004, freeimage/trunk/freeimage-unbundle.patch)
===
--- community-staging-x86_64/freeimage-unbundle.patch   
(rev 0)
+++ community-staging-x86_64/freeimage-unbundle.patch   2020-05-09 16:36:14 UTC 
(rev 626005)
@@ -0,0 +1,750 @@
+diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
+--- FreeImage/genfipsrclist.sh 2018-07-28 18:53:18.0 +0200
 FreeImage-new/genfipsrclist.sh 2018-07-31 23:37:58.552953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib 
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+ 
+ 
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+   echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+ 
+diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
+--- FreeImage/gensrclist.sh2018-07-28 18:52:50.0 +0200
 FreeImage-new/gensrclist.sh2018-07-31 23:37:58.555953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+ 
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 18.0" >>

[arch-commits] Commit in freeimage/repos (3 files)

2019-10-18 Thread Antonio Rojas via arch-commits 
Date: Friday, October 18, 2019 @ 20:02:17
  Author: arojas
Revision: 517059

archrelease: copy trunk to community-staging-x86_64

Added:
  freeimage/repos/community-staging-x86_64/
  freeimage/repos/community-staging-x86_64/PKGBUILD
(from rev 517058, freeimage/trunk/PKGBUILD)
  freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch
(from rev 517058, freeimage/trunk/freeimage-unbundle.patch)

--+
 PKGBUILD |   46 ++
 freeimage-unbundle.patch |  750 +
 2 files changed, 796 insertions(+)

Copied: freeimage/repos/community-staging-x86_64/PKGBUILD (from rev 517058, 
freeimage/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-10-18 20:02:17 UTC (rev 517059)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Stefan Husmann 
+# Contributor: Mihai Militaru 
+# Contributor: scippio 
+
+pkgname=freeimage
+pkgver=3.18.0
+pkgrel=3
+pkgdesc="Library project for developers who would like to support popular 
graphics image formats"
+arch=('x86_64')
+license=('GPL' 'custom:FIPL')
+url="http://freeimage.sourceforge.net/;
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+makedepends=('mesa' 'glu')
+source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip;
+freeimage-unbundle.patch)
+sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
+
'605fd28aaaf3b0ad225d04dd7de5e34d825bb7aa4b1f3a3b4219657c51b2f1507512916e95ba1a731ca5fc8b704f03b83371ab9ad066d74fd49feee735cf13b5')
+
+prepare() {
+  cd FreeImage
+
+  # TODO: This will only compile against libjpeg-turbo 2 but we will wait for 
that :D
+  patch -p1 -i ../freeimage-unbundle.patch # Unbundle libraries (Fedora)
+  rm -r Source/Lib* Source/ZLib Source/OpenEXR
+  # can't be built due to private headers
+  > Source/FreeImage/PluginG3.cpp
+  > Source/FreeImageToolkit/JPEGTransform.cpp
+}
+
+build() {
+  cd FreeImage
+  sh gensrclist.sh
+  sh genfipsrclist.sh
+  make -f Makefile.gnu
+  make -f Makefile.fip
+}
+
+package() {
+  cd FreeImage
+  make -f Makefile.gnu DESTDIR=${pkgdir} install
+  make -f Makefile.fip DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch (from 
rev 517058, freeimage/trunk/freeimage-unbundle.patch)
===
--- community-staging-x86_64/freeimage-unbundle.patch   
(rev 0)
+++ community-staging-x86_64/freeimage-unbundle.patch   2019-10-18 20:02:17 UTC 
(rev 517059)
@@ -0,0 +1,750 @@
+diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
+--- FreeImage/genfipsrclist.sh 2018-07-28 18:53:18.0 +0200
 FreeImage-new/genfipsrclist.sh 2018-07-31 23:37:58.552953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib 
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+ 
+ 
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+   echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+ 
+diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
+--- FreeImage/gensrclist.sh2018-07-28 18:52:50.0 +0200
 FreeImage-new/gensrclist.sh2018-07-31 23:37:58.555953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+ 
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 18.0" >>

[arch-commits] Commit in freeimage/repos (3 files)

2018-10-17 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, October 17, 2018 @ 22:16:10
  Author: svenstaro
Revision: 395098

archrelease: copy trunk to community-staging-x86_64

Added:
  freeimage/repos/community-staging-x86_64/
  freeimage/repos/community-staging-x86_64/PKGBUILD
(from rev 395097, freeimage/trunk/PKGBUILD)
  freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch
(from rev 395097, freeimage/trunk/freeimage-unbundle.patch)

--+
 PKGBUILD |   46 ++
 freeimage-unbundle.patch |  750 +
 2 files changed, 796 insertions(+)

Copied: freeimage/repos/community-staging-x86_64/PKGBUILD (from rev 395097, 
freeimage/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-10-17 22:16:10 UTC (rev 395098)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Stefan Husmann 
+# Contributor: Mihai Militaru 
+# Contributor: scippio 
+
+pkgname=freeimage
+pkgver=3.18.0
+pkgrel=1
+pkgdesc="Library project for developers who would like to support popular 
graphics image formats"
+arch=('x86_64')
+license=('GPL' 'custom:FIPL')
+url="http://freeimage.sourceforge.net/;
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+makedepends=('mesa' 'glu')
+source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip;
+freeimage-unbundle.patch)
+sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
+
'57f5b751f79f96f8c5e1e5f0fcb5bb7e5aa2c453542989a2b29ada1dc328ed1aed863c240111e0dafb0957c53a4cf0d1e72e68e53fb3aa388fb437974dcf')
+
+prepare() {
+  cd FreeImage
+
+  # TODO: This will only compile against libjpeg-turbo 2 but we will wait for 
that :D
+  patch -p1 -i ../freeimage-unbundle.patch # Unbundle libraries (Fedora)
+  rm -r Source/Lib* Source/ZLib Source/OpenEXR
+  # can't be built due to private headers
+  > Source/FreeImage/PluginG3.cpp
+  > Source/FreeImageToolkit/JPEGTransform.cpp
+}
+
+build() {
+  cd FreeImage
+  sh gensrclist.sh
+  sh genfipsrclist.sh
+  make -f Makefile.gnu
+  make -f Makefile.fip
+}
+
+package() {
+  cd FreeImage
+  make -f Makefile.gnu DESTDIR=${pkgdir} install
+  make -f Makefile.fip DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch (from 
rev 395097, freeimage/trunk/freeimage-unbundle.patch)
===
--- community-staging-x86_64/freeimage-unbundle.patch   
(rev 0)
+++ community-staging-x86_64/freeimage-unbundle.patch   2018-10-17 22:16:10 UTC 
(rev 395098)
@@ -0,0 +1,750 @@
+diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
+--- FreeImage/genfipsrclist.sh 2018-07-28 18:53:18.0 +0200
 FreeImage-new/genfipsrclist.sh 2018-07-31 23:37:58.552953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib 
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+ 
+ 
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+   echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+ 
+diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
+--- FreeImage/gensrclist.sh2018-07-28 18:52:50.0 +0200
 FreeImage-new/gensrclist.sh2018-07-31 23:37:58.555953202 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+ 
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 18.0" >>

[arch-commits] Commit in freeimage/repos (3 files)

2018-08-18 Thread Antonio Rojas via arch-commits 
Date: Saturday, August 18, 2018 @ 22:33:52
  Author: arojas
Revision: 372711

archrelease: copy trunk to community-staging-x86_64

Added:
  freeimage/repos/community-staging-x86_64/
  freeimage/repos/community-staging-x86_64/PKGBUILD
(from rev 372710, freeimage/trunk/PKGBUILD)
  freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch
(from rev 372710, freeimage/trunk/freeimage-unbundle.patch)

--+
 PKGBUILD |   49 
 freeimage-unbundle.patch |  548 +
 2 files changed, 597 insertions(+)

Copied: freeimage/repos/community-staging-x86_64/PKGBUILD (from rev 372710, 
freeimage/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2018-08-18 22:33:52 UTC (rev 372711)
@@ -0,0 +1,49 @@
+# Maintainer: Sven-Hendrik Haase 
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Stefan Husmann 
+# Contributor: Mihai Militaru 
+# Contributor: scippio 
+
+pkgname=freeimage
+pkgver=3.17.0
+pkgrel=7
+pkgdesc="Library project for developers who would like to support popular 
graphics image formats"
+arch=('x86_64')
+license=('GPL' 'custom:FIPL')
+url="http://freeimage.sourceforge.net/;
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+makedepends=('mesa' 'glu')
+source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip;
+freeimage-unbundle.patch CVE-2015-0852.patch CVE-2016-5684.patch)
+md5sums=('459e15f0ec75d6efa3c7bd63277ead86'
+ 'c336ba01a7fab92bff97f78140f190e9'
+ 'b21385e2da5dcdf4aa4e98d11150115d'
+ '2efbe4123d832930778b7c146d4f60f1')
+
+prepare() {
+  cd FreeImage
+  patch -p1 -i ../CVE-2016-5684.patch
+  patch -p1 -i ../CVE-2015-0852.patch
+
+  patch -p1 -i ../freeimage-unbundle.patch # Unbundle libraries (Fedora)
+  rm -r Source/Lib* Source/ZLib Source/OpenEXR
+# can't be built due to private headers
+  > Source/FreeImage/PluginG3.cpp
+  > Source/FreeImageToolkit/JPEGTransform.cpp
+}
+
+build() {
+  cd FreeImage
+  sh gensrclist.sh
+  sh genfipsrclist.sh
+  make -f Makefile.gnu
+  make -f Makefile.fip
+}
+
+package() {
+  cd FreeImage
+  make -f Makefile.gnu DESTDIR=${pkgdir} install
+  make -f Makefile.fip DESTDIR=${pkgdir} install
+
+  install -D -m644 ${srcdir}/FreeImage/license-fi.txt 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: freeimage/repos/community-staging-x86_64/freeimage-unbundle.patch (from 
rev 372710, freeimage/trunk/freeimage-unbundle.patch)
===
--- community-staging-x86_64/freeimage-unbundle.patch   
(rev 0)
+++ community-staging-x86_64/freeimage-unbundle.patch   2018-08-18 22:33:52 UTC 
(rev 372711)
@@ -0,0 +1,548 @@
+diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
+--- FreeImage/genfipsrclist.sh 2015-02-20 10:52:16.0 +0100
 FreeImage-new/genfipsrclist.sh 2015-09-05 02:13:52.041353305 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib 
Wrapper/FreeImagePlus"
++DIRLIST="Wrapper/FreeImagePlus"
+ 
+ 
+ echo "VER_MAJOR = 3" > fipMakefile.srcs
+@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
+ for DIR in $DIRLIST; do
+   echo -n " -I$DIR" >> fipMakefile.srcs
+ done
++echo -n " -IDist" >> fipMakefile.srcs
+ echo >> fipMakefile.srcs
+ 
+diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
+--- FreeImage/gensrclist.sh2015-02-20 10:51:50.0 +0100
 FreeImage-new/gensrclist.sh2015-09-05 02:13:52.041353305 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG 
Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR 
Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf 
Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath 
Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal 
Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR 
Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
+ 
+ echo "VER_MAJOR = 3" > Makefile.srcs
+ echo "VER_MINOR = 17.0" >> Makefile.srcs
+diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
+---