libjpeg-turbo: merge patches

src/libjpeg-turbo-1-fixes.patch

@@ -3,10 +3,10 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From 04ccaff0828b986fe9c97334734957b0edb8b007 Mon Sep 17 00:00:00 2001
+From aba5b24329e9f7209e47d400648e01a1de516e5e Mon Sep 17 00:00:00 2001
 From: MXE
 Date: Sun, 6 Sep 2015 23:16:12 +1000
-Subject: [PATCH 1/2] fix typedef conflicts
+Subject: [PATCH 1/3] fix typedef conflicts
 
 taken from:
 https://aur.archlinux.org/cgit/aur.git/tree/0001-header-compat.mingw.patch?h=mingw-w64-libjpeg-turbo
@@ -48,10 +48,10 @@ index 108e7de..ea74b4f 100644
 2.3.2 (Apple Git-55)
 
 
-From 530578ee474c1f85732705cdcd95cb0cf529c52e Mon Sep 17 00:00:00 2001
+From 49614a87a8a028fd7ce93edbbe8b5b79b9c97213 Mon Sep 17 00:00:00 2001
 From: MXE
 Date: Sun, 6 Sep 2015 23:17:23 +1000
-Subject: [PATCH 2/2] include stdio.h
+Subject: [PATCH 2/3] include stdio.h
 
 taken from:
 https://aur.archlinux.org/cgit/aur.git/tree/libjpeg-turbo-1.3.1-libmng-compatibility.patch?h=mingw-w64-libjpeg-turbo
@@ -71,3 +71,26 @@ index 9615c5d..f5fffe5 100644
 -- 
 2.3.2 (Apple Git-55)
 
+
+From e7a2f20d69b45f76834aeb71ff08c3f4b487f944 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Mon, 21 Sep 2015 20:34:03 +1000
+Subject: [PATCH 3/3] install dll to bin
+
+
+diff --git a/ltmain.sh b/ltmain.sh
+index a968835..f9cf33d 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5229,7 +5229,7 @@ fi\
+ 	  # place dlname in correct position for cygwin
+ 	  tdlname=$dlname
+ 	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/$dlname ;;
+ 	  esac
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+-- 
+2.3.2 (Apple Git-55)
+

src/libjpeg-turbo-2-install-DLL-to-bin-libjpeg-turbo.patch

@@ -1,28 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-From 703326874bf235adb392b9748ff0a56a08991690 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 6 Sep 2015 17:45:40 +0100
-Subject: [PATCH] install DLL to bin/libjpeg-turbo not to lib/bin
-
----
- ltmain.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index a968835..6acc338 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -5229,7 +5229,7 @@ fi\
- 	  # place dlname in correct position for cygwin
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/$dlname ;;
- 	  esac
- 	  $echo > $output "\
- # $outputname - a libtool library file
--- 
-2.1.4
-