rpms/DVDRipOMatic/devel DVDRipOMatic-0.95-newmplayerfix.patch, NONE, 1.1 DVDRipOMatic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Xavier Lamien]

Author: laxathom

Update of /cvs/free/rpms/DVDRipOMatic/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11172/devel

Modified Files:
	.cvsignore sources 
Added Files:
	DVDRipOMatic-0.95-newmplayerfix.patch DVDRipOMatic.spec 
Log Message:
Initial import.

DVDRipOMatic-0.95-newmplayerfix.patch:

--- NEW FILE DVDRipOMatic-0.95-newmplayerfix.patch ---
--- DVDRipOMatic-0.95/DVDScan.orig	2006-10-07 13:26:12.000000000 +0100
+++ DVDRipOMatic-0.95/DVDScan	2007-03-11 22:33:42.000000000 +0000
@@ -397,6 +397,11 @@
  
  NumAudioStreams=$(cat "$MPlayerOutput" | grep "\[open\] audio stream" | wc -l)
 
+ ## Simple Patch here by dribble to support (hopefully) older and newer mplayer
+ if [ $NumAudioStreams -eq 0 ]; then
+  NumAudioStreams=$(cat "$MPlayerOutput" | grep "^audio stream:" | wc -l)
+ fi
+
  # Not all audio streams reported by MPlayer may actually exist.
  # Count which streams really exist.
 
@@ -412,6 +417,11 @@
 
    StreamDescription=`cat "$MPlayerOutput" | grep "\[open\] audio stream" | tail -n $[$NumAudioStreams - $Stream + 1] | head -n 1`
 
+   ## Simple Patch here by dribble to support (hopefully) older and newer mplayer
+   if [ -z "$StreamDescription" ]; then
+    StreamDescription=`cat "$MPlayerOutput" | grep "^audio stream:" | tail -n $[$NumAudioStreams - $Stream + 1] | head -n 1`
+   fi
+
    if [ -z "$StreamDescription" ]; then
      break;
    fi
@@ -619,4 +629,4 @@
 
 rm -f "$TCProbeOutput"
 rm -f "$MPlayerOutput"
-rm -f "$MPlayerAudioDetectOutput"
\ No newline at end of file
+rm -f "$MPlayerAudioDetectOutput"


--- NEW FILE DVDRipOMatic.spec ---
Name:           DVDRipOMatic
Version:        0.95
Release:        4%{?dist}
Summary:        Simple DVD to XviD ripping application
Group:          Applications/Multimedia
License:        GPL
URL:            http://dvdripomatic.sourceforge.net
Source0:        http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Patch0:         DVDRipOMatic-0.95-newmplayerfix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  desktop-file-utils
Requires:       bc
Requires:       kdewebdev
Requires:       kdebase
Requires:       mencoder
Requires:       mplayer
Requires:       transcode

%description
DVD Rip-O-Matic is a simple DVD-to-XviD ripping application developed by Dik
Takken. The wizard was designed to be very easy to use; it automatically
detects the optimal settings for you. It should also produce very high quality
AVI files, even if you have no idea what the settings mean and just use it in
the next-next-next-finish way.


%prep
%setup -q
%patch0 -p1


%build
# Build desktop icons
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=%{name}
GenericName=: DVD Ripping Tool
Comment=%{summary}
Exec=dvdripomatic
Icon=dvd_unmount
Terminal=false
Type=Application
Categories=Qt;KDE;AudioVideo;
EOF

#Create simple scripts for easy launching from the command line.
cat << EOF > dvdripomatic
#!/bin/sh
# Simple script for friendly command line lauching of dvdripomatic
exec %{_bindir}/kmdr-executor %{_datadir}/apps/%{name}/%{name}.kmdr
EOF


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/apps/%{name}
mkdir -p %{buildroot}%{_bindir}
install -pm0644 %{name}.kmdr %{buildroot}%{_datadir}/apps/%{name}
install -pm0644 banner.png %{buildroot}%{_datadir}/apps/%{name}
install -pm0755 DVDScan %{buildroot}%{_datadir}/apps/%{name}
install -pm0755 dvdripomatic %{buildroot}%{_bindir}

desktop-file-install --vendor dribble \
                     --dir %{buildroot}%{_datadir}/applications \
                     %{name}.desktop


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_datadir}/apps/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
%{_bindir}/dvdripomatic
%doc Changelog README


%changelog
* Mon Mar 12 2007 Ian Chapman <packages at amiga-hardware.com> 0.95-4%{?dist}
- Added patch to support newer versions of mplayer

* Mon Jan 15 2007 Ian Chapman <packages at amiga-hardware.com> 0.95-3%{?dist}
- Dropped version= from .desktop file.
- Included README_dvdripomatic.dribble

* Sun Jan 14 2007 Ian Chapman <packages at amiga-hardware.com> 0.95-2%{?dist}
- Dropped --add-category=X-Fedora from .desktop file

* Sun Dec 03 2006 Ian Chapman <packages at amiga-hardware.com> 0.95-1%{?dist}
- Initial release

Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/DVDRipOMatic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2008 11:36:43 -0000	1.1
+++ .cvsignore	4 Sep 2008 10:13:23 -0000	1.2
@@ -0,0 +1 @@
+DVDRipOMatic-0.95.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/DVDRipOMatic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jun 2008 11:36:43 -0000	1.1
+++ sources	4 Sep 2008 10:13:23 -0000	1.2
@@ -0,0 +1 @@
+66378742b03a622e05aa02a0b175880d  DVDRipOMatic-0.95.tar.bz2