[SCM] libgroove/master: remove unnecessary patch

andrewrk-guest at users.alioth.debian.org andrewrk-guest at users.alioth.debian.org
Mon Mar 17 03:08:08 UTC 2014


The following commit has been merged in the master branch:
commit d2425f4c157d76ced6a09616a2ad37a4fd686f32
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun Mar 16 19:25:12 2014 -0700

    remove unnecessary patch
    
    The patch was from upstream and upstream is now merged in.

diff --git a/debian/patches/fix-cmake-build-warnings.patch b/debian/patches/fix-cmake-build-warnings.patch
deleted file mode 100644
index ee3ff42..0000000
--- a/debian/patches/fix-cmake-build-warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: fix cmake build warnings
-Origin: upstream, https://github.com/andrewrk/libgroove/commit/d67aa64b261
-
---- libgroove-3.0.6+dfsg.orig/CMakeLists.txt
-+++ libgroove-3.0.6+dfsg/CMakeLists.txt
-@@ -253,7 +253,7 @@ else()
-   target_link_libraries(groove LINK_PUBLIC ${LIBAV_AVUTIL_LIBRARIES})
-   include_directories(${LIBAV_INCLUDE_DIRS})
- endif()
--target_link_libraries(groove ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries(groove LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- 
- 
- add_library(groove_static STATIC ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS})
-@@ -299,7 +299,7 @@ else()
-     VERSION ${LIBGROOVE_VERSION}
-     COMPILE_FLAGS ${LIB_CFLAGS}
-     )
--  target_link_libraries(grooveplayer groove)
-+  target_link_libraries(grooveplayer LINK_PUBLIC groove)
-   add_dependencies(grooveplayer groove)
-   if(SDL2_IS_BUNDLED)
-     target_link_libraries(grooveplayer SDL2-static)
-@@ -342,7 +342,7 @@ else()
-     VERSION ${LIBGROOVE_VERSION}
-     COMPILE_FLAGS ${LIB_CFLAGS}
-     )
--  target_link_libraries(grooveloudness groove ${CMAKE_THREAD_LIBS_INIT})
-+  target_link_libraries(grooveloudness LINK_PUBLIC groove ${CMAKE_THREAD_LIBS_INIT})
-   add_dependencies(grooveloudness groove)
-   if(EBUR128_IS_BUNDLED)
-     target_link_libraries(grooveloudness ebur128_static)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 998c072..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-cmake-build-warnings.patch

-- 
libgroove packaging



More information about the pkg-multimedia-commits mailing list