zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

projectm: Update to latest master

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-05-14 23:54:14 +02:00
parent 82b51fc833
commit 3b43f2a829
3 changed files with 1 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
recipes-misc/recipes-multimedia/projectm/files/0002-Re-add-pkg-config-support.patch
View File

@@ -1,74 +0,0 @@
From 4305ce94f40526de8cd92200c1abf5f369bc03b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 14 Apr 2018 21:45:07 +0200
Subject: [PATCH 2/3] Re-add pkg-config support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Give others - e.g qmmp the chance to find projectM
Upstream-Status: Submitted [1]
[1] https://github.com/projectM-visualizer/projectm/pull/54#pullrequestreview-112244678
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 1 +
src/libprojectM/Makefile.am | 6 +++---
src/libprojectM/libprojectM.pc.in | 14 +++++++-------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 96ce9dd7..eb582aa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_CONFIG_FILES([
src/libprojectM/Renderer/Makefile
src/libprojectM/NativePresetFactory/Makefile
src/libprojectM/MilkdropPresetFactory/Makefile
+ src/libprojectM/libprojectM.pc
src/NativePresets/Makefile
src/projectM-sdl/Makefile
src/projectM-qt/Makefile
diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am
index 73d8353f..f102b9fb 100644
--- a/src/libprojectM/Makefile.am
+++ b/src/libprojectM/Makefile.am
@@ -48,6 +48,6 @@ libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \
omptl/omptl_algorithm
pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = src/libprojectM.pc
-# EXTRA_DIST += src/libprojectM.pc.in
-# CLEANFILES += src/libprojectM.pc
+pkgconfig_DATA = libprojectM.pc
+EXTRA_DIST += libprojectM.pc.in
+CLEANFILES += libprojectM.pc
diff --git a/src/libprojectM/libprojectM.pc.in b/src/libprojectM/libprojectM.pc.in
index 90de7523..84f6694e 100644
--- a/src/libprojectM/libprojectM.pc.in
+++ b/src/libprojectM/libprojectM.pc.in
@@ -1,12 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@CMAKE_INSTALL_PREFIX@/include
-pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
-sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgdatadir=@datadir@/@PACKAGE_NAME@
+sysconfdir=@datadir@/@PACKAGE_NAME@
Name: libprojectM
-Version: @PROJECTM_VERSION@
+Version: @PACKAGE_VERSION@
Description: projectM - OpenGL Milkdrop
Requires:
Libs: -L${libdir} -lprojectM
--
2.14.3

49
recipes-misc/recipes-multimedia/projectm/files/0003-Install-headers-to-usr-include-libprojectM.patch
View File

@@ -1,49 +0,0 @@
From 9c7d9dfdd4c8c9360850cd4712ca2d46afdac62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 15 Apr 2018 00:20:41 +0200
Subject: [PATCH 3/3] Install headers to /usr/include/libprojectM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
That is where the were before switching to autotools and where projects expect
them.
Upstream-Status: Submitted [1]
[1] https://github.com/projectM-visualizer/projectm/pull/54#pullrequestreview-112244678
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/Makefile.am | 4 ++++
src/libprojectM/Makefile.am | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index ea0af3a3..85478b4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,3 +7,7 @@ if ENABLE_QT
endif
SUBDIRS=libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR}
+
+# system headers/libraries/data to install
+# for compatibility reasons here as nobase_include
+nobase_include_HEADERS = libprojectM/projectM.hpp libprojectM/Common.hpp libprojectM/dlldefs.h libprojectM/event.h libprojectM/fatal.h libprojectM/PCM.hpp
diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am
index f102b9fb..12d16cac 100644
--- a/src/libprojectM/Makefile.am
+++ b/src/libprojectM/Makefile.am
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libprojectM/Renderer \
$(FTGL_CFLAGS) $(CG_CFLAGS)
-# system headers/libraries/data to install
-include_HEADERS = projectM.hpp Common.hpp dlldefs.h event.h fatal.h PCM.hpp
lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library
# link flags
--
2.14.3

4
recipes-misc/recipes-multimedia/projectm/projectm_git.bb
View File

@@ -17,10 +17,8 @@ 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-find-native-qt-build-tools-by-configure-options-auto.patch \
file://0002-Re-add-pkg-config-support.patch \
file://0003-Install-headers-to-usr-include-libprojectM.patch \
"
SRCREV_projectm = "2a3a5315f5c45c89c9c8641381c65da55545694f"
SRCREV_projectm = "9650468607537a028e4d71523c5e88a81f506578"
SRC_URI[presets.md5sum] = "8976d72c05e3f4ddee996c6f2e98fc63"
SRC_URI[presets.sha256sum] = "e323515f0ee5920ec45e4f9efdb55890f028dabb5ae9468fdc97c43d55040614"