From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/mpd/Makefile | 69 ++++++++++++++++++++++++----------------- package/mpd/files/mpd.conffiles | 1 + package/mpd/files/mpd.init | 4 ++- package/mpd/files/mpd.postinst | 6 ++++ package/mpd/ipkg/mpd.conffiles | 1 - package/mpd/ipkg/mpd.control | 5 --- package/mpd/ipkg/mpd.postinst | 6 ---- 7 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 package/mpd/files/mpd.conffiles create mode 100644 package/mpd/files/mpd.postinst delete mode 100644 package/mpd/ipkg/mpd.conffiles delete mode 100644 package/mpd/ipkg/mpd.control delete mode 100644 package/mpd/ipkg/mpd.postinst (limited to 'package/mpd') diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 65baca748..b18836d8d 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -9,64 +9,85 @@ PKG_NAME:= mpd PKG_VERSION:= 0.14.2 PKG_RELEASE:= 3 PKG_MD5SUM:= 64177135f64aca555887ba378de8cdfb -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} +PKG_DESCR:= A music player for flac, mp3 and ogg +PKG_SECTION:= net +PKG_DEPENDS:= alsa-lib glib2 libcurl +PKG_URL:= http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=musicpd/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE})) +ifneq (${ADK_COMPILE_MPD_WITH_MP3},) +PKG_DEPENDS+= libid3tag libmad +endif + +ifneq (${ADK_COMPILE_MPD_WITH_MP4},) +PKG_DEPENDS+= libfaad2 +endif + +ifeq (${ADK_COMPILE_MPD_WITH_OGG},y) +PKG_DEPENDS+= libvorbis libogg +endif + +ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},) +PKG_DEPENDS+= libvorbisidec +endif + +ifneq (${ADK_COMPILE_MPD_WITH_FLAC},) +PKG_DEPENDS+= libflac +endif + +ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) +PKG_DEPENDS+= libshout liblame +endif + +$(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto XAKE_FLAGS+= MPD_CFLAGS='' -PKG_DEPENDS:= glib2 alsa-lib libcurl CONFIGURE_ARGS+= \ - --enable-alsa \ - --disable-mod \ - --disable-oss \ - --disable-audiofile \ - --disable-mpc \ + --enable-alsa \ + --disable-mod \ + --disable-oss \ + --disable-audiofile \ + --disable-mpc \ ifneq (${ADK_COMPILE_MPD_WITH_MP3},) -PKG_DEPENDS+= libid3tag libmad CONFIGURE_ARGS+= --enable-id3 --enable-mp3 else CONFIGURE_ARGS+= --disable-id3 --disable-mp3 endif ifneq (${ADK_COMPILE_MPD_WITH_MP4},) -PKG_DEPENDS+= libfaad2 CONFIGURE_ARGS+= --enable-aac else CONFIGURE_ARGS+= --disable-aac endif ifeq (${ADK_COMPILE_MPD_WITH_OGG},y) -PKG_DEPENDS+= libvorbis libogg CONFIGURE_ARGS+= --enable-oggvorbis else CONFIGURE_ARGS+= --disable-oggvorbis endif ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},) -PKG_DEPENDS+= libvorbisidec CONFIGURE_ARGS+= \ - --disable-oggvorbis \ - --with-tremor \ - --with-tremor-includes=${STAGING_DIR}/usr/include \ - --with-tremor-libraries=${STAGING_DIR}/usr/lib + --disable-oggvorbis \ + --with-tremor \ + --with-tremor-includes=${STAGING_DIR}/usr/include \ + --with-tremor-libraries=${STAGING_DIR}/usr/lib endif ifneq (${ADK_COMPILE_MPD_WITH_FLAC},) -PKG_DEPENDS+= libflac CONFIGURE_ARGS+= --enable-flac else CONFIGURE_ARGS+= --disable-flac endif ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},) -PKG_DEPENDS+= libshout liblame CONFIGURE_ARGS+= --enable-shout-ogg \ --enable-shout-mp3 \ --enable-lame @@ -76,19 +97,9 @@ CONFIGURE_ARGS+= --disable-shout-ogg \ --disable-lame endif -COMMA:= , -EMPTY:= -SPACE:= ${EMPTY} ${EMPTY} -PKG_DEPENDS:= ${subst ${SPACE},${COMMA}${SPACE},${sort ${PKG_DEPENDS}}} - - post-install: - ${INSTALL_DIR} ${IDIR_MPD}/usr/bin - ${INSTALL_DIR} ${IDIR_MPD}/etc/init.d + ${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc ${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin ${INSTALL_DATA} ./files/mpd.conf ${IDIR_MPD}/etc/mpd.conf - ${INSTALL_BIN} ./files/mpd.init \ - ${IDIR_MPD}/etc/init.d/mpd - echo "Depends: ${PKG_DEPENDS}" >> ${IDIR_MPD}/CONTROL/control include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mpd/files/mpd.conffiles b/package/mpd/files/mpd.conffiles new file mode 100644 index 000000000..a8d69760e --- /dev/null +++ b/package/mpd/files/mpd.conffiles @@ -0,0 +1 @@ +/etc/mpd.conf diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index b07a189a1..d71797a0d 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG mpd +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst new file mode 100644 index 000000000..361adeec0 --- /dev/null +++ b/package/mpd/files/mpd.postinst @@ -0,0 +1,6 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +gid=$(get_next_gid) +add_group mpd $gid +add_user mpd $(get_next_uid) $gid /mnt +add_rcconf mpd diff --git a/package/mpd/ipkg/mpd.conffiles b/package/mpd/ipkg/mpd.conffiles deleted file mode 100644 index a8d69760e..000000000 --- a/package/mpd/ipkg/mpd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/mpd.conf diff --git a/package/mpd/ipkg/mpd.control b/package/mpd/ipkg/mpd.control deleted file mode 100644 index 946f3d022..000000000 --- a/package/mpd/ipkg/mpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: mpd -Priority: optional -Section: net -Depends: alsa-lib -Description: A music player for flac, mp3 and ogg. diff --git a/package/mpd/ipkg/mpd.postinst b/package/mpd/ipkg/mpd.postinst deleted file mode 100644 index 361adeec0..000000000 --- a/package/mpd/ipkg/mpd.postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -gid=$(get_next_gid) -add_group mpd $gid -add_user mpd $(get_next_uid) $gid /mnt -add_rcconf mpd -- cgit v1.2.3