From 6c2487386462b9e717e4f7f4c0244e29097b35fe Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 12 Jan 2016 22:40:25 +0100 Subject: [PATCH] asplib: bump version to 2fac1bf --- packages/audio/asplib/package.mk | 2 +- .../audio/asplib/patches/asplib-cmake.patch | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/audio/asplib/package.mk b/packages/audio/asplib/package.mk index 9315dcd19a..3059d68ca1 100644 --- a/packages/audio/asplib/package.mk +++ b/packages/audio/asplib/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="asplib" -PKG_VERSION="39fe0a7" +PKG_VERSION="2fac1bf" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/audio/asplib/patches/asplib-cmake.patch b/packages/audio/asplib/patches/asplib-cmake.patch index 9a9e126cdc..8782cf72e6 100644 --- a/packages/audio/asplib/patches/asplib-cmake.patch +++ b/packages/audio/asplib/patches/asplib-cmake.patch @@ -1,16 +1,15 @@ -diff -Naur asplib-39fe0a7.orig/CMakeLists.txt asplib-39fe0a7/CMakeLists.txt ---- asplib-39fe0a7.orig/CMakeLists.txt 2015-10-21 16:06:32.000000000 -0700 -+++ asplib-39fe0a7/CMakeLists.txt 2015-10-22 21:04:00.057711594 -0700 -@@ -1,60 +1,17 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2016-01-12 22:24:43.000000000 +0100 ++++ b/CMakeLists.txt 2016-01-12 22:47:16.624139358 +0100 +@@ -1,64 +1,17 @@ project(asplib) --cmake_minimum_required(VERSION 2.6) + cmake_minimum_required(VERSION 2.6) -enable_language(CXX) - -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) - -include(UseMultiArch.cmake) -+cmake_minimum_required(VERSION 2.8) set(asplib_NAME asplib) set(asplib_DESCRIPTION "asplib (Achim's Signal Processing LIBrary), is a small and lightweight C++ library for digital signal processing.") @@ -33,6 +32,10 @@ diff -Naur asplib-39fe0a7.orig/CMakeLists.txt asplib-39fe0a7/CMakeLists.txt -#set(asplib_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") -#set(asplib_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${TINYXML_LIBRARIES}) - +-if (NOT WIN32) +- add_definitions(-fPIC -g -O2) +-endif() +- -include_directories(${PROJECT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/Biquads) @@ -67,7 +70,7 @@ diff -Naur asplib-39fe0a7.orig/CMakeLists.txt asplib-39fe0a7/CMakeLists.txt install(DIRECTORY ${PROJECT_SOURCE_DIR}/interfaces/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/interfaces FILES_MATCHING PATTERN "*.h") -@@ -62,8 +19,6 @@ +@@ -66,8 +19,6 @@ FILES_MATCHING PATTERN "*.h") install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/os/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/os/ FILES_MATCHING PATTERN "*.h") @@ -76,7 +79,7 @@ diff -Naur asplib-39fe0a7.orig/CMakeLists.txt asplib-39fe0a7/CMakeLists.txt install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/os/linux/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/os/linux/ FILES_MATCHING PATTERN "*.h") install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/computeDeviceInfo/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/computeDeviceInfo/ -@@ -73,54 +28,4 @@ +@@ -77,54 +28,4 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/Biquads/Biquad_Native/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/Biquads/Biquad_Native/ FILES_MATCHING PATTERN "*.h")