From 9630bd71eaccfe20c17643ac3e8987586e266382 Mon Sep 17 00:00:00 2001 From: jc Date: Mon, 27 Jun 2016 12:41:32 +0200 Subject: [PATCH 1/6] squeezelite: remove ir --- .../multimedia-tools-depends/squeezelite/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk index ff96989a38..68d8dc930f 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk @@ -23,7 +23,7 @@ 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" } From a706c7f3bcf6e3d4adbf6e58210a2de5007153a7 Mon Sep 17 00:00:00 2001 From: jc Date: Mon, 27 Jun 2016 17:51:06 +0200 Subject: [PATCH 2/6] multimedia-tools: reflect change to squeezelite --- packages/addons/tools/multimedia-tools/changelog.txt | 3 +++ packages/addons/tools/multimedia-tools/package.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/tools/multimedia-tools/changelog.txt b/packages/addons/tools/multimedia-tools/changelog.txt index 6b1a075208..51c160bfe9 100644 --- a/packages/addons/tools/multimedia-tools/changelog.txt +++ b/packages/addons/tools/multimedia-tools/changelog.txt @@ -1,3 +1,6 @@ +7.0.102 +- Remove IR support from squeezelite + 7.0.101 - Add mpg123 and squeezelite diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk index e2ba18e035..32007cc516 100644 --- a/packages/addons/tools/multimedia-tools/package.mk +++ b/packages/addons/tools/multimedia-tools/package.mk @@ -18,7 +18,7 @@ PKG_NAME="multimedia-tools" PKG_VERSION="" -PKG_REV="101" +PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="" From 3222665392a72e12ecf14702ecebf2a0f7aae179 Mon Sep 17 00:00:00 2001 From: jc Date: Fri, 12 Aug 2016 01:34:40 +0200 Subject: [PATCH 3/6] alsautils: build alsamixer, do not install it --- packages/audio/alsa-utils/package.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index e3868442ed..ab216150dd 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/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 From 9d2a1808184c70c001e1adcb82234f5b43c380df Mon Sep 17 00:00:00 2001 From: jc Date: Thu, 11 Aug 2016 09:12:39 +0200 Subject: [PATCH 4/6] squeezelite: update to 33cca7e --- .../multimedia-tools-depends/squeezelite/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk index 68d8dc930f..98b57bb420 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="squeezelite" -PKG_VERSION="94bffda" +PKG_VERSION="33cca7e" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPLv3" From 426920ad55e22bc3f693e6bc6e1bf0e1e8798ae6 Mon Sep 17 00:00:00 2001 From: jc Date: Sun, 14 Aug 2016 14:06:14 +0200 Subject: [PATCH 5/6] mpg123: update to 1.23.6 --- .../addon-depends/multimedia-tools-depends/mpg123/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk index 3a99f9cb8f..b66e4f5a1d 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk +++ b/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" From 162bda0f9206019021984902d24315797a47d938 Mon Sep 17 00:00:00 2001 From: jc Date: Thu, 11 Aug 2016 09:13:32 +0200 Subject: [PATCH 6/6] multimedia-tools: add alsamixer, bump mpg123 and squeezelite --- packages/addons/tools/multimedia-tools/changelog.txt | 5 +++++ packages/addons/tools/multimedia-tools/package.mk | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/multimedia-tools/changelog.txt b/packages/addons/tools/multimedia-tools/changelog.txt index 51c160bfe9..6d2df63f5f 100644 --- a/packages/addons/tools/multimedia-tools/changelog.txt +++ b/packages/addons/tools/multimedia-tools/changelog.txt @@ -1,3 +1,8 @@ +7.0.103 +- Add alsamixer +- Update mpg123 to 1.23.6 +- Update squeezelite to 33cca7e + 7.0.102 - Remove IR support from squeezelite diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk index 32007cc516..8c0e1fb3b2 100644 --- a/packages/addons/tools/multimedia-tools/package.mk +++ b/packages/addons/tools/multimedia-tools/package.mk @@ -18,7 +18,7 @@ PKG_NAME="multimedia-tools" PKG_VERSION="" -PKG_REV="102" +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