From 8f81a0fcffb7012e16fd160f56a69b0fcddde6bb Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 28 Feb 2010 21:51:12 +0100
Subject: vorbis-tools: Upgrade to 1.2.0

---
 conf/checksums.ini                                 |  4 ----
 .../remove-deprecated-curl-option.patch            | 12 -----------
 recipes/vorbis-tools/vorbis-tools_1.1.1.bb         | 21 --------------------
 recipes/vorbis-tools/vorbis-tools_1.2.0.bb         | 23 ++++++++++++++++++++++
 4 files changed, 23 insertions(+), 37 deletions(-)
 delete mode 100644 recipes/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch
 delete mode 100644 recipes/vorbis-tools/vorbis-tools_1.1.1.bb
 create mode 100644 recipes/vorbis-tools/vorbis-tools_1.2.0.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 25aaeb4417..9a090a4413 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -27926,10 +27926,6 @@ sha256=08d588ce0731d0c0e55a1cac35acf019e1b735d0f75f16962adfeb4fefd69441
 md5=80d3ae3bbae2a488d433d86b8fd64777
 sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
 
-[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz]
-md5=47845fd76f5f2354a3619c4097575487
-sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad
-
 [http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
 md5=aaccdffc5656095a45dfe87c5bf612cb
 sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
diff --git a/recipes/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch b/recipes/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch
deleted file mode 100644
index 5c52ef1b0d..0000000000
--- a/recipes/vorbis-tools/vorbis-tools-1.1.1/remove-deprecated-curl-option.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN vorbis-tools-1.1.1.orig/ogg123/http_transport.c vorbis-tools-1.1.1/ogg123/http_transport.c
---- vorbis-tools-1.1.1.orig/ogg123/http_transport.c	2005-06-13 15:11:44.000000000 +0200
-+++ vorbis-tools-1.1.1/ogg123/http_transport.c	2007-12-19 10:40:19.000000000 +0100
-@@ -116,7 +116,7 @@
-   if (inputOpts.ProxyTunnel)
-     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
-   */
--  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
-+  /* curl_easy_setopt(handle, CURLOPT_MUTE, 1); */
-   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/recipes/vorbis-tools/vorbis-tools_1.1.1.bb b/recipes/vorbis-tools/vorbis-tools_1.1.1.bb
deleted file mode 100644
index 01fc248dd1..0000000000
--- a/recipes/vorbis-tools/vorbis-tools_1.1.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \
-ogginfo (displays ogg information), vcut (ogg file splitter), and \
-vorbiscomment (ogg comment editor)."
-LICENSE = "GPL"
-DEPENDS = "libogg libvorbis libao curl"
-SECTION = "console/multimedia"
-
-SRC_URI = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${PV}.tar.gz \
-           file://remove-deprecated-curl-option.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--without-flac --without-speex \
-		--with-ogg-libraries=${STAGING_LIBDIR}/ \
-		--with-ogg-includes=${STAGING_INCDIR}/ \
-		--with-vorbis-libraries=${STAGING_LIBDIR}/ \
-		--with-vorbis-includes=${STAGING_INCDIR}/ \
-		--with-ao-libraries=${STAGING_LIBDIR}/ \
-		--with-ao-includes=${STAGING_INCDIR}/ \
-		--with-curl-libraries=${STAGING_LIBDIR}/ \
-		--with-curl-includes=${STAGING_INCDIR}/"
diff --git a/recipes/vorbis-tools/vorbis-tools_1.2.0.bb b/recipes/vorbis-tools/vorbis-tools_1.2.0.bb
new file mode 100644
index 0000000000..7a231f8a4c
--- /dev/null
+++ b/recipes/vorbis-tools/vorbis-tools_1.2.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool), \
+ogginfo (displays ogg information), vcut (ogg file splitter), and \
+vorbiscomment (ogg comment editor)."
+LICENSE = "GPL"
+DEPENDS = "libogg libvorbis libao curl"
+SECTION = "console/multimedia"
+
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${PV}.tar.gz;name=src"
+
+SRC_URI[src.md5sum] = "df976d24e51ef3d87cd462edf747bf9a"
+SRC_URI[src.sha256sum] = "dbe753ce0ae0797f25117720bb2ba0d848388d3f47af8db31ebc35552c3de07b"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-flac --without-speex \
+		--with-ogg-libraries=${STAGING_LIBDIR}/ \
+		--with-ogg-includes=${STAGING_INCDIR}/ \
+		--with-vorbis-libraries=${STAGING_LIBDIR}/ \
+		--with-vorbis-includes=${STAGING_INCDIR}/ \
+		--with-ao-libraries=${STAGING_LIBDIR}/ \
+		--with-ao-includes=${STAGING_INCDIR}/ \
+		--with-curl-libraries=${STAGING_LIBDIR}/ \
+		--with-curl-includes=${STAGING_INCDIR}/"
-- 
cgit v1.2.3