12:09 p.m.
commit 684be212aa72467f0fd07dc121746dec6d5cbde7
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Oct 15 13:09:00 2017 +0100
Fix calls to unsupported (EOL) options of transcode and sox (#4673)
spec clean up, urls and license fixes .
DVDAuthorWizard-Builder.sh.patch | 42 ++++++++++++++++++++++++++++++++++++++++
DVDAuthorWizard.spec | 23 +++++++++++-----------
2 files changed, 54 insertions(+), 11 deletions(-)
---
diff --git a/DVDAuthorWizard-Builder.sh.patch b/DVDAuthorWizard-Builder.sh.patch
new file mode 100644
index 0000000..601487b
--- /dev/null
+++ b/DVDAuthorWizard-Builder.sh.patch
@@ -0,0 +1,42 @@
+--- ./bin/DVDAuthorWizard-Builder.sh.orig 2017-03-18 22:18:16.000000000 +0100
++++ ./bin/DVDAuthorWizard-Builder.sh 2017-10-02 09:22:00.955789419 +0200
+@@ -327,13 +327,13 @@
+ # -x autodetect video, ignore audio
+ # -I 5 Deinterlace with linear blend (lb)
+ # -Z Convert frame size
+- # --keep_asr Fit input image in target framesize without changing aspect
++ # EOL --keep_asr Fit input image in target framesize without changing aspect
+ # -y im,null Export video to ImageMagick, ignore audio
+
+ DiskSpaceWarning "$(pwd)" 100
+
+ transcode -i "$1" -x auto,null -I 5 $TranscodeEffectString -Z $2 \
+- --keep_asr -y im,null -F png -c $3-$4 -o frame%d.png 2>&1
++ -y im,null -F png -c $3-$4 -o frame%d.png 2>&1
+
+ DiskSpaceError "$(pwd)"
+
+@@ -1069,7 +1069,7 @@
+
+ pushd "$WorkingDir"
+
+- dd if=/dev/zero bs=2 count=$NumAudioFrames | sox -r 48000 -t .sw - -t .wav -w
/dev/stdout \
++ dd if=/dev/zero bs=2 count=$NumAudioFrames | sox -r 48000 -t .sw - -t .wav
/dev/stdout \
+ | mp2enc -b 128 -r 48000 -o soundtrack.mp2
< /dev/stdin
+
+ popd
+@@ -1093,12 +1093,12 @@
+
+ if [ "$DetectedSampleRate" == 48000 ]; then
+
+- sox "$SoundtrackFile" -t .wav -w "$WorkingDir/soundtrack.wav"
\
++ sox "$SoundtrackFile" -t .wav "$WorkingDir/soundtrack.wav" \
+ fade t 0 $Length $FadeoutLength trim 0 $Length
+
+ else
+
+- sox "$SoundtrackFile" -t .wav -w -r 48000
"$WorkingDir/soundtrack.wav" \
++ sox "$SoundtrackFile" -t .wav -r 48000
"$WorkingDir/soundtrack.wav" \
+ fade t 0 $Length $FadeoutLength trim 0 $Length resample -qs
+
+ fi
diff --git a/DVDAuthorWizard.spec b/DVDAuthorWizard.spec
index 69471fb..0aa2063 100644
--- a/DVDAuthorWizard.spec
+++ b/DVDAuthorWizard.spec
@@ -1,21 +1,22 @@
Name: DVDAuthorWizard
Version: 1.4.6
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Create a video DVD from MPEG-2 files
Group: Applications/Multimedia
-License: GPL
-URL: http://dvdauthorwizard.sourceforge.net
-Source0: http://dl.sf.net/dvdauthorwizard/%{name}-%{version}.tar.bz2
+License: GPLv2
+URL: https://sourceforge.net/projects/dvdauthorwizard/
+Source0: http://download.sf.net/dvdauthorwizard/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: DVDAuthorWizard-Builder.sh.patch
BuildArch: noarch
BuildRequires: desktop-file-utils
-Requires: kdebase3, bc, k3b, sox, mjpegtools, transcode, xine
+Requires: kdebase3 bc sox mjpegtools transcode
Requires: dvdauthor >= 0.6.11
Requires: ImageMagick >= 6.2.0
Requires: kdewebdev >= 3.3.0
+Recommends: k3b xine-ui
%description
@@ -27,6 +28,7 @@ follow.
%prep
%setup -q
+%patch0 -p1 -b .options
sed -i 's/\/\.\.\/share\/apps\/dvdauthorwizard//g' bin/DVDAuthorWizard.kmdr
sed -i 's/..\/share\/apps\/dvdauthorwizard/\/usr\/share\/apps\/DVDAuthorWizard/g'
\
bin/DVDAuthorWizard-Builder.sh
@@ -45,7 +47,6 @@ EOF
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/apps/%{name}
mkdir -p %{buildroot}%{_bindir}
@@ -59,10 +60,6 @@ desktop-file-install --vendor "" \
%{SOURCE1}
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root,-)
%doc Changelog Creating?Chapters.txt
@@ -72,6 +69,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Oct 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1.4.6-11
+- Fix calls to unsupported (EOL) options of transcode and sox (#4673)
+- spec clean up, urls and license fixes .
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> -
1.4.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild