[oe] [PATCH v2] libdvdnav: add recipe for version 4.1.3-7 from debian

[Frans Meulenbroeks]

2010/10/17 Andreas Oberritter <obi at opendreambox.org>:
> * v2: inherit lib_package before binconfig
>
> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> ---
>  ...-dvdnavmini.pc-link-against-libdvdnavmini.patch |   25 ++++++++++++++++++++
>  recipes/libdvdnav/libdvdnav_4.1.3-7.bb             |    5 ++++
>  recipes/libdvdnav/libdvdnav_git.inc                |   24 +++++++++++++++++++
>  3 files changed, 54 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/libdvdnav/files/0001-dvdnavmini.pc-link-against-libdvdnavmini.patch
>  create mode 100644 recipes/libdvdnav/libdvdnav_4.1.3-7.bb
>  create mode 100644 recipes/libdvdnav/libdvdnav_git.inc
>
> diff --git a/recipes/libdvdnav/files/0001-dvdnavmini.pc-link-against-libdvdnavmini.patch b/recipes/libdvdnav/files/0001-dvdnavmini.pc-link-against-libdvdnavmini.patch
> new file mode 100644
> index 0000000..84ce442
> --- /dev/null
> +++ b/recipes/libdvdnav/files/0001-dvdnavmini.pc-link-against-libdvdnavmini.patch
> @@ -0,0 +1,25 @@
> +upstream: Daniel Baumann <daniel at debian.org>
> +status: pending
> +
> +From 2329cd28d7508f9809f849fa547362aa7df160ba Mon Sep 17 00:00:00 2001
> +From: Andreas Oberritter <obi at opendreambox.org>
> +Date: Fri, 8 Oct 2010 00:50:54 +0000
> +Subject: [PATCH] dvdnavmini.pc: link against libdvdnavmini
> +
> +---
> + misc/dvdnavmini.pc.in |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/misc/dvdnavmini.pc.in b/misc/dvdnavmini.pc.in
> +index 52945b3..773be2f 100644
> +--- a/misc/dvdnavmini.pc.in
> ++++ b/misc/dvdnavmini.pc.in
> +@@ -8,4 +8,4 @@ Description: DVD Navigation mini library
> + Version: @VERSION@
> +
> + Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
> +-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
> ++Libs: -L${libdir} -ldvdnavmini @THREAD_LIBS@

Is this not better done with CFLAGS and LDFLAGS ?
(personally I prefer using CFLAGS above a patch, as it is less likely
to break if you move to a newer version).

> +--
> +1.7.1
> +
> diff --git a/recipes/libdvdnav/libdvdnav_4.1.3-7.bb b/recipes/libdvdnav/libdvdnav_4.1.3-7.bb
> new file mode 100644
> index 0000000..b1d75ad
> --- /dev/null
> +++ b/recipes/libdvdnav/libdvdnav_4.1.3-7.bb
> @@ -0,0 +1,5 @@
> +require libdvdnav_git.inc

I feel that in general  an inc file should not have any version info
in the name. It is supposed to to be for multiple versions,
exception could be if an inc file is to share info between e.g. native
cross target sdk versions (like e.g. for gcc).

Since there is only one recipe using it, I'd suggest inlining the inc file.
Otherwise if you feel keeping the inc is useful, rename the file to
libdvdnav.inc


> +
> +SRC_URI += "file://0001-dvdnavmini.pc-link-against-libdvdnavmini.patch"
> +
> +SRCREV = "850e513d4fea29b40879378b13003cd677e5214b"
> diff --git a/recipes/libdvdnav/libdvdnav_git.inc b/recipes/libdvdnav/libdvdnav_git.inc
> new file mode 100644
> index 0000000..242f765
> --- /dev/null
> +++ b/recipes/libdvdnav/libdvdnav_git.inc
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "DVD navigation multimeda library"
> +SECTION = "libs/multimedia"
> +LICENSE = "GPL"

v2+ ?

> +DEPENDS = "libdvdread"
> +
> +SRC_URI = "git://git.debian-maintainers.org/git/daniel/${PN}.git;protocol=git;branch=debian"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit autotools lib_package binconfig pkgconfig
> +
> +do_unpackpost() {
> +        QUILT_PATCHES=debian/patches quilt push -a
> +}
> +
> +FILES_${PN} = "${libdir}/${PN}${SOLIB}"
> +
> +addtask unpackpost after do_unpack before do_patch
> +
> +python populate_packages_prepend () {
> +        description = bb.data.expand('${DESCRIPTION}', d)
> +        libdir = bb.data.expand('${libdir}', d)
> +        do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', description + ' (%s)', extra_depends='', allow_links=True)
> +}
> --
> 1.7.1
>

Best regards, Frans