[SCM] libebur128/master: remove patches which are now shipped upstream

andrewrk-guest at users.alioth.debian.org andrewrk-guest at users.alioth.debian.org
Sun Sep 28 23:39:39 UTC 2014


The following commit has been merged in the master branch:
commit 7fb49d4c979422388ac37bcb38d85895cd386298
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun Sep 28 23:32:11 2014 +0000

    remove patches which are now shipped upstream

diff --git a/debian/patches/fix-missing-math-lib.patch b/debian/patches/fix-missing-math-lib.patch
deleted file mode 100644
index 73238d4..0000000
--- a/debian/patches/fix-missing-math-lib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Andrew Kelley <superjoe30 at gmail.com>
-Subject: add -lm on UNIX systems
- Previously libebur128 was not being linked with -lm. Now it is.
-Origin: upstream, https://github.com/jiixyj/libebur128/commit/f68096cdebd
---- a/ebur128/CMakeLists.txt
-+++ b/ebur128/CMakeLists.txt
-@@ -47,6 +47,9 @@
-     SOVERSION ${EBUR128_VERSION_MAJOR}
-     VERSION ${EBUR128_VERSION})
- 
-+if(UNIX)
-+  target_link_libraries(ebur128 -lm)
-+endif(UNIX)
- 
- if(SPEEXDSP_FOUND AND NOT DISABLE_SPEEXDSP)
-     set_property(TARGET ebur128_static APPEND_STRING PROPERTY
diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
deleted file mode 100644
index a74f378..0000000
--- a/debian/patches/gnu-install-dirs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Sebastian Ramacher <sramacher at debian.org>
-Subject: Use GNUInstallDirs to determine install locations
- GNUInstallDirs is available as of cmake 2.8.5.
-Origin: upstream, https://github.com/jiixyj/libebur128/commit/5ee26401
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
- include(utils)
-+include(GNUInstallDirs)
- 
- add_subdirectory(ebur128)
- add_subdirectory(test)
---- a/ebur128/CMakeLists.txt
-+++ b/ebur128/CMakeLists.txt
-@@ -60,5 +60,5 @@
- set(SUMMARY_SPEEXDSP_FOUND ${SPEEXDSP_FOUND} CACHE INTERNAL "")
- set(EBUR128_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
- 
--install(FILES ebur128.h DESTINATION include)
--install(TARGETS ebur128 ebur128_static DESTINATION lib)
-+install(FILES ebur128.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+install(TARGETS ebur128 ebur128_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7cc01ce..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-gnu-install-dirs.patch
-fix-missing-math-lib.patch

-- 
libebur128 packaging



More information about the pkg-multimedia-commits mailing list