summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2005-08-24 16:31:01 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-24 16:31:01 +0000
commit8c966cff6336246b315a053bcd77997b7c57dd3b (patch)
tree594962416d66e49909814420d895cf187ba69742
parent743ac60674226e2addd09172be7ff42cc5050483 (diff)
parent9ab834cb933cbe887ecc45a05086aeac9bcae5af (diff)
merge of 306834bf0afc5bbcbeb23e82545629c967983bbf
and 936ba133ee1bf0c175548350fd1a973a8054b138
-rw-r--r--packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty (renamed from packages/vlc/files/.mtn2git_empty)0
-rw-r--r--packages/vlc/vlc-gpe-0.8.1/fix-pda.patch (renamed from packages/vlc/files/fix-pda.patch)0
-rw-r--r--packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch14
-rw-r--r--packages/vlc/vlc-gpe_0.8.1.bb5
4 files changed, 17 insertions, 2 deletions
diff --git a/packages/vlc/files/.mtn2git_empty b/packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/vlc/files/.mtn2git_empty
+++ b/packages/vlc/vlc-gpe-0.8.1/.mtn2git_empty
diff --git a/packages/vlc/files/fix-pda.patch b/packages/vlc/vlc-gpe-0.8.1/fix-pda.patch
index 5338851463..5338851463 100644
--- a/packages/vlc/files/fix-pda.patch
+++ b/packages/vlc/vlc-gpe-0.8.1/fix-pda.patch
diff --git a/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch b/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch
new file mode 100644
index 0000000000..2a5a92463c
--- /dev/null
+++ b/packages/vlc/vlc-gpe-0.8.1/vlc-tremor.patch
@@ -0,0 +1,14 @@
+--- vlc-0.8.1/modules/codec/vorbis.c.orig 2005-08-05 19:57:05 +0200
++++ vlc-0.8.1/modules/codec/vorbis.c 2005-08-05 20:01:22 +0200
+@@ -481,7 +481,11 @@
+ #endif
+
+ if( p_oggpacket->bytes &&
++#ifdef MODULE_NAME_IS_tremor
++ vorbis_synthesis( &p_sys->vb, p_oggpacket, 1 ) == 0 )
++#else
+ vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
++#endif
+ vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb );
+
+ /* **pp_pcm is a multichannel float vector. In stereo, for
diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index f433803b89..599701d5df 100644
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -4,12 +4,13 @@ LICENSE = "GPL"
PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "gpe"
-PR = "r3"
+PR = "r4"
DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
-file://fix-pda.patch;patch=1"
+ file://fix-pda.patch;patch=1 \
+ file://vlc-tremor.patch;patch=1"
S = "${WORKDIR}/vlc-${PV}"
inherit autotools