[SCM] libmpc/master: Refreshed

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7503ac41eaeb7552b365b01a0add8ccbcaf771cf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Sep 11 18:35:27 2016 +0200

    Refreshed

diff --git a/debian/patches/03_mpcchap.patch b/debian/patches/03_mpcchap.patch
index b1f04b0..1a740b5 100644
--- a/debian/patches/03_mpcchap.patch
+++ b/debian/patches/03_mpcchap.patch
@@ -1,8 +1,6 @@
-Index: libmpc/configure.in
-===================================================================
---- libmpc.orig/configure.in
-+++ libmpc/configure.in
-@@ -28,6 +28,12 @@ esac
+--- a/configure.in
++++ b/configure.in
+@@ -28,6 +28,12 @@
  AC_SUBST([EXTRALIBS])
  
  AC_ARG_ENABLE([mpcchap], [AS_HELP_STRING([--enable-mpcchap], [enable building mpcchap])])
@@ -15,11 +13,9 @@ Index: libmpc/configure.in
  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
+--- a/mpcchap/Makefile.am
++++ b/mpcchap/Makefile.am
+@@ -4,7 +4,8 @@
  
  common_sources = ../common/tags.c ../common/crc32.c
  
@@ -29,18 +25,16 @@ Index: libmpc/mpcchap/Makefile.am
  
  if HAVE_VISIBILITY
    AM_CFLAGS = -fvisibility=hidden
-@@ -16,4 +17,4 @@ dictionary.h iniparser.h
+@@ -16,4 +17,4 @@
  
  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 @@
- 
+--- a/mpcchap/mpcchap.c
++++ b/mpcchap/mpcchap.c
+@@ -25,7 +25,7 @@
+ #include <inttypes.h>
  #include <sys/stat.h>
  
 -#include <cuetools/cuefile.h>
@@ -48,7 +42,7 @@ Index: libmpc/mpcchap/mpcchap.c
  
  // tags.c
  void    Init_Tags        ( void );
-@@ -153,13 +153,13 @@ mpc_status add_chaps_ini(char * mpc_file
+@@ -161,14 +161,14 @@
  mpc_status add_chaps_cue(char * mpc_file, char * chap_file, mpc_demux * demux, mpc_streaminfo * si)
  {
  	Cd *cd = 0;
@@ -58,6 +52,7 @@ Index: libmpc/mpcchap/mpcchap.c
  	FILE * in_file;
  	int chap_pos, end_pos, chap_size, i;
  	char * tmp_buff;
+     mpc_status ret = MPC_STATUS_OK;
  
 -	if (0 == (cd = cf_parse(chap_file, &format))) {
 +	if (0 == (cd = cue_parse_file(chap_file))) {

-- 
libmpc packaging