jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4812 from heitbaum/vsxu-drop

Browse Source 
Drop vsxu and dependancy glfw
This commit is contained in:
CvH 2020-12-30 00:32:18 +01:00 committed by GitHub
commit c9e96e63cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/graphics/glfw/package.mk
View File

@ -1,24 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
PKG_NAME="glfw"
PKG_VERSION="2.7.9"
PKG_SHA256="b7276dcadc85a07077834d1043f11ffd6a3a379647bb94361b4abc3ffca75e7d"
PKG_ARCH="x86_64"
PKG_LICENSE="BSD"
PKG_SITE="http://glfw.org"
PKG_URL="$SOURCEFORGE_SRC/glfw/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain mesa glu"
PKG_LONGDESC="provides a simple API for creating windows, contexts and surfaces, receiving input and events"
if [ "$OPENGL" = "no" ] ; then
exit 0
fi
make_target() {
make x11 PREFIX=$SYSROOT_PREFIX/usr
}
makeinstall_target() {
make x11-install PREFIX=$SYSROOT_PREFIX/usr
}

34
packages/graphics/vsxu/package.mk
View File

@ -1,34 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vsxu"
PKG_VERSION="0.5.1"
PKG_SHA256="6707b230ba6cb28c5b19ec6163722b801dd30afed8f966b57e188761b4d54b8e"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.vsxu.com"
# repackaged from https://github.com/vovoid/vsxu/archive/$PKG_VERSION.tar.gz
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain $OPENGL libX11 glew glfw zlib libpng libjpeg-turbo freetype"
PKG_LONGDESC="an OpenGL-based programming environment to visualize music and create graphic effects"
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 \
-DVSXU_STATIC=1 \
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
-DCMAKE_CXX_FLAGS=-I$SYSROOT_PREFIX/usr/include/freetype2"
pre_configure_target(){
export LDFLAGS="$LDFLAGS -lX11"
}
post_makeinstall_target() {
mkdir -p $SYSROOT_PREFIX/usr/lib/vsxu
cp -PR $INSTALL/usr/lib/* $SYSROOT_PREFIX/usr/lib
mkdir -p $SYSROOT_PREFIX/usr/include/
cp -RP $INSTALL/usr/include/* $SYSROOT_PREFIX/usr/include
mkdir -p $SYSROOT_PREFIX/usr/share/
cp -RP $INSTALL/usr/share/vsxu $SYSROOT_PREFIX/usr/share
}

75
packages/graphics/vsxu/patches/vsxu-01-fix-order.patch
View File

@ -1,75 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e61faf..435cf29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,10 +389,11 @@ add_definitions(-DVSXU_INSTALL_LIB_DIR="${VSXU_INSTALL_LIB_DIR}")
################################################################################
# VSXU LIBRARIES ###############################################################
################################################################################
-add_subdirectory(engine)
add_subdirectory(engine_audiovisual)
add_subdirectory(engine_graphics)
+# order matters - need to add plugins before engine to create static glue
add_subdirectory(plugins)
+add_subdirectory(engine)
add_subdirectory(widget)
################################################################################
--- vsxu-0.5.1/CMakeLists.txt.orig 2015-05-12 14:43:04.427596836 +0200
+++ vsxu-0.5.1/CMakeLists.txt 2015-05-12 14:43:13.995596648 +0200
@@ -56,27 +56,6 @@
endif()
################################################################################
-# The pkg-config file
-################################################################################
-IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
- if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
- file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
- CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
- ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
- @ONLY)
-
- else()
- CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
- ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
- @ONLY)
- endif()
-
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
- DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
-ENDIF()
-
-
-################################################################################
# CPACK OPTIONS ################################################################
################################################################################
SET(CPACK_PACKAGE_NAME "vsxu")
@@ -417,6 +396,27 @@
add_subdirectory(tools/vsxl)
endif(UNIX)
+################################################################################
+# The pkg-config file
+################################################################################
+IF (UNIX OR VSXU_WINDOWS_LIB_BUILD)
+ if (VSXU_STATIC EQUAL 1 AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs")
+ file (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/plugins/static_factory_pkgconfig_libs" VSXU_PLUGIN_PKGCONFIG_LIBS)
+ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.static
+ ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+ @ONLY)
+
+ else()
+ CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/libvsxu.pc.in.dynamic
+ ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+ @ONLY)
+ endif()
+
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/libvsxu.pc
+ DESTINATION ${VSXU_INSTALL_LIB_DIR}/pkgconfig)
+ENDIF()
+
+

27
packages/graphics/vsxu/patches/vsxu-02-fix-glfw.patch
View File

@ -1,27 +0,0 @@
--- vsxu-0.5.1/cmake/modules/FindGLFW.cmake.orig 2015-05-12 14:22:23.123621176 +0200
+++ vsxu-0.5.1/cmake/modules/FindGLFW.cmake 2015-05-12 14:23:14.863620161 +0200
@@ -19,6 +19,14 @@
# TODO:
# Allow the user to select to link to a shared library or to a static library.
+find_package(PkgConfig)
+
+pkg_check_modules(GLFW libglfw)
+set(GLFW_INCLUDE_PATH ${GLFW_INCLUDE_DIRS})
+set(GLFW_LIBRARY ${GLFW_LIBRARIES} -lXrandr)
+
+if(NOT GLFW_FOUND)
+
#Search for the include file...
FIND_PATH(GLFW_INCLUDE_PATH GL/glfw.h DOC "Path to GLFW include directory."
HINTS
@@ -45,5 +53,7 @@
${GLFW_ROOT_DIR}/lib-msvc100/release # added by ptr
)
+endif()
+
INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW DEFAULT_MSG GLFW_LIBRARY GLFW_INCLUDE_PATH)

11
packages/graphics/vsxu/patches/vsxu-03-fix-exr.patch
View File

@ -1,11 +0,0 @@
--- vsxu-0.5.1/plugins/src/texture/CMakeLists.txt.orig 2015-05-12 14:04:42.659641970 +0200
+++ vsxu-0.5.1/plugins/src/texture/CMakeLists.txt 2015-05-12 14:05:43.315640780 +0200
@@ -8,7 +8,7 @@
message("configuring vsxu module " ${module_id})
-include_directories(/usr/include/OpenEXR)
+#include_directories(/usr/include/OpenEXR)
# set defines for MOD_CM, MOD_DM, MOD_NM
CREATE_STATIC_GLUE(${module_id})

11
packages/graphics/vsxu/patches/vsxu-04-fix-freetype.patch
View File

@ -1,11 +0,0 @@
--- vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt.orig 2015-05-12 14:07:20.367638877 +0200
+++ vsxu-0.5.1/plugins/src/render.text/CMakeLists.txt 2015-05-12 14:07:24.371638799 +0200
@@ -20,7 +20,7 @@
endif(WIN32)
if(UNIX)
- include_directories(/usr/include/freetype2)
+ # include_directories(/usr/include/freetype2)
endif(UNIX)
# include common