[SCM] libgroove/master: refresh GNUInstallDirs patch

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

The following commit has been merged in the master branch:
commit 508de8f48caedb95e3b179efd697f225d1d8eaed
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun Sep 28 23:10:05 2014 +0000

    refresh GNUInstallDirs patch

diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
index b0e9e1b..2a7e353 100644
--- a/debian/patches/gnu-install-dirs.patch
+++ b/debian/patches/gnu-install-dirs.patch
@@ -1,21 +1,21 @@
 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-4.0.1+dfsg.orig/CMakeLists.txt
-+++ libgroove-4.0.1+dfsg/CMakeLists.txt
-@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
+Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c530bbe6b7dc69e9bf
+--- libgroove-4.2.0.orig/CMakeLists.txt
++++ libgroove-4.2.0/CMakeLists.txt
+@@ -1,6 +1,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 4)
-@@ -284,15 +285,15 @@ set_target_properties(groove_static PROP
- if(LIBAV_IS_BUNDLED)
-   add_dependencies(groove_static libav)
- endif()
+@@ -160,15 +161,15 @@ add_library(groove_static STATIC ${LIBGR
+ set_target_properties(groove_static PROPERTIES
+   OUTPUT_NAME groove
+   COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
 -install(TARGETS groove_static DESTINATION lib)
 +install(TARGETS groove_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
@@ -31,8 +31,8 @@ Origin: vendor
  
  add_executable(metadata example/metadata.c)
  set_target_properties(metadata PROPERTIES
-@@ -330,8 +331,8 @@ else()
-   endif()
+@@ -204,8 +205,8 @@ else()
+   target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY})
    include_directories(${SDL2_INCLUDE_DIR})
  
 -  install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer")
@@ -42,17 +42,17 @@ Origin: vendor
  
    add_library(grooveplayer_static STATIC
      ${LIBGROOVE_PLAYER_SOURCES}
-@@ -342,7 +343,7 @@ else()
-   if(SDL2_IS_BUNDLED)
-     add_dependencies(grooveplayer_static SDL2-static)
-   endif()
+@@ -213,7 +214,7 @@ else()
+   set_target_properties(grooveplayer_static PROPERTIES
+     OUTPUT_NAME grooveplayer
+     COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
 -  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()
+@@ -239,8 +240,8 @@ else()
+   target_link_libraries(grooveloudness LINK_PRIVATE ${EBUR128_LIBRARY})
    include_directories(${EBUR128_INCLUDE_DIR})
  
 -  install(FILES "grooveloudness/loudness.h" DESTINATION "include/grooveloudness")
@@ -62,17 +62,17 @@ Origin: vendor
  
  
    add_library(grooveloudness_static STATIC
-@@ -389,7 +390,7 @@ else()
-   if(EBUR128_IS_BUNDLED)
-     add_dependencies(grooveloudness_static ebur128_static)
-   endif()
+@@ -249,7 +250,7 @@ else()
+   set_target_properties(grooveloudness_static PROPERTIES
+     OUTPUT_NAME grooveloudness
+     COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
 -  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})
+@@ -275,8 +276,8 @@ else()
+   target_link_libraries(groovefingerprinter LINK_PRIVATE ${CHROMAPRINT_LIBRARY})
    include_directories(${CHROMAPRINT_INCLUDE_DIR})
  
 -  install(FILES "groovefingerprinter/fingerprinter.h" DESTINATION "include/groovefingerprinter")
@@ -82,7 +82,7 @@ Origin: vendor
  
  
    add_library(groovefingerprinter_static STATIC
-@@ -425,7 +426,7 @@ else()
+@@ -285,7 +286,7 @@ else()
    set_target_properties(groovefingerprinter_static PROPERTIES
      OUTPUT_NAME groovefingerprinter
      COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")

-- 
libgroove packaging