diff options
author | Jon Nall <nall@gentoo.org> | 2002-12-09 02:28:51 +0000 |
---|---|---|
committer | Jon Nall <nall@gentoo.org> | 2002-12-09 02:28:51 +0000 |
commit | 50bd58cfa1f724b8dd1b4678b8859e96b87c2961 (patch) | |
tree | 889bb230b03eff6fc94dc91ec19d8e70fe81060e /media-libs/gst-plugins/files | |
parent | version bump, header fixes, added IUSE (diff) | |
download | historical-50bd58cfa1f724b8dd1b4678b8859e96b87c2961.tar.gz historical-50bd58cfa1f724b8dd1b4678b8859e96b87c2961.tar.bz2 historical-50bd58cfa1f724b8dd1b4678b8859e96b87c2961.zip |
keyworded ~ppc; fixed endianness in wavparse; fixed parallel build problem for ppc
Diffstat (limited to 'media-libs/gst-plugins/files')
3 files changed, 126 insertions, 0 deletions
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1 new file mode 100644 index 000000000000..d31363476a96 --- /dev/null +++ b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.2-r1 @@ -0,0 +1 @@ +MD5 f2d499cf117408b5a4adc7a0d71eb095 gst-plugins-0.4.2.tar.gz 1937052 diff --git a/media-libs/gst-plugins/files/gst-plugins-0.4.2-parallel-make-depfix.patch b/media-libs/gst-plugins/files/gst-plugins-0.4.2-parallel-make-depfix.patch new file mode 100644 index 000000000000..ae24448780b7 --- /dev/null +++ b/media-libs/gst-plugins/files/gst-plugins-0.4.2-parallel-make-depfix.patch @@ -0,0 +1,11 @@ +--- gst/playondemand/Makefile.in.orig 2002-12-06 18:25:37.000000000 -0600 ++++ gst/playondemand/Makefile.in 2002-12-06 18:25:53.000000000 -0600 +@@ -239,7 +239,7 @@ + am_demo_mp3_OBJECTS = demo_mp3-demo-mp3.$(OBJEXT) + demo_mp3_OBJECTS = $(am_demo_mp3_OBJECTS) + demo_mp3_LDADD = $(LDADD) +-demo_mp3_DEPENDENCIES = ++demo_mp3_DEPENDENCIES = ./libgstplayondemand.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) diff --git a/media-libs/gst-plugins/files/gst-plugins-0.4.2-wavparse-bigendian.patch b/media-libs/gst-plugins/files/gst-plugins-0.4.2-wavparse-bigendian.patch new file mode 100644 index 000000000000..b33073eb0f47 --- /dev/null +++ b/media-libs/gst-plugins/files/gst-plugins-0.4.2-wavparse-bigendian.patch @@ -0,0 +1,114 @@ +diff -u gst/wavparse.orig/gstriff.c gst/wavparse/gstriff.c +--- gst/wavparse.orig/gstriff.c 2002-12-07 12:45:41.000000000 -0600 ++++ gst/wavparse/gstriff.c 2002-12-07 15:17:30.000000000 -0600 +@@ -69,9 +69,9 @@ + g_return_val_if_fail(chunk != NULL,0); + chunk->offset = riff->nextlikely+8; /* point to the actual data */ + chunk->id = words[0]; +- chunk->size = words[1]; ++ chunk->size = GUINT32_FROM_LE(words[1]); + /* g_print("chunk id is 0x%08x '%s' and is 0x%08x long\n",words[0], */ +-/* gst_riff_id_to_fourcc(words[0]),words[1]); */ ++/* gst_riff_id_to_fourcc(words[0]),chunk->size); */ + riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ + riff->chunks = g_list_prepend(riff->chunks,chunk); + } +@@ -82,15 +82,15 @@ + + gulong gst_riff_fourcc_to_id(gchar *fourcc) { + g_return_val_if_fail(fourcc != NULL,0); +- +- return (fourcc[0] << 0) | (fourcc[1] << 8) | +- (fourcc[2] << 16) | (fourcc[3] << 24); ++ return GUINT32_FROM_LE((gulong)(fourcc[0] << 0) | (fourcc[1] << 8) | ++ (fourcc[2] << 16) | (fourcc[3] << 24)); + } + + gchar *gst_riff_id_to_fourcc(gulong id) { + gchar *fourcc = (gchar *)malloc(5); + + g_return_val_if_fail(fourcc != NULL, NULL); ++ id = GUINT32_FROM_LE(id); + + fourcc[0] = (id >> 0) & 0xff; + fourcc[1] = (id >> 8) & 0xff; +diff -u gst/wavparse.orig/gstwavparse.c gst/wavparse/gstwavparse.c +--- gst/wavparse.orig/gstwavparse.c 2002-12-07 12:45:41.000000000 -0600 ++++ gst/wavparse/gstwavparse.c 2002-12-07 15:17:37.000000000 -0600 +@@ -61,7 +61,10 @@ + "format", GST_PROPS_STRING ("int"), + "law", GST_PROPS_INT (0), + "endianness", GST_PROPS_INT (G_BYTE_ORDER), +- "signed", GST_PROPS_BOOLEAN (TRUE), ++ "signed", GST_PROPS_LIST ( ++ GST_PROPS_BOOLEAN (FALSE), ++ GST_PROPS_BOOLEAN (TRUE) ++ ), + "width", GST_PROPS_LIST ( + GST_PROPS_INT (8), + GST_PROPS_INT (16) +@@ -262,6 +265,11 @@ + /* we can gather format information now */ + format = (GstWavParseFormat *)((guchar *) GST_BUFFER_DATA (buf) + fmt->offset); + ++ wavparse->bps = GUINT16_FROM_LE(format->wBlockAlign); ++ wavparse->rate = GUINT32_FROM_LE(format->dwSamplesPerSec); ++ wavparse->channels = GUINT16_FROM_LE(format->wChannels); ++ wavparse->width = GUINT16_FROM_LE(format->wBitsPerSample); ++ + /* set the caps on the src pad */ + caps = GST_CAPS_NEW ( + "parsewav_src", +@@ -269,11 +277,11 @@ + "format", GST_PROPS_STRING ("int"), + "law", GST_PROPS_INT (0), /*FIXME */ + "endianness", GST_PROPS_INT (G_BYTE_ORDER), +- "signed", GST_PROPS_BOOLEAN (TRUE), /*FIXME */ +- "width", GST_PROPS_INT (format->wBitsPerSample), +- "depth", GST_PROPS_INT (format->wBitsPerSample), +- "rate", GST_PROPS_INT (format->dwSamplesPerSec), +- "channels", GST_PROPS_INT (format->wChannels) ++ "signed", GST_PROPS_BOOLEAN ((wavparse->width > 8) ? TRUE : FALSE), ++ "width", GST_PROPS_INT (wavparse->width), ++ "depth", GST_PROPS_INT (wavparse->width), ++ "rate", GST_PROPS_INT (wavparse->rate), ++ "channels", GST_PROPS_INT (wavparse->channels) + ); + + if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) { +@@ -281,13 +289,8 @@ + return; + } + +- wavparse->bps = format->wBlockAlign; +- wavparse->rate = format->dwSamplesPerSec; +- wavparse->channels = format->wChannels; +- wavparse->width = format->wBitsPerSample; +- + GST_DEBUG (0, "frequency %d, channels %d", +- format->dwSamplesPerSec, format->wChannels); ++ wavparse->rate, wavparse->channels); + + /* we're now looking for the data chunk */ + wavparse->state = GST_WAVPARSE_CHUNK_DATA; +--- gst-libs/gst/riff/riffutil.c.orig 2002-12-08 14:15:46.000000000 -0600 ++++ gst-libs/gst/riff/riffutil.c 2002-12-08 14:16:29.000000000 -0600 +@@ -27,8 +27,8 @@ + gulong gst_riff_fourcc_to_id(gchar *fourcc) { + g_return_val_if_fail(fourcc != NULL, 0); + +- return (fourcc[0] << 0) | (fourcc[1] << 8) | +- (fourcc[2] << 16) | (fourcc[3] << 24); ++ return GUINT32_FROM_LE((gulong)(fourcc[0] << 0) | (fourcc[1] << 8) | ++ (fourcc[2] << 16) | (fourcc[3] << 24)); + } + + gchar *gst_riff_id_to_fourcc(gulong id) { +@@ -36,6 +36,7 @@ + + g_return_val_if_fail(fourcc != NULL, NULL); + ++ id = GUINT32_FROM_LE(id); + fourcc[0] = (id >> 0) & 0xff; + fourcc[1] = (id >> 8) & 0xff; + fourcc[2] = (id >> 16) & 0xff; |