[SCM] ableton-link/master: Refreshed patches.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Sun Oct 30 20:03:18 UTC 2016


The following commit has been merged in the master branch:
commit ba2fcdb4fba9c15b5f4027628b9b2f4a179d07cf
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sun Oct 30 20:51:35 2016 +0100

    Refreshed patches.

diff --git a/debian/patches/DEBIAN_catch.patch b/debian/patches/DEBIAN_catch.patch
index 1d3522e..596fdb1 100644
--- a/debian/patches/DEBIAN_catch.patch
+++ b/debian/patches/DEBIAN_catch.patch
@@ -8,8 +8,8 @@ Forwarded: no
 Last-Update: 2016-10-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- ableton-link_1.0.0.orig/src/ableton/test/catch/CatchMain.cpp
-+++ ableton-link_1.0.0/src/ableton/test/catch/CatchMain.cpp
+--- ableton-link.orig/src/ableton/test/catch/CatchMain.cpp
++++ ableton-link/src/ableton/test/catch/CatchMain.cpp
 @@ -46,8 +46,9 @@
  
  } // anonymous namespace
diff --git a/debian/patches/DEBIAN_system_libraries.patch b/debian/patches/DEBIAN_system_libraries.patch
index ef80c2b..679d385 100644
--- a/debian/patches/DEBIAN_system_libraries.patch
+++ b/debian/patches/DEBIAN_system_libraries.patch
@@ -7,8 +7,8 @@ Forwarded: not-needed
 Last-Update: 2016-10-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- ableton-link_1.0.0.orig/cmake_include/AsioStandaloneConfig.cmake
-+++ ableton-link_1.0.0/cmake_include/AsioStandaloneConfig.cmake
+--- ableton-link.orig/cmake_include/AsioStandaloneConfig.cmake
++++ ableton-link/cmake_include/AsioStandaloneConfig.cmake
 @@ -1,10 +1,5 @@
  add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE)
  
@@ -20,8 +20,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  if (WIN32)
    set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY
      INTERFACE_COMPILE_DEFINITIONS
---- ableton-link_1.0.0.orig/cmake_include/CatchConfig.cmake
-+++ ableton-link_1.0.0/cmake_include/CatchConfig.cmake
+--- ableton-link.orig/cmake_include/CatchConfig.cmake
++++ ableton-link/cmake_include/CatchConfig.cmake
 @@ -1,6 +1,2 @@
  add_library(Catch::Catch IMPORTED INTERFACE)
  
diff --git a/debian/patches/jack_support.patch b/debian/patches/jack_support.patch
index 12cb02d..dad53e2 100644
--- a/debian/patches/jack_support.patch
+++ b/debian/patches/jack_support.patch
@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +++ ableton-link/CMakeLists.txt
 @@ -16,6 +16,7 @@
  if(UNIX)
-   set(LINK_WORD_SIZE "64" CACHE STRING "Set the word size (must be either 32 or 64)")
+   set(LINK_WORD_SIZE "native" CACHE STRING "Set the word size (must be either 32 or 64 (or 'native')")
    option(LINK_ENABLE_ASAN "Build with Address Sanitizier (ASan)" OFF)
 +  option(LINK_BUILD_JACK "Build example applications with JACK support" ON)
  endif()

-- 
ableton-link packaging



More information about the pkg-multimedia-commits mailing list