summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-moblin/packages/taglib/taglib-1.5/fix_gcc4.3_ftbfs.diff.diff0
-rw-r--r--meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583286.diff.diff0
-rw-r--r--meta-moblin/packages/taglib/taglib-1.5/fix_includes_r583305.diff.diff0
-rw-r--r--meta-moblin/packages/taglib/taglib-1.5/fix_vbr_length_r515068_r579077.diff.diff0
-rw-r--r--meta-moblin/packages/taglib/taglib-1.5/reopen_readonly_r633092.diff.diff0
-rw-r--r--meta-moblin/packages/taglib/taglib-1.6.1/configuretweak.patch71
-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 @@
1New autoconf gets upset if AC_PROC_CC and friends aren't called at
2the top level (see http://www.gnu.org/software/hello/manual/autoconf/Expanded-Before-Required.html)
3
4Fix macros accordingly fixing build failures
5
6RP 2/2/10
7
8Index: taglib-1.6.1/acinclude.m4
9===================================================================
10--- taglib-1.6.1.orig/acinclude.m4 2010-02-01 23:57:16.857788731 +0000
11+++ taglib-1.6.1/acinclude.m4 2010-02-01 23:58:08.239039503 +0000
12@@ -3141,12 +3141,7 @@
13 [kde_use_profiling="no"]
14 )
15
16- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
17- CFLAGS=" $CFLAGS"
18
19- AC_PROG_CC
20-
21- AC_PROG_CPP
22
23 if test "$GCC" = "yes"; then
24 if test "$kde_use_debug_code" != "no"; then
25@@ -3174,9 +3169,6 @@
26 LDFLAGS=""
27 fi
28
29- CXXFLAGS=" $CXXFLAGS"
30-
31- AC_PROG_CXX
32
33 KDE_CHECK_FOR_BAD_COMPILER
34
35Index: taglib-1.6.1/configure.in
36===================================================================
37--- taglib-1.6.1.orig/configure.in 2010-02-01 23:46:47.389039146 +0000
38+++ taglib-1.6.1/configure.in 2010-02-01 23:58:14.317819479 +0000
39@@ -36,6 +36,21 @@
40 dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
41 unset CDPATH
42
43+dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
44+CFLAGS=" $CFLAGS"
45+
46+AC_PROG_CC
47+
48+AC_PROG_CPP
49+
50+CXXFLAGS=" $CXXFLAGS"
51+
52+AC_PROG_CXX
53+
54+dnl checks for programs.
55+dnl first check for c/c++ compilers
56+AC_CHECK_COMPILERS
57+
58 dnl Checking host/target/build systems, for make, install etc.
59 AC_CANONICAL_SYSTEM
60 dnl Perform program name transformation
61@@ -62,9 +77,7 @@
62 AM_CONFIG_HEADER(config.h)
63 AM_CONFIG_HEADER(taglib/taglib_config.h)
64
65-dnl checks for programs.
66-dnl first check for c/c++ compilers
67-AC_CHECK_COMPILERS
68+
69
70 dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
71 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 @@
1Index: taglib-1.5/acinclude.m4 1Index: taglib-1.6.1/acinclude.m4
2=================================================================== 2===================================================================
3--- taglib-1.5.orig/acinclude.m4 2008-02-12 23:53:04.000000000 +0000 3--- taglib-1.6.1.orig/acinclude.m4 2009-10-31 10:04:35.000000000 +0000
4+++ taglib-1.5/acinclude.m4 2008-12-16 18:25:54.000000000 +0000 4+++ taglib-1.6.1/acinclude.m4 2010-02-01 15:25:38.887788993 +0000
5@@ -5995,5894 +5995,3 @@ 5@@ -5997,5894 +5997,3 @@
6 KDE_USE_PIE="-pie" 6 KDE_USE_PIE="-pie"
7 fi 7 fi
8 ]) 8 ])
@@ -5897,3 +5897,18 @@ Index: taglib-1.5/acinclude.m4
5897-SED=$lt_cv_path_SED 5897-SED=$lt_cv_path_SED
5898-AC_MSG_RESULT([$SED]) 5898-AC_MSG_RESULT([$SED])
5899-]) 5899-])
5900Index: taglib-1.6.1/Makefile.am
5901===================================================================
5902--- taglib-1.6.1.orig/Makefile.am 2010-02-01 16:47:11.687791360 +0000
5903+++ taglib-1.6.1/Makefile.am 2010-02-01 16:47:33.217875703 +0000
5904@@ -8,8 +8,8 @@
5905 $(top_srcdir)/subdirs:
5906 cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
5907
5908-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
5909- @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
5910+$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in
5911+ @cd $(top_srcdir) && cat admin/acinclude.m4.in > acinclude.m4
5912
5913 MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
5914
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
2SECTION = "libs/multimedia" 2SECTION = "libs/multimedia"
3HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" 3HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5PR = "r2" 5PR = "r3"
6 6
7SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ 7SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
8 file://nolibtool.patch;patch=1 \ 8 file://configuretweak.patch;patch=1 \
9 file://fix_gcc4.3_ftbfs.diff.diff;patch=1 \ 9 file://nolibtool.patch;patch=1"
10 file://fix_includes_r583305.diff.diff;patch=1 \
11 file://fix_includes_r583286.diff.diff;patch=1 \
12 file://fix_vbr_length_r515068_r579077.diff.diff;patch=1 \
13 file://reopen_readonly_r633092.diff.diff;patch=1"
14 10
15S = "${WORKDIR}/taglib-${PV}" 11S = "${WORKDIR}/taglib-${PV}"
16 12
@@ -19,3 +15,9 @@ inherit autotools_stage pkgconfig binconfig
19PACKAGES =+ "${PN}-c" 15PACKAGES =+ "${PN}-c"
20FILES_${PN}-dbg += "${bindir}/taglib-config" 16FILES_${PN}-dbg += "${bindir}/taglib-config"
21FILES_${PN}-c = "${libdir}/libtag_c.so.*" 17FILES_${PN}-c = "${libdir}/libtag_c.so.*"
18
19do_configure_prepend () {
20 rm -f ${S}/admin/ltmain.sh
21 rm -f ${S}/admin/libtool.m4.in
22}
23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-06 18:18:18 +0000