From: Chris Lord <chris@openedhand.com>
Date: Sun, 17 Apr 2005 03:03:31 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
X-Git-Tag: Release-2010-05/1~14424
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca324c3ec4522fed89197c039f379d8abdde5ed6;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/17 04:02:51+01:00 (none)!cwiiis
Move some patches from libxine-opie-1.0 to files, and apply them to libxine_1.0

BKrev: 4261d203seT0HI4tEww5LGp8XGhuFQ
---

diff --git a/packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch b/packages/libxine/files/libxine-cut-memusage.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0/libxine-cut-memusage.patch
rename to packages/libxine/files/libxine-cut-memusage.patch
diff --git a/packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch b/packages/libxine/files/libxine-ffmpeg-enable-arm.patch
similarity index 100%
rename from packages/libxine/libxine-1.0/libxine-ffmpeg-enable-arm.patch
rename to packages/libxine/files/libxine-ffmpeg-enable-arm.patch
diff --git a/packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch b/packages/libxine/files/libxine-libavcodec.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0/libxine-libavcodec.patch
rename to packages/libxine/files/libxine-libavcodec.patch
diff --git a/packages/libxine/libxine-1.0/libxine-libvorbis.patch b/packages/libxine/files/libxine-libvorbis.patch
similarity index 100%
rename from packages/libxine/libxine-1.0/libxine-libvorbis.patch
rename to packages/libxine/files/libxine-libvorbis.patch
diff --git a/packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch b/packages/libxine/files/libxine-tremor-autoconf.patch
similarity index 100%
rename from packages/libxine/libxine-1.0/libxine-tremor-autoconf.patch
rename to packages/libxine/files/libxine-tremor-autoconf.patch
diff --git a/packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch b/packages/libxine/files/mpegvideo-static-inlinine.patch
similarity index 100%
rename from packages/libxine/libxine-opie-1.0/mpegvideo-static-inlinine.patch
rename to packages/libxine/files/mpegvideo-static-inlinine.patch
diff --git a/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch b/packages/libxine/libxine-opie-1.0/libxine-ffmpeg-enable-arm.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch b/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch
deleted file mode 100644
index 81bcbd5468..0000000000
--- a/packages/libxine/libxine-opie-1.0/libxine-libvorbis.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: xine-lib-1.0/src/libvorbis/xine_decoder.c
-===================================================================
---- xine-lib-1.0.orig/src/libvorbis/xine_decoder.c	2005-02-20 18:21:57.924625900 +0100
-+++ xine-lib-1.0/src/libvorbis/xine_decoder.c	2005-02-20 18:52:02.016033646 +0100
-@@ -40,7 +40,7 @@
- #include "buffer.h"
- 
- #include <ogg/ogg.h>
--#include <vorbis/codec.h>
-+#include <tremor/ivorbiscodec.h>
- 
- #define MAX_NUM_SAMPLES 4096
- 
-@@ -216,7 +216,7 @@
-  
-   } else if (this->output_open) {
- 
--    float **pcm;
-+    int **pcm;
-     int samples;
- 
-     if(vorbis_synthesis(&this->vb,&this->op,1)==0) 
-@@ -245,9 +245,9 @@
- 	 interleave */
-       for(i=0;i<this->vi.channels;i++){
- 	ogg_int16_t *ptr=audio_buffer->mem+i;
--	float  *mono=pcm[i];
-+	int  *mono=pcm[i];
- 	for(j=0;j<bout;j++){
--	  int val=mono[j]*32767.f;
-+	  int val=mono[j]>>9;
- 	  /* might as well guard against clipping */
- 	  if(val>32767){
- 	    val=32767;
diff --git a/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch b/packages/libxine/libxine-opie-1.0/libxine-tremor-autoconf.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb
index 9b1328ceff..dd6779f581 100644
--- a/packages/libxine/libxine_1.0.bb
+++ b/packages/libxine/libxine_1.0.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "zlib libogg tremor libmad esound-gpe"
 PROVIDES = "virtual/libxine"
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gettext
 
@@ -21,7 +21,10 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
 	file://no-caca-no-aalib.patch;patch=1 \
 	file://dont-have-xv.patch;patch=1 \
 	file://restore-esd.patch;patch=1 \
-	file://fix-syntax-xine-vorbis-decoder.patch;patch=1"
+	file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \
+	file://libxine-cut-memusage.patch;patch=1 \
+	file://mpegvideo-static-inlinine.patch;patch=1 \
+	file://libxine-libavcodec.patch;patch=1"
 
 SOV = "1.0.7"