commit: 3e7e7c2f0676cbc616c23321b2fd41f0de523fe6 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Dec 23 16:09:23 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 29 13:11:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7e7c2f
media-libs/libraw: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3224 .../libraw/files/libraw-0.16.0_alpha2-libdir.patch | 32 ----------- .../libraw/files/libraw-0.16.0_beta1-include.patch | 20 ------- .../files/libraw-0.16.0_beta1-libsuffix.patch | 64 ---------------------- .../files/libraw-0.16.0_beta1-libsuffixpc.patch | 24 -------- 4 files changed, 140 deletions(-) diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch deleted file mode 100644 index ae21f62..00000000 --- a/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- LibRaw-0.16.0-Alpha2/CMakeLists.txt -+++ LibRaw-0.16.0-Alpha2/CMakeLists.txt -@@ -565,14 +565,14 @@ - # Install Shared binary files. - INSTALL(TARGETS raw - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - - INSTALL(TARGETS raw_r - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - - # Install find cmake script to the system for client applications. -@@ -626,8 +626,8 @@ - - INSTALL(TARGETS ${_target} - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - ENDMACRO(LIBRAW_BUILD_SAMPLES) - diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch deleted file mode 100644 index d0d2355..00000000 --- a/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake -index abe6c03..aede5f2 100644 ---- a/cmake/data/libraw.pc.cmake -+++ b/cmake/data/libraw.pc.cmake -@@ -9,4 +9,4 @@ URL: http://www.libraw.org - Requires: - Version: @RAW_LIB_VERSION_STRING@ - Libs: -L${libdir} -lraw --Cflags: -I${includedir}/libraw -+Cflags: -I${includedir} -diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake -index d74e49a..16134e8 100644 ---- a/cmake/data/libraw_r.pc.cmake -+++ b/cmake/data/libraw_r.pc.cmake -@@ -9,4 +9,4 @@ URL: http://www.libraw.org - Requires: - Version: @RAW_LIB_VERSION_STRING@ - Libs: -L${libdir} -lraw_r --Cflags: -I${includedir}/libraw -+Cflags: -I${includedir} diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch deleted file mode 100644 index aa2a813..00000000 --- a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch +++ /dev/null @@ -1,64 +0,0 @@ -Backport of -From ce720038ed40e4c4554e0d8c0e4e003834ed1652 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Fri, 29 Nov 2013 20:53:46 +0100 -Subject: [PATCH] Allow specifying a suffix of the libdir -To allow installing to lib32/64 e.g. - - -diff -ruN LibRaw-0.16.0-Beta1.orig/CMakeLists.txt LibRaw-0.16.0-Beta1/CMakeLists.txt ---- LibRaw-0.16.0-Beta1.orig/CMakeLists.txt 2013-12-23 14:36:05.569116564 +0100 -+++ LibRaw-0.16.0-Beta1/CMakeLists.txt 2013-12-23 14:39:37.716121606 +0100 -@@ -95,6 +95,8 @@ - # ================================================================================================== - # General definitions rules - -+SET(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" ) -+ - # To prevent warnings from M$ compiler - IF(WIN32 AND MSVC) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) -@@ -560,10 +562,10 @@ - # Configure and install data file for packaging. - IF(NOT WIN32) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib/pkgconfig) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw_r.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc @ONLY) -- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib/pkgconfig) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.lsm) - ENDIF() -@@ -584,14 +586,14 @@ - # Install Shared binary files. - INSTALL(TARGETS raw - RUNTIME DESTINATION bin -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - - INSTALL(TARGETS raw_r - RUNTIME DESTINATION bin -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - - # Install find cmake script to the system for client applications. -@@ -633,8 +635,9 @@ - - INSTALL(TARGETS ${_target} - RUNTIME DESTINATION bin -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} -+ ) - - ENDMACRO(LIBRAW_BUILD_SAMPLES) - diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch deleted file mode 100644 index 7d140c7..00000000 --- a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake -index 9d34612..abe6c03 100644 ---- a/cmake/data/libraw.pc.cmake -+++ b/cmake/data/libraw.pc.cmake -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - includedir=${prefix}/include/libraw - - Name: @PROJECT_NAME@ -diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake -index bf779d9..d74e49a 100644 ---- a/cmake/data/libraw_r.pc.cmake -+++ b/cmake/data/libraw_r.pc.cmake -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - includedir=${prefix}/include/libraw - - Name: @PROJECT_NAME@
