sound/mocp: General cleanup

General cleanup of this port

Don't add libraries as dependencies and disable them later on in configure
arguments (curl and (lib)samplerate). Enabled from now on.
Fix dependencies and functionality provided by external libraries. If we link
(lib)ffmpeg we don't need to have external libraries for handling formats
that ffmpeg already handles.
Update PKG_MD5SUM (deprecated) to PKG_HASH

Sources:
https://github.com/mir-ror/moc/blob/master/decoder_plugins/ffmpeg/ffmpeg.c#L213

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
This commit is contained in:
Daniel Engberg 2017-07-12 08:37:01 +02:00
parent 537ffd4da7
commit 08e74f346a
1 changed files with 8 additions and 6 deletions

View File

@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=moc PKG_NAME:=moc
PKG_VERSION:=2.5.2 PKG_VERSION:=2.5.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ftp.daper.net/pub/soft/moc/stable/ PKG_SOURCE_URL:=http://ftp.daper.net/pub/soft/moc/stable/
PKG_MD5SUM:=f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08 PKG_HASH:=f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/moc define Package/moc
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-lib +libid3tag +libflac +libsamplerate +libncursesw +libffmpeg +libltdl +libmagic +faad2 +libdb47 DEPENDS:=+libcurl $(ICONV_DEPENDS) +alsa-lib +libid3tag +libsamplerate +libncursesw +libffmpeg +libltdl +libmagic +libdb47
TITLE:=Music On Console TITLE:=Music On Console
URL:=http://moc.daper.net/ URL:=http://moc.daper.net/
endef endef
@ -43,16 +43,18 @@ TARGET_CFLAGS+=-D_GNU_SOURCE
TARGET_CPPFLAGS+=-P TARGET_CPPFLAGS+=-P
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
$(if $(CONFIG_BUILD_PATENTED),,--without-mp3) \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--disable-debug \ --disable-debug \
--without-speex \ --without-speex \
--without-samplerate \ --without-aac \
--without-curl \
--without-flac \ --without-flac \
--without-mp3 \
--without-musepack \ --without-musepack \
--without-rcc \ --without-rcc \
--without-sndfile \
--without-vorbis \
--without-wavpack \
$(if $(CONFIG_PACKAGE_libncursesw),--with-ncursesw --without-ncurses,--with-ncurses --without-ncursesw) \ $(if $(CONFIG_PACKAGE_libncursesw),--with-ncursesw --without-ncurses,--with-ncurses --without-ncursesw) \
--with-bdb-dir="$(STAGING_DIR)/usr" --with-bdb-dir="$(STAGING_DIR)/usr"