From c285fd114245e9e96d1307df6a17814940fdad01 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Thu, 13 Jul 2017 23:40:51 +0200 Subject: [PATCH] sound/mpg123: Update to 1.25.2 Update mpg123 to 1.25.2 Change download URL to Sourceforge Change deprecated checksum variable (PKG_MD5SUM) to PKG_HASH Add libout123 Add generic optimizations depending on platform have fpu or not Add NEON-specific optimization Remove BUILD_PATENTED, reference: https://github.com/openwrt/packages/pull/4587 Small cleanup of Makefile Thanks to Ted Hess for reviewing and suggesting compilation fix NOTE: mpg123 uses the most recent approach just like ffmpeg that's mentioned here: https://github.com/openwrt/packages/pull/4555 Signed-off-by: Daniel Engberg --- sound/mpg123/Makefile | 59 +++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/sound/mpg123/Makefile b/sound/mpg123/Makefile index 8495ed257..5b0436c79 100644 --- a/sound/mpg123/Makefile +++ b/sound/mpg123/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpg123 -PKG_VERSION:=1.22.3 -PKG_RELEASE:=3 +PKG_VERSION:=1.25.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.mpg123.de/download/ -PKG_MD5SUM:=fca857bc5ad0d2070cd38bd5f0f85f1c +PKG_SOURCE_URL:=@SF/mpg123 +PKG_HASH:=5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 PKG_MAINTAINER:=Zoltan HERPAI PKG_FIXUP:=libtool @@ -27,7 +27,6 @@ include $(INCLUDE_DIR)/package.mk define Package/mpg123/Default URL:=http://www.mpg123.de - DEPENDS:=@BUILD_PATENTED endef define Package/libmpg123 @@ -38,33 +37,56 @@ define Package/libmpg123 DEPENDS:=+libltdl endef +define Package/libout123 + $(call Package/mpg123/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Library for continuous playback of audio streams via various platform-specific output methods + DEPENDS:=+libltdl +endef + define Package/mpg123 $(call Package/mpg123/Default) SECTION:=sound CATEGORY:=Sound TITLE:=fast console mpeg audio player - DEPENDS+=+libmpg123 +alsa-lib + DEPENDS+=+libmpg123 +alsa-lib +libout123 endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ +TARGET_CFLAGS += -D_GNU_SOURCE + +CONFIGURE_ARGS+= \ + --enable-shared \ + --enable-static \ + --with-audio=alsa \ + --with-default-audio=alsa \ + +ifeq ($(CONFIG_SOFT_FLOAT),y) + CONFIGURE_ARGS+= \ --with-cpu=generic_nofpu \ - --with-audio=alsa \ - --with-default-audio=alsa \ - ) -endef + --enable-int-quality=yes +else + CONFIGURE_ARGS+= \ + --with-cpu=generic_fpu +endif + +ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),) + CONFIGURE_ARGS+= \ + --with-cpu=arm_fpu +endif define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/include/mpg123.h \ + $(PKG_INSTALL_DIR)/usr/include/out123.h \ + $(PKG_INSTALL_DIR)/usr/include/fmt123.h \ $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libmpg123.{la,a,so*} \ + $(PKG_INSTALL_DIR)/usr/lib/libout123.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/mpg123 @@ -75,6 +97,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpg123.pc \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libout123.pc \ $(1)/usr/lib/pkgconfig endef @@ -85,6 +108,13 @@ define Package/libmpg123/install $(1)/usr/lib/ endef +define Package/libout123/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libout123.so* \ + $(1)/usr/lib/ +endef + define Package/mpg123/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) \ @@ -99,4 +129,5 @@ define Package/mpg123/install endef $(eval $(call BuildPackage,libmpg123)) +$(eval $(call BuildPackage,libout123)) $(eval $(call BuildPackage,mpg123))