5:01 p.m.
Author: juran
Update of /cvs/free/rpms/transcode/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6911
Modified Files:
transcode-1.0.5-ffmpeg.patch transcode.spec
Log Message:
Back to ffmpeg and apply patch for new structure
transcode-1.0.5-ffmpeg.patch:
Index: transcode-1.0.5-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/transcode/F-8/transcode-1.0.5-ffmpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transcode-1.0.5-ffmpeg.patch 9 Aug 2008 09:35:26 -0000 1.1
+++ transcode-1.0.5-ffmpeg.patch 12 Aug 2008 17:01:23 -0000 1.2
@@ -1,11 +1,10 @@
-diff -up transcode-1.0.5/acinclude.m4.orig transcode-1.0.5/acinclude.m4
-diff -up transcode-1.0.5/configure.in.orig transcode-1.0.5/configure.in
---- transcode-1.0.5/configure.in.orig 2008-07-03 20:02:33.000000000 +0300
-+++ transcode-1.0.5/configure.in 2008-07-05 12:14:24.000000000 +0300
+diff -up transcode-1.0.4/configure.in.ffmpeg transcode-1.0.4/configure.in
+--- transcode-1.0.4/configure.in.ffmpeg 2008-08-12 19:53:21.000000000 +0300
++++ transcode-1.0.4/configure.in 2008-08-12 19:57:30.000000000 +0300
@@ -611,14 +611,14 @@ AC_ARG_ENABLE(libavcodec-static,
esac],
[enable_libavcodec_static=no])
- LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs
libavcodec)"
+ LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS -lm -lz $PTHREAD_LIBS"
-TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/avcodec.h],
- avcodec, avcodec_thread_init, FFMpeg, [http://www.ffmpeg.org/])
+TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/libavcodec/avcodec.h],
@@ -31,7 +30,7 @@
[echo $ac_n "cross compiling; assumed OK... $ac_c"
LIBAVCODEC_VERSION=""
LIBAVCODEC_BUILD=""])
-@@ -820,7 +820,7 @@ AM_CONDITIONAL(HAVE_IBP, test x"$have_ib
+@@ -792,7 +792,7 @@ AM_CONDITIONAL(HAVE_IBP, test x"$have_ib
dnl
dnl libpostproc
dnl
@@ -40,9 +39,21 @@
postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/])
TC_PKG_HAVE(libpostproc, LIBPOSTPROC)
-diff -up transcode-1.0.5/export/export_ffmpeg.c.orig
transcode-1.0.5/export/export_ffmpeg.c
---- transcode-1.0.5/export/export_ffmpeg.c.orig 2008-07-03 20:37:46.000000000 +0300
-+++ transcode-1.0.5/export/export_ffmpeg.c 2008-07-03 20:38:05.000000000 +0300
+diff -up transcode-1.0.4/export/aud_aux.c.ffmpeg transcode-1.0.4/export/aud_aux.c
+--- transcode-1.0.4/export/aud_aux.c.ffmpeg 2007-08-06 12:56:57.000000000 +0300
++++ transcode-1.0.4/export/aud_aux.c 2008-08-12 19:53:22.000000000 +0300
+@@ -31,7 +31,7 @@
+ #include <inttypes.h>
+ #include <assert.h>
+
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+
+ #include "aud_aux.h"
+ #include "ac3.h"
+diff -up transcode-1.0.4/export/export_ffmpeg.c.ffmpeg
transcode-1.0.4/export/export_ffmpeg.c
+--- transcode-1.0.4/export/export_ffmpeg.c.ffmpeg 2005-07-12 09:58:36.000000000 +0300
++++ transcode-1.0.4/export/export_ffmpeg.c 2008-08-12 19:53:22.000000000 +0300
@@ -36,7 +36,7 @@
#include "vid_aux.h"
// FIXME
@@ -52,9 +63,9 @@
#if !defined(INFINITY) && defined(HUGE_VAL)
#define INFINITY HUGE_VAL
-diff -up transcode-1.0.5/export/ffmpeg_cfg.h.orig transcode-1.0.5/export/ffmpeg_cfg.h
---- transcode-1.0.5/export/ffmpeg_cfg.h.orig 2008-07-03 20:37:00.000000000 +0300
-+++ transcode-1.0.5/export/ffmpeg_cfg.h 2008-07-03 20:37:20.000000000 +0300
+diff -up transcode-1.0.4/export/ffmpeg_cfg.h.ffmpeg transcode-1.0.4/export/ffmpeg_cfg.h
+--- transcode-1.0.4/export/ffmpeg_cfg.h.ffmpeg 2004-10-18 05:04:14.000000000 +0300
++++ transcode-1.0.4/export/ffmpeg_cfg.h 2008-08-12 19:53:22.000000000 +0300
@@ -2,7 +2,7 @@
#define __FFMPEG_CFG_H
@@ -64,9 +75,9 @@
//char *lavc_param_vcodec = "mpeg4";
//extern int lavc_param_vbitrate;
-diff -up transcode-1.0.5/filter/filter_resample.c.orig
transcode-1.0.5/filter/filter_resample.c
---- transcode-1.0.5/filter/filter_resample.c.orig 2008-07-03 20:38:33.000000000 +0300
-+++ transcode-1.0.5/filter/filter_resample.c 2008-07-03 20:38:50.000000000 +0300
+diff -up transcode-1.0.4/filter/filter_resample.c.ffmpeg
transcode-1.0.4/filter/filter_resample.c
+--- transcode-1.0.4/filter/filter_resample.c.ffmpeg 2005-07-04 10:23:01.000000000 +0300
++++ transcode-1.0.4/filter/filter_resample.c 2008-08-12 19:53:22.000000000 +0300
@@ -30,7 +30,7 @@
#include "filter.h"
#include "optstr.h"
@@ -76,9 +87,9 @@
static char * resample_buffer = NULL;
static int bytes_per_sample;
-diff -up transcode-1.0.5/filter/pp/filter_pp.c.orig
transcode-1.0.5/filter/pp/filter_pp.c
---- transcode-1.0.5/filter/pp/filter_pp.c.orig 2008-07-05 12:28:19.000000000 +0300
-+++ transcode-1.0.5/filter/pp/filter_pp.c 2008-07-05 12:28:48.000000000 +0300
+diff -up transcode-1.0.4/filter/pp/filter_pp.c.ffmpeg
transcode-1.0.4/filter/pp/filter_pp.c
+--- transcode-1.0.4/filter/pp/filter_pp.c.ffmpeg 2005-07-04 10:23:01.000000000 +0300
++++ transcode-1.0.4/filter/pp/filter_pp.c 2008-08-12 19:53:22.000000000 +0300
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <inttypes.h>
@@ -88,9 +99,9 @@
static pp_mode_t *mode[MAX_FILTER];
static pp_context_t *context[MAX_FILTER];
-diff -up transcode-1.0.5/import/decode_lavc.c.orig transcode-1.0.5/import/decode_lavc.c
---- transcode-1.0.5/import/decode_lavc.c.orig 2008-07-03 20:39:16.000000000 +0300
-+++ transcode-1.0.5/import/decode_lavc.c 2008-07-03 20:39:44.000000000 +0300
+diff -up transcode-1.0.4/import/decode_lavc.c.ffmpeg
transcode-1.0.4/import/decode_lavc.c
+--- transcode-1.0.4/import/decode_lavc.c.ffmpeg 2005-07-04 10:23:01.000000000 +0300
++++ transcode-1.0.4/import/decode_lavc.c 2008-08-12 19:53:22.000000000 +0300
@@ -31,7 +31,7 @@
#ifdef EMULATE_FAST_INT
#undef EMULATE_FAST_INT
@@ -100,9 +111,9 @@
#include "yuv2rgb.h"
#define READ_BUFFER_SIZE (10*1024*1024)
-diff -up transcode-1.0.5/import/import_ffmpeg.c.orig
transcode-1.0.5/import/import_ffmpeg.c
---- transcode-1.0.5/import/import_ffmpeg.c.orig 2008-07-03 20:40:05.000000000 +0300
-+++ transcode-1.0.5/import/import_ffmpeg.c 2008-07-03 20:40:25.000000000 +0300
+diff -up transcode-1.0.4/import/import_ffmpeg.c.ffmpeg
transcode-1.0.4/import/import_ffmpeg.c
+--- transcode-1.0.4/import/import_ffmpeg.c.ffmpeg 2007-08-07 14:30:57.000000000 +0300
++++ transcode-1.0.4/import/import_ffmpeg.c 2008-08-12 19:53:22.000000000 +0300
@@ -38,7 +38,7 @@ static int capability_flag = TC_CAP_YUV
// FIXME
@@ -112,10 +123,10 @@
#include "libvo/yuv2rgb.h"
#include "avilib/avilib.h"
-diff -up transcode-1.0.5/src/transcode.c.orig transcode-1.0.5/src/transcode.c
---- transcode-1.0.5/src/transcode.c.orig 2008-01-05 16:37:15.000000000 +0200
-+++ transcode-1.0.5/src/transcode.c 2008-07-03 20:41:27.000000000 +0300
-@@ -4609,7 +4609,7 @@ int main(int argc, char *argv[]) {
+diff -up transcode-1.0.4/src/transcode.c.ffmpeg transcode-1.0.4/src/transcode.c
+--- transcode-1.0.4/src/transcode.c.ffmpeg 2007-07-30 23:01:19.000000000 +0300
++++ transcode-1.0.4/src/transcode.c 2008-08-12 19:53:22.000000000 +0300
+@@ -4617,7 +4617,7 @@ int main(int argc, char *argv[]) {
// unneeded object files from a .a file.
#if 0
@@ -124,15 +135,3 @@
void dummy_avcodec(void) {
AVCodecContext *ctx = NULL;
-diff -up transcode-1.0.5/export/aud_aux.c.orig transcode-1.0.5/export/aud_aux.c
---- transcode-1.0.5/export/aud_aux.c.orig 2008-07-05 23:14:48.000000000 +0300
-+++ transcode-1.0.5/export/aud_aux.c 2008-07-05 23:15:33.000000000 +0300
-@@ -31,7 +31,7 @@
- #include <inttypes.h>
- #include <assert.h>
-
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
- #include "aud_aux.h"
- #include "ac3.h"
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-8/transcode.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- transcode.spec 10 Aug 2008 17:03:12 -0000 1.4
+++ transcode.spec 12 Aug 2008 17:01:23 -0000 1.5
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.0.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -19,6 +19,7 @@
Patch3: transcode-1.0.4.external_dv.patch
Patch4: transcode-1.0.4.dep-cleanup.patch
Patch5: transcode-1.0.4-shared_libmpeg3.patch
+Patch6: transcode-1.0.5-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel
@@ -34,7 +35,7 @@
BuildRequires: libquicktime-devel >= 0.9.8
BuildRequires: lame-devel >= 3.89
BuildRequires: SDL-devel >= 1.1.6
-BuildRequires: ffmpeg-compat-devel >= 0.4.9
+BuildRequires: ffmpeg-devel >= 0.4.9
BuildRequires: mpeg2dec-devel >= 0.4.0-0.lvn.3.b
BuildRequires: pvm
BuildRequires: libtheora-devel
@@ -73,7 +74,7 @@
rm filter/preview/dv_types.h
%patch4 -p1 -b .dep-cleanup
%patch5 -p1 -b .shared-libmpeg3
-
+%patch6 -p1 -b .ffmpeg
%build
autoreconf # for patch2, and fixes standard rpaths on lib64 archs
@@ -131,6 +132,9 @@
%changelog
+* Tue Aug 12 2008 David Juran <david(a)juran.se> - 1.0.4-8
+- Back to ffmpeg and apply patch for new structure
+
* Sun Aug 10 2008 David Juran <david(a)juran.se> - 1.0.4-7
- exchange ffmpeg for ffmpeg-compat