diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/faad2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/faad2/Manifest | 15 | ||||
| -rw-r--r-- | media-libs/faad2/faad2-2.0-r5.ebuild | 11 | ||||
| -rw-r--r-- | media-libs/faad2/files/faad2-2.0-amd64_noext.patch | 283 |
4 files changed, 11 insertions, 304 deletions
diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog index 1a2afff707c0..20d01e47e84a 100644 --- a/media-libs/faad2/ChangeLog +++ b/media-libs/faad2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/faad2 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.43 2005/03/25 23:52:56 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.44 2005/05/05 11:39:39 luckyduck Exp $ + + 05 May 2005; Jan Brinkmann <luckyduck@gentoo.org> + -files/faad2-2.0-amd64_noext.patch, faad2-2.0-r5.ebuild: + removed patch again, other programs dont like it *faad2-2.0-r5 (26 Mar 2005) diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest index 3a5af1491ac5..d462041ed91a 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -1,15 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 09895e3d45713684c8539ee3e217c806 faad2-2.0-r4.ebuild 2082 MD5 6ef9876bb677ab3ba3ce5754c886af12 faad2-2.0-r3.ebuild 2092 MD5 0fe7937cc235e121a0f49ad7f096bcf3 faad2-1.1.ebuild 1080 -MD5 1558c6a9cdf54626aa9c903488f32158 faad2-2.0-r5.ebuild 2124 -MD5 f7cdaaef56e33ce33c2d1a9a19cc9e8e ChangeLog 5912 +MD5 5ebec7960f4780d562976ee9740ac8a3 faad2-2.0-r5.ebuild 2082 +MD5 e1e83f1c1df5c2f459a63a8f4e63aa40 ChangeLog 6075 MD5 28448949b05e4107de323e7468679e65 faad2-2.0-r2.ebuild 1722 MD5 b16b4f0c45feaa82f3c58f5f69b588dd metadata.xml 472 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659 -MD5 a3eea56a1efe8b54f884b00c080e3bbd files/faad2-2.0-amd64_noext.patch 9501 MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62 MD5 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416 @@ -20,10 +16,3 @@ MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r4 61 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r5 61 MD5 f597fe37924ee807ccafd546e2662513 files/faad2-2.0-makefile-space.patch 326 MD5 ae1e030d365422623250d1fa71e2fe72 files/faad2-1.1-gentoo.diff 440 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCRKRg06ebR+OMO78RAoU2AJ9YHz+8NwyYlEgYsfN7VpivtYl3AgCffLBu -vq+vDhKrJXfCyzmqN9YMCrI= -=6VPd ------END PGP SIGNATURE----- diff --git a/media-libs/faad2/faad2-2.0-r5.ebuild b/media-libs/faad2/faad2-2.0-r5.ebuild index 0ed752703c31..48b4f13e0ea6 100644 --- a/media-libs/faad2/faad2-2.0-r5.ebuild +++ b/media-libs/faad2/faad2-2.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r5.ebuild,v 1.1 2005/03/25 23:52:56 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r5.ebuild,v 1.2 2005/05/05 11:39:40 luckyduck Exp $ inherit eutils libtool flag-o-matic @@ -27,7 +27,6 @@ S=${WORKDIR}/${PN} DOCS="AUTHORS ChangeLog INSTALL NEWS README README.linux TODO" src_unpack() { - unpack ${A} cd ${S} @@ -35,12 +34,12 @@ src_unpack() { epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch epatch ${FILESDIR}/${P}-gcc34.patch - # merged version of the noext and amd64 patch, see #61528 - epatch ${FILESDIR}/${P}-amd64_noext.patch - cd ${S}/common/mp4v2 epatch ${FILESDIR}/mp4atom-sliver.patch + cd ${S}/plugins/xmms/src + epatch ${FILESDIR}/${P}-noext.patch + # Get the xmms plugin to behave cd ${S} elibtoolize @@ -48,7 +47,6 @@ src_unpack() { } src_compile() { - # see #34392 filter-flags -mfpmath=sse @@ -75,7 +73,6 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die dodoc ${DOCS} diff --git a/media-libs/faad2/files/faad2-2.0-amd64_noext.patch b/media-libs/faad2/files/faad2-2.0-amd64_noext.patch deleted file mode 100644 index 414f2e94b8fb..000000000000 --- a/media-libs/faad2/files/faad2-2.0-amd64_noext.patch +++ /dev/null @@ -1,283 +0,0 @@ -diff -uprN faad2.orig/include/faad.h faad2/include/faad.h ---- faad2.orig/include/faad.h 2005-03-25 23:57:01.555618312 +0100 -+++ faad2/include/faad.h 2005-03-25 23:58:49.002283936 +0100 -@@ -114,7 +114,7 @@ typedef struct mp4AudioSpecificConfig - /* Audio Specific Info */ - unsigned char objectTypeIndex; - unsigned char samplingFrequencyIndex; -- unsigned long samplingFrequency; -+ unsigned int samplingFrequency; - unsigned char channelsConfiguration; - - /* GA Specific Info */ -@@ -134,7 +134,7 @@ typedef struct mp4AudioSpecificConfig - typedef struct faacDecConfiguration - { - unsigned char defObjectType; -- unsigned long defSampleRate; -+ unsigned int defSampleRate; - unsigned char outputFormat; - unsigned char downMatrix; - unsigned char useOldADTSFormat; -@@ -143,11 +143,11 @@ typedef struct faacDecConfiguration - - typedef struct faacDecFrameInfo - { -- unsigned long bytesconsumed; -- unsigned long samples; -+ unsigned int bytesconsumed; -+ unsigned int samples; - unsigned char channels; - unsigned char error; -- unsigned long samplerate; -+ unsigned int samplerate; - - /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */ - unsigned char sbr; -@@ -168,7 +168,7 @@ typedef struct faacDecFrameInfo - - char* FAADAPI faacDecGetErrorMessage(unsigned char errcode); - --unsigned long FAADAPI faacDecGetCapabilities(void); -+unsigned int FAADAPI faacDecGetCapabilities(void); - - faacDecHandle FAADAPI faacDecOpen(void); - -@@ -178,32 +178,32 @@ unsigned char FAADAPI faacDecSetConfigur - faacDecConfigurationPtr config); - - /* Init the library based on info from the AAC file (ADTS/ADIF) */ --long FAADAPI faacDecInit(faacDecHandle hDecoder, -+int FAADAPI faacDecInit(faacDecHandle hDecoder, - unsigned char *buffer, -- unsigned long buffer_size, -- unsigned long *samplerate, -+ unsigned int buffer_size, -+ unsigned int *samplerate, - unsigned char *channels); - - /* Init the library using a DecoderSpecificInfo */ - char FAADAPI faacDecInit2(faacDecHandle hDecoder, unsigned char *pBuffer, -- unsigned long SizeOfDecoderSpecificInfo, -- unsigned long *samplerate, unsigned char *channels); -+ unsigned int SizeOfDecoderSpecificInfo, -+ unsigned int *samplerate, unsigned char *channels); - - /* Init the library for DRM */ --char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned long samplerate, -+char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned int samplerate, - unsigned char channels); - --void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, long frame); -+void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, int frame); - - void FAADAPI faacDecClose(faacDecHandle hDecoder); - - void* FAADAPI faacDecDecode(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, - unsigned char *buffer, -- unsigned long buffer_size); -+ unsigned int buffer_size); - - char FAADAPI AudioSpecificConfig(unsigned char *pBuffer, -- unsigned long buffer_size, -+ unsigned int buffer_size, - mp4AudioSpecificConfig *mp4ASC); - - #ifdef _WIN32 -diff -uprN faad2.orig/libfaad/common.h faad2/libfaad/common.h ---- faad2.orig/libfaad/common.h 2005-03-25 23:57:01.535621352 +0100 -+++ faad2/libfaad/common.h 2005-03-25 23:58:49.003283784 +0100 -@@ -193,12 +193,26 @@ typedef float float32_t; - # include <strings.h> - #endif - #if HAVE_INTTYPES_H -+#warning "Using HAVE_INTTYPES_H" - # include <inttypes.h> - #else - # if HAVE_STDINT_H -+#warning "Using HAVE_STDINT_H" - # include <stdint.h> - # else - /* we need these... */ -+#ifdef __x86_64__ -+#warning "Using AMD64 definitions" -+typedef unsigned long uint64_t; -+typedef unsigned int uint32_t; -+typedef unsigned short uint16_t; -+typedef unsigned char uint8_t; -+typedef long int64_t; -+typedef int int32_t; -+typedef short int16_t; -+typedef char int8_t; -+#else -+#warning "Using 32-bit definitions" - typedef unsigned long long uint64_t; - typedef unsigned long uint32_t; - typedef unsigned short uint16_t; -@@ -207,6 +221,7 @@ typedef long long int64_t; - typedef long int32_t; - typedef short int16_t; - typedef char int8_t; -+#endif - # endif - #endif - #if HAVE_UNISTD_H -diff -uprN faad2.orig/plugins/mpeg4ip/aa_file.cpp faad2/plugins/mpeg4ip/aa_file.cpp ---- faad2.orig/plugins/mpeg4ip/aa_file.cpp 2005-03-25 23:57:01.559617704 +0100 -+++ faad2/plugins/mpeg4ip/aa_file.cpp 2005-03-25 23:58:49.003283784 +0100 -@@ -22,6 +22,8 @@ - * aa_file.cpp - create media structure for aac files - */ - -+#define __STDC_LIMIT_MACROS -+#include <stdint.h> - #include "faad2.h" - codec_data_t *aac_file_check (lib_message_func_t message, - const char *name, -@@ -56,7 +58,7 @@ codec_data_t *aac_file_check (lib_messag - aac->m_buffer_size_max, - aac->m_ifile); - -- unsigned long freq; -+ unsigned int freq; - unsigned char chans; - - faacDecInit(aac->m_info, (unsigned char *)aac->m_buffer, -diff -uprN faad2.orig/plugins/mpeg4ip/faad2.cpp faad2/plugins/mpeg4ip/faad2.cpp ---- faad2.orig/plugins/mpeg4ip/faad2.cpp 2005-03-25 23:57:01.560617552 +0100 -+++ faad2/plugins/mpeg4ip/faad2.cpp 2005-03-25 23:58:49.004283632 +0100 -@@ -18,6 +18,13 @@ - ** - ** $Id: faad2-2.0-amd64_noext.patch,v 1.1 2005/03/25 23:52:56 luckyduck Exp $ - **/ -+#define __STDC_LIMIT_MACROS -+#include <stdint.h> -+ -+#ifndef UINT32_MAX -+#error "stdint.h didn't define UINT32_MAX, wtf?" -+#endif -+ - #include "faad2.h" - #include <mpeg4_audio_config.h> - #include <mpeg4_sdp.h> -@@ -76,7 +83,7 @@ static codec_data_t *aac_codec_create (c - } - - aac->m_info = faacDecOpen(); -- unsigned long srate; -+ unsigned int srate; - unsigned char chan; - if ((userdata == NULL && fmtp == NULL) || - (faacDecInit2(aac->m_info, -@@ -156,7 +163,7 @@ static int aac_decode (codec_data_t *ptr - void *userdata) - { - aac_codec_t *aac = (aac_codec_t *)ptr; -- unsigned long bytes_consummed; -+ unsigned int bytes_consummed; - int bits = -1; - // struct timezone tz; - -@@ -188,7 +195,7 @@ static int aac_decode (codec_data_t *ptr - * If not initialized, do so. - */ - abort(); -- unsigned long freq; -+ unsigned int freq; - unsigned char chans; - - faacDecInit(aac->m_info, -@@ -202,7 +209,7 @@ static int aac_decode (codec_data_t *ptr - } - - uint8_t *buff; -- unsigned long samples; -+ unsigned int samples; - bytes_consummed = buflen; - //aa_message(LOG_DEBUG, aaclib, "decoding %d bits", buflen * 8); - faacDecFrameInfo frame_info; -@@ -237,7 +244,7 @@ static int aac_decode (codec_data_t *ptr - aac->m_vft->audio_configure(aac->m_ifptr, - aac->m_freq, - aac->m_chans, -- AUDIO_S16SYS, -+ AUDIO_FMT_S16, - aac->m_output_frame_size); - uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr); - aac->m_audio_inited = 1; -diff -uprN faad2.orig/plugins/xmms/src/libmp4.c faad2/plugins/xmms/src/libmp4.c ---- faad2.orig/plugins/xmms/src/libmp4.c 2005-03-25 23:57:01.557618008 +0100 -+++ faad2/plugins/xmms/src/libmp4.c 2005-03-26 00:43:12.494371592 +0100 -@@ -22,6 +22,10 @@ - #define MP4_ABOUT "Written by ciberfred" - #define BUFFER_SIZE FAAD_MIN_STREAMSIZE*64 - -+void getMP4info(char* file); -+int getAACTrack(MP4FileHandle file); -+ -+ - static void mp4_init(void); - static void mp4_about(void); - static void mp4_play(char *); -@@ -34,6 +38,9 @@ static void mp4_getSongInfo(char *); - static int mp4_isFile(char *); - static void* mp4Decode(void *); - -+void getMP4info(char* file); -+int getAACTrack(MP4FileHandle file); -+ - InputPlugin mp4_ip = - { - 0, // handle -@@ -112,11 +119,11 @@ static int mp4_isFile(char *filename) - gchar* extention; - - extention = strrchr(filename, '.'); -- if (extention && -+ if (extention &&( - !strcasecmp(extention, ".mp4") || // official extention - !strcasecmp(extention, ".m4a") || // Apple mp4 extention - !strcasecmp(extention, ".aac") // old MPEG2/4-AAC extention -- ){ -+ )){ - return (1); - } - } -@@ -202,11 +209,11 @@ static void *mp4Decode(void *args) - faacDecHandle decoder; - unsigned char *buffer = NULL; - guint bufferSize = 0; -- gulong samplerate; -+ guint samplerate; - guchar channels; - guint avgBitrate; - MP4Duration duration; -- gulong msDuration; -+ guint msDuration; - MP4SampleId numSamples; - MP4SampleId sampleID = 1; - -@@ -329,10 +336,10 @@ static void *mp4Decode(void *args) - FILE *file = NULL; - faacDecHandle decoder = 0; - guchar *buffer = 0; -- gulong bufferconsumed = 0; -- gulong samplerate = 0; -+ guint bufferconsumed = 0; -+ guint samplerate = 0; - guchar channels; -- gulong buffervalid = 0; -+ guint buffervalid = 0; - TitleInput* input; - gchar *temp = g_strdup(args); - gchar *ext = strrchr(temp, '.'); -@@ -424,7 +431,7 @@ static void *mp4Decode(void *args) - - while(bPlaying && buffervalid > 0){ - faacDecFrameInfo finfo; -- unsigned long samplesdecoded; -+ unsigned int samplesdecoded; - char* sample_buffer = NULL; - /* - if(bSeek && seekPosition!=-1){ |