Merge pull request #640 from awiouy/mm7

backport of #495 and #620 (multimedia-tools)

packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mpg123"
-PKG_VERSION="1.23.4"
+PKG_VERSION="1.23.6"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2"

packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="squeezelite"
-PKG_VERSION="94bffda"
+PKG_VERSION="33cca7e"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
 PKG_URL="https://github.com/ralph-irving/squeezelite/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac lirc libmad libvorbis mpg123 soxr"
+PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr"
 PKG_SECTION="tools"
 PKG_PRIORITY="optional"
 PKG_SHORTDESC="squeezelite"
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 pre_make_target() {
-  OPTS="-DDSD -DIR -DFFMPEG -DRESAMPLE -DVISEXPORT -DIR"
+  OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT"
   CFLAGS="$CFLAGS $OPTS"
   LDFLAGS="$LDFLAGS -lasound -lpthread -lm -lrt"
 }

packages/addons/tools/multimedia-tools/changelog.txt

@@ -1,3 +1,11 @@
+7.0.103
+- Add alsamixer
+- Update mpg123 to 1.23.6
+- Update squeezelite to 33cca7e
+
+7.0.102
+- Remove IR support from squeezelite
+
 7.0.101
 - Add mpg123 and squeezelite
 

packages/addons/tools/multimedia-tools/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="multimedia-tools"
 PKG_VERSION=""
-PKG_REV="101"
+PKG_REV="103"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE=""
@@ -27,7 +27,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of multimedia tools and programs"
-PKG_LONGDESC="This bundle currently includes mediainfo, mesa-demos, mpg123, opencaster, squeezelite, tsdecrypt and tstools."
+PKG_LONGDESC="This bundle currently includes alsamixer, mediainfo, mesa-demos, mpg123, opencaster, squeezelite, tsdecrypt and tstools."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Multimedia Tools"
@@ -38,6 +38,7 @@ PKG_ADDON_REPOVERSION="7.0"
 PKG_AUTORECONF="no"
 
 PKG_DEPENDS_TARGET="toolchain \
+                    alsa-utils \
                     mediainfo \
                     mesa-demos \
                     mpg123 \
@@ -48,6 +49,9 @@ PKG_DEPENDS_TARGET="toolchain \
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    # alsamixer
+    cp -P $(get_build_dir alsa-utils)/.$TARGET_NAME/alsamixer/alsamixer $ADDON_BUILD/$PKG_ADDON_ID/bin/
+
     # mediainfo
     cp -P $(get_build_dir mediainfo)/Project/GNU/CLI/mediainfo $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/audio/alsa-utils/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain alsa-lib"
+PKG_DEPENDS_TARGET="toolchain alsa-lib netbsd-curses"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="alsa-utils: Advanced Linux Sound Architecture utilities"
@@ -35,7 +35,6 @@ PKG_AUTORECONF="yes"
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                            --disable-xmlto \
-                           --disable-alsamixer \
                            --disable-alsaconf \
                            --disable-alsaloop \
                            --enable-alsatest \
@@ -53,7 +52,7 @@ post_makeinstall_target() {
 # so we avoid resetting our soundconfig
   rm -rf $INSTALL/usr/lib/udev/rules.d/90-alsa-restore.rules
 
-  for i in aconnect alsaucm amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do
+  for i in aconnect alsamixer alsaucm amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do
     rm -rf $INSTALL/usr/bin/$i
   done