diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
| commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
| tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /media-libs/vigra/files | |
| parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) | |
gentoo resync : 28.04.2019
Diffstat (limited to 'media-libs/vigra/files')
| -rw-r--r-- | media-libs/vigra/files/vigra-1.11.0-gcc-7.patch | 13 | ||||
| -rw-r--r-- | media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch | 29 |
2 files changed, 29 insertions, 13 deletions
diff --git a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch b/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch deleted file mode 100644 index 4aaba64ed5e9..000000000000 --- a/media-libs/vigra/files/vigra-1.11.0-gcc-7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/vigra/imagecontainer.hxx b/include/vigra/imagecontainer.hxx -index a6f0f80..636cc64 100644 ---- a/include/vigra/imagecontainer.hxx -+++ b/include/vigra/imagecontainer.hxx -@@ -763,7 +763,7 @@ public: - /** swap contents of this array with the contents of other - (STL-Container interface) - */ -- void swap(const ImagePyramid<ImageType, Alloc> &other) -+ void swap(ImagePyramid<ImageType, Alloc> &other) - { - images_.swap(other.images_); - std::swap(lowestLevel_, other.lowestLevel_); diff --git a/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch new file mode 100644 index 000000000000..2b4b90df348f --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch @@ -0,0 +1,29 @@ +LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already. + +--- a/config/vigra-config.in 2017-05-19 17:01:08.000000000 +0200 ++++ b/config/vigra-config.in 2019-04-08 22:33:18.938060195 +0200 +@@ -68,7 +68,7 @@ + if op.impex_lib: # was: --impex_lib|--impex-lib|--libs + ldflags = [] + +- libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@' ++ libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@' + if libDir not in standardLibDirs: + ldflags.append('-L' + libDir) + +--- a/config/VigraSetDefaults.cmake 2017-05-19 17:01:08.000000000 +0200 ++++ b/config/VigraSetDefaults.cmake 2019-04-08 22:33:09.361974643 +0200 +@@ -59,13 +59,6 @@ + CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?" + FORCE) + +-IF(NOT DEFINED LIBDIR_SUFFIX) +- SET(LIBDIR_SUFFIX "") +-ENDIF() +-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX} +- CACHE STRING "Define suffix of lib directory name (empty string or 32 or 64)." +- FORCE) +- + IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX) + SET(DEPENDENCY_SEARCH_PREFIX "") + ENDIF() |