projectm: update to a later version found on github
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
@@ -0,0 +1,75 @@
|
||||
From 434fbf38dc706208610b685845746f369ef2d4e2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 25 Oct 2016 00:36:23 +0200
|
||||
Subject: [PATCH] Fix sdl2 build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| ld: error: SDL2main: no archive symbol table (run ranlib)
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/cmake/FindSDL2.cmake | 16 ----------------
|
||||
src/projectM-sdl/cmake/FindSDL2.cmake | 16 ----------------
|
||||
2 files changed, 32 deletions(-)
|
||||
|
||||
diff --git a/src/cmake/FindSDL2.cmake b/src/cmake/FindSDL2.cmake
|
||||
index 236d6b4..01ec022 100644
|
||||
--- a/src/cmake/FindSDL2.cmake
|
||||
+++ b/src/cmake/FindSDL2.cmake
|
||||
@@ -91,22 +91,6 @@ FIND_LIBRARY(SDL2_LIBRARY_TEMP
|
||||
PATHS ${SDL2_SEARCH_PATHS}
|
||||
)
|
||||
|
||||
-IF(NOT SDL2_BUILDING_LIBRARY)
|
||||
- IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
- # Non-OS X framework versions expect you to also dynamically link to
|
||||
- # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
|
||||
- # seem to provide SDL2main for compatibility even though they don't
|
||||
- # necessarily need it.
|
||||
- FIND_LIBRARY(SDL2MAIN_LIBRARY
|
||||
- NAMES SDL2main
|
||||
- HINTS
|
||||
- $ENV{SDL2DIR}
|
||||
- PATH_SUFFIXES lib64 lib
|
||||
- PATHS ${SDL2_SEARCH_PATHS}
|
||||
- )
|
||||
- ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
|
||||
-
|
||||
# SDL2 may require threads on your system.
|
||||
# The Apple build may not need an explicit flag because one of the
|
||||
# frameworks may already provide it.
|
||||
diff --git a/src/projectM-sdl/cmake/FindSDL2.cmake b/src/projectM-sdl/cmake/FindSDL2.cmake
|
||||
index 026dc34..6231fd9 100644
|
||||
--- a/src/projectM-sdl/cmake/FindSDL2.cmake
|
||||
+++ b/src/projectM-sdl/cmake/FindSDL2.cmake
|
||||
@@ -94,22 +94,6 @@ FIND_LIBRARY(SDL2_LIBRARY_TEMP
|
||||
PATHS ${SDL2_SEARCH_PATHS}
|
||||
)
|
||||
|
||||
-IF(NOT SDL2_BUILDING_LIBRARY)
|
||||
- IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
- # Non-OS X framework versions expect you to also dynamically link to
|
||||
- # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
|
||||
- # seem to provide SDL2main for compatibility even though they don't
|
||||
- # necessarily need it.
|
||||
- FIND_LIBRARY(SDL2MAIN_LIBRARY
|
||||
- NAMES SDL2main
|
||||
- HINTS
|
||||
- $ENV{SDL2DIR}
|
||||
- PATH_SUFFIXES lib64 lib
|
||||
- PATHS ${SDL2_SEARCH_PATHS}
|
||||
- )
|
||||
- ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
|
||||
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
|
||||
-
|
||||
# SDL2 may require threads on your system.
|
||||
# The Apple build may not need an explicit flag because one of the
|
||||
# frameworks may already provide it.
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
From edd199d0369a2198f2033bf2e7e5420a33d9316c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 24 Oct 2016 00:06:38 +0200
|
||||
Subject: [PATCH] fix build wit gcc-6
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/libprojectM/Common.hpp | 3 ++-
|
||||
src/libprojectM/MilkdropPresetFactory/Parser.cpp | 10 +++++-----
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp
|
||||
index b292495..abc153e 100755
|
||||
--- a/src/libprojectM/Common.hpp
|
||||
+++ b/src/libprojectM/Common.hpp
|
||||
@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t len, const char *pMode);
|
||||
|
||||
#ifdef LINUX
|
||||
#include <cstdlib>
|
||||
-#define projectM_isnan isnan
|
||||
+#include <cmath>
|
||||
+#define projectM_isnan std::isnan
|
||||
|
||||
#endif
|
||||
|
||||
diff --git a/src/libprojectM/MilkdropPresetFactory/Parser.cpp b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
|
||||
index 16c3c82..8e0bc6a 100755
|
||||
--- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
|
||||
+++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
|
||||
@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std::istream & fs, char * pa
|
||||
PerFrameEqn * per_frame_eqn;
|
||||
GenExpr * gen_expr;
|
||||
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
if (param_string == NULL)
|
||||
return NULL;
|
||||
@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream & fs, MilkdropPreset *
|
||||
|
||||
if (preset == NULL)
|
||||
return NULL;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
|
||||
if ((token = parseToken(fs, name)) != tEq)
|
||||
@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p
|
||||
/* Null argument checks */
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std::istream & fs, MilkdropPreset * preset
|
||||
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, std::istream & fs, MilkdropPreset * prese
|
||||
if (token == NULL)
|
||||
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From b37875b04823545b863c126f97b1558b92763584 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 24 Oct 2016 00:58:47 +0200
|
||||
Subject: [PATCH] projectM-test: add missing build paths
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/projectM-test/CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/projectM-test/CMakeLists.txt b/src/projectM-test/CMakeLists.txt
|
||||
index bbd1e51..4121049 100644
|
||||
--- a/src/projectM-test/CMakeLists.txt
|
||||
+++ b/src/projectM-test/CMakeLists.txt
|
||||
@@ -35,11 +35,11 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
|
||||
endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
|
||||
|
||||
-INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
|
||||
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
|
||||
LINK_DIRECTORIES(${PROJECTM_LINK})
|
||||
|
||||
-TARGET_LINK_LIBRARIES(projectM-test projectM ${SDL_LIBRARY})
|
||||
-TARGET_LINK_LIBRARIES(projectM-test-memleak projectM ${SDL_LIBRARY} )
|
||||
-TARGET_LINK_LIBRARIES(projectM-test-texture projectM ${SDL_LIBRARY} )
|
||||
+TARGET_LINK_LIBRARIES(projectM-test projectM ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
|
||||
+TARGET_LINK_LIBRARIES(projectM-test-memleak projectM ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
|
||||
+TARGET_LINK_LIBRARIES(projectM-test-texture projectM ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
|
||||
|
||||
INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 09d2274828a7d0bdb4b42c7c2871d11170f681cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 25 Oct 2016 01:18:41 +0200
|
||||
Subject: [PATCH] workaround link failures
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/projectM-sdl/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/projectM-sdl/CMakeLists.txt b/src/projectM-sdl/CMakeLists.txt
|
||||
index 64c2feb..1960431 100644
|
||||
--- a/src/projectM-sdl/CMakeLists.txt
|
||||
+++ b/src/projectM-sdl/CMakeLists.txt
|
||||
@@ -23,7 +23,7 @@ FIND_PACKAGE(SDL2 REQUIRED)
|
||||
|
||||
# link in projectM
|
||||
# i have no idea if this is correct
|
||||
-TARGET_LINK_LIBRARIES(projectMSDL projectM ${OPENGL_LIBRARIES} ${SDL2_LIBRARY})
|
||||
+TARGET_LINK_LIBRARIES(projectMSDL ${SDL2_LIBRARY} projectM ${OPENGL_LIBRARIES})
|
||||
SET(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
|
||||
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL2_INCLUDE_DIR})
|
||||
LINK_DIRECTORIES(${PROJECTM_LINK})
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 1c2c784eaef478319840f1c0516682b6cbaa0452 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 24 Oct 2016 01:07:41 +0200
|
||||
Subject: [PATCH] projectM-libvisual: set libvisual path correctly
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/projectM-libvisual/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/projectM-libvisual/CMakeLists.txt b/src/projectM-libvisual/CMakeLists.txt
|
||||
index 28d8f90..2084fdb 100644
|
||||
--- a/src/projectM-libvisual/CMakeLists.txt
|
||||
+++ b/src/projectM-libvisual/CMakeLists.txt
|
||||
@@ -44,7 +44,7 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
|
||||
endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
|
||||
|
||||
-INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBVISUAL_INCLUDEDIR} ${SDL_INCLUDE_DIR})
|
||||
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBVISUAL_INCLUDE_DIRS} ${SDL_INCLUDE_DIR})
|
||||
LINK_DIRECTORIES(${PROJECTM_LINK})
|
||||
|
||||
TARGET_LINK_LIBRARIES(projectM_libvisual projectM ${SDL_LIBRARY} ${LIBVISUAL_LIBRARIES})
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
SUMMARY = "projectM is a MilkDrop compatible opensource music visualizer"
|
||||
HOMEPAGE = "https://sourceforge.net/projects/projectm/"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fd92fcd555d2efd7892a388a6933d2c1"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
DEPENDS += " \
|
||||
virtual/libgl \
|
||||
glew \
|
||||
ftgl \
|
||||
libvisual \
|
||||
libsdl \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/${BPN}/${PV}/projectM-complete-${PV}-Source.tar.gz \
|
||||
file://0001-fix-build-wit-gcc-6.patch \
|
||||
file://0002-projectM-test-add-missing-build-paths.patch \
|
||||
file://0003-projectM-libvisual-set-libvisual-path-correctly.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "debf30f7ce94ff0102f06fbb0cc4e92b"
|
||||
SRC_URI[sha256sum] = "513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee"
|
||||
|
||||
S = "${WORKDIR}/projectM-complete-${PV}-Source"
|
||||
|
||||
# projectm supports qt4 only - disable componenrs asking for qt4
|
||||
EXTRA_OECMAKE += "-DINCLUDE-PROJECTM-QT=OFF -DINCLUDE-PROJECTM-PULSEAUDIO=OFF"
|
||||
|
||||
do_install_append() {
|
||||
# original name confuses sanity check for file already in sysroot -> avoild by renaming
|
||||
mv '${D}/${datadir}/projectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk' \
|
||||
'${D}/${datadir}/projectM/presets/Eo.S. - skylight a3 (trip colors flux2)_phat_Multi_shaped2_zoe_colours5.milk' || true
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/projectM \
|
||||
${libdir}/libvisual-0.4/actor/*.so \
|
||||
"
|
||||
49
recipes-misc/recipes-multimedia/projectm/projectm_git.bb
Normal file
49
recipes-misc/recipes-multimedia/projectm/projectm_git.bb
Normal file
@@ -0,0 +1,49 @@
|
||||
SUMMARY = "projectM is a MilkDrop compatible opensource music visualizer"
|
||||
HOMEPAGE = "http://projectm-visualizer.github.io/projectm/"
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26f590fe167311fe2a5a7ce0b3e71900"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
DEPENDS += " \
|
||||
virtual/libgl \
|
||||
glew \
|
||||
ftgl \
|
||||
libvisual \
|
||||
libsdl \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/projectM-visualizer/projectm.git;name=projectm \
|
||||
http://spiegelmc.com.s3.amazonaws.com/pub/projectm_presets.zip;name=presets \
|
||||
file://0001-Fix-sdl2-build.patch \
|
||||
file://0002-workaround-link-failures.patch \
|
||||
"
|
||||
SRCREV_projectm = "eafa3251c3af3a801950d588c3b531fbc7cba317"
|
||||
SRC_URI[presets.md5sum] = "8976d72c05e3f4ddee996c6f2e98fc63"
|
||||
SRC_URI[presets.sha256sum] = "e323515f0ee5920ec45e4f9efdb55890f028dabb5ae9468fdc97c43d55040614"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.2.0+git${SRCPV}"
|
||||
|
||||
# why is static default?
|
||||
EXTRA_OECMAKE += "-DBUILD_PROJECTM_STATIC=OFF"
|
||||
|
||||
# projectm supports qt4 only - disable componenrs asking for qt4
|
||||
EXTRA_OECMAKE += "-DINCLUDE-PROJECTM-QT=OFF -DINCLUDE-PROJECTM-PULSEAUDIO=OFF"
|
||||
|
||||
# force gles1
|
||||
#EXTRA_OECMAKE += "USE_GLES1=ON"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}/${datadir}/projectM/presets
|
||||
install -m 0644 ${WORKDIR}/presets/presets_projectM/* ${D}/${datadir}/projectM/presets/
|
||||
# original name confuses sanity check for file already in sysroot -> avoild by renaming
|
||||
mv '${D}/${datadir}/projectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk' \
|
||||
'${D}/${datadir}/projectM/presets/Eo.S. - skylight a3 (trip colors flux2)_phat_Multi_shaped2_zoe_colours5.milk' || true
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/projectM \
|
||||
${libdir}/libvisual-0.4/actor/*.so \
|
||||
"
|
||||
Reference in New Issue
Block a user