summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2024-02-16 03:58:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2024-02-16 04:00:52 +0100
commit5a9932a33df3c582c7a35c9ae448315e67618b38 (patch)
tree9a69fc78ff1e63f32ec106355c6ecae13279af79
parente7b4507965cad75d243f6420c0c74a206a745251 (diff)
ympd: remove package, use mympd instead
-rw-r--r--package/ympd/Makefile29
-rw-r--r--package/ympd/files/ympd.init29
-rw-r--r--package/ympd/files/ympd.postinst3
-rw-r--r--package/ympd/patches/patch-src_mpd_client_c11
-rw-r--r--package/ympd/patches/patch-src_mpd_client_h16
5 files changed, 0 insertions, 88 deletions
diff --git a/package/ympd/Makefile b/package/ympd/Makefile
deleted file mode 100644
index 7b2b7dd42..000000000
--- a/package/ympd/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:= ympd
-PKG_VERSION:= 612f8fc0b2c47fc89d403e4a044541c6b2b238c8
-PKG_GIT:= hash
-PKG_RELEASE:= 4
-PKG_DESCR:= standalone music player daemon web gui
-PKG_SECTION:= net/http
-PKG_DEPENDS:= libmpdclient libressl
-PKG_BUILDDEP:= cmake-host libmpdclient libressl
-PKG_URL:= http://www.ympd.org/
-PKG_SITES:= https://github.com/notandy/ympd.git
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,YMPD,ympd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:= cmake
-TARGET_CFLAGS+= -std=c99
-
-ympd-install:
- $(INSTALL_DIR) $(IDIR_YMPD)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/ympd \
- $(IDIR_YMPD)/usr/bin
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ympd/files/ympd.init b/package/ympd/files/ympd.init
deleted file mode 100644
index 6dd7af28c..000000000
--- a/package/ympd/files/ympd.init
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG ympd
-#INIT 90
-
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
- test x"${ympd:-NO}" = x"NO" && exit 0
- test x"$ympd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
- exec sh $0 start
- ;;
-start)
- ympd -w 80 &
- ;;
-stop)
- kill $(pgrep -f ympd)
- ;;
-restart)
- sh $0 stop
- sh $0 start
- ;;
-*)
- echo "Usage: $0 {start | stop | restart}"
- exit 1
- ;;
-esac
-exit $?
diff --git a/package/ympd/files/ympd.postinst b/package/ympd/files/ympd.postinst
deleted file mode 100644
index abc75c6f7..000000000
--- a/package/ympd/files/ympd.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf ympd NO
diff --git a/package/ympd/patches/patch-src_mpd_client_c b/package/ympd/patches/patch-src_mpd_client_c
deleted file mode 100644
index 1a537f944..000000000
--- a/package/ympd/patches/patch-src_mpd_client_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ympd-612f8fc0b2c47fc89d403e4a044541c6b2b238c8.orig/src/mpd_client.c 2023-01-22 15:17:39.000000000 +0100
-+++ ympd-612f8fc0b2c47fc89d403e4a044541c6b2b238c8/src/mpd_client.c 2023-01-22 15:21:36.423601244 +0100
-@@ -30,6 +30,8 @@
-
- /* forward declaration */
- static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
-+char dirble_api_token[28];
-+struct t_mpd mpd;
-
- const char * mpd_cmd_strs[] = {
- MPD_CMDS(GEN_STR)
diff --git a/package/ympd/patches/patch-src_mpd_client_h b/package/ympd/patches/patch-src_mpd_client_h
deleted file mode 100644
index 06248b2ea..000000000
--- a/package/ympd/patches/patch-src_mpd_client_h
+++ /dev/null
@@ -1,16 +0,0 @@
---- ympd-612f8fc0b2c47fc89d403e4a044541c6b2b238c8.orig/src/mpd_client.h 2023-01-22 15:17:39.000000000 +0100
-+++ ympd-612f8fc0b2c47fc89d403e4a044541c6b2b238c8/src/mpd_client.h 2023-01-22 15:23:26.726407119 +0100
-@@ -96,9 +96,11 @@ struct t_mpd {
-
- int song_id;
- unsigned queue_version;
--} mpd;
-+};
-
--char dirble_api_token[28];
-+extern struct t_mpd mpd;
-+
-+extern char dirble_api_token[28];
-
- struct t_mpd_client_session {
- int song_id;