File project.diff of Package mingw64-libjpeg-turbo

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw64-libjpeg-turbo (Revision b9f57640372b064df9d225fcc1b84616)

Currently displaying revision b9f57640372b064df9d225fcc1b84616 , Show latest

--- mingw64-libjpeg-turbo.spec.orig
+++ mingw64-libjpeg-turbo.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define srcver   1.4.0
+%define srcver   2.1.5.1
 %define major    8
 %define minor    0
 %define micro    2
@@ -35,12 +35,10 @@ Group:          Productivity/Graphics/Co
 URL:            http://sourceforge.net/projects/libjpeg-turbo
 
 Source:         http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%version.tar.gz
-Patch0:         libjpeg-turbo-1.4.0-int32.patch
 Patch1:         libjpeg-turbo-1.3.0-tiff-ojpeg.patch
-Patch2:         libjpeg-1.4.0-ocloexec.patch
-Patch3:         libjpeg-turbo-remove-test.patch
-Patch4:         jpeg-typedef-boolean.diff
+BuildRequires:  mingw64-cross-cmake
 BuildRequires:  mingw64-cross-gcc-c++
+BuildRequires:  mingw64-cross-pkg-config
 BuildRequires:  libtool
 BuildRequires:  yasm
 Obsoletes:      mingw64-jpeg = 6b
@@ -95,30 +93,23 @@ files using the libjpeg library.
 
 %prep
 %setup -qn libjpeg-turbo-%srcver
-%patch0
 %patch1
-%patch2
-%patch -P 3 -P 4 -p1
 
 %build
-autoreconf -fiv
-export LDFLAGS="-Wl,-z,relro,-z,now"
-%_mingw64_configure --disable-static \
-           --with-jpeg8
-make %{?_smp_mflags}
+%_mingw64_cmake \
+    -DCMAKE_SYSTEM_PROCESSOR=%_arch \
+    -DENABLE_STATIC=OFF \
+    -DWITH_JPEG8=ON
+%_mingw64_cmake_build
 
 %install
-%make_install
-# Fix perms
-chmod -x README-turbo.txt
-# Remove unwanted files
-rm -f %buildroot/%_mingw64_libdir/lib{,turbo}jpeg.la
+%_mingw64_cmake_install
 # Remove docs, we'll select docs manually
 rm -rf "%buildroot/%_mingw64_datadir/doc/"
 
 %files
 %defattr(-,root,root)
-%doc README README-turbo.txt change.log ChangeLog.txt
+%doc README.md change.log ChangeLog.md
 %doc usage.txt wizard.txt
 %_mingw64_bindir/*.exe
 %doc %_mingw64_mandir/man1/*
@@ -129,13 +120,16 @@ rm -rf "%buildroot/%_mingw64_datadir/doc
 
 %files -n mingw64-libturbojpeg%tmajor
 %defattr(-,root,root)
-%_mingw64_bindir/libturbojpeg-%tmajor.dll
+%_mingw64_bindir/libturbojpeg.dll
 
 %files -n mingw64-libjpeg%major-devel
 %defattr(-,root,root)
 %_mingw64_includedir/*.h
 %_mingw64_libdir/libjpeg.dll.a
 %_mingw64_libdir/libturbojpeg.dll.a
-%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
+%_mingw64_libdir/cmake/libjpeg-turbo/
+%_mingw64_libdir/pkgconfig/libjpeg.pc
+%_mingw64_libdir/pkgconfig/libturbojpeg.pc
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c
 
 %changelog
--- mingw64-libjpeg62-turbo.spec.orig
+++ mingw64-libjpeg62-turbo.spec
@@ -19,7 +19,7 @@
 %define major   62
 %define minor   1
 %define micro   0
-%define srcver  1.4.0
+%define srcver  2.1.5.1
 %define libver  %major.%minor.%micro
 
 Name:           libjpeg62-turbo
@@ -31,11 +31,10 @@ Group:          Productivity/Graphics/Co
 URL:            http://sourceforge.net/projects/libjpeg-turbo
 
 Source:         http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%version.tar.gz
-Patch0:         libjpeg-turbo-1.4.0-int32.patch
 Patch1:         libjpeg-turbo-1.3.0-tiff-ojpeg.patch
-Patch2:         libjpeg-1.4.0-ocloexec.patch
-Patch4:         jpeg-typedef-boolean.diff
+BuildRequires:  mingw64-cross-cmake
 BuildRequires:  mingw64-cross-gcc-c++
+BuildRequires:  mingw64-cross-pkg-config
 BuildRequires:  libtool
 BuildRequires:  yasm
 Conflicts:      mingw64-jpeg%major
@@ -73,35 +72,30 @@ files using the libjpeg library.
 
 %prep
 %setup -q -n libjpeg-turbo-%srcver
-%patch0
 %patch1
-%patch2
-%patch -P 4 -p1
 
 %build
-autoreconf -fiv
-export LDFLAGS="-Wl,-z,relro,-z,now"
-%_mingw64_configure --disable-static 
-make %{?_smp_mflags}
+%_mingw64_cmake \
+    -DCMAKE_SYSTEM_PROCESSOR=%_arch \
+    -DENABLE_STATIC=OFF
+%_mingw64_cmake_build
 
 %install
-%make_install
-# Fix perms
-chmod -x README-turbo.txt
+%_mingw64_cmake_install
 # Remove unwanted files
 rm -f %buildroot/%_mingw64_libdir/lib{,turbo}jpeg.la
 rm %buildroot/%_mingw64_bindir/*.exe
 rm %buildroot/%_mingw64_mandir/man1/*
 # libjpegturbo is provided with libjpeg-turbo.spec yet
 rm %buildroot/%_mingw64_includedir/turbojpeg.h
-rm %buildroot/%_mingw64_bindir/libturbojpeg-*.dll
+rm %buildroot/%_mingw64_bindir/libturbojpeg.dll
 rm %buildroot/%_mingw64_libdir/libturbojpeg.dll.a
 # Remove docs, we'll select docs manually
-rm -rf %buildroot/%_mingw64_datadir/doc/
+rm -rf "%buildroot/%_mingw64_datadir/doc/"
 
 %files
 %defattr(-,root,root)
-%doc README README-turbo.txt change.log ChangeLog.txt
+%doc README.md change.log ChangeLog.md
 %doc usage.txt wizard.txt
 
 %files -n mingw64-libjpeg%major
@@ -112,6 +106,9 @@ rm -rf %buildroot/%_mingw64_datadir/doc/
 %defattr(-,root,root)
 %_mingw64_includedir/*.h
 %_mingw64_libdir/libjpeg.dll.a
-%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
+%_mingw64_libdir/cmake/libjpeg-turbo/
+%_mingw64_libdir/pkgconfig/libjpeg.pc
+%_mingw64_libdir/pkgconfig/libturbojpeg.pc
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c
 
 %changelog

Places

File project.diff of Package mingw64-libjpeg-turbo (Revision b9f57640372b064df9d225fcc1b84616)

Places