flac: Upgraded to version 1.2.1

Acquire flac-gcc43-fixes.patch from OE to fix a build issue
Rebase disable-xmms-plugin.patch
Change the local file directory name to ${PN}-${PV}

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

5 files changed, 41 insertions, 22 deletions

diff --git a/meta/packages/flac/flac-1.1.2/disable-xmms-plugin.patch b/meta/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
deleted file mode 100644
index e42fcbd84d..0000000000
--- a/meta/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- flac-1.1.0/src/Makefile.am.orig     2004-12-25 01:11:45.000000000 +0100
-+++ flac-1.1.0/src/Makefile.am  2004-12-25 01:12:10.000000000 +0100
-@@ -15,10 +15,6 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--if FLaC__HAS_XMMS
--XMMS_DIRS = plugin_xmms
--endif
--
- if FLaC__HAS_OGG
- OGGFLAC_DIRS = libOggFLAC libOggFLAC++
- OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
-@@ -33,7 +29,6 @@
-        metaflac \
-        monkeys_audio_utilities \
-        plugin_common \
--       $(XMMS_DIRS) \
-        plugin_winamp2 \
-        plugin_winamp3 \
-        test_grabbag \
diff --git a/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch
new file mode 100644
index 0000000000..e2f4fa1360
--- /dev/null
+++ b/meta/packages/flac/flac-1.2.1/disable-xmms-plugin.patch
@@ -0,0 +1,24 @@
+# Acquired from OpenEmbedded
+
+diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am
+--- flac-1.2.1-orig/src/Makefile.am     2010-06-23 15:06:29.167865355 +0800
++++ flac-1.2.1-new/src/Makefile.am      2010-06-25 16:23:05.555202728 +0800
+@@ -15,10 +15,6 @@
+ #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+ #  distribution.
+ 
+-if FLaC__HAS_XMMS
+-XMMS_DIRS = plugin_common plugin_xmms
+-endif
+-
+ if FLaC__WITH_CPPLIBS
+ CPPLIBS_DIRS = libFLAC++ test_libFLAC++
+ endif
+@@ -29,7 +25,6 @@
+        flac \
+        metaflac \
+        monkeys_audio_utilities \
+-       $(XMMS_DIRS) \
+        plugin_winamp2 \
+        test_grabbag \
+        test_libs_common \
diff --git a/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch
new file mode 100644
index 0000000000..fdb6f1337e
--- /dev/null
+++ b/meta/packages/flac/flac-1.2.1/flac-gcc43-fixes.patch
@@ -0,0 +1,14 @@
+# Acquired from OpenEmbedded
+# Fix no declaration of memcmp()
+
+diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp   2010-06-23 15:06:29.159481339 +0800
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp        2010-06-23 15:06:46.233384883 +0800
+@@ -30,6 +30,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
+ 
diff --git a/meta/packages/flac/flac-1.1.2/xmms.m4 b/meta/packages/flac/flac-1.2.1/xmms.m4
index 6d1489bf19..5e250cdd38 100644
--- a/meta/packages/flac/flac-1.1.2/xmms.m4
+++ b/meta/packages/flac/flac-1.2.1/xmms.m4
@@ -1,5 +1,6 @@
 # CFLAGS and library paths for XMMS
 # written 15 December 1999 by Ben Gertzfield <che@debian.org>
+# Acquired from OpenEmbedded
 
 dnl Usage:
 dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
diff --git a/meta/packages/flac/flac_1.1.2.bb b/meta/packages/flac/flac_1.2.1.bb
index 78f29fbca3..8459201ee7 100644
--- a/meta/packages/flac/flac_1.1.2.bb
+++ b/meta/packages/flac/flac_1.2.1.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
 LICENSE = "BSD GPL"
 SECTION = "libs"
 DEPENDS = "libogg"
-PR = "r6"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
            file://disable-xmms-plugin.patch;patch=1 \
+           file://flac-gcc43-fixes.patch;patch=1 \
            file://xmms.m4"
 
 S = "${WORKDIR}/flac-${PV}"