[SCM] libgroove/master: add patch for GNUInstallDirs

[andrewrk-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b0b877ef535eece4ed8248daaf1398109ce54a1b
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sat Apr 19 14:39:38 2014 -0700

    add patch for GNUInstallDirs

diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
new file mode 100644
index 0000000..761af0c
--- /dev/null
+++ b/debian/patches/gnu-install-dirs.patch
@@ -0,0 +1,93 @@
+From: Andrew Kelley <superjoe30 at gmail.com>
+Subject: Use GNUInstallDirs to determine install locations
+ GNUInstallDirs is available as of cmake 2.8.5.
+Origin: vendor
+--- libgroove-3.1.0+dfsg.orig/CMakeLists.txt
++++ libgroove-3.1.0+dfsg/CMakeLists.txt
+@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
+ project(groove C)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ set(LIBGROOVE_STATUS "yes")
+ set(LIBGROOVE_VERSION_MAJOR 3)
+@@ -284,15 +285,15 @@ set_target_properties(groove_static PROP
+ if(LIBAV_IS_BUNDLED)
+   add_dependencies(groove_static libav)
+ endif()
+-install(TARGETS groove_static DESTINATION lib)
++install(TARGETS groove_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+ install(FILES
+   "groove/groove.h"
+   "groove/queue.h"
+   "groove/encoder.h"
+-  DESTINATION "include/groove")
+-install(TARGETS groove DESTINATION lib)
++  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/groove")
++install(TARGETS groove DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ add_executable(metadata example/metadata.c)
+ set_target_properties(metadata PROPERTIES
+@@ -330,8 +331,8 @@ else()
+   endif()
+   include_directories(${SDL2_INCLUDE_DIR})
+ 
+-  install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer")
+-  install(TARGETS grooveplayer DESTINATION lib)
++  install(FILES "grooveplayer/player.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveplayer")
++  install(TARGETS grooveplayer DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+   add_library(grooveplayer_static STATIC
+     ${LIBGROOVE_PLAYER_SOURCES}
+@@ -342,7 +343,7 @@ else()
+   if(SDL2_IS_BUNDLED)
+     add_dependencies(grooveplayer_static SDL2-static)
+   endif()
+-  install(TARGETS grooveplayer_static DESTINATION lib)
++  install(TARGETS grooveplayer_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+   add_executable(playlist example/playlist.c ${PROJECT_SOURCE_DIR}/grooveplayer/player.h)
+@@ -376,8 +377,8 @@ else()
+   endif()
+   include_directories(${EBUR128_INCLUDE_DIR})
+ 
+-  install(FILES "grooveloudness/loudness.h" DESTINATION "include/grooveloudness")
+-  install(TARGETS grooveloudness DESTINATION lib)
++  install(FILES "grooveloudness/loudness.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveloudness")
++  install(TARGETS grooveloudness DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+   add_library(grooveloudness_static STATIC
+@@ -389,7 +390,7 @@ else()
+   if(EBUR128_IS_BUNDLED)
+     add_dependencies(grooveloudness_static ebur128_static)
+   endif()
+-  install(TARGETS grooveloudness_static DESTINATION lib)
++  install(TARGETS grooveloudness_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+   add_executable(replaygain example/replaygain.c)
+@@ -415,8 +416,8 @@ else()
+   target_link_libraries(groovefingerprinter LINK_PRIVATE ${CHROMAPRINT_LIBRARIES})
+   include_directories(${CHROMAPRINT_INCLUDE_DIR})
+ 
+-  install(FILES "groovefingerprinter/fingerprinter.h" DESTINATION "include/groovefingerprinter")
+-  install(TARGETS groovefingerprinter DESTINATION lib)
++  install(FILES "groovefingerprinter/fingerprinter.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/groovefingerprinter")
++  install(TARGETS groovefingerprinter DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+   add_library(groovefingerprinter_static STATIC
+@@ -425,7 +426,7 @@ else()
+   set_target_properties(groovefingerprinter_static PROPERTIES
+     OUTPUT_NAME groovefingerprinter
+     COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
+-  install(TARGETS groovefingerprinter_static DESTINATION lib)
++  install(TARGETS groovefingerprinter_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+   add_executable(fingerprint example/fingerprint.c)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..815548a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gnu-install-dirs.patch

-- 
libgroove packaging