From 844343d4a4fb5aac3e617367785affb0e9a59cd7 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sun, 13 Sep 2020 21:34:00 +0300 Subject: [PATCH] musepack, libmpcdec SV8, removed SV7. --- multimedia/sound/libmpcdec/pspec.xml | 73 ------------------- multimedia/sound/libmpcdec/translations.xml | 14 ---- .../{libmpcdec => libreplaygain}/actions.py | 11 +-- multimedia/sound/libreplaygain/pspec.xml | 48 ++++++++++++ multimedia/sound/musepack/actions.py | 18 +++++ .../sound/musepack/files/arch/Makefile.patch | 44 +++++++++++ .../sound/musepack/files/arch/configure.patch | 21 ++++++ .../sound/musepack/files/arch/mpcchap.patch | 66 +++++++++++++++++ .../sound/musepack/files/arch/mpcdec.patch | 22 ++++++ .../musepack/files/arch/mpcdecmake.patch | 7 ++ multimedia/sound/musepack/pspec.xml | 73 +++++++++++++++++++ multimedia/sound/musepack/translations.xml | 20 +++++ 12 files changed, 325 insertions(+), 92 deletions(-) delete mode 100644 multimedia/sound/libmpcdec/pspec.xml delete mode 100644 multimedia/sound/libmpcdec/translations.xml rename multimedia/sound/{libmpcdec => libreplaygain}/actions.py (50%) create mode 100644 multimedia/sound/libreplaygain/pspec.xml create mode 100644 multimedia/sound/musepack/actions.py create mode 100644 multimedia/sound/musepack/files/arch/Makefile.patch create mode 100644 multimedia/sound/musepack/files/arch/configure.patch create mode 100644 multimedia/sound/musepack/files/arch/mpcchap.patch create mode 100644 multimedia/sound/musepack/files/arch/mpcdec.patch create mode 100644 multimedia/sound/musepack/files/arch/mpcdecmake.patch create mode 100644 multimedia/sound/musepack/pspec.xml create mode 100644 multimedia/sound/musepack/translations.xml diff --git a/multimedia/sound/libmpcdec/pspec.xml b/multimedia/sound/libmpcdec/pspec.xml deleted file mode 100644 index 51bfce0b8f..0000000000 --- a/multimedia/sound/libmpcdec/pspec.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - libmpcdec - http://www.musepack.net/ - - PisiLinux Community - admins@pisilinux.org - - BSD - library - Portable Musepack decoder library - Musepack is an audio compression format with a strong emphasis on high quality. It's not lossless, but it is designed for transparency, so that you won't be able to hear differences between the original wave file and the much smaller MPC file. It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has rapidly developed and vastly improved and is now at an advanced stage in which it contains heavily optimized and patentless code. - http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2 - - - - libmpcdec - - /usr/lib - - - - - libmpcdec-devel - Development files for libmpcdec - - libmpcdec - - - /usr/include - - - - - - 2020-01-19 - 1.2.6 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - - 2018-08-07 - 1.2.6 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - - 2017-02-18 - 1.2.6 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - - 2016-06-09 - 1.2.6 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - - 2014-05-20 - 1.2.6 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - diff --git a/multimedia/sound/libmpcdec/translations.xml b/multimedia/sound/libmpcdec/translations.xml deleted file mode 100644 index c24e8ff7d9..0000000000 --- a/multimedia/sound/libmpcdec/translations.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - libmpcdec - Musepack SV7 kodlama kitaplığı - libmpcdec, taşınabilir bir Musepack kodlama kitaplığıdır. - Librairie de décodage portable Musepack. - - - - libmpcdec-devel - libmpcdec için geliştirme dosyaları - - diff --git a/multimedia/sound/libmpcdec/actions.py b/multimedia/sound/libreplaygain/actions.py similarity index 50% rename from multimedia/sound/libmpcdec/actions.py rename to multimedia/sound/libreplaygain/actions.py index f79d0eca85..babf9ee1ee 100644 --- a/multimedia/sound/libmpcdec/actions.py +++ b/multimedia/sound/libreplaygain/actions.py @@ -2,16 +2,17 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import autotools -import os +from pisi.actionsapi import get def setup(): - autotools.configure("--disable-static") + autotools.configure() def build(): - autotools.make() + autotools.make() def install(): - autotools.install() + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + diff --git a/multimedia/sound/libreplaygain/pspec.xml b/multimedia/sound/libreplaygain/pspec.xml new file mode 100644 index 0000000000..ac3b95f28f --- /dev/null +++ b/multimedia/sound/libreplaygain/pspec.xml @@ -0,0 +1,48 @@ + + + + + libreplaygain + https://www.musepack.net/ + + Pisilinux Community + admins@pisilinux.org + + LGPL + library + replaygain library. + musepack replaygain library. + + https://files.musepack.net/source/libreplaygain_r475.tar.gz + + + + + libreplaygain + + /usr/lib + + + + + libreplaygain-devel + Development files for libreplaygain + + libreplaygain + + + /usr/include + + + + + + 2020-08-20 + 8 + First build. + Pisilinux Community + admins@pisilinux.org + + + + diff --git a/multimedia/sound/musepack/actions.py b/multimedia/sound/musepack/actions.py new file mode 100644 index 0000000000..ecad681a4e --- /dev/null +++ b/multimedia/sound/musepack/actions.py @@ -0,0 +1,18 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file https://www.gnu.org/licenses/gpl-3.0.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import get + +def setup(): + autotools.configure("--enable-mpcchap --disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + diff --git a/multimedia/sound/musepack/files/arch/Makefile.patch b/multimedia/sound/musepack/files/arch/Makefile.patch new file mode 100644 index 0000000000..6f2a4cab84 --- /dev/null +++ b/multimedia/sound/musepack/files/arch/Makefile.patch @@ -0,0 +1,44 @@ +--- + mpc2sv8/Makefile.am | 5 +++-- + mpcdec/Makefile.am | 5 +++-- + mpcenc/Makefile.am | 5 +++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +--- a/mpc2sv8/Makefile.am ++++ b/mpc2sv8/Makefile.am +@@ -11,6 +11,7 @@ common_sources = ../common/crc32.c + METASOURCES = AUTO + bin_PROGRAMS = mpc2sv8 + mpc2sv8_SOURCES = mpc2sv8.c $(common_sources) +-mpc2sv8_LDADD = -lm \ ++mpc2sv8_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm +--- a/mpcdec/Makefile.am ++++ b/mpcdec/Makefile.am +@@ -9,6 +9,7 @@ endif + METASOURCES = AUTO + bin_PROGRAMS = mpcdec + mpcdec_SOURCES = mpcdec.c +-mpcdec_LDADD = -lm \ ++mpcdec_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libwavformat/libwavformat.a ++ $(top_builddir)/libwavformat/libwavformat.a \ ++ -lm +--- a/mpcenc/Makefile.am ++++ b/mpcenc/Makefile.am +@@ -22,8 +22,9 @@ mpcenc_SOURCES = keyboard.c mpcenc.c pip + $(common_sources) \ + mpcenc.h predict.h config.h + +-mpcenc_LDADD = -lm \ ++mpcenc_LDADD = \ + $(EXTRALIBS) \ + $(top_builddir)/libmpcpsy/libmpcpsy.a \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm + diff --git a/multimedia/sound/musepack/files/arch/configure.patch b/multimedia/sound/musepack/files/arch/configure.patch new file mode 100644 index 0000000000..fea7fe8092 --- /dev/null +++ b/multimedia/sound/musepack/files/arch/configure.patch @@ -0,0 +1,21 @@ +--- a/configure.in 2020-09-13 18:27:24.186893066 +0300 ++++ b/configure.in 2020-09-13 18:28:54.905398925 +0300 +@@ -3,7 +3,8 @@ + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([libmpcdec/mpc_reader.c]) + AM_CONFIG_HEADER([include/config.h]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE(subdir-objects) ++AM_MAINTAINER_MODE + + AC_LANG_C + AC_PROG_CC +@@ -30,7 +31,7 @@ + AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes]) + + +-CHECK_VISIBILITY ++AM_CONDITIONAL([HAVE_VISIBILITY], [true]) + + AC_CONFIG_FILES([ + Makefile diff --git a/multimedia/sound/musepack/files/arch/mpcchap.patch b/multimedia/sound/musepack/files/arch/mpcchap.patch new file mode 100644 index 0000000000..72b7d067b1 --- /dev/null +++ b/multimedia/sound/musepack/files/arch/mpcchap.patch @@ -0,0 +1,66 @@ +Index: libmpc/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -28,6 +28,12 @@ esac + AC_SUBST([EXTRALIBS]) + + AC_ARG_ENABLE([mpcchap], [AS_HELP_STRING([--enable-mpcchap], [enable building mpcchap])]) ++if test "x$enable_mpcchap" = xyes; then ++ PKG_CHECK_MODULES(LIBCUE, libcue) ++ AC_SUBST(LIBCUE_CFLAGS) ++ AC_SUBST(LIBCUE_LIBS) ++fi ++ + AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes]) + + +Index: libmpc/mpcchap/Makefile.am +=================================================================== +--- a/mpcchap/Makefile.am ++++ b/mpcchap/Makefile.am +@@ -4,7 +4,8 @@ bin_PROGRAMS = mpcchap + + common_sources = ../common/tags.c ../common/crc32.c + +-AM_CPPFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include \ ++ $(LIBCUE_CFLAGS) + + if HAVE_VISIBILITY + AM_CFLAGS = -fvisibility=hidden +@@ -16,4 +17,4 @@ dictionary.h iniparser.h + + mpcchap_LDADD = $(top_builddir)/libmpcdec/libmpcdec.la \ + $(top_builddir)/libmpcenc/libmpcenc.a \ +- -lm -lcuefile ++ -lm $(LIBCUE_LIBS) +Index: libmpc/mpcchap/mpcchap.c +=================================================================== +--- a/mpcchap/mpcchap.c ++++ b/mpcchap/mpcchap.c +@@ -24,7 +24,7 @@ + + #include + +-#include ++#include + + // tags.c + void Init_Tags ( void ); +@@ -153,13 +153,13 @@ mpc_status add_chaps_ini(char * mpc_file + mpc_status add_chaps_cue(char * mpc_file, char * chap_file, mpc_demux * demux, mpc_streaminfo * si) + { + Cd *cd = 0; +- int nchap, format = UNKNOWN; ++ int nchap; + struct stat stbuf; + FILE * in_file; + int chap_pos, end_pos, chap_size, i; + char * tmp_buff; + +- if (0 == (cd = cf_parse(chap_file, &format))) { ++ if (0 == (cd = cue_parse_file(chap_file))) { + fprintf(stderr, "%s: input file error\n", chap_file); + return !MPC_STATUS_OK; + } diff --git a/multimedia/sound/musepack/files/arch/mpcdec.patch b/multimedia/sound/musepack/files/arch/mpcdec.patch new file mode 100644 index 0000000000..0a452b37e6 --- /dev/null +++ b/multimedia/sound/musepack/files/arch/mpcdec.patch @@ -0,0 +1,22 @@ +Subject: Add extern keyword to global variable declaration. +Origin: upstream, commit:r479 +Bug-Debian: http://bugs.debian.org/665974 +--- + libmpcdec/requant.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/libmpcdec/requant.h ++++ b/libmpcdec/requant.h +@@ -47,9 +47,9 @@ extern "C" { + + + /* C O N S T A N T S */ +-const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer +-const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients +-const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset ++extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer ++extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients ++extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset + + #define Cc (__Cc + 1) + #define Dc (__Dc + 1) diff --git a/multimedia/sound/musepack/files/arch/mpcdecmake.patch b/multimedia/sound/musepack/files/arch/mpcdecmake.patch new file mode 100644 index 0000000000..554a282f28 --- /dev/null +++ b/multimedia/sound/musepack/files/arch/mpcdecmake.patch @@ -0,0 +1,7 @@ +--- a/libmpcdec/Makefile.am 2009-10-20 20:11:41.000000000 +0200 ++++ b/libmpcdec/Makefile.am 2009-10-20 20:12:02.000000000 +0200 +@@ -17,3 +17,4 @@ + $(common_sources) + + libmpcdec_la_LDFLAGS = -no-undefined -version-info 7:0:1 ++libmpcdec_la_LIBADD = -lm diff --git a/multimedia/sound/musepack/pspec.xml b/multimedia/sound/musepack/pspec.xml new file mode 100644 index 0000000000..88c653d599 --- /dev/null +++ b/multimedia/sound/musepack/pspec.xml @@ -0,0 +1,73 @@ + + + + + musepack + https://www.musepack.net/ + + Pisilinux Community + admins@pisilinux.org + + BSD + LGPL + library + Portable Musepack decoder library. + Musepack is an audio compression format with a strong emphasis on high quality. It's not lossless, but it is designed for transparency, so that you won't be able to hear differences between the original wave file and the much smaller MPC file. It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has rapidly developed and vastly improved and is now at an advanced stage in which it contains heavily optimized and patentless code. + + https://files.musepack.net/source/musepack_src_r475.tar.gz + + + libcue-devel + libreplaygain-devel + + + arch/configure.patch + arch/Makefile.patch + arch/mpcchap.patch + arch/mpcdec.patch + arch/mpcdecmake.patch + + + + + musepack + + libcue + libmpcdec + libreplaygain + + + /usr/bin + /usr/share + + + + + libmpcdec + + /usr/lib + + + + + libmpcdec-devel + Development files for libmpcdec + + libmpcdec + + + /usr/include + + + + + + 2020-08-20 + 8 + First build. + Pisilinux Community + admins@pisilinux.org + + + + diff --git a/multimedia/sound/musepack/translations.xml b/multimedia/sound/musepack/translations.xml new file mode 100644 index 0000000000..960d206d92 --- /dev/null +++ b/multimedia/sound/musepack/translations.xml @@ -0,0 +1,20 @@ + + + + musepack + Musepack SV8 tools. + Musepack is an audio compression format with a strong emphasis on high quality. It's not lossless, but it is designed for transparency, so that you won't be able to hear differences between the original wave file and the much smaller MPC file. + + + + libmpcdec + Musepack SV8 kodlama kitaplığı + libmpcdec, taşınabilir bir Musepack kodlama kitaplığıdır. + Librairie de décodage portable Musepack. + + + + libmpcdec-devel + libmpcdec için geliştirme dosyaları + +