[SCM] libgroove/master: Refresh patch, not yet applied upstream

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Fri Oct 30 00:27:08 UTC 2015


The following commit has been merged in the master branch:
commit 33cb04c6a23d3da015d947b11b9d11cde9a50407
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Oct 29 20:26:19 2015 -0300

    Refresh patch, not yet applied upstream

diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
index 2a7e353..ab23ae2 100644
--- a/debian/patches/gnu-install-dirs.patch
+++ b/debian/patches/gnu-install-dirs.patch
@@ -2,17 +2,17 @@ From: Andrew Kelley <superjoe30 at gmail.com>
 Subject: Use GNUInstallDirs to determine install locations
  GNUInstallDirs is available as of cmake 2.8.5.
 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)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,6 +7,7 @@ endif()
+ 
  project(groove C)
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 +include(GNUInstallDirs)
  
  set(LIBGROOVE_STATUS "yes")
  set(LIBGROOVE_VERSION_MAJOR 4)
-@@ -160,15 +161,15 @@ add_library(groove_static STATIC ${LIBGR
+@@ -166,15 +167,15 @@ add_library(groove_static STATIC ${LIBGR
  set_target_properties(groove_static PROPERTIES
    OUTPUT_NAME groove
    COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
@@ -31,7 +31,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
  add_executable(metadata example/metadata.c)
  set_target_properties(metadata PROPERTIES
-@@ -204,8 +205,8 @@ else()
+@@ -210,8 +211,8 @@ else()
    target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY})
    include_directories(${SDL2_INCLUDE_DIR})
  
@@ -42,7 +42,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
    add_library(grooveplayer_static STATIC
      ${LIBGROOVE_PLAYER_SOURCES}
-@@ -213,7 +214,7 @@ else()
+@@ -219,7 +220,7 @@ else()
    set_target_properties(grooveplayer_static PROPERTIES
      OUTPUT_NAME grooveplayer
      COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
@@ -51,7 +51,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
  
    add_executable(playlist example/playlist.c ${PROJECT_SOURCE_DIR}/grooveplayer/player.h)
-@@ -239,8 +240,8 @@ else()
+@@ -245,8 +246,8 @@ else()
    target_link_libraries(grooveloudness LINK_PRIVATE ${EBUR128_LIBRARY})
    include_directories(${EBUR128_INCLUDE_DIR})
  
@@ -62,7 +62,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
  
    add_library(grooveloudness_static STATIC
-@@ -249,7 +250,7 @@ else()
+@@ -255,7 +256,7 @@ else()
    set_target_properties(grooveloudness_static PROPERTIES
      OUTPUT_NAME grooveloudness
      COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")
@@ -71,7 +71,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
  
    add_executable(replaygain example/replaygain.c)
-@@ -275,8 +276,8 @@ else()
+@@ -281,8 +282,8 @@ else()
    target_link_libraries(groovefingerprinter LINK_PRIVATE ${CHROMAPRINT_LIBRARY})
    include_directories(${CHROMAPRINT_INCLUDE_DIR})
  
@@ -82,7 +82,7 @@ Forwarded: https://github.com/andrewrk/libgroove/commit/14481a0978389a677150a7c5
  
  
    add_library(groovefingerprinter_static STATIC
-@@ -285,7 +286,7 @@ else()
+@@ -291,7 +292,7 @@ else()
    set_target_properties(groovefingerprinter_static PROPERTIES
      OUTPUT_NAME groovefingerprinter
      COMPILE_FLAGS "${LIB_CFLAGS} -fPIC")

-- 
libgroove packaging



More information about the pkg-multimedia-commits mailing list