Browse Source

mpg123: update to 1.3.1, use shared variant

Waldemar Brodkorb 2 years ago
parent
commit
d2ff62a4b6
2 changed files with 11 additions and 18 deletions
  1. 11 7
      package/mpg123/Makefile
  2. 0 11
      package/mpg123/patches/patch-configure_ac

+ 11 - 7
package/mpg123/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		mpg123
 PKG_NAME:=		mpg123
-PKG_VERSION:=		1.25.2
+PKG_VERSION:=		1.3.1
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38
+PKG_HASH:=		36ffe1ff2246da8606c35f5199f439d969da20eadeb2c4ef4278c7aca8f88a5d
 PKG_DESCR:=		mp3 console player
 PKG_DESCR:=		mp3 console player
 PKG_SECTION:=		mm/audio
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		alsa-lib
 PKG_DEPENDS:=		alsa-lib
@@ -21,8 +21,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 
 $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 
-AUTOTOOL_STYLE:=	autoreconf
-
 ifeq ($(ADK_TARGET_CPU_X86_I486),y)
 ifeq ($(ADK_TARGET_CPU_X86_I486),y)
 CONFIGURE_ARGS+=	--with-cpu=i486
 CONFIGURE_ARGS+=	--with-cpu=i486
 endif
 endif
@@ -33,13 +31,19 @@ ifeq ($(ADK_TARGET_CPU_WITH_NEON),y)
 CONFIGURE_ARGS+=	--with-cpu=neon
 CONFIGURE_ARGS+=	--with-cpu=neon
 endif
 endif
 
 
-TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
-CONFIGURE_ARGS+=	--disable-shared \
-			--with-default-audio=alsa
+CONFIGURE_ARGS+=	--with-default-audio=alsa
 
 
 mpg123-install:
 mpg123-install:
 	$(INSTALL_DIR) $(IDIR_MPG123)/usr/bin
 	$(INSTALL_DIR) $(IDIR_MPG123)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
 		$(IDIR_MPG123)/usr/bin
 		$(IDIR_MPG123)/usr/bin
+	$(INSTALL_DIR) $(IDIR_MPG123)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmpg123*.so* \
+		$(IDIR_MPG123)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libltdl.so.3* \
+		$(IDIR_MPG123)/usr/lib
+	$(INSTALL_DIR) $(IDIR_MPG123)/usr/lib/mpg123
+	$(CP) $(WRKINST)/usr/lib/mpg123/* \
+		$(IDIR_MPG123)/usr/lib/mpg123
 
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 0 - 11
package/mpg123/patches/patch-configure_ac

@@ -1,11 +0,0 @@
---- mpg123-1.21.0.orig/configure.ac	2014-09-28 16:27:28.000000000 -0500
-+++ mpg123-1.21.0/configure.ac	2015-02-16 13:31:29.910186926 -0600
-@@ -1548,7 +1548,7 @@ do
- 				HAVE_ALSA=no
- 			else
- 
--			ALSA_LIBS="-lasound"
-+			ALSA_LIBS="-lasound -lpthread"
- 			# Check for ALSA
- 			AC_CHECK_LIB( [asound], [snd_pcm_open],
- 				[ AC_CHECK_HEADER( [alsa/asoundlib.h],