[oggvideotools] fix FTBFS
Peter Robinson
pbrobinson at fedoraproject.org
Sun Jul 8 15:37:22 UTC 2012
commit dc2aa72c899b508f5294d6e4a808543b23f7130c
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Sun Jul 8 16:37:16 2012 +0100
fix FTBFS
.gitignore | 2 +-
oggvideotools-fixbuild.patch | 128 ++++++++++++++++++++++++++++++++++++++++++
oggvideotools.spec | 16 +++--
3 files changed, 138 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0f47ec..8e87ac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-oggvideotools-0.8.tar.gz
+oggvideotools-0.*.tar.gz
diff --git a/oggvideotools-fixbuild.patch b/oggvideotools-fixbuild.patch
new file mode 100644
index 0000000..ddcd00d
--- /dev/null
+++ b/oggvideotools-fixbuild.patch
@@ -0,0 +1,128 @@
+--- oggvideotools-0.8/src/oggLength.cpp.orig 2012-07-08 15:19:44.397377525 +0100
++++ oggvideotools-0.8/src/oggLength.cpp 2012-07-08 15:20:34.479660350 +0100
+@@ -27,6 +27,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8/src/ringbuffer.cpp.orig 2012-07-08 15:34:27.265976331 +0100
++++ oggvideotools-0.8/src/ringbuffer.cpp 2012-07-08 15:34:41.795347561 +0100
+@@ -47,7 +47,6 @@
+
+ unsigned int ringbuffer::addData(const unsigned char* data, unsigned int len)
+ {
+- bool drop(false);
+
+ lock();
+
+@@ -74,7 +73,6 @@
+ end += (len - size + used);
+ end %= size;
+ used = size;
+- drop = true;
+ } else {
+ used += len;
+ }
+--- oggvideotools-0.8/src/oggDump.cpp.orig 2012-07-08 15:40:19.526975653 +0100
++++ oggvideotools-0.8/src/oggDump.cpp 2012-07-08 15:40:53.609846218 +0100
+@@ -31,6 +31,7 @@
+ #include <fstream>
+ #include <ostream>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "rawMediaPacket.h"
+--- oggvideotools-0.8/src/oggCut.cpp.orig 2012-07-08 15:57:32.011339045 +0100
++++ oggvideotools-0.8/src/oggCut.cpp 2012-07-08 15:57:52.765868794 +0100
+@@ -29,6 +29,7 @@
+ #include <map>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8/src/oggCat.cpp.orig 2012-07-08 15:59:30.021351153 +0100
++++ oggvideotools-0.8/src/oggCat.cpp 2012-07-08 16:00:10.699389380 +0100
+@@ -28,6 +28,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <unistd.h>
+
+ #include <cstdlib>
+ #include <ctime>
+--- oggvideotools-0.8/src/oggJoin.cpp.orig 2012-07-08 16:03:11.116993897 +0100
++++ oggvideotools-0.8/src/oggJoin.cpp 2012-07-08 16:03:36.976653800 +0100
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "oggDecoder.h"
+--- oggvideotools-0.8/src/oggSplit.cpp.orig 2012-07-08 16:02:29.391929053 +0100
++++ oggvideotools-0.8/src/oggSplit.cpp 2012-07-08 16:02:56.752627293 +0100
+@@ -24,6 +24,7 @@
+ #include <sstream>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "rawMediaPacket.h"
+--- oggvideotools-0.8/src/oggScroll.cpp.orig 2012-07-08 16:09:13.116248067 +0100
++++ oggvideotools-0.8/src/oggScroll.cpp 2012-07-08 16:09:30.294690040 +0100
+@@ -23,6 +23,7 @@
+ #include <map>
+ #include <termios.h>
+ #include <SDL/SDL.h>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8/src/oggSlideshow.cpp.orig 2012-07-08 16:14:54.632032644 +0100
++++ oggvideotools-0.8/src/oggSlideshow.cpp 2012-07-08 16:15:18.481645929 +0100
+@@ -33,6 +33,7 @@
+ #include <cmath>
+ #include <cstring>
+ #include <ctime>
++#include <unistd.h>
+ //#include <cc++/slog.h>
+
+ #include "th_helper.h"
+--- oggvideotools-0.8/src/oggThumb.cpp.orig 2012-07-08 16:21:31.202227616 +0100
++++ oggvideotools-0.8/src/oggThumb.cpp 2012-07-08 16:21:48.271666305 +0100
+@@ -32,6 +32,7 @@
+ #include <iostream>
+ #include <cstdlib>
+ #include <queue>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8/src/oggResize.cpp.orig 2012-07-08 15:48:55.801477052 +0100
++++ oggvideotools-0.8/src/oggResize.cpp 2012-07-08 15:49:14.555476271 +0100
+@@ -34,6 +34,7 @@
+ #include <cstdlib>
+ #include <cmath>
+ #include <ctime>
++#include <unistd.h>
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+--- oggvideotools-0.8/src/oggSilence.cpp.orig 2012-07-08 15:49:37.517474667 +0100
++++ oggvideotools-0.8/src/oggSilence.cpp 2012-07-08 15:49:52.841473944 +0100
+@@ -30,6 +30,7 @@
+ #include <sstream>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+
+ #include "vorbisEncoder.h"
+ #include "streamMux.h"
diff --git a/oggvideotools.spec b/oggvideotools.spec
index 053be57..4bae34c 100644
--- a/oggvideotools.spec
+++ b/oggvideotools.spec
@@ -1,13 +1,15 @@
Name: oggvideotools
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Toolbox for manipulating Ogg video files
Group: Applications/Multimedia
License: GPLv2+
URL: http://dev.streamnik.de/oggvideotools.html
+
Source0: http://downloads.sourceforge.net/project/oggvideotools/oggvideotools/oggvideotools-0.7b/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: oggvideotools-fixbuild.patch
+
BuildRequires: pkgconfig
BuildRequires: libogg-devel libvorbis-devel libtheora-devel SDL-devel
BuildRequires: gd-devel
@@ -20,6 +22,7 @@ such as for splitting the different streams.
%prep
%setup -q
+%patch0 -p1 -b .fixbuild
%build
%configure
@@ -27,21 +30,20 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
chmod 644 docs/DocuOggVideoTools.pdf ChangeLog scripts/*
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%defattr(-,root,root,-)
%doc COPYING README ChangeLog docs/DocuOggVideoTools.pdf scripts/*
%{_bindir}/*
%{_mandir}/man1/ogg*
+
%changelog
+* Sun Jul 8 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.8-7
+- Fix FTBFS
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-6
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list