Skip to Content.
Please activate JavaScript in your web browser
List archive
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
Chronological
Thread
<
Chronological
>
<
Thread
>
From
: Arwed von Merkatz <v.merkatz AT gmx.net>
To
: sm-commit AT lists.ibiblio.org
Subject
: Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
Date
: Mon, 17 Jul 2006 22:19:32 +0200
On Tue, Jul 11, 2006 at 06:28:16AM -0500, Ladislav Hagara wrote:
>
GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:
>
>
video-libs/xine-lib/DETAILS | 7 ++--
>
video-libs/xine-lib/HISTORY | 4 ++
>
video-libs/xine-lib/PRE_BUILD | 5 ---
>
video-libs/xine-lib/xine_flac.diff | 54
>
-------------------------------------
>
4 files changed, 9 insertions(+), 61 deletions(-)
>
>
New commits:
>
commit 6c6bcb0793a90336d197c0092fa0e51715c95386
>
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
>
>
xine-lib 1.1.2, SECURITY_PATCH=1
Sorry for asking, but my bugs mailbox is the one with the biggest
backlog, has a bug been filed for integration of this, and if so, what
bug number?
>
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
>
index 5ae7b22..85a367b 100755
>
--- a/video-libs/xine-lib/DETAILS
>
+++ b/video-libs/xine-lib/DETAILS
>
@@ -1,12 +1,13 @@
>
SPELL=xine-lib
>
- VERSION=1.1.1
>
- SOURCE=$SPELL-$VERSION.tar.gz
>
+ VERSION=1.1.2
>
+ SOURCE=$SPELL-$VERSION.tar.bz2
>
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
>
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
>
WEB_SITE=
http://xine.sourceforge.net
>
ENTERED=20010927
>
-
>
SOURCE_HASH=sha512:cb669a0b9ca4e3c5d4c4c8b156e26dab0a1dc0b48a5d73727f2d53a437560170820d81c6fd2a5ead21361eb645bda8e5c97017a6cf0019f70b0761b935cc4df1
>
+
>
SOURCE_HASH=sha512:ae736be0a23a865652e0eb1d33af649c7d9ff992b2d6a67e59448fb3d43a2bba3a51f98d2d596b7473e88b348e0b7e43f1ad2369c287304a1fed1a5f79b2f7a1
>
LICENSE[0]=GPL
>
+ SECURITY_PATCH=1
>
PATCHLEVEL=2
>
KEYWORDS="player video libs"
>
SHORT="xine is a free video player."
>
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
>
index 3e12fe6..01eede4 100644
>
--- a/video-libs/xine-lib/HISTORY
>
+++ b/video-libs/xine-lib/HISTORY
>
@@ -1,3 +1,7 @@
>
+2006-07-11 Ladislav Hagara <hgr AT vabo.cz>
>
+ * DETAILS: 1.1.2, SECURITY_PATCH=1, CVE-2005-4048, CVE-2006-2802
>
+ * PRE_BUILD, xine_flac.diff: removed patch, has been integrated
>
+
>
2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
>
* PRE_BUILD: Apply patch to fix flac playback. Thanks, Bearcat!
>
* xine_flac.diff: Added.
>
diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
>
index 213753c..bd2e595 100755
>
--- a/video-libs/xine-lib/PRE_BUILD
>
+++ b/video-libs/xine-lib/PRE_BUILD
>
@@ -5,7 +5,4 @@ # fix a typo (missing quoting) so detect
>
# compiles but fails to run otherwise
>
sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
>
sedit 's/$(FFMPEG_LIBS)/\0 $(FFMPEG_POSTPROC_LIBS)/' \
>
- src/libffmpeg/Makefile.in &&
>
-
>
-# apply patch to fix flac playback in xine-lib 1.1.1
>
-patch -p0 < $SCRIPT_DIRECTORY/xine_flac.diff
>
+ src/libffmpeg/Makefile.in
>
diff --git a/video-libs/xine-lib/xine_flac.diff
>
b/video-libs/xine-lib/xine_flac.diff
>
deleted file mode 100644
>
index f253012..0000000
>
--- a/video-libs/xine-lib/xine_flac.diff
>
+++ /dev/null
>
@@ -1,54 +0,0 @@
>
---- src/demuxers/demux_flac.c 2004-09-22 23:54:44.000000000 +0300
>
-+++ src/demuxers/demux_flac.c.new 2006-07-06 02:36:47.000000000 +0300
>
-@@ -270,23 +270,36 @@
>
- /* send start buffers */
>
- _x_demux_control_start(this->stream);
>
-
>
-- if (this->audio_fifo) {
>
-- buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
>
-- buf->type = BUF_AUDIO_FLAC;
>
-- buf->decoder_flags =
>
BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
>
-- buf->decoder_info[0] = 0;
>
-- buf->decoder_info[1] = this->sample_rate;
>
-- buf->decoder_info[2] = this->bits_per_sample;
>
-- buf->decoder_info[3] = this->channels;
>
-- /* copy the faux WAV header */
>
-- buf->size = sizeof(xine_waveformatex) + FLAC_STREAMINFO_SIZE;
>
-- memcpy(buf->content, this->streaminfo, buf->size);
>
-- /* forge a WAV header with the proper length */
>
-- wave.cbSize = FLAC_STREAMINFO_SIZE;
>
-- memcpy(buf->content, &wave, sizeof(xine_waveformatex));
>
-- this->audio_fifo->put (this->audio_fifo, buf);
>
-+ if ( ! this->audio_fifo )
>
-+ {
>
-+ this->status = DEMUX_FINISHED;
>
-+ return;
>
- }
>
-
>
-+ buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
>
-+ buf->type = BUF_AUDIO_FLAC;
>
-+ buf->decoder_flags =
>
BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
>
-+ buf->decoder_info[0] = 0;
>
-+ buf->decoder_info[1] = this->sample_rate;
>
-+ buf->decoder_info[2] = this->bits_per_sample;
>
-+ buf->decoder_info[3] = this->channels;
>
-+ /* copy the faux WAV header */
>
-+ buf->size = sizeof(xine_waveformatex) + FLAC_STREAMINFO_SIZE;
>
-+ memcpy(buf->content, this->streaminfo, buf->size);
>
-+ /* forge a WAV header with the proper length */
>
-+ wave.cbSize = FLAC_STREAMINFO_SIZE;
>
-+ memcpy(buf->content, &wave, sizeof(xine_waveformatex));
>
-+ this->audio_fifo->put (this->audio_fifo, buf);
>
-+
>
-+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0);
>
-+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1);
>
-+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS,
>
-+ this->channels);
>
-+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE,
>
-+ this->sample_rate);
>
-+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS,
>
-+ this->bits_per_sample);
>
-+
>
- this->status = DEMUX_OK;
>
- }
>
-
>
_______________________________________________
>
SM-Commit mailing list
>
SM-Commit AT lists.ibiblio.org
>
http://lists.ibiblio.org/mailman/listinfo/sm-commit
>
--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org
[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
,
Ladislav Hagara, 07/11/2006
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
,
Arwed von Merkatz, 07/17/2006
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
,
Jeremy Blosser, 07/17/2006
Re: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6c6bcb0793a90336d197c0092fa0e51715c95386)
,
Arwed von Merkatz, 07/17/2006
Archive powered by
MHonArc 2.6.24
.