Skip to contentSkip to conversation

ympd: new package (version 2)

PATCH New Eric Limpens 2 participants 3 messages Sep 23, 2014 – Sep 27, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ympd: new package (version 2)

---
 package/Config.in                                       |  1 +
 package/ympd/Config.in                                  | 10 ++++++++++
 package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch | 16 ++++++++++++++++
 package/ympd/ympd.mk                                    | 16 ++++++++++++++++
 4 files changed, 43 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/Config.in +1 -0
index 2eefc3f..1578404 100644
@@ -35,6 +35,7 @@ menu "Audio and video applications"
 	source "package/wavpack/Config.in"
 	source "package/xbmc/Config.in"
 	source "package/yavta/Config.in"
+	source "package/ympd/Config.in"
 endmenu
 
 menu "Compressors and decompressors"
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 +16 -0
new file mode 100644
index 0000000..502e532
@@ -0,0 +1,16 @@
+CMakeLists.txt: make it cross-compile friendly. Upstream is looking into a proper solution. 
+
+Signed-Off-by: Eric Limpens <[email protected]>
+
+--- ympd-a98d760dddff4b0dd595d977c9077f34beff05c5/CMakeLists.txt	2014-05-24 15:25:47.000000000 +0200
++++ ympd-a98d760dddff4b0dd595d977c9077f34beff05c5-1/CMakeLists.txt	2014-09-23 20:04:55.491997850 +0200
+@@ -29,6 +29,7 @@
+ )
+ 
+-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)
++set(MKDATA_EXE "./mkdata")
+ 
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
package/ympd/ympd.mk new file +16 -0
new file mode 100644
index 0000000..33fd4ec
@@ -0,0 +1,16 @@
+################################################################################
+#
+# ympd
+#
+################################################################################
+
+YMPD_VERSION = a98d760dddff4b0dd595d977c9077f34beff05c5
+YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))
+
+define YMPD_MAKE_HOST_TOOL
+        $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata
+endef
+
+YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL
+
+$(eval $(cmake-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ympd: new package (version 2)

Quoted 19 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Eric" == Eric Limpens <[email protected]> writes:

---
 package/Config.in                                       |  1 +
 package/ympd/Config.in                                  | 10 ++++++++++
 package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch | 16 ++++++++++++++++
 package/ympd/ympd.mk                                    | 16 ++++++++++++++++
 4 files changed, 43 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

+++ b/package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch

package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch new file +4 -0
@@ -0,0 +1,16 @@
+CMakeLists.txt: make it cross-compile friendly. Upstream is looking into a proper solution. 
+
+Signed-Off-by: Eric Limpens <[email protected]>
+

package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch line 14

Quoted 10 lines
package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch new file +10 -0
+--- ympd-a98d760dddff4b0dd595d977c9077f34beff05c5/CMakeLists.txt	2014-05-24 15:25:47.000000000 +0200
++++ ympd-a98d760dddff4b0dd595d977c9077f34beff05c5-1/CMakeLists.txt	2014-09-23 20:04:55.491997850 +0200
+@@ -29,6 +29,7 @@
+ )
+ 
+-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)
++set(MKDATA_EXE "./mkdata")

It seems like you missed Samuels' feedback?

Quoted 8 lines
(quoted diff) +2 -0
+ 
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
package/ympd/ympd.mk new file +0 -0
new file mode 100644
index 0000000..33fd4ec

package/ympd/ympd.mk line 8

Quoted 8 lines
package/ympd/ympd.mk new file +8 -0
@@ -0,0 +1,16 @@
+################################################################################
+#
+# ympd
+#
+################################################################################
+
+YMPD_VERSION = a98d760dddff4b0dd595d977c9077f34beff05c5
+YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))

What about license?

You need to add MPD_DEPENDENCIES = libmpdclient to ensure libmpdclient gets built before ympd.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 ympd: new package (version 2)

I'll add the license and dependency statements and will modify the patch to use the more elegant approach suggested by Samuel.

Thanks for your input, Eric.

Quoted 58 lines · Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Eric" == Eric Limpens <[email protected]> writes:

---
 package/Config.in                                       |  1 +
 package/ympd/Config.in                                  | 10 ++++++++++
 package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch | 16

++++++++++++++++

Quoted 1 line
 package/ympd/ympd.mk                                    | 16

++++++++++++++++

Quoted 3 lines
 4 files changed, 43 insertions(+)
 create mode 100644 package/ympd/Config.in
 create mode 100644

package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch

Review line 1

Quoted 5 lines
 create mode 100644 package/ympd/ympd.mk

+++ b/package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch

(quoted diff) +1 -0
@@ -0,0 +1,16 @@
+CMakeLists.txt: make it cross-compile friendly. Upstream is looking

into a proper solution.

package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch

Quoted 4 lines
package/ympd/ympd-0001-CMake-cross-compile-mkdata.patch new file +4 -0
+
+Signed-Off-by: Eric Limpens <[email protected]>
+
+--- ympd-a98d760dddff4b0dd595d977c9077f34beff05c5/CMakeLists.txt
2014-05-24 15:25:47.000000000 +0200
 > ++++ ympd-a98d760dddff4b0dd595d977c9077f34beff05c5-1/CMakeLists.txt
2014-09-23 20:04:55.491997850 +0200
 > +@@ -29,6 +29,7 @@
 > + )
 > +
 > +-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)
 > ++set(MKDATA_EXE "./mkdata")

It seems like you missed Samuels' feedback?

Quoted 9 lines
(quoted diff) +2 -0
+
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
package/ympd/ympd.mk new file +0 -0
new file mode 100644
index 0000000..33fd4ec
@@ -0,0 +1,16 @@
(quoted diff) +2 -0
+################################################################################
 > +#
 > +# ympd
 > +#
 >
+################################################################################
 > +
 > +YMPD_VERSION = a98d760dddff4b0dd595d977c9077f34beff05c5
 > +YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))
Quoted 8 lines

What about license?

You need to add MPD_DEPENDENCIES = libmpdclient to ensure libmpdclient gets built before ympd.

--
Bye, Peter Korsgaard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140927/deea39c7/attachment.html>