libjpeg: Update to 2.1.4

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm
index 1dea7aa929c45d0649d3fb02a6bc49f27d6a4e64..b4d7b0eb02194fe8c585c670d9c51a5c77e45853 100644 (file)
--- a/libjpeg/libjpeg.nm
+++ b/libjpeg/libjpeg.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libjpeg
-version    = 1.4.2
+version    = 2.1.4
 release    = 1
 thisapp    = libjpeg-turbo-%{version}
 
@@ -27,18 +27,28 @@ source_dl  = http://sourceforge.net/projects/libjpeg-turbo/files/%{version}/
 
 build
        requires
-               autoconf
-               automake
+               cmake
                gcc-c++
-               libtool
                nasm
        end
 
-       configure_options += \
-               --enable-shared
+       # NASM object files are missing GNU Property note for Intel CET,
+       # force it on the resulting library
+       LDFLAGS +="-Wl,-z,ibt -Wl,-z,shstk"
 
-       prepare_cmds
-               autoreconf -vfi
+       export LD_LIBRARY_PATH = %{DIR_APP}
+
+       build
+               %{cmake} . \
+                       -DCMAKE_SKIP_RPATH:BOOL=YES \
+                       -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
+                       -DENABLE_STATIC:BOOL=NO
+
+               make %{PARALLELISMFLAGS}
+       end
+
+       test
+               make test
        end
 end