Author: pebender
Date: Sun Nov 2 12:56:10 2008
New Revision: 3900
Added:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-15767.27884.patch.gar
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-libdvdread_udf.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-x11_headers.patch
trunk/gar-minimyth/script/mediaplayers/xine-lib/files/xine-lib-1.1.15-ffmpeg_api_change.patch
trunk/gar-minimyth/script/utils/transcode/files/transcode-1.0.7rc1-configure.patch
Removed:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-15261.27547.patch.gar
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-cross-i386.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-cross-x86_64.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-libdvdread_udf.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27547.15261-x11_headers.patch
trunk/gar-minimyth/script/utils/transcode/files/transcode-1.0.6-configure.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/index.html
trunk/gar-minimyth/script/lib/ffmpeg/Makefile
trunk/gar-minimyth/script/lib/ffmpeg/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
trunk/gar-minimyth/script/mediaplayers/xine-lib/Makefile
trunk/gar-minimyth/script/mediaplayers/xine-lib/checksums
trunk/gar-minimyth/script/utils/transcode/Makefile
trunk/gar-minimyth/script/utils/transcode/checksums
Log:
- Updated packages
lib/ffmpeg
mediaplayers/mplayer-svn
utils/transcode
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Sun Nov 2
12:56:10 2008
@@ -18,6 +18,9 @@
xorg-7.4/libpthread-stubs.
Updated packages
+ lib/ffmpeg.
+ mediaplayers/mplayer-svn.
+ utils/transcode.
xorg-7.3/xkeyboard-config.
xorg-7.3/libdrm.
xorg-7.3/xf86-video-intel.
Modified: trunk/gar-minimyth/html/minimyth/index.html
==============================================================================
--- trunk/gar-minimyth/html/minimyth/index.html (original)
+++ trunk/gar-minimyth/html/minimyth/index.html Sun Nov 2 12:56:10 2008
@@ -65,19 +65,19 @@
</ul>
</li>
<li>
- <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
27547</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15261</strong>
+ <a href="http://www.mplayerhq.hu/";>MPlayer</a> <strong>SVN
27884</strong> and
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15767</strong>
(experimental)
</li>
<li>
<a href="http://www.videolan.org/";>VLC</a>
<strong>0.9.5</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15261</strong>
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15767</strong>
(experimental)
</li>
<li>
<a href="http://www.xinehq.de/";>xine-ui</a>
<strong>0.99.5</strong>,
<a href="http://www.xinehq.de/";>xine-lib</a>
<strong>1.1.15</strong> and
- <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15261</strong>
+ <a href="http://ffmpeg.mplayerhq.hu/";>FFmpeg</a> <strong>SVN
15767</strong>
</li>
<li>
<a href="http://fceultra.sourceforge.net/";>FCE Ultra</a>
<strong>0.98.13-pre</strong>
@@ -195,7 +195,7 @@
alt="Valid CSS!" height="31" width="88" /></a>
</div>
<div class="version">
- Last Updated on 2008-10-31
+ Last Updated on 2008-11-02
<br />
< mailto : webmaster at minimyth dot org >
</div>
Modified: trunk/gar-minimyth/script/lib/ffmpeg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/Makefile (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/Makefile Sun Nov 2 12:56:10 2008
@@ -1,5 +1,5 @@
GARNAME = ffmpeg
-GARVERSION = 15261.27547
+GARVERSION = 15767.27884
CATEGORIES = lib
MASTER_SITES = svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
@@ -22,6 +22,7 @@
CONFIGURE_ARGS = \
--enable-logging \
--prefix=$(prefix) \
+ --bindir=$(bindir) \
--libdir=$(libdir) \
--shlibdir=$(libdir) \
--incdir=$(includedir)/ffmpeg \
@@ -40,8 +41,6 @@
--disable-w32threads \
--enable-x11grab \
--disable-mlib \
- --disable-liba52 \
- --disable-liba52bin \
--disable-avisynth \
--disable-libamr-nb \
--disable-libamr-wb \
@@ -54,6 +53,7 @@
--disable-libmp3lame \
--disable-libnut \
--disable-libschroedinger \
+ --disable-libspeex \
--disable-libtheora \
--disable-libvorbis \
--disable-libx264 \
@@ -61,10 +61,11 @@
--cross-prefix=$(compiler_prefix) \
--enable-cross-compile \
--target-os="linux" \
- --cc="gcc" \
+ --cc="$(CC)" \
--extra-cflags="$(CFLAGS)" \
--extra-ldflags="$(LDFLAGS)" \
--extra-libs="" \
+ --extra-version="" \
--build-suffix="" \
--arch=$(GARCH_FAMILY) \
--cpu=$(GARCH) \
@@ -82,7 +83,6 @@
--enable-zlib \
--enable-bzlib \
--disable-vhook \
- --disable-debug \
--disable-mpegaudio-hp \
--enable-gray \
--enable-ffmpeg \
@@ -98,6 +98,8 @@
--enable-parsers \
--enable-bsfs \
--disable-protocols \
+ --enable-filters \
+ --disable-debug \
--disable-gprof \
--enable-optimizations \
--disable-extra-warnings \
Modified: trunk/gar-minimyth/script/lib/ffmpeg/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/checksums (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/checksums Sun Nov 2 12:56:10 2008
@@ -1 +1 @@
-9634862190570c0bed1ebb87e02a4c5e download/ffmpeg-15261.27547.patch.gar
+15d4230014580dfbaa389ddb95681f7e download/ffmpeg-15767.27884.patch.gar
Added:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-15767.27884.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-15767.27884.patch.gar
Sun Nov 2 12:56:10 2008
@@ -0,0 +1,46 @@
+diff -Naur ffmpeg-15767.27884-old/configure
ffmpeg-15767.27884-new/configure
+--- ffmpeg-15767.27884-old/configure 2008-11-02 12:12:57.000000000 -0800
++++ ffmpeg-15767.27884-new/configure 2008-11-02 12:13:46.000000000 -0800
+@@ -680,11 +680,11 @@
+ func=$4
+ shift 4
+ disable $cfg
+- check_cmd ${pkg}-config --version
++ check_cmd @GAR_DESTDIR@@GAR_bindir@/${pkg}-config --version
+ err=$?
+ if test "$err" = 0; then
+- temp_cflags `${pkg}-config --cflags`
+- temp_extralibs `${pkg}-config --libs`
++ temp_cflags [EMAIL PROTECTED]@@GAR_bindir@/${pkg}-config --cflags`
++ temp_extralibs [EMAIL PROTECTED]@@GAR_bindir@/${pkg}-config --libs`
+ check_lib "$@" $header $func && enable $cfg
+ fi
+ return $err
+@@ -1874,7 +1874,7 @@
+
+ disable sdl_too_old
+ disable sdl
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="@GAR_DESTDIR@@GAR_bindir@/sdl-config"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=`"${SDL_CONFIG}" --cflags`
+ temp_cflags $sdl_cflags
+diff -Naur ffmpeg-15767.27884-old/Makefile ffmpeg-15767.27884-new/Makefile
+--- ffmpeg-15767.27884-old/Makefile 2008-11-02 12:12:57.000000000 -0800
++++ ffmpeg-15767.27884-new/Makefile 2008-11-02 12:13:46.000000000 -0800
+@@ -89,11 +89,11 @@
+
+ HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS)
$(HOOKS-yes)))
+
+-VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
+-LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++VHOOKCFLAGS-$(HAVE_IMLIB2) += [EMAIL PROTECTED]@@GAR_bindir@/imlib2-config
--cflags`
++LIBS_imlib2$(SLIBSUF) = [EMAIL PROTECTED]@@GAR_bindir@/imlib2-config
--libs`
+
+-VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
+-LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++VHOOKCFLAGS-$(HAVE_FREETYPE2) +=
[EMAIL PROTECTED]@@GAR_bindir@/freetype-config --cflags`
++LIBS_drawtext$(SLIBSUF) =
[EMAIL PROTECTED]@@GAR_bindir@/freetype-config --libs`
+
+ VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
+
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Sun Nov 2
12:56:10 2008
@@ -1,9 +1,9 @@
GARNAME = MPlayer
-GARVERSION = 27547.15261
+GARVERSION = 27884.15767
CATEGORIES = mediaplayers
MASTER_SITES = svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-libdvdread_udf.patch
$(DISTNAME)-x11_headers.patch $(DISTNAME)-cross-$(GARCH_FAMILY).patch
+PATCHFILES = $(DISTNAME)-libdvdread_udf.patch $(DISTNAME)-x11_headers.patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
@@ -44,6 +44,7 @@
--disable-lircc \
--disable-joystick \
--disable-apple-remote \
+ --disable-apple-ir \
--enable-vm \
--enable-xf86keysym \
--disable-radio \
@@ -89,11 +90,13 @@
--disable-rpath
# Codecs
# --enable-libcdio must be auto or cflags and libs will not be determined
correctly.
-# --enable-libdca
# --enable-libavutil_so
# --enable-libavcodec_so
# --enable-libavformat_so
# --enable-libpostproc_so
+# --enable-libswscale_so
+# --enable-libdca
+# --enable-liba52
CONFIGURE_ARGS_CODEC = \
--disable-gif \
--enable-png \
@@ -104,12 +107,17 @@
--enable-xanim \
--enable-real \
--disable-xvid \
+ --disable-xvid-lavc \
--disable-x264 \
+ --disable-x264-lavc \
+ --disable-libdirac-lavc \
+ --disable-libschroedinger-lavc \
--disable-libnut \
--disable-libavutil_a \
--disable-libavcodec_a \
--disable-libavformat_a \
--disable-libpostproc_a \
+ --disable-libswscale_a \
--disable-libavcodec_mpegaudio_hp \
--disable-tremor-internal \
--disable-tremor-low \
@@ -121,13 +129,17 @@
--disable-faad-internal \
--disable-faad-fixed \
--disable-faac \
+ --disable-faac-lavc \
--disable-ladspa \
--disable-libdv \
--enable-mad \
+ --disable-mp3lame \
+ --disable-mp3lame-lavc \
+ --disable-toolame \
--disable-twolame \
--disable-xmms \
--enable-mp3lib \
- --enable-liba52 \
+ --disable-liba52-internal \
--enable-libmpeg2 \
--disable-musepack \
--disable-libamr_nb \
@@ -163,11 +175,13 @@
--enable-xinerama \
--enable-x11 \
--disable-xshape \
+ --disable-xss \
--disable-fbdev \
--disable-mlib \
--disable-3dfx \
--disable-tdfxfb \
--disable-s3fb \
+ --disable-wii \
--disable-directfb \
--disable-zr \
--disable-bl \
@@ -175,7 +189,8 @@
--disable-xvr100 \
--disable-tga \
--disable-pnm \
- --disable-md5sum
+ --disable-md5sum \
+ --disable-yuv4mpeg
# Audio output: enable alsa
CONFIGURE_ARGS_AUDIO = \
--enable-alsa \
@@ -198,9 +213,12 @@
--as="$(AS)" \
--ar="$(AR)" \
--ranlib="$(RANLIB)" \
+ --windres="false" \
--target="$(GARCH_FAMILY)-linux" \
+ --disable-static \
--charset="UTF-8" \
- --language="all"
+ --language="all" \
+ --with-install="$(DESTDIR)$(bindir)"
CONFIGURE_ARGS_ADVANCED = \
--enable-mmx \
--enable-mmxext \
@@ -213,6 +231,7 @@
--disable-altivec \
--disable-armv5te \
--disable-armv6 \
+ --disable-armvfp \
--disable-iwmmxt \
--enable-fastmemcpy \
--disable-big-endian \
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Sun Nov
2
12:56:10 2008
@@ -1,4 +1,2 @@
-30eee9f2f54bb15f1fef51e3cbce3a60
download/MPlayer-27547.15261-libdvdread_udf.patch
-ed3b1ee81081164af8f30e28eac3fedc
download/MPlayer-27547.15261-x11_headers.patch
-99dadb98596fb7e181cbbd4f8a7485ea
download/MPlayer-27547.15261-cross-i386.patch
-ea19fce18c4e841994eda4ab8efb3672
download/MPlayer-27547.15261-cross-x86_64.patch
+bbfc268350535732906b7f19eb11947e
download/MPlayer-27884.15767-libdvdread_udf.patch
+2c7918a7d532a015342674e5f83554ee
download/MPlayer-27884.15767-x11_headers.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-libdvdread_udf.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-libdvdread_udf.patch
Sun Nov 2 12:56:10 2008
@@ -0,0 +1,76 @@
+diff -Naur MPlayer-27884.15767-old/libdvdread/dvd_reader.c
MPlayer-27884.15767-new/libdvdread/dvd_reader.c
+--- MPlayer-27884.15767-old/libdvdread/dvd_reader.c 2008-11-02
12:17:53.000000000 -0800
++++ MPlayer-27884.15767-new/libdvdread/dvd_reader.c 2008-11-02
12:20:06.000000000 -0800
+@@ -1391,6 +1391,28 @@
+ return offset;
+ }
+
++int DVDFileSeekForce( dvd_file_t *dvd_file, int offset, int force_size )
++{
++ /* Check arguments. */
++ if( dvd_file == NULL || offset < 0 )
++ return -1;
++
++ if( dvd_file->dvd->isImageFile ) {
++ if( force_size < 0 )
++ force_size = (offset - 1) / DVD_VIDEO_LB_LEN + 1;
++ if( dvd_file->filesize < force_size ) {
++ dvd_file->filesize = force_size;
++ fprintf(stderr, "libdvdread: Ignored UDF provided size of file.\n");
++ }
++ }
++
++ if( offset > dvd_file->filesize * DVD_VIDEO_LB_LEN ) {
++ return -1;
++ }
++ dvd_file->seek_pos = (uint32_t) offset;
++ return offset;
++}
++
+ #ifndef HAVE_UINTPTR_T
+ #warning "Assuming that (unsigned long) can hold (void *)"
+ typedef unsigned long uintptr_t;
+@@ -1442,7 +1464,7 @@
+ memcpy( data, &(secbuf[ seek_byte ]), byte_size );
+ free( secbuf_start );
+
+- dvd_file->seek_pos += byte_size;
++ DVDFileSeekForce(dvd_file, dvd_file->seek_pos + byte_size, -1);
+ return byte_size;
+ }
+
+diff -Naur MPlayer-27884.15767-old/libdvdread/dvd_reader.h
MPlayer-27884.15767-new/libdvdread/dvd_reader.h
+--- MPlayer-27884.15767-old/libdvdread/dvd_reader.h 2008-11-02
12:17:53.000000000 -0800
++++ MPlayer-27884.15767-new/libdvdread/dvd_reader.h 2008-11-02
12:20:06.000000000 -0800
+@@ -240,6 +240,8 @@
+ */
+ int DVDFileSeek( dvd_file_t *, int );
+
++int DVDFileSeekForce( dvd_file_t *, int, int );
++
+ /**
+ * Reads the given number of bytes from the file. This call can only be
used
+ * on the information files, and may not be used for reading from a VOB.
This
+diff -Naur MPlayer-27884.15767-old/libdvdread/ifo_read.c
MPlayer-27884.15767-new/libdvdread/ifo_read.c
+--- MPlayer-27884.15767-old/libdvdread/ifo_read.c 2008-11-02
12:17:53.000000000 -0800
++++ MPlayer-27884.15767-new/libdvdread/ifo_read.c 2008-11-02
12:20:06.000000000 -0800
+@@ -110,6 +110,10 @@
+ return (DVDFileSeek(dvd_file, (int)offset) == (int)offset);
+ }
+
++static inline int DVDFileSeekForce_( dvd_file_t *dvd_file, uint32_t
offset, int force_size ) {
++ return (DVDFileSeekForce(dvd_file, (int)offset, force_size) ==
(int)offset);
++}
++
+
+ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, int title) {
+ ifo_handle_t *ifofile;
+@@ -1663,7 +1667,7 @@
+ unsigned int i;
+ int info_length;
+
+- if(!DVDFileSeek_(ifofile->file, sector * DVD_BLOCK_LEN))
++ if(!DVDFileSeekForce_(ifofile->file, sector * DVD_BLOCK_LEN, sector))
+ return 0;
+
+ if(!(DVDReadBytes(ifofile->file, vobu_admap, VOBU_ADMAP_SIZE)))
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-x11_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-27884.15767-x11_headers.patch
Sun Nov 2 12:56:10 2008
@@ -0,0 +1,42 @@
+diff -Naur MPlayer-27884.15767-old/configure
MPlayer-27884.15767-new/configure
+--- MPlayer-27884.15767-old/configure 2008-11-02 12:19:44.000000000 -0800
++++ MPlayer-27884.15767-new/configure 2008-11-02 12:20:49.000000000 -0800
+@@ -3894,23 +3894,23 @@
+ echocheck "X11 headers presence"
+ _x11_headers="no"
+ _res_comment="check if the dev(el) packages are installed"
+- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
++# for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
+ _x11_headers="yes"
+ _res_comment=""
+- break
+- fi
+- done
+- if test $_cross_compile = no; then
+- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
+- _inc_extra="$_inc_extra -I$I"
+- _x11_headers="yes"
+- _res_comment="using $I"
+- break
+- fi
+- done
+- fi
++# break
++# fi
++# done
++# if test $_cross_compile = no; then
++# for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
++# _inc_extra="$_inc_extra -I$I"
++# _x11_headers="yes"
++# _res_comment="using $I"
++# break
++# fi
++# done
++# fi
+ echores "$_x11_headers"
+
+
Modified: trunk/gar-minimyth/script/mediaplayers/xine-lib/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/xine-lib/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/xine-lib/Makefile Sun Nov 2
12:56:10 2008
@@ -3,7 +3,7 @@
CATEGORIES = mediaplayers
MASTER_SITES = http://easynews.dl.sourceforge.net/sourceforge/xine/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-libtool_2.2.x.patch $(DISTNAME).patch.gar
$(DISTNAME)-cross.patch
+PATCHFILES = $(DISTNAME)-ffmpeg_api_change.patch
$(DISTNAME)-libtool_2.2.x.patch $(DISTNAME).patch.gar
$(DISTNAME)-cross.patch
LICENSE = GPL2
DESCRIPTION =
Modified: trunk/gar-minimyth/script/mediaplayers/xine-lib/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/xine-lib/checksums (original)
+++ trunk/gar-minimyth/script/mediaplayers/xine-lib/checksums Sun Nov 2
12:56:10 2008
@@ -1,4 +1,5 @@
42a2b4893b7f892eb334de2fc36d49c8 download/xine-lib-1.1.15.tar.bz2
+041b6de6a6459eb4bb21fa4a8207e972
download/xine-lib-1.1.15-ffmpeg_api_change.patch
f3f6e55e32df8b0236e75143a2149ba8
download/xine-lib-1.1.15-libtool_2.2.x.patch
2d0aa9fbe0b5035e3c3a8147f121c8a5 download/xine-lib-1.1.15.patch.gar
3739e32c75f826f321a9f0153ac167c7 download/xine-lib-1.1.15-cross.patch
Added:
trunk/gar-minimyth/script/mediaplayers/xine-lib/files/xine-lib-1.1.15-ffmpeg_api_change.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/xine-lib/files/xine-lib-1.1.15-ffmpeg_api_change.patch
Sun Nov 2 12:56:10 2008
@@ -0,0 +1,26 @@
+diff -Naur xine-lib-1.1.15-old/src/combined/ffmpeg/ff_audio_decoder.c
xine-lib-1.1.15-new/src/combined/ffmpeg/ff_audio_decoder.c
+--- xine-lib-1.1.15-old/src/combined/ffmpeg/ff_audio_decoder.c 2008-07-15
16:13:03.000000000 -0700
++++ xine-lib-1.1.15-new/src/combined/ffmpeg/ff_audio_decoder.c 2008-11-02
11:52:12.000000000 -0800
+@@ -322,7 +322,7 @@
+
+ if (!this->output_open) {
+ if (!this->audio_bits || !this->audio_sample_rate |
| !this->audio_channels) {
+- avcodec_decode_audio (this->context,
++ avcodec_decode_audio2 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size,
+ &this->buf[0],
+diff -Naur xine-lib-1.1.15-old/src/combined/ffmpeg/ffmpeg_decoder.h
xine-lib-1.1.15-new/src/combined/ffmpeg/ffmpeg_decoder.h
+--- xine-lib-1.1.15-old/src/combined/ffmpeg/ffmpeg_decoder.h 2008-05-19
07:15:42.000000000 -0700
++++ xine-lib-1.1.15-new/src/combined/ffmpeg/ffmpeg_decoder.h 2008-11-02
11:52:12.000000000 -0800
+@@ -33,6 +33,10 @@
+ # include "../../libffmpeg/libavcodec/avcodec.h"
+ #endif
+
++#if LIBAVCODEC_VERSION_MAJOR > 51
++#define bits_per_sample bits_per_coded_sample
++#endif
++
+ typedef struct ff_codec_s {
+ uint32_t type;
+ enum CodecID id;
Modified: trunk/gar-minimyth/script/utils/transcode/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/transcode/Makefile (original)
+++ trunk/gar-minimyth/script/utils/transcode/Makefile Sun Nov 2 12:56:10
2008
@@ -1,5 +1,5 @@
GARNAME = transcode
-GARVERSION = 1.0.6
+GARVERSION = 1.0.7rc1
CATEGORIES = utils
MASTER_SITES = http://fromani.exit1.org/
MASTER_SITES += http://www.kraymer.mynetcologne.de/
Modified: trunk/gar-minimyth/script/utils/transcode/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/transcode/checksums (original)
+++ trunk/gar-minimyth/script/utils/transcode/checksums Sun Nov 2 12:56:10
2008
@@ -1,4 +1,4 @@
-7c3a341b0e4540e34ef50c66b0ab751d download/transcode-1.0.6.tar.bz2
-8b782fad28e35b5e4ad34c764c8c6ad4 download/transcode-1.0.6-configure.patch
+cc77486d6d17b266ae11ec805840fc29 download/transcode-1.0.7rc1.tar.bz2
+73e46f703a1ca06376a91a1433f74382
download/transcode-1.0.7rc1-configure.patch
5203436aec962a018494642e03852d10 download/config.cache.i386
5203436aec962a018494642e03852d10 download/config.cache.x86_64
Added:
trunk/gar-minimyth/script/utils/transcode/files/transcode-1.0.7rc1-configure.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/transcode/files/transcode-1.0.7rc1-configure.patch
Sun Nov 2 12:56:10 2008
@@ -0,0 +1,42 @@
+diff -Naur transcode-1.0.7rc1-old/configure.in
transcode-1.0.7rc1-new/configure.in
+--- transcode-1.0.7rc1-old/configure.in 2008-09-21 08:00:35.000000000
-0700
++++ transcode-1.0.7rc1-new/configure.in 2008-11-02 11:06:10.000000000
-0800
+@@ -680,7 +680,7 @@
+ dnl
+ LIBMPEG2_EXTRA_LIBS="$LIBMPEG2_EXTRA_LIBS $($PKG_CONFIG --libs
libmpeg2convert)"
+ TC_PKG_CHECK(libmpeg2, required, LIBMPEG2, no, mpeg2dec/mpeg2.h,
+- mpeg2, mpeg2_init, mpeg2dec, [http://libmpeg2.sourceforge.net/])
++ mpeg2, mpeg2_init, libmpeg2, [http://libmpeg2.sourceforge.net/])
+ TC_PKG_HAVE(libmpeg2, LIBMPEG2)
+
+
+@@ -910,8 +910,9 @@
+ ],
+ [lame_version="`./conftest$ac_exeext`"],
+ [TC_PKG_ERROR(lame, lame.h, yes, lame, [http://www.mp3dev.org/],
+- [cannot compile and run a test program])],,
+- [echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ [cannot compile and run a test program])],
++ [echo $ac_n "cross compiling; assumed OK... $ac_c"
++ lame_version=396])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+
+@@ -1159,7 +1160,7 @@
+ dnl
+ LIBXML2_EXTRA_LIBS="$LIBXML2_EXTRA_LIBS $($PKG_CONFIG --libs libxml-2.0)"
+ TC_PKG_CHECK(libxml2, no, LIBXML2, xml2-config, [libxml/parser.h],
+- xml2, xmlStrcmp, libxml-2.0, [http://xmlsoft.org])
++ xml2, xmlStrcmp, libXML, [http://xmlsoft.org])
+ TC_PKG_HAVE(libxml2, LIBXML2)
+
+ dnl
+@@ -1194,7 +1195,7 @@
+ dnl
+ dnl SDL
+ dnl
+-TC_PKG_CHECK(sdl, no, SDL, sdl-config, SDL.h, SDL, SDL_Init, SDL,
++TC_PKG_CHECK(sdl, no, SDL, sdl-config, SDL.h, SDL, SDL_Init, sdl,
+ [http://www.libsdl.org/])
+ if test x"$have_sdl" = x"yes" ; then
+ sdl_major_version=1
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
