Author: goetz
Date: Thu Feb 15 16:55:46 2007
New Revision: 121430
Added:
packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-asneeded.patch
packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-docbook.patch
packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-nawk.patch
Removed:
packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4rc2.tar.bz2
Modified:
packages/cooker/xvidcap/current/SPECS/xvidcap.spec
Log:
- fix ffmpeg build
- use docbook2x for help generation
- use awk instead of nawk
- fix call to ppm2mpeg helper script
Added: packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-asneeded.patch
==============================================================================
--- (empty file)
+++ packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-asneeded.patch
Thu Feb 15 16:55:46 2007
@@ -0,0 +1,11 @@
+--- xvidcap-1.1.4/ffmpeg/configure.asneeded 2007-02-11 15:32:57.000000000
+0100
++++ xvidcap-1.1.4/ffmpeg/configure 2007-02-11 15:32:57.000000000 +0100
+@@ -618,7 +618,7 @@
+ SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
+ ;;
+ Linux)
+-check_ldflags '-Wl,--as-needed'
++check_ldflags ''
+ ;;
+ IRIX*)
+ targetos=IRIX
Added: packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-docbook.patch
==============================================================================
--- (empty file)
+++ packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-docbook.patch Thu Feb
15 16:55:46 2007
@@ -0,0 +1,14 @@
+--- xvidcap-1.1.4/configure.in.docbook 2007-02-11 15:05:37.000000000 +0100
++++ xvidcap-1.1.4/configure.in 2007-02-11 15:06:15.000000000 +0100
+@@ -36,9 +36,9 @@
+ MK=''; AC_SUBST(MK)
+ #########################################################
+ #########################################################
+-AC_PATH_PROG(DOCBOOK2X_MAN,docbook2x-man,no)
++AC_PATH_PROG(DOCBOOK2X_MAN,docbook2man,no)
+ if test x$DOCBOOK2X_MAN = xno; then
+- AC_MSG_NOTICE(Couldn't find docbook2x-man to generate current man pages.
Will install pre-generated ones if present.)
++ AC_MSG_NOTICE(Couldn't find docbook2man to generate current man pages. Will
install pre-generated ones if present.)
+ fi
+
+ AC_PATH_PROG(XML2PO,xml2po,no)
Added: packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-nawk.patch
==============================================================================
--- (empty file)
+++ packages/cooker/xvidcap/current/SOURCES/xvidcap-1.1.4-nawk.patch Thu Feb
15 16:55:46 2007
@@ -0,0 +1,11 @@
+--- xvidcap-1.1.4/ppm2mpeg.sh.awk1 2007-02-11 16:10:38.000000000 +0100
++++ xvidcap-1.1.4/ppm2mpeg.sh 2007-02-11 16:10:52.000000000 +0100
+@@ -18,7 +18,7 @@
+ LOC_TRANSCODE=`which transcode`
+ LOC_FFMPEG=`which ffmpeg`
+ LOC_MENCODER=`which mencoder`
+-EXTENSION=`echo "${1}" | nawk -F "." '{print tolower($NF)}'`
++EXTENSION=`echo "${1}" | awk -F "." '{print tolower($NF)}'`
+ FILE=`echo "${1}" | sed 's/%[0-9]*[i|d]/*/g'`
+ OUTPUTFILE="/tmp/output.avi"
+
Modified: packages/cooker/xvidcap/current/SPECS/xvidcap.spec
==============================================================================
--- packages/cooker/xvidcap/current/SPECS/xvidcap.spec (original)
+++ packages/cooker/xvidcap/current/SPECS/xvidcap.spec Thu Feb 15 16:55:46 2007
@@ -1,6 +1,6 @@
%define name xvidcap
%define version 1.1.4
-%define release %mkrel 2
+%define release %mkrel 3
Name: %{name}
Summary: Screen capture video recorder
@@ -8,10 +8,14 @@
Release: %{release}
Source: %{name}-%{version}.tar.bz2
+Patch0: xvidcap-1.1.4-docbook.patch
+Patch1: xvidcap-1.1.4-asneeded.patch
+Patch2: xvidcap-1.1.4-nawk.patch
URL: http://xvidcap.sourceforge.net/
License: GPL
Group: Video
BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRequires: docbook2x
BuildRequires: gtk2-devel jpeg-devel png-devel zlib-devel
BuildRequires: libglade2.0-devel
BuildRequires: libxmu-devel
@@ -21,6 +25,9 @@
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
Requires: mplayer
+Requires: mencoder
+Requires: ffmpeg
+Requires: ImageMagick
%description
xvidcap is a screen capture enabling you to capture videos off your X-Window
@@ -29,6 +36,11 @@
%prep
%setup -q
+%patch0 -p1 -b .docbook
+%patch1 -p1 -b .asneeded
+%patch2 -p1 -b .fixawk
+
+aclocal && autoconf && automake
%build
%configure2_5x --with-forced-embedded-ffmpeg
@@ -37,6 +49,10 @@
%install
rm -rf $RPM_BUILD_ROOT %name.lang
%makeinstall
+
+chmod 755 %{_datadir}/%{name}/ppm2mpeg.sh
+ln -s %{_datadir}/%{name}/ppm2mpeg.sh $RPM_BUILD_ROOT%{_bindir}/ppm2mpeg.sh
+
rm -fr $RPM_BUILD_ROOT/%_docdir
%find_lang %name --with-gnome
for omf in %buildroot%_datadir/omf/*/*-??.omf;do
@@ -69,6 +85,7 @@
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/%name
+%{_bindir}/ppm2mpeg.sh
%{_mandir}/man1/*
%lang(de) %{_mandir}/de/man1/*
%lang(es) %{_mandir}/es/man1/*
