From 100c0f15b8a0668a67a2e13121fa0a20da0f9d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 21 May 2020 21:32:13 +0200 Subject: [PATCH] arty-fx: upgrade to latest to fix build with lv2 >= 1.1.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../openav/{arty-fx_1.3.bb => arty-fx.bb} | 3 ++- ...-build-flags-it-causes-trouble-for-m.patch | 16 ++++++------ ...flags-they-work-on-intel-hardware-on.patch | 25 +++++++++++-------- 3 files changed, 25 insertions(+), 19 deletions(-) rename recipes-musicians/openav/{arty-fx_1.3.bb => arty-fx.bb} (89%) diff --git a/recipes-musicians/openav/arty-fx_1.3.bb b/recipes-musicians/openav/arty-fx.bb similarity index 89% rename from recipes-musicians/openav/arty-fx_1.3.bb rename to recipes-musicians/openav/arty-fx.bb index 891ea28..db34cb4 100644 --- a/recipes-musicians/openav/arty-fx_1.3.bb +++ b/recipes-musicians/openav/arty-fx.bb @@ -17,8 +17,9 @@ SRC_URI = " \ file://0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch \ file://0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch \ " -SRCREV = "5ed821b77a5892f6d79bd29a52ec8685f89cefd0" +SRCREV = "6010d1a6034ea684cc2edb22021f034122ccf814" S = "${WORKDIR}/git" +PV = "1.3+git${SRCPV}" EXTRA_OECMAKE += " \ -DBUILD_SSE=OFF \ diff --git a/recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch b/recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch index 6a1c6f5..835c089 100644 --- a/recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch +++ b/recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch @@ -9,24 +9,24 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1fa4d5..6d7808f 100644 +index 1c290ba..561f254 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,9 +24,7 @@ pkg_check_modules(SND sndfile REQUIRED) include_directories( ${SND_INCLUDE_DIRS} ) #target_link_libraries( avtkDemo ${CAIRO_LIBRARIES} ) --SET(CMAKE_SHARED_LINKER_FLAGS "-fPIC -shared -L./src/avtk -Wl,--no-undefined") --SET(CMAKE_C_FLAGS "-g -Wall -O1 -Wno-unused-variable") --SET(CMAKE_CXX_FLAGS "-g -Wall -O1 -Wno-unused-variable -ftree-vectorize") +-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -L./src/avtk -Wl,--no-undefined") +-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O1 -Wno-unused-variable") +-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -O1 -Wno-unused-variable -ftree-vectorize") +SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -L./src/avtk") - # DSP sources + FILE(GLOB sources src/dsp/*.cxx src/dsp/rr/*.cxx src/dsp/eq/*.cc ) -- -2.9.5 +2.21.1 diff --git a/recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch b/recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch index e842d7c..1bb62a5 100644 --- a/recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch +++ b/recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch @@ -10,24 +10,29 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - src/avtk/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/avtk/CMakeLists.txt | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/avtk/CMakeLists.txt b/src/avtk/CMakeLists.txt -index 710533d..5c17071 100644 +index 072dddd..a15c47d 100644 --- a/src/avtk/CMakeLists.txt +++ b/src/avtk/CMakeLists.txt -@@ -55,8 +55,8 @@ include_directories( ${X11_INCLUDE_DIRS} ) +@@ -54,13 +54,8 @@ pkg_check_modules(X11 x11 REQUIRED) + include_directories( ${X11_INCLUDE_DIRS} ) link_directories ( ${X11_LIBRARY_DIRS} ) - --SET(CMAKE_C_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address --SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # -fsanitize=address -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # -fsanitize=address +-IF(NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") +- SET(CMAKE_C_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address +- SET(CMAKE_CXX_FLAGS "-fPIC -msse -msse2 -mfpmath=sse -g") # -fsanitize=address +-ELSE() +- SET(CMAKE_C_FLAGS "-fPIC -mfpu=neon -g") +- SET(CMAKE_CXX_FLAGS "-fPIC -mfpu=neon -g") +-ENDIF(NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g") FILE(GLOB src libs/pffft.cxx avtk/*.cxx ) -- -2.9.5 +2.21.1