normalize:rebuild

2018-12-17 12:02:55 +03:00
parent a0af4e7957
commit d810cae52e
7 changed files with 89 additions and 2 deletions
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## compressed-wav-files.dpatch by Stefan Fritsch <sf@sfritsch.de>
+##
+## 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);
+ 
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-flac.dpatch by Joachim Reichel <joachim.reichel@gmx.de>
+##
+## 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;
+     }
+ }
+ 
@@ -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
@@ -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.
@@ -24,8 +24,12 @@
            <Dependency>bash-completion</Dependency>
        </BuildDependencies>
        <Patches>
-            <Patch level="1">gentoo/normalize-0.7.7-audiofile-pkgconfig.patch</Patch> -->
-            <Patch level="1">gentoo/normalize-0.7.7-m4.patch</Patch>
+            <Patch level="1">mageia/compressed-wav-files.dpatch</Patch>
+            <Patch level="1">mageia/fix-flac.dpatch</Patch>
+            <Patch level="1">mageia/normalize-0.7.7-audiofile-pkgconfig.patch</Patch>
+            <Patch level="1">mageia/normalize-0.7.7-automake-1.13.patch</Patch>
+            <Patch level="1">mageia/normalize-0.7.7-m4.patch</Patch>
+            <Patch level="1">mageia/normalize-0.7.7-mdv-fix-local-config.patch</Patch>
        </Patches>
    </Source>