From 0411d6786e48a83061a2a7448890a8112d06ed0c Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Sat, 26 Jun 2010 14:38:21 +0800
Subject: libvorbis: Upgraded to version 1.3.1

Remove m4.patch since the change is already in the latest version
Change SRC_URI since the version 1.3.1 doesn't exist in the old address

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/packages/libvorbis/libvorbis/m4.patch | 26 --------------------------
 meta/packages/libvorbis/libvorbis_1.0.1.bb | 19 -------------------
 meta/packages/libvorbis/libvorbis_1.3.1.bb | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100644 meta/packages/libvorbis/libvorbis/m4.patch
 delete mode 100644 meta/packages/libvorbis/libvorbis_1.0.1.bb
 create mode 100644 meta/packages/libvorbis/libvorbis_1.3.1.bb

diff --git a/meta/packages/libvorbis/libvorbis/m4.patch b/meta/packages/libvorbis/libvorbis/m4.patch
deleted file mode 100644
index a62f365c9..000000000
--- a/meta/packages/libvorbis/libvorbis/m4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: libvorbis-1.0.1/vorbis.m4
-===================================================================
---- libvorbis-1.0.1.orig/vorbis.m4	2002-08-14 19:25:39.000000000 +0100
-+++ libvorbis-1.0.1/vorbis.m4	2008-04-15 15:43:15.000000000 +0100
-@@ -6,7 +6,7 @@
- dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
- dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
- dnl
--AC_DEFUN(XIPH_PATH_VORBIS,
-+AC_DEFUN([XIPH_PATH_VORBIS],
- [dnl 
- dnl Get the cflags and libraries
- dnl
-Index: libvorbis-1.0.1/acinclude.m4
-===================================================================
---- libvorbis-1.0.1.orig/acinclude.m4	2008-04-15 17:46:44.000000000 +0100
-+++ libvorbis-1.0.1/acinclude.m4	2008-04-15 17:46:55.000000000 +0100
-@@ -8,7 +8,7 @@
- dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
- dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
- dnl
--AC_DEFUN(XIPH_PATH_OGG,
-+AC_DEFUN([XIPH_PATH_OGG],
- [dnl 
- dnl Get the cflags and libraries
- dnl
diff --git a/meta/packages/libvorbis/libvorbis_1.0.1.bb b/meta/packages/libvorbis/libvorbis_1.0.1.bb
deleted file mode 100644
index 822171269..000000000
--- a/meta/packages/libvorbis/libvorbis_1.0.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "libs"
-DEPENDS = "libogg"
-DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
-that is free of intellectual property restrictions. libvorbis \
-is the main vorbis codec library."
-LICENSE = "BSD"
-PR = "r5"
-
-SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
-           file://m4.patch;patch=1"
-
-inherit autotools pkgconfig
-
-# vorbisfile.c reveals a problem in the gcc register spilling for the
-# thumb instruction set...
-FULL_OPTIMIZATION_thumb = "-O0"
-
-EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
-	        --with-ogg-includes=${STAGING_INCDIR}"
diff --git a/meta/packages/libvorbis/libvorbis_1.3.1.bb b/meta/packages/libvorbis/libvorbis_1.3.1.bb
new file mode 100644
index 000000000..4145f1d05
--- /dev/null
+++ b/meta/packages/libvorbis/libvorbis_1.3.1.bb
@@ -0,0 +1,18 @@
+SECTION = "libs"
+DEPENDS = "libogg"
+DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
+that is free of intellectual property restrictions. libvorbis \
+is the main vorbis codec library."
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+# vorbisfile.c reveals a problem in the gcc register spilling for the
+# thumb instruction set...
+FULL_OPTIMIZATION_thumb = "-O0"
+
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+	        --with-ogg-includes=${STAGING_INCDIR}"
-- 
cgit v1.2.3