cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Xine-lib 1.1.15

Browse Source 
This release contains some security fixes, notably a DoS via
corrupted Ogg files (CVS-2008-3231), some related fixes, and
fixes for a few possible buffer overflows.

ok jakemsr@
This commit is contained in:
brad 2008-08-20 01:54:01 +00:00
parent 750433f77a
commit 9d275cf52c
9 changed files with 121 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
multimedia/xine-lib/Makefile
View File

@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.36 2008/07/02 01:02:42 brad Exp $
# $OpenBSD: Makefile,v 1.37 2008/08/20 01:54:01 brad Exp $
SHARED_ONLY= Yes
COMMENT-main= multimedia decoding library
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output module for xine-lib
COMMENT-jack= jackd audio output module for xine-lib
V= 1.1.14
V= 1.1.15
DISTNAME= xine-lib-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-esd= xine-lib-esd-${V}
@ -14,7 +16,7 @@ PKGNAME-jack= xine-lib-jack-${V}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= multimedia
SHARED_LIBS= xine 22.0
SHARED_LIBS= xine 23.0
HOMEPAGE= http://xinehq.de/
@ -71,13 +73,12 @@ LIB_DEPENDS-jack= ${LIB_DEPENDS} \
xine::${BUILD_PKGPATH}
RUN_DEPENDS-jack= ${RUN_DEPENDS}
SHARED_ONLY= Yes
USE_X11= Yes
USE_LIBTOOL= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
XINEAPI_REV= 1.23
XINEAPI_REV= 1.24
SUBST_VARS+= XINEAPI_REV
.if ${MACHINE_ARCH} == "i386"
@ -87,8 +88,7 @@ MAKE_FLAGS+= TOMSMOCOMP_LINKS=\#
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-optimizations \
CONFIGURE_ARGS+= --disable-optimizations \
--disable-mlib \
--disable-opengl \
--disable-fb \
@ -117,10 +117,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-freetype \
--with-fontconfig \
--disable-vcd \
--with-external-ffmpeg=yes \
--with-external-dvdnav=yes \
--with-external-a52dec=yes \
--with-external-libmad=yes
--with-external-libmad=yes \
--with-external-libfaad=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
@ -133,9 +133,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
EXTRA_X_LIBS="-Wl,-R,${LOCALBASE}/lib -Wl,-R,${X11BASE}/lib" \
ac_cv_member_audio_info_t_output_muted=yes
post-patch:
post-extract:
.if ${MACHINE_ARCH} == "i386"
cp ${FILESDIR}/i386_set_ldt.c ${WRKSRC}/src/libw32dll/wine/
@cp ${FILESDIR}/i386_set_ldt.c ${WRKSRC}/src/libw32dll/wine
.endif
.include <bsd.port.mk>

10
multimedia/xine-lib/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xine-lib-1.1.14.tar.bz2) = Wy7cJk3a1Ixl4MA+AJqmkw==
RMD160 (xine-lib-1.1.14.tar.bz2) = UYtOkNVZcRVNeK9x9ph/CTDtk3w=
SHA1 (xine-lib-1.1.14.tar.bz2) = jf4HGGXr2wz+L1zih0hbte18aXg=
SHA256 (xine-lib-1.1.14.tar.bz2) = QKiQZeuPGJ03iLQq0tXzXqC5IwNyp2+WyaTEDnFgi/w=
SIZE (xine-lib-1.1.14.tar.bz2) = 7455590
MD5 (xine-lib-1.1.15.tar.bz2) = QqK0iTt/iS6zNN4vw21JyA==
RMD160 (xine-lib-1.1.15.tar.bz2) = XGTdUcBabhfLbfy7ipAJuoVxx18=
SHA1 (xine-lib-1.1.15.tar.bz2) = vLVn6ioRxfJrI4TVQAuEZuqQSMY=
SHA256 (xine-lib-1.1.15.tar.bz2) = B93yqfUhQX3S8JdTSlLd2dKINnmTL5Za5+ewEl08ncw=
SIZE (xine-lib-1.1.15.tar.bz2) = 7478750

7
multimedia/xine-lib/files/i386_set_ldt.c
View File

@ -1,3 +1,5 @@
/* $OpenBSD: i386_set_ldt.c,v 1.2 2008/08/20 01:54:01 brad Exp $ */
/*
* Copyright (c) 1993 John Brezak
* All rights reserved.
@ -34,10 +36,7 @@
#include <machine/sysarch.h>
int
i386_set_ldt(start, desc, num)
int start;
union descriptor *desc;
int num;
i386_set_ldt(int start, union descriptor *desc, int num)
{
struct i386_set_ldt_args p;

85
multimedia/xine-lib/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
--- configure.orig Sun Jun 29 13:13:20 2008
+++ configure Sun Jun 29 20:54:10 2008
@@ -24651,6 +24651,9 @@ _ACEOF
$OpenBSD: patch-configure,v 1.18 2008/08/20 01:54:01 brad Exp $
--- configure.orig Thu Aug 14 17:18:56 2008
+++ configure Thu Aug 14 19:04:37 2008
@@ -24654,6 +24654,9 @@ _ACEOF
fi
done
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
@@ -30988,13 +30991,13 @@ t q
@@ -31009,13 +31012,13 @@ t q
b
:q
q"
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
@@ -37830,7 +37833,7 @@ fi
@@ -37851,7 +37854,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
@@ -38079,7 +38082,7 @@ elif test "x$external_a52dec" = "xyes"; then
@@ -38100,7 +38103,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -38218,7 +38221,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
@@ -38239,7 +38242,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
else
have_a52="no"
@@ -38784,7 +38787,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
@@ -38805,7 +38808,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -38967,7 +38970,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
@@ -38988,7 +38991,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
@ -72,7 +72,66 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
else
{ echo "$as_me:$LINENO: result: *** All libmng dependent parts will be disabled ***" >&5
echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6; }
@@ -50265,7 +50268,7 @@ cat >>confdefs.h <<_ACEOF
@@ -45513,13 +45516,13 @@ if test "x$enable_faad" = "xno"; then
{ echo "$as_me:$LINENO: result: faad support disabled" >&5
echo "${ECHO_T}faad support disabled" >&6; }
elif test "x$with_external_libfaad" != "xno"; then
- { echo "$as_me:$LINENO: checking for NeAACDecInit in -lfaad" >&5
-echo $ECHO_N "checking for NeAACDecInit in -lfaad... $ECHO_C" >&6; }
-if test "${ac_cv_lib_faad_NeAACDecInit+set}" = set; then
+ { echo "$as_me:$LINENO: checking for faacDecInit in -lfaad" >&5
+echo $ECHO_N "checking for faacDecInit in -lfaad... $ECHO_C" >&6; }
+if test "${ac_cv_lib_faad_faacDecInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfaad $LIBS"
+LIBS="-lfaad -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -45533,11 +45536,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char NeAACDecInit ();
+char faacDecInit ();
int
main ()
{
-return NeAACDecInit ();
+return faacDecInit ();
;
return 0;
}
@@ -45560,21 +45563,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_faad_NeAACDecInit=yes
+ ac_cv_lib_faad_faacDecInit=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_faad_NeAACDecInit=no
+ ac_cv_lib_faad_faacDecInit=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_faad_NeAACDecInit" >&5
-echo "${ECHO_T}$ac_cv_lib_faad_NeAACDecInit" >&6; }
-if test $ac_cv_lib_faad_NeAACDecInit = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecInit" >&5
+echo "${ECHO_T}$ac_cv_lib_faad_faacDecInit" >&6; }
+if test $ac_cv_lib_faad_faacDecInit = yes; then
have_faad=yes
fi
@@ -50533,7 +50536,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
CFLAGS="$CFLAGS -faltivec -maltivec"
@ -81,7 +140,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
fi
;;
ppc-*-linux* | powerpc-*)
@@ -50773,7 +50776,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
@@ -51046,7 +51049,7 @@ XINE_SCRIPTPATH="\${xinedatadir}/scripts"
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
XINE_BUILD_OS="`uname -s -r -m`"
@ -90,7 +149,7 @@ $OpenBSD: patch-configure,v 1.17 2008/07/02 01:02:42 brad Exp $
@@ -51654,7 +51657,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
@@ -51927,7 +51930,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_i
{ echo "$as_me:$LINENO: result: $ac_cv_try_ldflags_ok" >&5
echo "${ECHO_T}$ac_cv_try_ldflags_ok" >&6; }
if test x"$ac_cv_try_ldflags_ok" = x"yes"; then

8
multimedia/xine-lib/patches/patch-src_demuxers_demux_asf_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.4 2008/07/02 01:02:42 brad Exp $
--- src/demuxers/demux_asf.c.orig Thu Jun 26 20:46:09 2008
+++ src/demuxers/demux_asf.c Sun Jun 29 20:54:11 2008
@@ -448,7 +448,7 @@ static int asf_read_header (demux_asf_t *this) {
$OpenBSD: patch-src_demuxers_demux_asf_c,v 1.5 2008/08/20 01:54:01 brad Exp $
--- src/demuxers/demux_asf.c.orig Thu Aug 7 13:52:44 2008
+++ src/demuxers/demux_asf.c Thu Aug 14 18:48:39 2008
@@ -460,7 +460,7 @@ static int asf_read_header (demux_asf_t *this) {
xine_log(this->stream->xine, XINE_LOG_MSG,
_("demux_asf: warning: The stream id=%d is encrypted.\n"), asf_stream->stream_number);
_x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,

22
multimedia/xine-lib/patches/patch-src_input_input_cdda_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
--- src/input/input_cdda.c.orig Sat Jun 14 19:15:00 2008
+++ src/input/input_cdda.c Mon Jun 16 02:30:50 2008
@@ -71,7 +71,7 @@
$OpenBSD: patch-src_input_input_cdda_c,v 1.5 2008/08/20 01:54:01 brad Exp $
--- src/input/input_cdda.c.orig Wed Aug 13 12:33:05 2008
+++ src/input/input_cdda.c Thu Aug 14 18:48:39 2008
@@ -72,7 +72,7 @@
#elif defined(WIN32)
#define DEFAULT_CDDA_DEVICE "d:\\"
#else
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
#endif
#define CDDB_SERVER "freedb.freedb.org"
@@ -610,7 +610,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
@@ -611,7 +611,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
return 0;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
#include <sys/cdio.h>
@@ -623,7 +623,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -624,7 +624,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
struct ioc_toc_header tochdr;
#if defined(__FreeBSD_kernel__)
struct ioc_read_toc_single_entry tocentry;
@ -28,7 +28,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
struct ioc_read_toc_entry tocentry;
struct cd_toc_entry data;
#endif
@@ -658,7 +658,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -659,7 +659,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
@ -37,7 +37,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -679,7 +679,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -680,7 +680,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
@ -46,7 +46,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
toc->toc_entries[i-1].track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
toc->toc_entries[i-1].first_frame_minute = tocentry.data->addr.msf.minute;
toc->toc_entries[i-1].first_frame_second = tocentry.data->addr.msf.second;
@@ -701,7 +701,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -702,7 +702,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
perror("CDIOREADTOCENTRY");
return -1;
}
@ -55,7 +55,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
memset(&data, 0, sizeof(data));
tocentry.data_len = sizeof(data);
tocentry.data = &data;
@@ -722,7 +722,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
@@ -723,7 +723,7 @@ static int read_cdrom_toc(int fd, cdrom_toc *toc) {
(tocentry.entry.addr.msf.minute * CD_SECONDS_PER_MINUTE * CD_FRAMES_PER_SECOND) +
(tocentry.entry.addr.msf.second * CD_FRAMES_PER_SECOND) +
tocentry.entry.addr.msf.frame;
@ -64,7 +64,7 @@ $OpenBSD: patch-src_input_input_cdda_c,v 1.4 2008/06/18 01:26:41 brad Exp $
toc->leadout_track.track_mode = (tocentry.data->control & 0x04) ? 1 : 0;
toc->leadout_track.first_frame_minute = tocentry.data->addr.msf.minute;
toc->leadout_track.first_frame_second = tocentry.data->addr.msf.second;
@@ -760,7 +760,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
@@ -761,7 +761,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this
perror("CDIOCREADAUDIO");
return -1;
}

8
multimedia/xine-lib/patches/patch-src_input_input_dvb_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_input_dvb_c,v 1.7 2008/07/02 01:02:42 brad Exp $
--- src/input/input_dvb.c.orig Wed Jun 25 09:04:09 2008
+++ src/input/input_dvb.c Sun Jun 29 20:54:12 2008
$OpenBSD: patch-src_input_input_dvb_c,v 1.8 2008/08/20 01:54:01 brad Exp $
--- src/input/input_dvb.c.orig Thu Aug 7 13:52:41 2008
+++ src/input/input_dvb.c Thu Aug 14 18:48:39 2008
@@ -903,7 +903,7 @@ static channel_t *load_channels(xine_t *xine, xine_str
if (!f) {
xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s': %s\n"), filename, strerror (errno));
@ -10,7 +10,7 @@ $OpenBSD: patch-src_input_input_dvb_c,v 1.7 2008/07/02 01:02:42 brad Exp $
return NULL;
}
if (fstat(fileno(f), &st) || !S_ISREG (st.st_mode)) {
@@ -2584,7 +2584,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
@@ -2585,7 +2585,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen
/* no data for several seconds - tell the user a possible reason */
if(this->read_failcount==5){

148
multimedia/xine-lib/patches/patch-src_libfaad_Makefile_in
View File

@ -1,148 +0,0 @@
$OpenBSD: patch-src_libfaad_Makefile_in,v 1.9 2008/07/02 01:02:42 brad Exp $
--- src/libfaad/Makefile.in.orig Sun Jun 29 13:13:07 2008
+++ src/libfaad/Makefile.in Sun Jun 29 20:54:13 2008
@@ -68,43 +68,7 @@ LTLIBRARIES = $(xineplug_LTLIBRARIES)
am__DEPENDENCIES_1 =
xineplug_decode_faad_la_DEPENDENCIES = $(XINE_LIB) \
$(am__DEPENDENCIES_1)
-am_xineplug_decode_faad_la_OBJECTS = xineplug_decode_faad_la-bits.lo \
- xineplug_decode_faad_la-cfft.lo \
- xineplug_decode_faad_la-common.lo \
- xineplug_decode_faad_la-decoder.lo \
- xineplug_decode_faad_la-drc.lo \
- xineplug_decode_faad_la-drm_dec.lo \
- xineplug_decode_faad_la-error.lo \
- xineplug_decode_faad_la-filtbank.lo \
- xineplug_decode_faad_la-hcr.lo \
- xineplug_decode_faad_la-huffman.lo \
- xineplug_decode_faad_la-ic_predict.lo \
- xineplug_decode_faad_la-is.lo \
- xineplug_decode_faad_la-lt_predict.lo \
- xineplug_decode_faad_la-mdct.lo xineplug_decode_faad_la-mp4.lo \
- xineplug_decode_faad_la-ms.lo \
- xineplug_decode_faad_la-output.lo \
- xineplug_decode_faad_la-pns.lo \
- xineplug_decode_faad_la-ps_dec.lo \
- xineplug_decode_faad_la-ps_syntax.lo \
- xineplug_decode_faad_la-pulse.lo \
- xineplug_decode_faad_la-rvlc.lo \
- xineplug_decode_faad_la-sbr_dct.lo \
- xineplug_decode_faad_la-sbr_dec.lo \
- xineplug_decode_faad_la-sbr_e_nf.lo \
- xineplug_decode_faad_la-sbr_fbt.lo \
- xineplug_decode_faad_la-sbr_hfadj.lo \
- xineplug_decode_faad_la-sbr_hfgen.lo \
- xineplug_decode_faad_la-sbr_huff.lo \
- xineplug_decode_faad_la-sbr_qmf.lo \
- xineplug_decode_faad_la-sbr_syntax.lo \
- xineplug_decode_faad_la-sbr_tf_grid.lo \
- xineplug_decode_faad_la-specrec.lo \
- xineplug_decode_faad_la-ssr.lo \
- xineplug_decode_faad_la-ssr_fb.lo \
- xineplug_decode_faad_la-ssr_ipqf.lo \
- xineplug_decode_faad_la-syntax.lo \
- xineplug_decode_faad_la-tns.lo \
+am_xineplug_decode_faad_la_OBJECTS = \
xineplug_decode_faad_la-xine_faad_decoder.lo
xineplug_decode_faad_la_OBJECTS = \
$(am_xineplug_decode_faad_la_OBJECTS)
@@ -461,97 +425,11 @@ SUBDIRS = codebook
xineplug_LTLIBRARIES = $(faad_module)
xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_faad_la_SOURCES = \
- bits.c \
- cfft.c \
- common.c \
- decoder.c \
- drc.c \
- drm_dec.c \
- error.c \
- filtbank.c \
- hcr.c \
- huffman.c \
- ic_predict.c \
- is.c \
- lt_predict.c \
- mdct.c \
- mp4.c \
- ms.c \
- output.c \
- pns.c \
- ps_dec.c \
- ps_syntax.c \
- pulse.c \
- rvlc.c \
- sbr_dct.c \
- sbr_dec.c \
- sbr_e_nf.c \
- sbr_fbt.c \
- sbr_hfadj.c \
- sbr_hfgen.c \
- sbr_huff.c \
- sbr_qmf.c \
- sbr_syntax.c \
- sbr_tf_grid.c \
- specrec.c \
- ssr.c \
- ssr_fb.c \
- ssr_ipqf.c \
- syntax.c \
- tns.c \
xine_faad_decoder.c
xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags)
-xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lm $(LTLIBINTL)
-noinst_HEADERS = \
- analysis.h \
- bits.h \
- cfft.h \
- cfft_tab.h \
- common.h \
- decoder.h \
- drc.h \
- drm_dec.h \
- error.h \
- filtbank.h \
- fixed.h \
- huffman.h \
- ic_predict.h \
- is.h \
- iq_table.h \
- kbd_win.h \
- lt_predict.h \
- mdct.h \
- mdct_tab.h \
- mp4.h \
- ms.h \
- output.h \
- pns.h \
- ps_dec.h \
- ps_tables.h \
- pulse.h \
- rvlc.h \
- sbr_dct.h \
- sbr_dec.h \
- sbr_e_nf.h \
- sbr_fbt.h \
- sbr_hfadj.h \
- sbr_hfgen.h \
- sbr_huff.h \
- sbr_noise.h \
- sbr_qmf.h \
- sbr_qmf_c.h \
- sbr_syntax.h \
- sbr_tf_grid.h \
- sine_win.h \
- specrec.h \
- ssr.h \
- ssr_fb.h \
- ssr_ipqf.h \
- ssr_win.h \
- structs.h \
- syntax.h \
- tns.h
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lm -lfaad $(LTLIBINTL)
+noinst_HEADERS =
all: all-recursive

42
multimedia/xine-lib/patches/patch-src_libfaad_xine_faad_decoder_c
View File

@ -1,29 +1,7 @@
$OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakemsr Exp $
--- src/libfaad/xine_faad_decoder.c.orig Tue Jan 1 08:30:08 2008
+++ src/libfaad/xine_faad_decoder.c Wed Jan 9 01:50:22 2008
@@ -31,16 +31,21 @@
#define LOG
*/
+#include <faad.h>
+
#include "xine_internal.h"
#include "audio_out.h"
#include "buffer.h"
#include "xineutils.h"
+
+#if 0
#include "common.h"
#include "structs.h"
#include "decoder.h"
#include "syntax.h"
#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */
+#endif
typedef struct {
audio_decoder_class_t decoder_class;
@@ -52,26 +57,26 @@ typedef struct faad_decoder_s {
$OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.3 2008/08/20 01:54:01 brad Exp $
--- src/libfaad/xine_faad_decoder.c.orig Wed Aug 13 12:26:38 2008
+++ src/libfaad/xine_faad_decoder.c Thu Aug 14 18:48:40 2008
@@ -56,26 +56,26 @@ typedef struct faad_decoder_s {
xine_stream_t *stream;
/* faad2 stuff */
@ -59,7 +37,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
uint32_t ao_cap_mode;
int output_open;
@@ -122,33 +127,33 @@ static void faad_meta_info_set ( faad_decoder_t *this
@@ -126,33 +126,33 @@ static void faad_meta_info_set ( faad_decoder_t *this
static int faad_open_dec( faad_decoder_t *this ) {
int used;
@ -101,7 +79,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
this->rate, this->num_channels, used);
this->size -= used;
@@ -162,7 +167,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
@@ -166,7 +166,7 @@ static int faad_open_dec( faad_decoder_t *this ) {
if( this->faac_failed ) {
if( this->faac_dec ) {
@ -110,7 +88,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
this->faac_dec = NULL;
}
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0);
@@ -186,9 +191,9 @@ static int faad_open_output( faad_decoder_t *this ) {
@@ -190,9 +190,9 @@ static int faad_open_output( faad_decoder_t *this ) {
this->ao_cap_mode = AO_CAP_MODE_5_1CHANNEL;
break;
} else {
@ -122,7 +100,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
this->num_channels = 2;
}
case 2:
@@ -211,7 +216,7 @@ static void faad_decode_audio ( faad_decoder_t *this,
@@ -215,7 +215,7 @@ static void faad_decode_audio ( faad_decoder_t *this,
uint8_t *sample_buffer;
uint8_t *inbuf;
audio_buffer_t *audio_buffer;
@ -131,7 +109,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
if( !this->faac_dec )
return;
@@ -220,12 +225,12 @@ static void faad_decode_audio ( faad_decoder_t *this,
@@ -224,12 +224,12 @@ static void faad_decode_audio ( faad_decoder_t *this,
while( (!this->raw_mode && end_frame && this->size >= 10) ||
(this->raw_mode && this->size >= this->rec_audio_src_size) ) {
@ -146,7 +124,7 @@ $OpenBSD: patch-src_libfaad_xine_faad_decoder_c,v 1.2 2008/01/15 00:36:46 jakems
used = 1;
} else {
used = this->faac_finfo.bytesconsumed;
@@ -405,7 +410,7 @@ static void faad_dispose (audio_decoder_t *this_gen) {
@@ -409,7 +409,7 @@ static void faad_dispose (audio_decoder_t *this_gen) {
this->dec_config_size = 0;
if( this->faac_dec )