[arch-commits] Commit in freeimage/trunk (PKGBUILD freeimage-unbundle.patch)

[Antonio Rojas]

    Date: Wednesday, June 13, 2018 @ 17:09:05
  Author: arojas
Revision: 342901

Fix linkage (FS#58998)

Modified:
  freeimage/trunk/PKGBUILD
  freeimage/trunk/freeimage-unbundle.patch

--------------------------+
 PKGBUILD                 |    9 +++++----
 freeimage-unbundle.patch |    4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-13 16:35:17 UTC (rev 342900)
+++ PKGBUILD	2018-06-13 17:09:05 UTC (rev 342901)
@@ -6,19 +6,20 @@
 
 pkgname=freeimage
 pkgver=3.17.0
-pkgrel=3
+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=('gcc-libs')
-makedepends=('openexr' 'openjpeg2' 'libtiff' 'libpng' 'libwebp' 'libraw' 'jxrlib' 'glu')
+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'
-         '6fb667a4e779196799333eabace2b7d4'
+         'b8d190316d4a3e3dd330a2af95dfd2da'
          'b21385e2da5dcdf4aa4e98d11150115d'
          '2efbe4123d832930778b7c146d4f60f1')
+options=(!strip)
 
 prepare() {
   cd FreeImage

Modified: freeimage-unbundle.patch
===================================================================
--- freeimage-unbundle.patch	2018-06-13 16:35:17 UTC (rev 342900)
+++ freeimage-unbundle.patch	2018-06-13 17:09:05 UTC (rev 342901)
@@ -66,7 +66,7 @@
  
  $(SHAREDLIB): $(MODULES)
 -	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) $(LDFLAGS)
  
  install:
  	install -d $(INCDIR) $(INSTALLDIR)
@@ -110,7 +110,7 @@
  
  $(SHAREDLIB): $(MODULES)
 -	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) $(LDFLAGS)
  
  install:
  	install -d $(INCDIR) $(INSTALLDIR)