diff --git a/multimedia/sound/normalize/files/mageia/compressed-wav-files.dpatch b/multimedia/sound/normalize/files/mageia/compressed-wav-files.dpatch new file mode 100644 index 0000000000..05a614fbf3 --- /dev/null +++ b/multimedia/sound/normalize/files/mageia/compressed-wav-files.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## compressed-wav-files.dpatch by Stefan Fritsch +## +## DP: afGetVirtualFrameSize() needs to be used instead of afGetFrameSize(), +## DP: otherwise the allocated buffer size is too small for compressed +## DP: WAV files (see #558399). + +@DPATCH@ +diff -urNad normalize-audio-0.7.7~/src/adjust.c normalize-audio-0.7.7/src/adjust.c +--- normalize-audio-0.7.7~/src/adjust.c 2009-01-29 21:25:27.000000000 +0100 ++++ normalize-audio-0.7.7/src/adjust.c 2009-11-28 17:23:40.000000000 +0100 +@@ -277,8 +277,8 @@ + + /* set up buffer to hold 1/100 of a second worth of frames */ + frames_in_buf = samp_rate / 100; +- src_framesz = afGetFrameSize(fhin, AF_DEFAULT_TRACK, 1); +- dst_framesz = afGetFrameSize(fhout, AF_DEFAULT_TRACK, 1); ++ src_framesz = afGetVirtualFrameSize(fhin, AF_DEFAULT_TRACK, 1); ++ dst_framesz = afGetVirtualFrameSize(fhout, AF_DEFAULT_TRACK, 1); + src_buf = (unsigned char *)xmalloc(frames_in_buf * src_framesz); + dst_buf = (unsigned char *)xmalloc(frames_in_buf * dst_framesz); + diff --git a/multimedia/sound/normalize/files/mageia/fix-flac.dpatch b/multimedia/sound/normalize/files/mageia/fix-flac.dpatch new file mode 100644 index 0000000000..9c18b992ab --- /dev/null +++ b/multimedia/sound/normalize/files/mageia/fix-flac.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-flac.dpatch by Joachim Reichel +## +## DP: fix typo w.r.t. flac support + +@DPATCH@ +diff -urNad normalize-audio-0.7.7~/src/normalize-mp3.in normalize-audio-0.7.7/src/normalize-mp3.in +--- normalize-audio-0.7.7~/src/normalize-mp3.in 2005-09-12 07:31:15.000000000 +0200 ++++ normalize-audio-0.7.7/src/normalize-mp3.in 2007-01-19 21:37:37.000000000 +0100 +@@ -294,7 +294,7 @@ + $path = find_prog("flac"); + if ($path) { + $path .= " -s -d -o %w %m"; +- $FLAC = $path; ++ $FLACDECODE = $path; + } + } + +@@ -303,7 +303,7 @@ + $path = find_prog("flac"); + if ($path) { + $path .= " -s -o %m %w"; +- $FLAC = $path; ++ $FLACENCODE = $path; + } + } + diff --git a/multimedia/sound/normalize/files/gentoo/normalize-0.7.7-audiofile-pkgconfig.patch b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-audiofile-pkgconfig.patch similarity index 100% rename from multimedia/sound/normalize/files/gentoo/normalize-0.7.7-audiofile-pkgconfig.patch rename to multimedia/sound/normalize/files/mageia/normalize-0.7.7-audiofile-pkgconfig.patch diff --git a/multimedia/sound/normalize/files/mageia/normalize-0.7.7-automake-1.13.patch b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-automake-1.13.patch new file mode 100644 index 0000000000..4df4a6dd2d --- /dev/null +++ b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-automake-1.13.patch @@ -0,0 +1,12 @@ +diff -up normalize-0.7.7/configure.ac.automake-1_13 normalize-0.7.7/configure.ac +--- normalize-0.7.7/configure.ac.automake-1_13 2013-01-06 16:14:40.292124401 +0100 ++++ normalize-0.7.7/configure.ac 2013-01-06 16:15:55.907413877 +0100 +@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(config) + AC_CONFIG_FILES(config/Makefile) + + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_CANONICAL_HOST + AC_PROG_CC diff --git a/multimedia/sound/normalize/files/gentoo/normalize-0.7.7-m4.patch b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-m4.patch similarity index 100% rename from multimedia/sound/normalize/files/gentoo/normalize-0.7.7-m4.patch rename to multimedia/sound/normalize/files/mageia/normalize-0.7.7-m4.patch diff --git a/multimedia/sound/normalize/files/mageia/normalize-0.7.7-mdv-fix-local-config.patch b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-mdv-fix-local-config.patch new file mode 100644 index 0000000000..450c076c26 --- /dev/null +++ b/multimedia/sound/normalize/files/mageia/normalize-0.7.7-mdv-fix-local-config.patch @@ -0,0 +1,22 @@ +diff -ur normalize-0.7.7/src/normalize-mp3.in normalize-0.7.7-patch/src/normalize-mp3.in +--- normalize-0.7.7/src/normalize-mp3.in 2005-09-12 07:31:15.000000000 +0200 ++++ normalize-0.7.7-patch/src/normalize-mp3.in 2011-08-21 22:16:49.984053565 +0200 +@@ -26,12 +26,12 @@ + # %b becomes bitrate of re-encoded file, as specified by the -b option + # Example: $OGGENCODE="oggenc -Q -b %b -o %m %w" + +-$MP3DECODE = "@MP3DECODE@"; +-$MP3ENCODE = "@MP3ENCODE@"; +-$OGGDECODE = "@OGGDECODE@"; +-$OGGENCODE = "@OGGENCODE@"; +-$FLACDECODE = "@FLACDECODE@"; +-$FLACENCODE = "@FLACENCODE@"; ++#$MP3DECODE = "@MP3DECODE@"; ++#$MP3ENCODE = "@MP3ENCODE@"; ++#$OGGDECODE = "@OGGDECODE@"; ++#$OGGENCODE = "@OGGENCODE@"; ++#$FLACDECODE = "@FLACDECODE@"; ++#$FLACENCODE = "@FLACENCODE@"; + + # The %w etc. substitutions should *not* be used in the following, as + # this script knows about their options already. diff --git a/multimedia/sound/normalize/pspec.xml b/multimedia/sound/normalize/pspec.xml index eb32a0a87c..5d5343f25d 100644 --- a/multimedia/sound/normalize/pspec.xml +++ b/multimedia/sound/normalize/pspec.xml @@ -24,8 +24,12 @@ bash-completion - gentoo/normalize-0.7.7-audiofile-pkgconfig.patch --> - gentoo/normalize-0.7.7-m4.patch + mageia/compressed-wav-files.dpatch + mageia/fix-flac.dpatch + mageia/normalize-0.7.7-audiofile-pkgconfig.patch + mageia/normalize-0.7.7-automake-1.13.patch + mageia/normalize-0.7.7-m4.patch + mageia/normalize-0.7.7-mdv-fix-local-config.patch