Packman Build Service PMBS

ffmpeg2theora.changes Changed

ffmpeg2theora.spec Changed

@@ -1,46 +1,54 @@
-# norootforbuild
-
-BuildRequires: libffmpeg-devel
-BuildRequires: libtheora-devel libmp3lame-devel
-BuildRequires: libkate-devel scons
-
-Name:         ffmpeg2theora
-License:      GNU General Public License (GPL)
-Group:        Productivity/Multimedia/Other
-Version:      0.29
-Release:      1
-Summary:      A simple converter to create Ogg Theora files
-URL:          http://v2v.cc/~j/ffmpeg2theora/index.html
-Source0:      http://v2v.cc/~j/ffmpeg2theora/%{name}-%{version}.tar.bz2
-Patch0:       ffmpeg2theora-fix-include-path.patch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+#
+# spec file for package ffmpeg2theora
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           ffmpeg2theora
+Version:        0.29
+Release:        0
+License:        GPL-2.0+
+Summary:        A simple converter to create Ogg Theora files
+Url:            http://v2v.cc/~j/ffmpeg2theora/index.html
+Group:          Productivity/Multimedia/Other
+Source:        http://v2v.cc/~j/ffmpeg2theora/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM marugerite@opensuse.org - port ffmpeg to 2.0
+Patch:		ffmpeg2theora-ffmpeg-2.0.patch
+# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix implicit declarations
+Patch1:		ffmpeg2theora-implicit-declaration.patch
+BuildRequires:	libffmpeg-devel
+BuildRequires:	libkate-devel
+BuildRequires:	libmp3lame-devel
+BuildRequires:	libtheora-devel
+BuildRequires:	scons
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A simple converter to create Ogg Theora files.
 
-
-
-
-Authors:
---------
-    Jan Gerber <j@v2v.cc>
-
-
-
 %prep
 %setup -q
-# Patch0:       ffmpeg2theora-fix-include-path.patch
-%patch0 -p1
+%patch -p1
+%patch1 -p1
 
 %build
 scons prefix=%{_prefix} APPEND_CCFLAGS="%{optflags}" APPEND_LINKFLAGS="-lm"
 
 %install
 scons prefix=%{_prefix} mandir=%{_mandir} destdir=%{buildroot} APPEND_CCFLAGS="%{optflags}" APPEND_LINKFLAGS="-lm" install
-%__install -D -m 0644 ffmpeg2theora.1 %{buildroot}%{_mandir}/man1/ffmpeg2theora.1
-
-%clean
- "%{buildroot}" != "/"  && %{__rm} -rf %{buildroot}
+install -D -m 0644 ffmpeg2theora.1 %{buildroot}%{_mandir}/man1/ffmpeg2theora.1
 
 %files
 %defattr(-,root,root)

ffmpeg2theora-ffmpeg-2.0.patch Added

@@ -0,0 +1,58 @@
+Index: ffmpeg2theora-0.29/src/ffmpeg2theora.c
+===================================================================
+--- ffmpeg2theora-0.29.orig/src/ffmpeg2theora.c
++++ ffmpeg2theora-0.29/src/ffmpeg2theora.c
+@@ -24,18 +24,19 @@
+ #include <getopt.h>
+ #include <math.h>
+ #include <errno.h>
++#include <ctype.h>
+ 
+-#include "libavformat/avformat.h"
+-#include "libavdevice/avdevice.h"
++#include <libavformat/avformat.h>
++#include <libavdevice/avdevice.h>
+ #ifdef HAVE_FRAMEHOOK
+-#include "libavformat/framehook.h"
++#include <libavformat/framehook.h>
+ #endif
+-#include "libswscale/swscale.h"
+-#include "libpostproc/postprocess.h"
++#include <libswscale/swscale.h>
++#include <libpostproc/postprocess.h>
+ 
+-#include "theora/theoraenc.h"
+-#include "vorbis/codec.h"
+-#include "vorbis/vorbisenc.h"
++#include <theora/theoraenc.h>
++#include <vorbis/codec.h>
++#include <vorbis/vorbisenc.h>
+ 
+ #ifdef WIN32
+ #include "fcntl.h"
+@@ -48,6 +49,7 @@
+ #include "avinfo.h"
+ 
+ #define LENGTH(x) (sizeof(x) / sizeof(*x))
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 19200 // 1 second of 48khz 32bit audio
+ 
+ enum {
+     NULL_FLAG,
+@@ -1424,7 +1426,7 @@ void ff2theora_output(ff2theora this) {
+ 
+                             if (venc_pix_fmt != this->pix_fmt) {
+                                 sws_scale(this->sws_colorspace_ctx,
+-                                frame->data, frame->linesize, 0, display_height,
++                                (const uint8_t * const*)frame->data, frame->linesize, 0, display_height,
+                                 output_tmp->data, output_tmp->linesize);
+                             }
+                             else{
+@@ -1468,7 +1470,7 @@ void ff2theora_output(ff2theora this) {
+                             }
+                             if (this->sws_scale_ctx) {
+                                 sws_scale(this->sws_scale_ctx,
+-                                    output_cropped->data,
++                                    (const uint8_t * const*)output_cropped->data,
+                                     output_cropped->linesize, 0,
+                                     display_height - (this->frame_topBand + this->frame_bottomBand),
+                                     output_resized->data,

ffmpeg2theora-fix-include-path.patch Deleted

ffmpeg2theora-implicit-declaration.patch Added

Changes of Revision 7