From 27150fca6fc69318ce3e04ed8893426b548e7fc0 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Thu, 6 Jul 2023 19:43:35 -0700 Subject: [PATCH 1/3] libprojectM: explicitly set all options Signed-off-by: Lukas Rusak --- packages/graphics/libprojectM/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index 0423f88656..9553d391f3 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -18,6 +18,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --disable-qt \ --disable-pulseaudio \ --disable-jack \ + --disable-sdl \ + --disable-llvm \ + --disable-emscripten \ + --enable-threading \ --enable-preset-subdirs" # workaround due broken release files, remove at next bump From 542342c24f1514c9fca16c064b8a4faada169b30 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Thu, 6 Jul 2023 19:23:52 -0700 Subject: [PATCH 2/3] libprojectM: update build options for opengles/opengl Signed-off-by: Lukas Rusak --- packages/graphics/libprojectM/package.mk | 18 +++++++++++++++++- .../patches/0001-add-enable-gl-switch.patch | 13 +++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 packages/graphics/libprojectM/patches/0001-add-enable-gl-switch.patch diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index 9553d391f3..499cfb672c 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="62b5b1b543b25cb8ad392d879378cfdc5c129165cf4d4f33fb159e364d42f135" PKG_LICENSE="GPL" PKG_SITE="https://github.com/projectM-visualizer/projectm" PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain freetype glm ${OPENGL}" +PKG_DEPENDS_TARGET="toolchain freetype glm" PKG_LONGDESC="A MilkDrop compatible opensource music visualizer." PKG_TOOLCHAIN="configure" PKG_BUILD_FLAGS="+pic" @@ -24,7 +24,23 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --enable-threading \ --enable-preset-subdirs" +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" + PKG_CONFIGURE_OPTS_TARGET+=" --disable-gles \ + --enable-gl" +fi + +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + PKG_CONFIGURE_OPTS_TARGET+=" --enable-gles \ + --disable-gl" +fi + # workaround due broken release files, remove at next bump pre_configure_target() { ./autogen.sh + + if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + export CFLAGS+=" -DSOIL_GLES2" + fi } diff --git a/packages/graphics/libprojectM/patches/0001-add-enable-gl-switch.patch b/packages/graphics/libprojectM/patches/0001-add-enable-gl-switch.patch new file mode 100644 index 0000000000..1c94fee435 --- /dev/null +++ b/packages/graphics/libprojectM/patches/0001-add-enable-gl-switch.patch @@ -0,0 +1,13 @@ +diff --color -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2021-02-20 11:40:39.000000000 -0800 ++++ b/configure.ac 2023-07-06 16:06:18.679702443 -0700 +@@ -37,7 +37,8 @@ + enable_sdl=yes + ], [ + dnl Running in a normal OS (not emscripten) +- AX_CHECK_GL ++ AC_ARG_ENABLE([gl], AS_HELP_STRING([--enable-gl], [OpenGL support]), [], [enable_gl=no]) ++ AS_IF([test "x$enable_gl" = "xyes"], [AX_CHECK_GL]) + + # check OS if mac or linux + AC_CANONICAL_HOST From da04ce6fd8717834057b91d4664dec1fee9d7150 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Thu, 6 Jul 2023 19:28:31 -0700 Subject: [PATCH 3/3] visualization.projectm: allow building for arm and OpenGLES Signed-off-by: Lukas Rusak --- .../kodi-binary-addons/visualization.projectm/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk index 920d02ff94..05fcc9d58e 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk @@ -6,7 +6,6 @@ PKG_NAME="visualization.projectm" PKG_VERSION="20.2.0-Nexus" PKG_SHA256="42599b0093ebc6730c3190ce28036a87042814af830441f3cb28ef11676277ae" PKG_REV="1" -PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.projectm" PKG_URL="https://github.com/xbmc/visualization.projectm/archive/${PKG_VERSION}.tar.gz" @@ -18,10 +17,6 @@ PKG_LONGDESC="visualization.projectm" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -if [ "${OPENGL}" = "no" ]; then - exit 0 -fi - pre_configure_target() { export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") }