Packman Build Service PMBS

Changes of Revision 13

ffmpeg2theora.spec Changed

@@ -26,15 +26,16 @@
 Source0:        http://v2v.cc/~j/ffmpeg2theora/%{name}-%{version}.tar.bz2
 Patch0:         ffmpeg2theora.sort.patch
 Patch1:         ffmpeg2theora.scons.patch
+Patch2:         ffmpeg2theora.deps.patch
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libavcodec) = 56.60.100
-BuildRequires:  pkgconfig(libavdevice) = 56.4.100
-BuildRequires:  pkgconfig(libavfilter) = 5.40.101
-BuildRequires:  pkgconfig(libavformat) = 56.40.101
-BuildRequires:  pkgconfig(libavutil) = 54.31.100
-BuildRequires:  pkgconfig(libpostproc) = 53.3.100
-BuildRequires:  pkgconfig(libswresample) = 1.2.101
-BuildRequires:  pkgconfig(libswscale) = 3.1.101
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavdevice)
+BuildRequires:  pkgconfig(libavfilter)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libpostproc)
+BuildRequires:  pkgconfig(libswresample)
+BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  libkate-devel
 BuildRequires:  libmp3lame-devel
@@ -46,9 +47,7 @@
 A simple converter to create Ogg Theora files.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
 
 %build
 
@@ -57,7 +56,7 @@
 	prefix=%{_prefix} \
 	mandir=%{_mandir} \
 	destdir=%{buildroot} \
-	APPEND_CCFLAGS="%{optflags} -Wno-unused-variable -Wno-unused-but-set-variable" \
+	APPEND_CCFLAGS="%{optflags} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-deprecated-declarations -Werror=implicit-function-declaration" \
 	APPEND_LINKFLAGS="-lm" \
 	install
 install -D -m 0644 ffmpeg2theora.1 %{buildroot}%{_mandir}/man1/ffmpeg2theora.1

ffmpeg2theora.deps.patch Added

@@ -0,0 +1,73 @@
+--- a/src/avinfo.c
++++ b/src/avinfo.c
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -42,8 +43,9 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ 
+-#include "libavformat/avformat.h"
+-#include "libavutil/pixdesc.h"
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavutil/pixdesc.h>
+ 
+ #ifndef WIN32
+ #if !defined(off64_t)
+--- a/src/ffmpeg2theora.c
++++ b/src/ffmpeg2theora.c
+@@ -26,18 +26,14 @@
+ #include <math.h>
+ #include <errno.h>
+ 
+-#include "libavformat/avformat.h"
+-#include "libavdevice/avdevice.h"
+-#ifdef HAVE_FRAMEHOOK
+-#include "libavformat/framehook.h"
+-#endif
+-#include "libswscale/swscale.h"
+-#include "libpostproc/postprocess.h"
++#include <libavdevice/avdevice.h>
++#include <libavfilter/buffersink.h>
++#include <libavfilter/buffersrc.h>
++#include <libpostproc/postprocess.h>
++#include <libswresample/swresample.h>
++#include <libswscale/swscale.h>
++
+ 
+-#include "libavutil/opt.h"
+-#include "libavutil/channel_layout.h"
+-#include "libavutil/samplefmt.h"
+-#include "libswresample_compat.h"
+ 
+ #include "theora/theoraenc.h"
+ #include "vorbis/codec.h"
+--- a/src/ffmpeg2theora.h
++++ b/src/ffmpeg2theora.h
+@@ -3,8 +3,8 @@
+ 
+ #include "subtitles.h"
+ #include <libavfilter/avfilter.h>
+-#include <libavfilter/buffersrc.h>
+-#include <libavfilter/buffersink.h>
++#include <libavformat/avformat.h>
++#include <libavutil/avutil.h>
+ 
+ typedef struct ff2theora_subtitle{
+     char *text;
+--- a/src/subtitles.c
++++ b/src/subtitles.c
+@@ -29,7 +29,6 @@
+ #include "iconv.h"
+ #endif
+ 
+-#include "libavformat/avformat.h"
+ 
+ #ifdef WIN32
+ #include "fcntl.h"