[svn] r5053 - in trunk/rpms: faad2 libquicktime mjpegtools
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Jan 8 19:45:00 CET 2007
Author: thias
Date: 2007-01-08 19:44:59 +0100 (Mon, 08 Jan 2007)
New Revision: 5053
Added:
trunk/rpms/faad2/faad2-2.5-faacDec.patch
trunk/rpms/libquicktime/libquicktime-0.9.10-faad2.patch
Modified:
trunk/rpms/libquicktime/libquicktime.spec
trunk/rpms/mjpegtools/mjpegtools.spec
Log:
Minor fixes.
Added: trunk/rpms/faad2/faad2-2.5-faacDec.patch
===================================================================
--- trunk/rpms/faad2/faad2-2.5-faacDec.patch (rev 0)
+++ trunk/rpms/faad2/faad2-2.5-faacDec.patch 2007-01-08 18:44:59 UTC (rev 5053)
@@ -0,0 +1,32 @@
+diff -Naupr faad2.orig/include/neaacdec.h faad2/include/neaacdec.h
+--- faad2.orig/include/neaacdec.h 2006-08-13 16:13:31.000000000 +0200
++++ faad2/include/neaacdec.h 2007-01-08 18:12:11.000000000 +0100
+@@ -38,28 +38,6 @@ extern "C" {
+ #endif /* __cplusplus */
+
+
+-#if 1
+-/* MACROS FOR BACKWARDS COMPATIBILITY */
+-/* structs */
+-#define faacDecHandle NeAACDecHandle
+-#define faacDecConfiguration NeAACDecConfiguration
+-#define faacDecConfigurationPtr NeAACDecConfigurationPtr
+-#define faacDecFrameInfo NeAACDecFrameInfo
+-/* functions */
+-#define faacDecGetErrorMessage NeAACDecGetErrorMessage
+-#define faacDecSetConfiguration NeAACDecSetConfiguration
+-#define faacDecGetCurrentConfiguration NeAACDecGetCurrentConfiguration
+-#define faacDecInit NeAACDecInit
+-#define faacDecInit2 NeAACDecInit2
+-#define faacDecInitDRM NeAACDecInitDRM
+-#define faacDecPostSeekReset NeAACDecPostSeekReset
+-#define faacDecOpen NeAACDecOpen
+-#define faacDecClose NeAACDecClose
+-#define faacDecDecode NeAACDecDecode
+-#define AudioSpecificConfig NeAACDecAudioSpecificConfig
+-#endif
+-
+-
+ #ifdef _WIN32
+ #pragma pack(push, 8)
+ #ifndef NEAACDECAPI
Added: trunk/rpms/libquicktime/libquicktime-0.9.10-faad2.patch
===================================================================
--- trunk/rpms/libquicktime/libquicktime-0.9.10-faad2.patch (rev 0)
+++ trunk/rpms/libquicktime/libquicktime-0.9.10-faad2.patch 2007-01-08 18:44:59 UTC (rev 5053)
@@ -0,0 +1,117 @@
+diff -Naupr libquicktime-0.9.10.orig/configure libquicktime-0.9.10/configure
+--- libquicktime-0.9.10.orig/configure 2006-08-03 01:02:25.000000000 +0200
++++ libquicktime-0.9.10/configure 2006-08-03 01:02:25.000000000 +0200
+@@ -26188,11 +26188,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ {
+ int faad_major;
+ int faad_minor;
+- faacDecHandle dec;
++ NeAACDecHandle dec;
+
+ if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
+ return -1;
+- dec = faacDecOpen();
++ dec = NeAACDecOpen();
+ if(!dec)
+ return -1;
+ return 0;
+diff -Naupr libquicktime-0.9.10.orig/configure.ac libquicktime-0.9.10/configure.ac
+--- libquicktime-0.9.10.orig/configure.ac 2006-08-03 00:53:54.000000000 +0200
++++ libquicktime-0.9.10/configure.ac 2006-08-03 00:53:54.000000000 +0200
+@@ -479,11 +479,11 @@ LIBS="$LIBS -lfaad -lm"
+ {
+ int faad_major;
+ int faad_minor;
+- faacDecHandle dec;
++ NeAACDecHandle dec;
+
+ if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
+ return -1;
+- dec = faacDecOpen();
++ dec = NeAACDecOpen();
+ if(!dec)
+ return -1;
+ return 0;
+diff -Naupr libquicktime-0.9.10.orig/plugins/faad2/faad2.c libquicktime-0.9.10/plugins/faad2/faad2.c
+--- libquicktime-0.9.10.orig/plugins/faad2/faad2.c 2006-07-30 14:06:06.000000000 +0200
++++ libquicktime-0.9.10/plugins/faad2/faad2.c 2007-01-08 18:03:30.000000000 +0100
+@@ -28,7 +28,7 @@
+
+ typedef struct
+ {
+- faacDecHandle dec;
++ NeAACDecHandle dec;
+
+ /* Start and end positions of the sample buffer */
+
+@@ -50,7 +50,7 @@ static int delete_codec(quicktime_audio_
+ quicktime_faad2_codec_t *codec = ((quicktime_codec_t*)atrack->codec)->priv;
+
+ if(codec->dec)
+- faacDecClose(codec->dec);
++ NeAACDecClose(codec->dec);
+
+ if(codec->sample_buffer)
+ free(codec->sample_buffer);
+@@ -99,7 +99,7 @@ static int decode_chunk(quicktime_t *fil
+ {
+ int i, j, num_packets, num_samples, packet_size;
+ float * samples;
+- faacDecFrameInfo frame_info;
++ NeAACDecFrameInfo frame_info;
+
+ quicktime_audio_map_t *track_map = &(file->atracks[track]);
+
+@@ -137,12 +137,12 @@ static int decode_chunk(quicktime_t *fil
+ track_map->current_chunk, i, packet_size, num_samples);
+ #endif
+
+- samples = faacDecDecode(codec->dec, &frame_info,
++ samples = NeAACDecDecode(codec->dec, &frame_info,
+ codec->data, packet_size);
+ if(!samples)
+ {
+- fprintf(stderr, "faad2: faacDecDecode failed %s\n",
+- faacDecGetErrorMessage(frame_info.error));
++ fprintf(stderr, "faad2: NeAACDecDecode failed %s\n",
++ NeAACDecGetErrorMessage(frame_info.error));
+
+ return 0;
+ }
+@@ -320,7 +320,7 @@ void quicktime_init_codec_faad2(quicktim
+ unsigned long samplerate;
+ unsigned char channels;
+
+- faacDecConfigurationPtr cfg;
++ NeAACDecConfigurationPtr cfg;
+
+ quicktime_codec_t *codec_base = (quicktime_codec_t*)atrack->codec;
+ quicktime_faad2_codec_t *codec;
+@@ -339,7 +339,7 @@ void quicktime_init_codec_faad2(quicktim
+ decode() call, but in this case, we might need to
+ set the correct samplerate, which should be known before */
+
+- codec->dec = faacDecOpen();
++ codec->dec = NeAACDecOpen();
+
+ stsd = &(atrack->track->mdia.minf.stbl.stsd);
+
+@@ -360,15 +360,15 @@ void quicktime_init_codec_faad2(quicktim
+ fprintf(stderr, "No extradata found, decoding is doomed to failure\n");
+ }
+
+- cfg = faacDecGetCurrentConfiguration(codec->dec);
++ cfg = NeAACDecGetCurrentConfiguration(codec->dec);
+ cfg->outputFormat = FAAD_FMT_FLOAT;
+
+- faacDecSetConfiguration(codec->dec, cfg);
++ NeAACDecSetConfiguration(codec->dec, cfg);
+
+ // fprintf(stderr, "faad2 init\n");
+ // lqt_hexdump(extradata, extradata_size, 16);
+
+- faacDecInit2(codec->dec, extradata, extradata_size,
++ NeAACDecInit2(codec->dec, extradata, extradata_size,
+ &samplerate, &channels);
+
+ if(atrack->samplerate != samplerate)
Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec 2007-01-08 18:31:20 UTC (rev 5052)
+++ trunk/rpms/libquicktime/libquicktime.spec 2007-01-08 18:44:59 UTC (rev 5053)
@@ -24,27 +24,31 @@
Summary: Library for reading and writing quicktime files
Name: libquicktime
Version: 0.9.10
-Release: 2%{?prever:.%{prever}}
+Release: 3%{?prever:.%{prever}}
License: GPL
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source: http://dl.sf.net/libquicktime/libquicktime-%{version}%{?prever}.tar.gz
Patch0: libquicktime-0.9.8-plugin_dir.patch
Patch1: libquicktime-0.9.10-x264.patch
+Patch2: libquicktime-0.9.10-faad2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gtk2-devel, libdv-devel, libvorbis-devel, lame-devel
BuildRequires: libpng-devel >= 1.0.8, libjpeg-devel, gcc-c++
%{?!_without_1394:BuildRequires: libraw1394-devel, libavc1394-devel}
%{?!_without_alsa:BuildRequires: alsa-lib-devel}
%{?!_without_ffmpeg:BuildRequires: ffmpeg-devel}
-%{?_with_modxorg:BuildRequires: libXt-devel, mesa-libGLU-devel, libXaw-devel, libXv-devel}
+%{?!_without_faac:BuildRequires: faac-devel}
+%{?!_without_faad2:BuildRequires: faad2-devel}
+%{?!_without_x264:BuildRequires: x264-devel}
+%{?_with_modxorg:BuildRequires: libXt-devel, libGLU-devel, libXaw-devel, libXv-devel}
# A bug, the devel libs don't require the main ones :-(
%{?yd3:BuildRequires: libraw1394, libavc1394}
# The configure automatically adds MMX stuff if detected, so x86 becomes i586
-%ifarch %{ix86}
+#ifarch %{ix86}
#BuildArch: i586
-%endif
+#endif
%description
Libquicktime is a library for reading and writing QuickTime files
@@ -74,6 +78,7 @@
%setup -n %{name}-%{version}%{?prever}
%patch0 -p1 -b .plugin_dir
%patch1 -p1 -b .x264
+%patch2 -p1 -b .faad2
%build
@@ -125,6 +130,10 @@
%changelog
+* Mon Jan 8 2007 Matthias Saou <http://freshrpms.net/> 0.9.10-3
+- Include patch to fix runtime against latest faad2.
+- Add explicit faac, faad2, x264 buildreqs (ffmpeg was pulling them in anyway).
+
* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.9.10-2
- Include patch to rebuild against latest x264.
Modified: trunk/rpms/mjpegtools/mjpegtools.spec
===================================================================
--- trunk/rpms/mjpegtools/mjpegtools.spec 2007-01-08 18:31:20 UTC (rev 5052)
+++ trunk/rpms/mjpegtools/mjpegtools.spec 2007-01-08 18:44:59 UTC (rev 5053)
@@ -3,9 +3,6 @@
# Upstream: Gernot Ziegler <gz$lysator,liu,se>
# Upstream: <mjpeg-developer$lists,sourceforge,net>
-##Archs: i686 x86_64 ppc
-##Archs: i686
-
%{?dist: %{expand: %%define %dist 1}}
%{?fedora: %{expand: %%define fc%{fedora} 1}}
More information about the svn-commits
mailing list