[arch-commits] Commit in musepack/repos (9 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Nov 10 00:32:35 UTC 2018
Date: Saturday, November 10, 2018 @ 00:32:34
Author: foutrelis
Revision: 338859
archrelease: copy trunk to staging-x86_64
Added:
musepack/repos/staging-x86_64/
musepack/repos/staging-x86_64/01_am-maintainer-mode.patch
(from rev 338858, musepack/trunk/01_am-maintainer-mode.patch)
musepack/repos/staging-x86_64/02_link-libm.patch
(from rev 338858, musepack/trunk/02_link-libm.patch)
musepack/repos/staging-x86_64/03_mpcchap.patch
(from rev 338858, musepack/trunk/03_mpcchap.patch)
musepack/repos/staging-x86_64/04_link-order.patch
(from rev 338858, musepack/trunk/04_link-order.patch)
musepack/repos/staging-x86_64/05_visibility.patch
(from rev 338858, musepack/trunk/05_visibility.patch)
musepack/repos/staging-x86_64/1001_missing_extern_kw.patch
(from rev 338858, musepack/trunk/1001_missing_extern_kw.patch)
musepack/repos/staging-x86_64/PKGBUILD
(from rev 338858, musepack/trunk/PKGBUILD)
musepack/repos/staging-x86_64/add_subdir-objects.patch
(from rev 338858, musepack/trunk/add_subdir-objects.patch)
------------------------------+
01_am-maintainer-mode.patch | 12 ++++++
02_link-libm.patch | 7 ++++
03_mpcchap.patch | 66 ++++++++++++++++++++++++++++++++++++++
04_link-order.patch | 44 +++++++++++++++++++++++++
05_visibility.patch | 13 +++++++
1001_missing_extern_kw.patch | 22 ++++++++++++
PKGBUILD | 71 +++++++++++++++++++++++++++++++++++++++++
add_subdir-objects.patch | 16 +++++++++
8 files changed, 251 insertions(+)
Copied: musepack/repos/staging-x86_64/01_am-maintainer-mode.patch (from rev 338858, musepack/trunk/01_am-maintainer-mode.patch)
===================================================================
--- staging-x86_64/01_am-maintainer-mode.patch (rev 0)
+++ staging-x86_64/01_am-maintainer-mode.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,12 @@
+Index: libmpc-0.1~r459/configure.in
+===================================================================
+--- libmpc-0.1~r459.orig/configure.in 2010-05-31 16:32:02.551447078 +0200
++++ libmpc-0.1~r459/configure.in 2010-05-31 16:32:09.578951197 +0200
+@@ -4,6 +4,7 @@
+ AC_CONFIG_SRCDIR([libmpcdec/mpc_reader.c])
+ AM_CONFIG_HEADER([include/config.h])
+ AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
+
+ AC_LANG_C
+ AC_PROG_CC
Copied: musepack/repos/staging-x86_64/02_link-libm.patch (from rev 338858, musepack/trunk/02_link-libm.patch)
===================================================================
--- staging-x86_64/02_link-libm.patch (rev 0)
+++ staging-x86_64/02_link-libm.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,7 @@
+--- a/libmpcdec/Makefile.am.old 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
Copied: musepack/repos/staging-x86_64/03_mpcchap.patch (from rev 338858, musepack/trunk/03_mpcchap.patch)
===================================================================
--- staging-x86_64/03_mpcchap.patch (rev 0)
+++ staging-x86_64/03_mpcchap.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,66 @@
+Index: libmpc/configure.in
+===================================================================
+--- libmpc.orig/configure.in
++++ libmpc/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
+===================================================================
+--- libmpc.orig/mpcchap/Makefile.am
++++ libmpc/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
+===================================================================
+--- libmpc.orig/mpcchap/mpcchap.c
++++ libmpc/mpcchap/mpcchap.c
+@@ -24,7 +24,7 @@
+
+ #include <sys/stat.h>
+
+-#include <cuetools/cuefile.h>
++#include <libcue/libcue.h>
+
+ // 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;
+ }
Copied: musepack/repos/staging-x86_64/04_link-order.patch (from rev 338858, musepack/trunk/04_link-order.patch)
===================================================================
--- staging-x86_64/04_link-order.patch (rev 0)
+++ staging-x86_64/04_link-order.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,44 @@
+---
+ mpc2sv8/Makefile.am | 5 +++--
+ mpcdec/Makefile.am | 5 +++--
+ mpcenc/Makefile.am | 5 +++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+--- libmpc.orig/mpc2sv8/Makefile.am
++++ libmpc/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
+--- libmpc.orig/mpcdec/Makefile.am
++++ libmpc/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
+--- libmpc.orig/mpcenc/Makefile.am
++++ libmpc/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
+
Copied: musepack/repos/staging-x86_64/05_visibility.patch (from rev 338858, musepack/trunk/05_visibility.patch)
===================================================================
--- staging-x86_64/05_visibility.patch (rev 0)
+++ staging-x86_64/05_visibility.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,13 @@
+Index: libmpc/configure.in
+===================================================================
+--- libmpc.orig/configure.in
++++ libmpc/configure.in
+@@ -37,7 +37,7 @@ fi
+ AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes])
+
+
+-CHECK_VISIBILITY
++AM_CONDITIONAL([HAVE_VISIBILITY], [true])
+
+ AC_CONFIG_FILES([
+ Makefile
Copied: musepack/repos/staging-x86_64/1001_missing_extern_kw.patch (from rev 338858, musepack/trunk/1001_missing_extern_kw.patch)
===================================================================
--- staging-x86_64/1001_missing_extern_kw.patch (rev 0)
+++ staging-x86_64/1001_missing_extern_kw.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -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(-)
+
+--- libmpc.orig/libmpcdec/requant.h
++++ libmpc/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)
Copied: musepack/repos/staging-x86_64/PKGBUILD (from rev 338858, musepack/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,71 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=musepack
+pkgname=('musepack-tools' 'libmpcdec')
+pkgver=0.1+r475
+pkgrel=2
+epoch=1
+_rel=475
+pkgdesc="MusePack commandline utilities and decoder library"
+arch=('x86_64')
+url="http://musepack.net/"
+license=('LGPL' 'custom')
+depends=('glibc')
+makedepends=('libreplaygain' 'libcue')
+source=(http://files.musepack.net/source/musepack_src_r${_rel}.tar.gz
+ 01_am-maintainer-mode.patch
+ 02_link-libm.patch
+ 03_mpcchap.patch
+ 04_link-order.patch
+ 05_visibility.patch
+ 1001_missing_extern_kw.patch
+ add_subdir-objects.patch)
+md5sums=('754d67be67f713e54baf70fcfdb2817e'
+ '6da8b85474fe2fcf55d4a3cfa68ddd8e'
+ '57f9c8f1858008ac14b0d3cf2b7cf2dc'
+ 'b0b499dcdbb87b53eaf6db67e1592b51'
+ 'b1e5b6f8cb3c5b77e4438971c7a20797'
+ '661783cf9ad4fed435d1c055b74b680b'
+ 'e7ab0ee8b1753d5986a2cefe233cc99a'
+ 'dc3e62894bf81dabd4451646b183a2e4')
+
+prepare() {
+ cd musepack_src_r${_rel}
+ patch -Np1 -i ../01_am-maintainer-mode.patch
+ patch -Np1 -i ../02_link-libm.patch
+ patch -Np1 -i ../03_mpcchap.patch
+ patch -Np1 -i ../04_link-order.patch
+ patch -Np1 -i ../05_visibility.patch
+ patch -Np1 -i ../1001_missing_extern_kw.patch
+ patch -Np1 -i ../add_subdir-objects.patch
+ mv configure.in configure.ac
+}
+
+build() {
+ cd musepack_src_r${_rel}
+ autoreconf -fi
+ ./configure --prefix=/usr --enable-mpcchap
+ make
+}
+
+package_libmpcdec() {
+ pkgdesc="MusePack decoding library"
+ license=('custom')
+
+ cd musepack_src_r${_rel}
+ make -C include DESTDIR="${pkgdir}" install
+ make -C libmpcdec DESTDIR="${pkgdir}" install
+ install -Dm644 libmpcdec/COPYING ${pkgdir}/usr/share/licenses/libmpcdec/COPYING
+}
+
+package_musepack-tools() {
+ depends=('libcue' 'libreplaygain' 'libmpcdec>=1:0.1+r475')
+ pkgdesc="MusePack commandline tools"
+ options=(!emptydirs)
+ license=('LGPL')
+
+ cd musepack_src_r${_rel}
+ make DESTDIR="${pkgdir}" install
+ make -C libmpcdec DESTDIR="${pkgdir}" uninstall
+ make -C include DESTDIR="${pkgdir}" uninstall
+}
Copied: musepack/repos/staging-x86_64/add_subdir-objects.patch (from rev 338858, musepack/trunk/add_subdir-objects.patch)
===================================================================
--- staging-x86_64/add_subdir-objects.patch (rev 0)
+++ staging-x86_64/add_subdir-objects.patch 2018-11-10 00:32:34 UTC (rev 338859)
@@ -0,0 +1,16 @@
+Description: avoid automake error
+Author: Hideki Yamane <henrich at debian.org>
+Forwarded: no
+Last-Update: 2013-10-23
+
+--- libmpc-0.1~r459.orig/configure.in
++++ libmpc-0.1~r459/configure.in
+@@ -3,7 +3,7 @@ AC_CONFIG_AUX_DIR([config])
+ 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
More information about the arch-commits
mailing list