diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 14:32:39 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 14:32:39 +0000 |
commit | 99643e58b582d8fcbe474ae2aff7cc674ecea1d8 (patch) | |
tree | 5c7773ea417dbc889fe0a6105de4f9e3052a51e4 /meta-moblin | |
parent | dd5269c3299fe94fa4c9cbb8c953f7f1737ee921 (diff) | |
download | openembedded-core-99643e58b582d8fcbe474ae2aff7cc674ecea1d8.tar.gz openembedded-core-99643e58b582d8fcbe474ae2aff7cc674ecea1d8.tar.bz2 openembedded-core-99643e58b582d8fcbe474ae2aff7cc674ecea1d8.zip |
taglib: 1.5 -> 1.6.1 (and apply autoconf/automake fixes)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.5/fix_gcc4.3_ftbfs.diff.diff | 0 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583286.diff.diff | 0 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583305.diff.diff | 0 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.5/fix_vbr_length_r515068_r579077.diff.diff | 0 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.5/reopen_readonly_r633092.diff.diff | 0 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.6.1/configuretweak.patch | 71 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib-1.6.1/nolibtool.patch (renamed from meta-moblin/packages/taglib/taglib-1.5/nolibtool.patch) | 23 | ||||
-rw-r--r-- | meta-moblin/packages/taglib/taglib_1.6.1.bb (renamed from meta-moblin/packages/taglib/taglib_1.5.bb) | 16 |
8 files changed, 99 insertions, 11 deletions
diff --git a/meta-moblin/packages/taglib/taglib-1.5/fix_gcc4.3_ftbfs.diff.diff b/meta-moblin/packages/taglib/taglib-1.5/fix_gcc4.3_ftbfs.diff.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-moblin/packages/taglib/taglib-1.5/fix_gcc4.3_ftbfs.diff.diff +++ /dev/null diff --git a/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583286.diff.diff b/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583286.diff.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583286.diff.diff +++ /dev/null diff --git a/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583305.diff.diff b/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583305.diff.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583305.diff.diff +++ /dev/null diff --git a/meta-moblin/packages/taglib/taglib-1.5/fix_vbr_length_r515068_r579077.diff.diff b/meta-moblin/packages/taglib/taglib-1.5/fix_vbr_length_r515068_r579077.diff.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-moblin/packages/taglib/taglib-1.5/fix_vbr_length_r515068_r579077.diff.diff +++ /dev/null diff --git a/meta-moblin/packages/taglib/taglib-1.5/reopen_readonly_r633092.diff.diff b/meta-moblin/packages/taglib/taglib-1.5/reopen_readonly_r633092.diff.diff deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta-moblin/packages/taglib/taglib-1.5/reopen_readonly_r633092.diff.diff +++ /dev/null diff --git a/meta-moblin/packages/taglib/taglib-1.6.1/configuretweak.patch b/meta-moblin/packages/taglib/taglib-1.6.1/configuretweak.patch new file mode 100644 index 0000000000..07eb6d754c --- /dev/null +++ b/meta-moblin/packages/taglib/taglib-1.6.1/configuretweak.patch @@ -0,0 +1,71 @@ +New autoconf gets upset if AC_PROC_CC and friends aren't called at +the top level (see http://www.gnu.org/software/hello/manual/autoconf/Expanded-Before-Required.html) + +Fix macros accordingly fixing build failures + +RP 2/2/10 + +Index: taglib-1.6.1/acinclude.m4 +=================================================================== +--- taglib-1.6.1.orig/acinclude.m4 2010-02-01 23:57:16.857788731 +0000 ++++ taglib-1.6.1/acinclude.m4 2010-02-01 23:58:08.239039503 +0000 +@@ -3141,12 +3141,7 @@ + [kde_use_profiling="no"] + ) + +- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS +- CFLAGS=" $CFLAGS" + +- AC_PROG_CC +- +- AC_PROG_CPP + + if test "$GCC" = "yes"; then + if test "$kde_use_debug_code" != "no"; then +@@ -3174,9 +3169,6 @@ + LDFLAGS="" + fi + +- CXXFLAGS=" $CXXFLAGS" +- +- AC_PROG_CXX + + KDE_CHECK_FOR_BAD_COMPILER + +Index: taglib-1.6.1/configure.in +=================================================================== +--- taglib-1.6.1.orig/configure.in 2010-02-01 23:46:47.389039146 +0000 ++++ taglib-1.6.1/configure.in 2010-02-01 23:58:14.317819479 +0000 +@@ -36,6 +36,21 @@ + dnl This ksh/zsh feature conflicts with `cd blah ; pwd` + unset CDPATH + ++dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS ++CFLAGS=" $CFLAGS" ++ ++AC_PROG_CC ++ ++AC_PROG_CPP ++ ++CXXFLAGS=" $CXXFLAGS" ++ ++AC_PROG_CXX ++ ++dnl checks for programs. ++dnl first check for c/c++ compilers ++AC_CHECK_COMPILERS ++ + dnl Checking host/target/build systems, for make, install etc. + AC_CANONICAL_SYSTEM + dnl Perform program name transformation +@@ -62,9 +77,7 @@ + AM_CONFIG_HEADER(config.h) + AM_CONFIG_HEADER(taglib/taglib_config.h) + +-dnl checks for programs. +-dnl first check for c/c++ compilers +-AC_CHECK_COMPILERS ++ + + dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ + dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ diff --git a/meta-moblin/packages/taglib/taglib-1.5/nolibtool.patch b/meta-moblin/packages/taglib/taglib-1.6.1/nolibtool.patch index fa9d5982af..b072cbcacb 100644 --- a/meta-moblin/packages/taglib/taglib-1.5/nolibtool.patch +++ b/meta-moblin/packages/taglib/taglib-1.6.1/nolibtool.patch @@ -1,8 +1,8 @@ -Index: taglib-1.5/acinclude.m4 +Index: taglib-1.6.1/acinclude.m4 =================================================================== ---- taglib-1.5.orig/acinclude.m4 2008-02-12 23:53:04.000000000 +0000 -+++ taglib-1.5/acinclude.m4 2008-12-16 18:25:54.000000000 +0000 -@@ -5995,5894 +5995,3 @@ +--- taglib-1.6.1.orig/acinclude.m4 2009-10-31 10:04:35.000000000 +0000 ++++ taglib-1.6.1/acinclude.m4 2010-02-01 15:25:38.887788993 +0000 +@@ -5997,5894 +5997,3 @@ KDE_USE_PIE="-pie" fi ]) @@ -5897,3 +5897,18 @@ Index: taglib-1.5/acinclude.m4 -SED=$lt_cv_path_SED -AC_MSG_RESULT([$SED]) -]) +Index: taglib-1.6.1/Makefile.am +=================================================================== +--- taglib-1.6.1.orig/Makefile.am 2010-02-01 16:47:11.687791360 +0000 ++++ taglib-1.6.1/Makefile.am 2010-02-01 16:47:33.217875703 +0000 +@@ -8,8 +8,8 @@ + $(top_srcdir)/subdirs: + cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs + +-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in +- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4 ++$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in ++ @cd $(top_srcdir) && cat admin/acinclude.m4.in > acinclude.m4 + + MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files + diff --git a/meta-moblin/packages/taglib/taglib_1.5.bb b/meta-moblin/packages/taglib/taglib_1.6.1.bb index f86c881f6c..e6d634ce3a 100644 --- a/meta-moblin/packages/taglib/taglib_1.5.bb +++ b/meta-moblin/packages/taglib/taglib_1.6.1.bb @@ -2,15 +2,11 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of seve SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" LICENSE = "LGPL" -PR = "r2" +PR = "r3" SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ - file://nolibtool.patch;patch=1 \ - file://fix_gcc4.3_ftbfs.diff.diff;patch=1 \ - file://fix_includes_r583305.diff.diff;patch=1 \ - file://fix_includes_r583286.diff.diff;patch=1 \ - file://fix_vbr_length_r515068_r579077.diff.diff;patch=1 \ - file://reopen_readonly_r633092.diff.diff;patch=1" + file://configuretweak.patch;patch=1 \ + file://nolibtool.patch;patch=1" S = "${WORKDIR}/taglib-${PV}" @@ -19,3 +15,9 @@ inherit autotools_stage pkgconfig binconfig PACKAGES =+ "${PN}-c" FILES_${PN}-dbg += "${bindir}/taglib-config" FILES_${PN}-c = "${libdir}/libtag_c.so.*" + +do_configure_prepend () { + rm -f ${S}/admin/ltmain.sh + rm -f ${S}/admin/libtool.m4.in +} + |