From d4f1ead1c85c0279cefc7ddc0137b7f535895a11 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 18 Mar 2017 02:37:56 +0100 Subject: lensfun: unify patch --- src/lensfun-1-fixes.patch | 58 ++++++++++++++++++++++++++---------------- src/lensfun-2-pkg-config.patch | 28 -------------------- 2 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 src/lensfun-2-pkg-config.patch diff --git a/src/lensfun-1-fixes.patch b/src/lensfun-1-fixes.patch index bf475d3..a85f5ea 100644 --- a/src/lensfun-1-fixes.patch +++ b/src/lensfun-1-fixes.patch @@ -1,9 +1,11 @@ This file is part of MXE. See LICENSE.md for licensing information. -From fd0f1a46e5220cb13c5b445b9447f2fbc26ff7eb Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 21 Oct 2014 18:24:56 -0700 -Subject: [PATCH 1/3] build system: Detect POSIX regex lib more properly +Subject: [PATCH] build system: Detect POSIX regex lib more properly Previously, if the regex lib has to be linked separately, as in the case of MinGW/libgnurx, it is not detected properly, and build fails for shared @@ -16,7 +18,7 @@ and is licensed under the LGPL 3, same as this library. Signed-off-by: Timothy Gu diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8416fe6..bbdf75a 100644 +index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,16 +16,18 @@ SET(VERSION_BUGFIX 0) @@ -51,7 +53,7 @@ index 8416fe6..bbdf75a 100644 IF(BUILD_AUXFUN) diff --git a/build/CMakeModules/FindRegex.cmake b/build/CMakeModules/FindRegex.cmake new file mode 100644 -index 0000000..cae186f +index 1111111..2222222 --- /dev/null +++ b/build/CMakeModules/FindRegex.cmake @@ -0,0 +1,64 @@ @@ -120,7 +122,7 @@ index 0000000..cae186f + +MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt -index 9e210f3..ab6ce9a 100644 +index 1111111..2222222 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,4 +1,4 @@ @@ -130,7 +132,7 @@ index 9e210f3..ab6ce9a 100644 ENDIF() diff --git a/libs/lensfun/CMakeLists.txt b/libs/lensfun/CMakeLists.txt -index 7eaadcc..23262f5 100644 +index 1111111..2222222 100644 --- a/libs/lensfun/CMakeLists.txt +++ b/libs/lensfun/CMakeLists.txt @@ -17,8 +17,10 @@ ELSE() @@ -146,7 +148,7 @@ index 7eaadcc..23262f5 100644 TARGET_LINK_LIBRARIES(lensfun ${GLIB2_LIBRARIES}) diff --git a/libs/lensfun/lensfun.pc.cmake b/libs/lensfun/lensfun.pc.cmake -index 6d14b12..5f91d44 100644 +index 1111111..2222222 100644 --- a/libs/lensfun/lensfun.pc.cmake +++ b/libs/lensfun/lensfun.pc.cmake @@ -10,4 +10,5 @@ Description: A photographic lens database and access library @@ -156,7 +158,7 @@ index 6d14b12..5f91d44 100644 +Libs.private: @REGEX_LIBRARIES@ Cflags: -I${includedir} -I${includedir}/lensfun diff --git a/libs/regex/CMakeLists.txt b/libs/regex/CMakeLists.txt -index 27bc6c6..bcddcf0 100644 +index 1111111..2222222 100644 --- a/libs/regex/CMakeLists.txt +++ b/libs/regex/CMakeLists.txt @@ -1,5 +1,5 @@ @@ -166,19 +168,16 @@ index 27bc6c6..bcddcf0 100644 FILE(GLOB REGEX_SRC *.c *.h) LIST(APPEND REGEX_SRC ../../include/regex/regex.h) ADD_LIBRARY(tre_regex STATIC ${REGEX_SRC}) --- -1.9.1 - -From bed1d4d5ed265083b340aed398403cbaba46e340 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 21 Oct 2014 18:36:15 -0700 -Subject: [PATCH 2/3] Only install glib DLL on MSVC +Subject: [PATCH] Only install glib DLL on MSVC Signed-off-by: Timothy Gu diff --git a/CMakeLists.txt b/CMakeLists.txt -index bbdf75a..7690630 100644 +index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,7 @@ IF(BUILD_DOC) @@ -190,20 +189,17 @@ index bbdf75a..7690630 100644 FIND_FILE(GLIB2_DLL NAMES glib-2.dll glib-2-vs9.dll PATHS "${GLIB2_BASE_DIR}/bin" --- -1.9.1 - -From ccdd4f111b4c45bd654531650e4cdb25fdd38b6c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 21 Oct 2014 18:41:09 -0700 -Subject: [PATCH 3/3] Add option whether or not to install into source tree on +Subject: [PATCH] Add option whether or not to install into source tree on WIN32 Signed-off-by: Timothy Gu diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7690630..ef8cf65 100644 +index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,9 @@ OPTION(BUILD_FOR_SSE "Build with support for SSE" ON) @@ -225,6 +221,24 @@ index 7690630..ef8cf65 100644 # install into place in build-dir SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun") ELSE() --- -1.9.1 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 21 Oct 2014 18:54:03 -0700 +Subject: [PATCH] pkgconfig: Explicitly depend on libstdc++ + +Fixes MinGW static. + +Signed-off-by: Timothy Gu + +diff --git a/libs/lensfun/lensfun.pc.cmake b/libs/lensfun/lensfun.pc.cmake +index 1111111..2222222 100644 +--- a/libs/lensfun/lensfun.pc.cmake ++++ b/libs/lensfun/lensfun.pc.cmake +@@ -10,5 +10,5 @@ Description: A photographic lens database and access library + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.@VERSION_BUGFIX@ + Requires.private: glib-2.0 + Libs: -L${libdir} -llensfun +-Libs.private: @REGEX_LIBRARIES@ ++Libs.private: @REGEX_LIBRARIES@ -lstdc++ + Cflags: -I${includedir} -I${includedir}/lensfun diff --git a/src/lensfun-2-pkg-config.patch b/src/lensfun-2-pkg-config.patch deleted file mode 100644 index 7b8c6cd..0000000 --- a/src/lensfun-2-pkg-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From da0bb87d6e520c042f98204c35105bcf4be7ea0f Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Tue, 21 Oct 2014 18:54:03 -0700 -Subject: [PATCH] pkgconfig: Explicitly depend on libstdc++ - -Fixes MinGW static. - -Signed-off-by: Timothy Gu ---- - libs/lensfun/lensfun.pc.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/lensfun/lensfun.pc.cmake b/libs/lensfun/lensfun.pc.cmake -index 5f91d44..9c291f8 100644 ---- a/libs/lensfun/lensfun.pc.cmake -+++ b/libs/lensfun/lensfun.pc.cmake -@@ -10,5 +10,5 @@ Description: A photographic lens database and access library - Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.@VERSION_BUGFIX@ - Requires.private: glib-2.0 - Libs: -L${libdir} -llensfun --Libs.private: @REGEX_LIBRARIES@ -+Libs.private: @REGEX_LIBRARIES@ -lstdc++ - Cflags: -I${includedir} -I${includedir}/lensfun --- -1.9.1 - -- cgit v0.12