From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Sat, 26 Jun 2010 06:39:15 +0000 (+0800)
Subject: libogg: Upgraded to version 1.2.0
X-Git-Tag: 2011-1~5699
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=408008ac093722cbc05626d096f99214c0eb2c24;p=openembedded-core.git

libogg: Upgraded to version 1.2.0

Remove m4.patch since the change has already in the upstream
Change SRC_URI because version 1.2.0 doesn't exist in the old address

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---

diff --git a/meta/packages/libogg/libogg/m4.patch b/meta/packages/libogg/libogg/m4.patch
deleted file mode 100644
index 66239f4f68..0000000000
--- a/meta/packages/libogg/libogg/m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libogg-1.1/ogg.m4.orig	2003-03-08 03:44:29 +0100
-+++ libogg-1.1/ogg.m4	2004-08-12 11:26:46 +0200
-@@ -5,7 +5,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/libogg/libogg_1.1.bb b/meta/packages/libogg/libogg_1.2.0.bb
similarity index 67%
rename from meta/packages/libogg/libogg_1.1.bb
rename to meta/packages/libogg/libogg_1.2.0.bb
index 7108876e9f..fd176a47b9 100644
--- a/meta/packages/libogg/libogg_1.1.bb
+++ b/meta/packages/libogg/libogg_1.2.0.bb
@@ -3,9 +3,8 @@ DESCRIPTION = "libogg is the bitstream and framing library \
 for the Ogg project. It provides functions which are \
 necessary to codec libraries like libvorbis."
 LICENSE = "BSD"
-PR = "r4"
+PR = "r0"
 
-SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \
-file://m4.patch;patch=1"
+SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz"
 
 inherit autotools pkgconfig