[svn] r5078 - in trunk/rpms: ati-x11-drv cinelerra
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Jan 15 19:05:12 CET 2007
Author: thias
Date: 2007-01-15 19:05:11 +0100 (Mon, 15 Jan 2007)
New Revision: 5078
Added:
trunk/rpms/cinelerra/cinelerra-2.1-faad2.patch
Modified:
trunk/rpms/ati-x11-drv/ati-x11-drv.spec
trunk/rpms/cinelerra/cinelerra.spec
Log:
Update ATI driver and update cinelerra with faad2 patch.
Modified: trunk/rpms/ati-x11-drv/ati-x11-drv.spec
===================================================================
--- trunk/rpms/ati-x11-drv/ati-x11-drv.spec 2007-01-15 17:58:21 UTC (rev 5077)
+++ trunk/rpms/ati-x11-drv/ati-x11-drv.spec 2007-01-15 18:05:11 UTC (rev 5078)
@@ -17,7 +17,7 @@
Summary: Proprietary ATI hardware accelerated OpenGL display driver
Name: ati-x11-drv
-Version: 8.32.5
+Version: 8.33.6
Release: 1
License: Proprietary
Group: User Interface/X Hardware Support
@@ -287,6 +287,9 @@
%changelog
+* Thu Jan 11 2007 Matthias Saou <http://freshrpms.net/> 8.33.6-1
+- Update to 8.33.6.
+
* Thu Dec 14 2006 Matthias Saou <http://freshrpms.net/> 8.32.5-1
- Update to 8.32.5.
Added: trunk/rpms/cinelerra/cinelerra-2.1-faad2.patch
===================================================================
--- trunk/rpms/cinelerra/cinelerra-2.1-faad2.patch (rev 0)
+++ trunk/rpms/cinelerra/cinelerra-2.1-faad2.patch 2007-01-15 18:05:11 UTC (rev 5078)
@@ -0,0 +1,278 @@
+diff -Naupr cinelerra-2.1.orig/quicktime/ffmpeg/libavcodec/faad.c cinelerra-2.1/quicktime/ffmpeg/libavcodec/faad.c
+--- cinelerra-2.1.orig/quicktime/ffmpeg/libavcodec/faad.c 2005-09-28 20:39:56.000000000 +0200
++++ cinelerra-2.1/quicktime/ffmpeg/libavcodec/faad.c 2007-01-09 14:46:42.000000000 +0100
+@@ -54,42 +54,42 @@ typedef struct {
+ int flags;
+
+ /* faad calls */
+- faacDecHandle FAADAPI (*faacDecOpen)(void);
+- faacDecConfigurationPtr FAADAPI (*faacDecGetCurrentConfiguration)(faacDecHandle hDecoder);
++ NeAACDecHandle FAADAPI (*NeAACDecOpen)(void);
++ NeAACDecConfigurationPtr FAADAPI (*NeAACDecGetCurrentConfiguration)(NeAACDecHandle hDecoder);
+ #ifndef FAAD2_VERSION
+- int FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
+- faacDecConfigurationPtr config);
+- int FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
++ int FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder,
++ NeAACDecConfigurationPtr config);
++ int FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder,
+ unsigned char *buffer,
+ unsigned long *samplerate,
+ unsigned long *channels);
+- int FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer,
++ int FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer,
+ unsigned long SizeOfDecoderSpecificInfo,
+ unsigned long *samplerate, unsigned long *channels);
+- int FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
++ int FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder,
+ unsigned char *buffer,
+ unsigned long *bytesconsumed,
+ short *sample_buffer,
+ unsigned long *samples);
+ #else
+- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
+- faacDecConfigurationPtr config);
+- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
++ unsigned char FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder,
++ NeAACDecConfigurationPtr config);
++ long FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder,
+ unsigned char *buffer,
+ unsigned long buffer_size,
+ unsigned long *samplerate,
+ unsigned char *channels);
+- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char *pBuffer,
++ char FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char *pBuffer,
+ unsigned long SizeOfDecoderSpecificInfo,
+ unsigned long *samplerate, unsigned char *channels);
+- void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
+- faacDecFrameInfo *hInfo,
++ void *FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder,
++ NeAACDecFrameInfo *hInfo,
+ unsigned char *buffer,
+ unsigned long buffer_size);
+- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode);
++ char* FAADAPI (*NeAACDecGetErrorMessage)(unsigned char errcode);
+ #endif
+
+- void FAADAPI (*faacDecClose)(faacDecHandle hDecoder);
++ void FAADAPI (*NeAACDecClose)(NeAACDecHandle hDecoder);
+
+
+ } FAACContext;
+@@ -112,13 +112,13 @@ static int faac_init_mp4(AVCodecContext
+ int r = 0;
+
+ if (avctx->extradata)
+- r = s->faacDecInit2(s->faac_handle, (uint8_t*) avctx->extradata,
++ r = s->NeAACDecInit2(s->faac_handle, (uint8_t*) avctx->extradata,
+ avctx->extradata_size,
+ &samplerate, &channels);
+- // else r = s->faacDecInit(s->faac_handle ... );
++ // else r = s->NeAACDecInit(s->faac_handle ... );
+
+ if (r < 0)
+- av_log(avctx, AV_LOG_ERROR, "faacDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n",
++ av_log(avctx, AV_LOG_ERROR, "NeAACDecInit2 failed r:%d sr:%ld ch:%ld s:%d\n",
+ r, samplerate, (long)channels, avctx->extradata_size);
+ avctx->sample_rate = samplerate;
+ avctx->channels = channels;
+@@ -137,13 +137,13 @@ static int faac_decode_frame(AVCodecCont
+ unsigned long samples;
+ int out;
+ #else
+- faacDecFrameInfo frame_info;
++ NeAACDecFrameInfo frame_info;
+ void *out;
+ #endif
+ if(buf_size == 0)
+ return 0;
+ #ifndef FAAD2_VERSION
+- out = s->faacDecDecode(s->faac_handle,
++ out = s->NeAACDecDecode(s->faac_handle,
+ (unsigned char*)buf,
+ &bytesconsumed,
+ data,
+@@ -155,11 +155,11 @@ static int faac_decode_frame(AVCodecCont
+ ? buf_size : (int)bytesconsumed;
+ #else
+
+- out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size);
++ out = s->NeAACDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size);
+
+ if (frame_info.error > 0) {
+ av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n",
+- s->faacDecGetErrorMessage(frame_info.error));
++ s->NeAACDecGetErrorMessage(frame_info.error));
+ return 0;
+ }
+
+@@ -178,8 +178,8 @@ static int faac_decode_end(AVCodecContex
+ {
+ FAACContext *s = (FAACContext *) avctx->priv_data;
+
+- if (s->faacDecClose)
+- s->faacDecClose(s->faac_handle);
++ if (s->NeAACDecClose)
++ s->NeAACDecClose(s->faac_handle);
+
+ dlclose(s->handle);
+ return 0;
+@@ -188,7 +188,7 @@ static int faac_decode_end(AVCodecContex
+ static int faac_decode_init(AVCodecContext *avctx)
+ {
+ FAACContext *s = (FAACContext *) avctx->priv_data;
+- faacDecConfigurationPtr faac_cfg;
++ NeAACDecConfigurationPtr faac_cfg;
+
+ #ifdef CONFIG_FAADBIN
+ const char* err = 0;
+@@ -201,38 +201,38 @@ static int faac_decode_init(AVCodecConte
+ return -1;
+ }
+ #define dfaac(a, b) \
+- do { static const char* n = "faacDec" #a; \
+- if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
++ do { static const char* n = "NeAACDec" #a; \
++ if ((s->NeAACDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
+ for(;;) {
+ #else /* !CONFIG_FAADBIN */
+-#define dfaac(a, b) s->faacDec ## a = faacDec ## a
++#define dfaac(a, b) s->NeAACDec ## a = NeAACDec ## a
+ #endif /* CONFIG_FAADBIN */
+
+ // resolve all needed function calls
+- dfaac(Open, (faacDecHandle FAADAPI (*)(void)));
+- dfaac(GetCurrentConfiguration, (faacDecConfigurationPtr
+- FAADAPI (*)(faacDecHandle)));
++ dfaac(Open, (NeAACDecHandle FAADAPI (*)(void)));
++ dfaac(GetCurrentConfiguration, (NeAACDecConfigurationPtr
++ FAADAPI (*)(NeAACDecHandle)));
+ #ifndef FAAD2_VERSION
+- dfaac(SetConfiguration, (int FAADAPI (*)(faacDecHandle,
+- faacDecConfigurationPtr)));
++ dfaac(SetConfiguration, (int FAADAPI (*)(NeAACDecHandle,
++ NeAACDecConfigurationPtr)));
+
+- dfaac(Init, (int FAADAPI (*)(faacDecHandle, unsigned char*,
++ dfaac(Init, (int FAADAPI (*)(NeAACDecHandle, unsigned char*,
+ unsigned long*, unsigned long*)));
+- dfaac(Init2, (int FAADAPI (*)(faacDecHandle, unsigned char*,
++ dfaac(Init2, (int FAADAPI (*)(NeAACDecHandle, unsigned char*,
+ unsigned long, unsigned long*,
+ unsigned long*)));
+- dfaac(Close, (void FAADAPI (*)(faacDecHandle hDecoder)));
+- dfaac(Decode, (int FAADAPI (*)(faacDecHandle, unsigned char*,
++ dfaac(Close, (void FAADAPI (*)(NeAACDecHandle hDecoder)));
++ dfaac(Decode, (int FAADAPI (*)(NeAACDecHandle, unsigned char*,
+ unsigned long*, short*, unsigned long*)));
+ #else
+- dfaac(SetConfiguration, (unsigned char FAADAPI (*)(faacDecHandle,
+- faacDecConfigurationPtr)));
+- dfaac(Init, (long FAADAPI (*)(faacDecHandle, unsigned char*,
++ dfaac(SetConfiguration, (unsigned char FAADAPI (*)(NeAACDecHandle,
++ NeAACDecConfigurationPtr)));
++ dfaac(Init, (long FAADAPI (*)(NeAACDecHandle, unsigned char*,
+ unsigned long, unsigned long*, unsigned char*)));
+- dfaac(Init2, (char FAADAPI (*)(faacDecHandle, unsigned char*,
++ dfaac(Init2, (char FAADAPI (*)(NeAACDecHandle, unsigned char*,
+ unsigned long, unsigned long*,
+ unsigned char*)));
+- dfaac(Decode, (void *FAADAPI (*)(faacDecHandle, faacDecFrameInfo*,
++ dfaac(Decode, (void *FAADAPI (*)(NeAACDecHandle, NeAACDecFrameInfo*,
+ unsigned char*, unsigned long)));
+ dfaac(GetErrorMessage, (char* FAADAPI (*)(unsigned char)));
+ #endif
+@@ -249,7 +249,7 @@ static int faac_decode_init(AVCodecConte
+ }
+ #endif
+
+- s->faac_handle = s->faacDecOpen();
++ s->faac_handle = s->NeAACDecOpen();
+ if (!s->faac_handle) {
+ av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot create handler!\n");
+ faac_decode_end(avctx);
+@@ -257,7 +257,7 @@ static int faac_decode_init(AVCodecConte
+ }
+
+
+- faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle);
++ faac_cfg = s->NeAACDecGetCurrentConfiguration(s->faac_handle);
+
+ if (faac_cfg) {
+ switch (avctx->bits_per_sample) {
+@@ -287,7 +287,7 @@ static int faac_decode_init(AVCodecConte
+ faac_cfg->defObjectType = LC;
+ }
+
+- s->faacDecSetConfiguration(s->faac_handle, faac_cfg);
++ s->NeAACDecSetConfiguration(s->faac_handle, faac_cfg);
+
+ faac_init_mp4(avctx);
+
+diff -Naupr cinelerra-2.1.orig/quicktime/mp4a.c cinelerra-2.1/quicktime/mp4a.c
+--- cinelerra-2.1.orig/quicktime/mp4a.c 2006-08-31 22:25:39.000000000 +0200
++++ cinelerra-2.1/quicktime/mp4a.c 2007-01-09 14:46:00.000000000 +0100
+@@ -23,9 +23,9 @@
+ typedef struct
+ {
+ // Decoder objects
+- faacDecHandle decoder_handle;
+- faacDecFrameInfo frame_info;
+- faacDecConfigurationPtr decoder_config;
++ NeAACDecHandle decoder_handle;
++ NeAACDecFrameInfo frame_info;
++ NeAACDecConfigurationPtr decoder_config;
+ int decoder_initialized;
+
+
+@@ -58,7 +58,7 @@ static int delete_codec(quicktime_audio_
+
+ if(codec->decoder_initialized)
+ {
+- faacDecClose(codec->decoder_handle);
++ NeAACDecClose(codec->decoder_handle);
+ }
+
+ if(codec->encoder_initialized)
+@@ -93,17 +93,17 @@ static int decode(quicktime_t *file,
+ // FAAD needs unsigned char here
+ unsigned char channels = track_map->channels;
+ quicktime_init_vbr(vbr, channels);
+- codec->decoder_handle = faacDecOpen();
+- codec->decoder_config = faacDecGetCurrentConfiguration(codec->decoder_handle);
++ codec->decoder_handle = NeAACDecOpen();
++ codec->decoder_config = NeAACDecGetCurrentConfiguration(codec->decoder_handle);
+ codec->decoder_config->outputFormat = FAAD_FMT_FLOAT;
+ // codec->decoder_config->defSampleRate =
+ // trak->mdia.minf.stbl.stsd.table[0].sample_rate;
+
+- faacDecSetConfiguration(codec->decoder_handle, codec->decoder_config);
++ NeAACDecSetConfiguration(codec->decoder_handle, codec->decoder_config);
+
+ quicktime_align_vbr(track_map, samples);
+ quicktime_read_vbr(file, track_map);
+- if(faacDecInit(codec->decoder_handle,
++ if(NeAACDecInit(codec->decoder_handle,
+ quicktime_vbr_input(vbr),
+ quicktime_vbr_input_size(vbr),
+ &samplerate,
+@@ -136,8 +136,8 @@ static int decode(quicktime_t *file,
+
+ if(quicktime_read_vbr(file, track_map)) break;
+
+- bzero(&codec->frame_info, sizeof(faacDecFrameInfo));
+- float *sample_buffer = faacDecDecode(codec->decoder_handle,
++ bzero(&codec->frame_info, sizeof(NeAACDecFrameInfo));
++ float *sample_buffer = NeAACDecDecode(codec->decoder_handle,
+ &codec->frame_info,
+ quicktime_vbr_input(vbr),
+ quicktime_vbr_input_size(vbr));
+@@ -145,7 +145,7 @@ static int decode(quicktime_t *file,
+ if (codec->frame_info.error > 0)
+ {
+ // printf("decode mp4a: %s\n",
+-// faacDecGetErrorMessage(codec->frame_info.error));
++// NeAACDecGetErrorMessage(codec->frame_info.error));
+ }
+
+ /*
Modified: trunk/rpms/cinelerra/cinelerra.spec
===================================================================
--- trunk/rpms/cinelerra/cinelerra.spec 2007-01-15 17:58:21 UTC (rev 5077)
+++ trunk/rpms/cinelerra/cinelerra.spec 2007-01-15 18:05:11 UTC (rev 5078)
@@ -8,12 +8,12 @@
%{?fc6:%define _with_modxorg 1}
%{?fc5:%define _with_modxorg 1}
-%define prever 20061024
+%define prever 20070108
Summary: Advanced audio and video capturing, compositing, and editing
Name: cinelerra
Version: 2.1
-Release: 0.10%{?prever:.%{prever}}
+Release: 0.12%{?prever:.%{prever}}
License: GPL
Group: Applications/Multimedia
URL: http://cvs.cinelerra.org/
@@ -24,6 +24,7 @@
# mv cinelerra-2.1.tar.gz cinelerra-2.1-svn20060918.tar.gz
Source0: cinelerra-%{version}%{?prever:-svn%{prever}}.tar.gz
Source1: cinelerra-64x64.png
+Patch0: cinelerra-2.1-faad2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%{?_with_modxorg:BuildRequires: libXt-devel, libXv-devel, libXxf86vm-devel, libXext-devel}
%{!?_with_modxorg:BuildRequires: xorg-x11-devel}
@@ -45,15 +46,17 @@
BuildRequires: libavc1394-devel >= 0.5.0
BuildRequires: x264-devel
BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel
+# This seems to actually require OpenGL 2.0 (NVidia proprietary only?)
%{?_with_opengl:BuildRequires: libGL-devel, libGLU-devel}
# Stuff not checked by configure, but still required
BuildRequires: nasm
BuildRequires: libtool
BuildRequires: freetype-devel
-# Included ffmpeg snapshot requires this
-BuildRequires: faac-devel
+# Included ffmpeg snapshot requires this - No longer needed with shared ffmpeg
+#BuildRequires: faac-devel
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel
BuildRequires: libdv-devel
+Buildrequires: ffmpeg-devel
BuildRequires: gcc-c++
%description
@@ -62,6 +65,7 @@
%prep
%setup
+%patch0 -p1 -b .faad2
# Add category "AudioVideo", as it ends up in "Others" otherwise
# Replace the ugly small xpm icon with a nicer png one
%{__perl} -pi -e 's|^(Categories=.*)|$1AudioVideo;|g;
@@ -71,6 +75,7 @@
%build
%configure \
--with-plugindir=%{_libdir}/cinelerra \
+ --with-external-ffmpeg \
%ifarch %{ix86} x86_64
--enable-mmx \
%endif
@@ -119,6 +124,13 @@
%changelog
+* Mon Jan 8 2007 Matthias Saou <http://freshrpms.net/> 2.0-0.12.20070108
+- Update to today's SVN code.
+- Include faad2 patch.
+- Try to enable OpenGL, but it seems like only proprietary NVidia libraries
+ would work, and the configure detection would need some changes too. So no.
+- Switch to using external ffmpeg since the internal fails to build on i386.
+
* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 2.0-0.10.20061024
- Update to today's SVN code.
- Rebuild against new x264.
More information about the svn-commits
mailing list