[SCM] libebur128/master: add patch for cmake to use GNUInstallDirs
andrewrk-guest at users.alioth.debian.org
andrewrk-guest at users.alioth.debian.org
Mon Feb 17 23:32:14 UTC 2014
The following commit has been merged in the master branch:
commit c74ed4bd592ad09c7712687edf336e286f876234
Author: Andrew Kelley <superjoe30 at gmail.com>
Date: Mon Feb 17 23:07:29 2014 +0000
add patch for cmake to use GNUInstallDirs
diff --git a/debian/control b/debian/control
index 7ef29c2..3923b03 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: libebur128-dev
Section: libdevel
Architecture: any
Depends: libebur128-1 (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: multiarch-support
Description: implementation of the EBU R128 loudness standard (development files)
The European Broadcasting Union Loudness Recommendation (EBU R128) informs
broadcasters how they can analyze and normalize audio so that each piece of
@@ -31,6 +32,7 @@ Description: implementation of the EBU R128 loudness standard (development files
Package: libebur128-1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support
Description: implementation of the EBU R128 loudness standard
The European Broadcasting Union Loudness Recommendation (EBU R128) informs
broadcasters how they can analyze and normalize audio so that each piece of
diff --git a/debian/libebur128-1.install b/debian/libebur128-1.install
index c926217..0776c88 100644
--- a/debian/libebur128-1.install
+++ b/debian/libebur128-1.install
@@ -1 +1 @@
-usr/lib/libebur128.so.*
+usr/lib/*/libebur128.so.*
diff --git a/debian/libebur128-dev.install b/debian/libebur128-dev.install
index bdc2135..a64e091 100644
--- a/debian/libebur128-dev.install
+++ b/debian/libebur128-dev.install
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/libebur128.a
-usr/lib/libebur128.so
+usr/lib/*/libebur128.a
+usr/lib/*/libebur128.so
diff --git a/debian/patches/gnu-install-dirs.patch b/debian/patches/gnu-install-dirs.patch
new file mode 100644
index 0000000..a74f378
--- /dev/null
+++ b/debian/patches/gnu-install-dirs.patch
@@ -0,0 +1,24 @@
+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
index cde37b8..7cc01ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+gnu-install-dirs.patch
fix-missing-math-lib.patch
--
libebur128 packaging
More information about the pkg-multimedia-commits
mailing list