jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to faad2-2.7

Browse Source
This commit is contained in:
Stephan Raue 2009-07-20 00:21:52 +02:00
parent fabe40addb
commit 4912177823
9 changed files with 1 additions and 47452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packages/audio/faad2/patches/01_xmms-autotools.diff
View File

@ -1,50 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_xmms-autotools.dpatch by Matthew W. S. Bell <matthew@bells23.org.uk>
##
## All lines beginning with ## DP:' are a description of the patch.
## DP: Fix the configuration of the XMMS plugin using autotools
## DP: This patch has already been applied, and autoreconf called.
@DPATCH@
diff -urNad faad2.tmp~/configure.in faad2.tmp/configure.in
--- faad2.tmp~/configure.in 2007-10-15 00:41:42.000000000 +0100
+++ faad2.tmp/configure.in 2007-10-15 00:43:05.000000000 +0100
@@ -16,9 +16,9 @@
dnl Checks for programs.
AC_PROG_CC
-AC_PROG_CPP
-dnl disable for mpeg4ip plugin
-dnl AC_PROG_CXX
+dnl AC_PROG_CPP
+dnl enable for mpeg4ip plugin, rather than above
+AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
@@ -129,10 +129,7 @@
fi
if test x$WITHXMMS = xyes; then
- AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
- if test "$XMMS_CONFIG" = "not_found"; then
- AC_MSG_ERROR("*** xmms-config not found - xmms plugin can't be build")
- fi
+ AM_PATH_XMMS()
AC_CHECK_HEADER(pthread.h,,
AC_MSG_ERROR(*** pthread headers support not installed or not found))
AC_CHECK_HEADER(id3.h,,
diff -urNad faad2.tmp~/plugins/xmms/src/Makefile.am faad2.tmp/plugins/xmms/src/Makefile.am
--- faad2.tmp~/plugins/xmms/src/Makefile.am 2007-10-15 00:42:18.000000000 +0100
+++ faad2.tmp/plugins/xmms/src/Makefile.am 2007-10-15 00:43:32.000000000 +0100
@@ -1,6 +1,7 @@
-local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
-local_LDFLAGS=`$(XMMS_CONFIG) --libs`
-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+local_CFLAGS=$(XMMS_CFLAGS) -Wall
+local_LDFLAGS=$(XMMS_LIBS)
+libdir = $(XMMS_INPUT_PLUGIN_DIR)
+
lib_LTLIBRARIES = libmp4.la
libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \

1047
packages/audio/faad2/patches/02_public-headers.diff
View File

File diff suppressed because it is too large Load Diff

19
packages/audio/faad2/patches/04_mp4ff_h-fix.diff
View File

@ -1,19 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## mp4ff.h_fix.dpatch by <matthew@bells23.org.uk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Imported from Ubuntu
@DPATCH@
diff -urNad faad2.tmp~/common/mp4ff/mp4ff.h faad2.tmp/common/mp4ff/mp4ff.h
--- faad2.tmp~/common/mp4ff/mp4ff.h 2007-10-15 00:36:42.000000000 +0100
+++ faad2.tmp/common/mp4ff/mp4ff.h 2007-10-15 16:52:52.000000000 +0100
@@ -37,7 +37,7 @@
extern "C" {
#endif /* __cplusplus */
-#include "mp4ff_int_types.h"
+#include <stdint.h>
/* file callback structure */
typedef struct

56
packages/audio/faad2/patches/05_mp4ff-static-makefile.diff
View File

@ -1,56 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_mp4ff-static_makefile.dpatch by <matthew@localhost.localdomain>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a static build of mp4ff to Makefile
@DPATCH@
diff -urNad faad2-svn~/common/mp4ff/Makefile.am faad2-svn/common/mp4ff/Makefile.am
--- faad2-svn~/common/mp4ff/Makefile.am 2007-11-28 23:34:18.000000000 +0000
+++ faad2-svn/common/mp4ff/Makefile.am 2007-11-28 23:40:29.000000000 +0000
@@ -1,8 +1,9 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LIBRARIES = libmp4ff.a
+include_HEADERS = mp4ff.h mp4ffint.h
-libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
- drms.h drms.c drmstables.h
+libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+ drms.h drms.c drmstables.h
diff -urNad faad2-svn~/frontend/Makefile.am faad2-svn/frontend/Makefile.am
--- faad2-svn~/frontend/Makefile.am 2007-11-28 23:34:18.000000000 +0000
+++ faad2-svn/frontend/Makefile.am 2007-11-28 23:39:28.000000000 +0000
@@ -1,11 +1,11 @@
bin_PROGRAMS = faad
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- -I$(top_srcdir)/common/mp4ff
+ -I$(top_srcdir)/common/mp4ff
faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
- $(top_builddir)/common/mp4ff/libmp4ff.la
+ $(top_builddir)/common/mp4ff/libmp4ff.a
faad_SOURCES = main.c \
- audio.c audio.h \
- $(top_srcdir)/common/faad/getopt.c
+ audio.c audio.h \
+ $(top_srcdir)/common/faad/getopt.c
diff -urNad faad2-svn~/plugins/xmms/src/Makefile.am faad2-svn/plugins/xmms/src/Makefile.am
--- faad2-svn~/plugins/xmms/src/Makefile.am 2007-11-28 23:38:02.000000000 +0000
+++ faad2-svn/plugins/xmms/src/Makefile.am 2007-11-28 23:38:02.000000000 +0000
@@ -8,7 +8,7 @@
-I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
- $(top_builddir)/common/mp4ff/libmp4ff.la
+ $(top_builddir)/common/mp4ff/libmp4ff.a
libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread

20
packages/audio/faad2/patches/07_remove-static.diff
View File

@ -1,20 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## mp4ff.c_remove-static.dpatch by <matthew@bells23.org.uk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Imported from Ubuntu
@DPATCH@
diff -Nur faad2-2.0.0clean-old/common/mp4ff/mp4ff.c faad2-2.0.0/common/mp4ff/mp4ff.c
--- faad2-2.0.0clean-old/common/mp4ff/mp4ff.c 2005-07-15 18:58:03.807969368 +0000
+++ faad2-2.0.0/common/mp4ff/mp4ff.c 2005-07-15 19:00:22.142939256 +0000
@@ -105,7 +105,7 @@
if (ff) free(ff);
}
-static void mp4ff_track_add(mp4ff_t *f)
+void mp4ff_track_add(mp4ff_t *f)
{
f->total_tracks++;

96
packages/audio/faad2/patches/10_faad-man.diff
View File

@ -1,96 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_faad-man.dpatch by <matthew@ibis.bells>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad faad2-2.6.1~/frontend/faad.man faad2-2.6.1/frontend/faad.man
--- faad2-2.6.1~/frontend/faad.man 1970-01-01 01:00:00.000000000 +0100
+++ faad2-2.6.1/frontend/faad.man 2008-06-17 04:19:24.000000000 +0100
@@ -0,0 +1,85 @@
+.TH FAAD "1" "October 2006" "faad 2.5" ""
+.SH NAME
+faad \(em Process an Advanced Audio Codec stream
+
+.SH "SYNOPSIS"
+.B faad
+[options] [\-w | \-o <output_filename> | \-a <output_filename>] input_filename
+
+.SH "DESCRIPTION"
+This utility provides a command line interface to libfaad2. This program reads in MPEG\(hy4 AAC files, processes, and outputs them in either Microsoft WAV, MPEG\(hy4 AAC ADTS, or standard PCM formats.
+
+.SH "OPTIONS"
+.TP
+.BI \-a " <filename>" ", \-\^\-adtsout" " <filename>"
+Sets the processing to output to the specified file in MPEG\(hy4 AAC ADTS format
+.TP
+.BI \-b " <number>" ", \-\^\-bits" " <number>"
+Set the output (individual) sample format. The number takes one of the following values:
+.RS
+.RS
+1: 16\(hybit PCM data (default).
+.br
+2: 24\(hybit PCM data.
+.br
+3: 32\(hybit PCM data.
+.br
+4: 32\(hybit floating\hy(point data.
+.br
+5: 64\(hybit floating\hy(point data.
+.RE
+.RE
+.TP
+.B \-d ", \-\^\-downmix"
+Set the processing to downsample from 5.1 (surround sound and bass) channels to 2 channels (stereo).
+.TP
+.BI \-f " <number>" ", \-\^\-format" " <number>"
+Set the output file format. The number takes one of the following values:
+.RS
+.RS
+1: Microsoft WAV format (default).
+.br
+2: Raw PCM data.
+.RE
+.RE
+.TP
+.BI \-g
+Set the processing to not perform gapless decoding.
+.TP
+.B \-h ", \-\^\-help"
+Shows a usage summary.
+.TP
+.B \-i ", \-\^\-info"
+Shows information about the about the input file.
+.TP
+.BI \-l " <number>" ", \-\^\-objecttype" " <number>"
+Sets the MPEG\hy(4 profile and object type for the processing to use. The number takes one of the following values:
+.RS
+.RS
+1: Main object type.
+.br
+2: Low Complexity (LC) object type (default).
+.br
+4: Long Term Prediction (LTP) object type.
+.br
+23: Low Delay (LD) object type.
+.RE
+.RE
+.TP
+.BI \-o " <filename>" ", \-\^\-outfile" " <number>"
+Sets the filename for processing output.
+.TP
+.B \-q ", \-\^\-quiet"
+Quiet \- Suppresses status messages during processing.
+.TP
+.B \-t ", \-\^\-oldformat"
+Sets the processing to use the old MPEG\(hy4 AAC ADTS format when outputting in said format.
+.TP
+.B \-w ", \-\^\-stdio"
+Sets the processing output to be sent to the standard out.
+
+.SH "AUTHOR"
+Matthew W. S. Bell <matthew (at) bells23.org.uk>
+
+.SH "SEE ALSO"
+\fBfaac\fP(1)

21
packages/audio/faad2/patches/12_heap_overflow.diff
View File

@ -1,21 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
@DPATCH@
--- faad2-2.6.1\faad2\frontend\main.c 2007-11-01 13:33:30.000000000 -0700
+++ faad2-2.6.1/frontend/main.c 2008-09-16 11:01:40.000000000 -0700
@@ -911,12 +911,14 @@
if (sampleId == 0) dur = 0;
if (useAacLength || (timescale != samplerate)) {
sample_count = frameInfo.samples;
} else {
sample_count = (unsigned int)(dur * frameInfo.channels);
+ if (sample_count > frameInfo.samples)
+ sample_count = frameInfo.samples;
if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
{
faad_fprintf(stderr, "MP4 seems to have incorrect frame duration, using values from AAC data.\n");
useAacLength = 1;
sample_count = frameInfo.samples;

46142
packages/audio/faad2/patches/99_autotools-regenerated.diff
View File

File diff suppressed because it is too large Load Diff

2
packages/audio/faad2/url
View File

@ -1 +1 @@
http://sources.openelec.tv/svn/faad2-2.6.1.tar.gz
http://puzzle.dl.sourceforge.net/sourceforge/faac/faad2-2.7.tar.bz2