Skip to contentSkip to conversation

ympd: new package

PATCH New Eric Limpens 2 participants 2 messages Sep 28, 2014 – Oct 4, 2014

lore
Share & tools
lore

Eric Limpens

author
#0 lore raw

PATCH 1/1 ympd: new package

Signed-off-by Eric Limpens <[email protected]>
---
 package/ympd/Config.in                              | 10 ++++++++++
 .../ympd/ympd-0001-CMake-cross-compile-mkdata.patch | 15 +++++++++++++++
 package/ympd/ympd.mk                                | 21 +++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/ympd/Config.in
 create mode 100644 package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch
 create mode 100644 package/ympd/ympd.mk
package/ympd/Config.in new file +10 -0
new file mode 100644
index 0000000..dadb897
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_YMPD
+	bool "ympd"
+	select BR2_PACKAGE_LIBMPDCLIENT
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  ympd, Standalone MPD Web GUI written in C,
+	  utilizing Websockets and Bootstrap/JS
+
+comment "ympd needs a toolchain w/ threads"
+	depends on !(BR2_TOOLCHAIN_HAS_THREADS)
package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch new file +15 -0
new file mode 100644
index 0000000..2ac27d5
@@ -0,0 +1,15 @@
+CMakeLists.txt: make it cross-compile friendly. Upstream is looking into a proper solution. 
+
+Signed-Off-by: Eric Limpens <[email protected]>
+diff -U2 -r ympd-a98d760dddff4b0dd595d977c9077f34beff05c5~/CMakeLists.txt ympd-a98d760dddff4b0dd595d977c9077f34beff05c5/CMakeLists.txt
+--- ympd-a98d760dddff4b0dd595d977c9077f34beff05c5~/CMakeLists.txt	2014-05-24 15:25:47.000000000 +0200
++++ ympd-a98d760dddff4b0dd595d977c9077f34beff05c5/CMakeLists.txt	2014-09-27 12:51:48.958358400 +0200
+@@ -29,6 +29,6 @@
+ )
+ 
+-add_executable(mkdata htdocs/mkdata.c)
+-get_target_property(MKDATA_EXE mkdata LOCATION)
++#add_executable(mkdata htdocs/mkdata.c)
++#get_target_property(MKDATA_EXE mkdata LOCATION)
+ 
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
package/ympd/ympd.mk new file +21 -0
new file mode 100644
index 0000000..fc4be4d
@@ -0,0 +1,21 @@
+################################################################################
+#
+# ympd
+#
+################################################################################
+
+YMPD_VERSION = a98d760dddff4b0dd595d977c9077f34beff05c5
+YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))
+YMPD_LICENSE = GPLv2
+YMPD_LICENSE_FILE = LICENSE
+YMPD_DEPENDENCIES = libmpdclient
+
+define YMPD_MAKE_HOST_TOOL
+        $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata
+endef
+
+YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL
+
+YMPD_CONF_OPT += -DMKDATA_EXE=$(@D)/mkdata
+
+$(eval $(cmake-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ympd: new package

Dear Eric Limpens,

Quoted 9 lines · Eric Limpens
Signed-off-by Eric Limpens <[email protected]>
---
 package/ympd/Config.in                              | 10 ++++++++++
 .../ympd/ympd-0001-CMake-cross-compile-mkdata.patch | 15 +++++++++++++++
 package/ympd/ympd.mk                                | 21 +++++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 package/ympd/Config.in
 create mode 100644 package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch
 create mode 100644 package/ympd/ympd.mk

I've applied your patch, after making a good number of changes:

[Thomas:
- Add the package to package/Config.in
- Add dependency on largefile
- Add new patch to CMakeLists.txt to remove the unused C++
dependency
- Change the existing CMakeLists.txt patch to simply remove the problematic code, and reword the explanation.]

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com