Prepare recipes for automake-1.13 (batch 1)

Prepare recipes for automake-1.13 (batch 1)

[Marko Lindqvist]

This batch is just three patches - most likely just drop in the
ocean of automake-1.13 problems in meta-openembedded. These are
kind side-products of trying to get things to work in
openembedded-core side.

Below text is about all the work I've done for automake-1.13
compatibility so far - not all of it is relevant to this batch.

--------------------------------------------------------------------

In practice there is three categories of changes in automake-1.13
that cause packages to break. From that follows that virtually all
problems fall to three categories, and all packages suffering from
problem of the same category get virtually identical fix.

* Long deprecated macros completely removed from automake-1.13,
  which errors out upon seeing them. For these I add patch,
  always called obsolete_automake_macros.patch, that replaces
  obsolete macro with proper one. Most of the patches are just
  AM_CONFIG_HEADER -> AC_CONFIG_HEADERS change.

* Trying to run help2man via "missing" when it doesn't exist.
  Old automake versions allowed "missing" to be used that way,
  1.13 aborts. I'm just removing the attempt to create manpages
  that way. Note that it never actually worked anyway -
  old automake just didn't abort when it failed.

* TESTS list cannot have $(srcdir) or $(top_srcdir) as part
  of the path. When it does, it's usually bug in the package,
  but unfortunately automake prevents it also when it's not.
  Solution applied here is to simply remove TESTS.

--------------------------------------------------------------------

[meta-oe][PATCH 1/3] tslib: replace obsolete automake macros with
[meta-oe][PATCH 2/3] libmikmod: replace obsolete automake macros
[meta-oe][PATCH 3/3] libmad: replace obsolete automake macros with



 - ML

[meta-oe][PATCH 1/3] tslib: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../tslib/tslib/obsolete_automake_macros.patch         |   16 ++++++++++++++++
 meta-oe/recipes-graphics/tslib/tslib_git.bb            |    3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch

diff --git a/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch b/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
new file mode 100644
index 0000000..752077d
--- /dev/null
+++ b/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Submitted [https://github.com/kergoth/tslib/pull/14]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff --git a/configure.ac b/configure.ac
+index c42be91..6d71be0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT(tslib, 1.0.0, kergoth@handhelds.org)
+ # AC_CONFIG_AUX_DIR(config)
+ AM_INIT_AUTOMAKE(dist-bzip2)
+ AC_CONFIG_SRCDIR([src/ts_close.c])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ PACKAGE_DESCRIPTION="Touchscreen Access Library"
+ AC_SUBST(PACKAGE_DESCRIPTION)
diff --git a/meta-oe/recipes-graphics/tslib/tslib_git.bb b/meta-oe/recipes-graphics/tslib/tslib_git.bb
index 07f8a97..71a63ee 100644
--- a/meta-oe/recipes-graphics/tslib/tslib_git.bb
+++ b/meta-oe/recipes-graphics/tslib/tslib_git.bb
@@ -10,11 +10,12 @@ SECTION = "base"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "git://github.com/kergoth/tslib.git;protocol=git \
+           file://obsolete_automake_macros.patch \
            file://ts.conf \
            file://tslib.sh"
 SRCREV = "e17263ef401ee885a27d649b90b577cfb44500e0"
-- 
1.7.10.4

[meta-oe][PATCH 2/3] libmikmod: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../mikmod/libmikmod/obsolete_automake_macros.patch     |   15 +++++++++++++++
 meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb   |    1 +
 2 files changed, 16 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch

diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch b/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
new file mode 100644
index 0000000..082bb04
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599281&group_id=40531&atid=428227)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libmikmod-3.1.12/configure.in libmikmod-3.1.12/configure.in
+--- libmikmod-3.1.12/configure.in	2007-12-15 11:22:57.000000000 +0200
++++ libmikmod-3.1.12/configure.in	2013-01-03 07:26:10.662775603 +0200
+@@ -13,7 +13,7 @@
+ LIBMIKMOD_VERSION=$LIBMIKMOD_MAJOR_VERSION.$LIBMIKMOD_MINOR_VERSION.$LIBMIKMOD_MICRO_VERSION$BETA
+
+ AM_INIT_AUTOMAKE(libmikmod,$LIBMIKMOD_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+ # ==============================================================
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
index cd80a6f..af5b5ff 100644
--- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb
@@ -11,6 +11,7 @@ SRC_URI = "\
   file://autofoo.patch \
   file://ldflags.patch \
   file://CVE-2010-2971.patch \
+  file://obsolete_automake_macros.patch \
 "
 
 SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16"
-- 
1.7.10.4

[meta-oe][PATCH 3/3] libmad: replace obsolete automake macros with working ones

[Marko Lindqvist]

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../libmad/libmad-0.15.1b/obsolete_automake_macros.patch |   14 ++++++++++++++
 meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb      |    6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch

diff --git a/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch b/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch
new file mode 100644
index 0000000..b0f5f77
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmad/libmad-0.15.1b/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted (https://sourceforge.net/tracker/?group_id=12349&atid=112349)
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd libmad-0.15.1b/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b/configure.ac	2004-01-23 11:41:32.000000000 +0200
++++ libmad-0.15.1b/configure.ac	2013-01-03 08:28:23.718693697 +0200
+@@ -28,7 +28,7 @@
+
+ AM_INIT_AUTOMAKE
+
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+ dnl System type.
diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
index e4a3df7..b5ff698 100644
--- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -6,10 +6,14 @@ DEPENDS = "libid3tag"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
            file://add-pkgconfig.patch \
            file://mad.diff \
-           file://mad-mips-h-constraint.patch"
+           file://mad-mips-h-constraint.patch \
+           file://obsolete_automake_macros.patch \
+"
 
 SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch"
 
-- 
1.7.10.4

Re: Prepare recipes for automake-1.13 (batch 1)

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2334 bytes --]

On Thu, Jan 03, 2013 at 08:54:12PM +0200, Marko Lindqvist wrote:
> This batch is just three patches - most likely just drop in the
> ocean of automake-1.13 problems in meta-openembedded. These are
> kind side-products of trying to get things to work in
> openembedded-core side.
> 
> Below text is about all the work I've done for automake-1.13
> compatibility so far - not all of it is relevant to this batch.

All 3 merged, libmikmod was missing PR bump, but it's not big issue for
this kind of change.

Cheers,

> --------------------------------------------------------------------
> 
> In practice there is three categories of changes in automake-1.13
> that cause packages to break. From that follows that virtually all
> problems fall to three categories, and all packages suffering from
> problem of the same category get virtually identical fix.
> 
> * Long deprecated macros completely removed from automake-1.13,
>   which errors out upon seeing them. For these I add patch,
>   always called obsolete_automake_macros.patch, that replaces
>   obsolete macro with proper one. Most of the patches are just
>   AM_CONFIG_HEADER -> AC_CONFIG_HEADERS change.
> 
> * Trying to run help2man via "missing" when it doesn't exist.
>   Old automake versions allowed "missing" to be used that way,
>   1.13 aborts. I'm just removing the attempt to create manpages
>   that way. Note that it never actually worked anyway -
>   old automake just didn't abort when it failed.
> 
> * TESTS list cannot have $(srcdir) or $(top_srcdir) as part
>   of the path. When it does, it's usually bug in the package,
>   but unfortunately automake prevents it also when it's not.
>   Solution applied here is to simply remove TESTS.
> 
> --------------------------------------------------------------------
> 
> [meta-oe][PATCH 1/3] tslib: replace obsolete automake macros with
> [meta-oe][PATCH 2/3] libmikmod: replace obsolete automake macros
> [meta-oe][PATCH 3/3] libmad: replace obsolete automake macros with
> 
> 
> 
>  - ML
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]