[oe-commits] Rolf Leggewie : flac: add 1.2.1. (Closes: #4386)

[GIT User account]

Module: openembedded.git
Branch: xora/angstrom-srcpv
Commit: 6d1b0baf0c1ff39b267e1ccef840cb97331872c5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6d1b0baf0c1ff39b267e1ccef840cb97331872c5

Author: Rolf Leggewie <oe-devel at rolf.leggewie.biz>
Date:   Mon May 18 18:10:56 2009 +0200

flac: add 1.2.1.  (Closes: #4386)
* move disable-xmms-plugin.patch from SRC_URI in .inc to
  1.1.0 and 1.1.2 bb file.  Does not apply cleanly to 1.2.1.
  Unsure if it would still be needed at runtime or not, but
  1.2.1 otherwise compiles fine.

---

 conf/checksums.ini         |    4 ++++
 recipes/flac/flac.inc      |    1 -
 recipes/flac/flac_1.1.0.bb |    4 +++-
 recipes/flac/flac_1.1.2.bb |    4 +++-
 recipes/flac/flac_1.2.1.bb |    3 +++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a194906..3fb70e8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6110,6 +6110,10 @@ sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 md5=2bfc127cdda02834d0491ab531a20960
 sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 
+[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz]
+md5=153c8b15a54da428d1f0fadc756c22c7
+sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+
 [http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm]
 md5=8845d4536fcd3a329690c93bce9bbf8e
 sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc
index 3fe7d59..cadc32f 100644
--- a/recipes/flac/flac.inc
+++ b/recipes/flac/flac.inc
@@ -5,7 +5,6 @@ SECTION = "libs"
 DEPENDS = "libogg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
-	   file://disable-xmms-plugin.patch;patch=1 \
 	   file://xmms.m4"
 
 inherit autotools
diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb
index debe8d7..5bb0d6c 100644
--- a/recipes/flac/flac_1.1.0.bb
+++ b/recipes/flac/flac_1.1.0.bb
@@ -1,3 +1,5 @@
 require flac.inc
 
-PR = "r6"
+PR = "r7"
+
+SRC_URI += "file://disable-xmms-plugin.patch;patch=1"
diff --git a/recipes/flac/flac_1.1.2.bb b/recipes/flac/flac_1.1.2.bb
index 69eb071..70d30c9 100644
--- a/recipes/flac/flac_1.1.2.bb
+++ b/recipes/flac/flac_1.1.2.bb
@@ -1,6 +1,8 @@
 require flac.inc
 
-PR = "r6"
+PR = "r7"
+
+SRC_URI += "file://disable-xmms-plugin.patch;patch=1"
 
 do_configure_append () {
 	# removes '-read-only-relocs' which is enabled for PowerPC builds.
diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb
new file mode 100644
index 0000000..94f24fc
--- /dev/null
+++ b/recipes/flac/flac_1.2.1.bb
@@ -0,0 +1,3 @@
+require flac.inc
+
+PR = "r0"