Re: [PATCH 05/19] cdrkit: initial add 1.1.11

[Martin Jansa <martin.jansa@gmail.com>]

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

On Thu, Sep 17, 2015 at 02:41:17AM +0200, Andreas Müller wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 18 ++++++++
>  ...te-a-run-test-to-determine-order-of-bitfi.patch | 53 ++++++++++++++++++++++
>  2 files changed, 71 insertions(+)
>  create mode 100644 meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
>  create mode 100644 meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch

I've skipped this one, please add PACKAGECONFIG/dependency on bzip2:

cdrkit-1.1.11: cdrkit rdepends on libbz2, but it isn't a build
dependency? [build-deps]

> 
> diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
> new file mode 100644
> index 0000000..310a7b9
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
> @@ -0,0 +1,18 @@
> +SUMMARY = "CD/DVD command line tools"
> +HOMEPAGE = "http://cdrkit.org/"
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8"
> +
> +# While writing download from cdrkit.org was broken so get sources from debian
> +SRC_URI = " \
> +    ${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \
> +    file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \
> +"
> +SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9"
> +SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"
> +
> +inherit cmake
> +
> +DEPENDS = "libcap file"
> +RDEPENDS_${PN} = "perl"
> diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
> new file mode 100644
> index 0000000..c9725cb
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
> @@ -0,0 +1,53 @@
> +From a702cd1bb5eba5a05d1098862b5b863a3f6dd558 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Thu, 10 Sep 2015 09:39:13 +0200
> +Subject: [PATCH] do not create a run test to determine order of bitfields
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +taken from [1]
> +
> +Upstream-Status: Inappropriate [cross compile specific]
> +
> +[1] http://cgit.openembedded.org/openembedded/tree/recipes/cdrkit/cdrkit/xconfig.patch
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + include/CMakeLists.txt | 2 --
> + include/xconfig.h.in   | 6 +++++-
> + 2 files changed, 5 insertions(+), 3 deletions(-)
> +
> +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
> +index 99a69fd..e5ba8a7 100644
> +--- a/include/CMakeLists.txt
> ++++ b/include/CMakeLists.txt
> +@@ -35,8 +35,6 @@ endif(VA_LIST_IS_ARRAY)
> + INCLUDE(TestBigEndian)
> + TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
> + 
> +-TRY_RUN(BITFIELDS_HTOL TEST_DUMMY ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/test_BITFIELDS_HTOL.c)
> +-
> + INCLUDE(CheckIncludeFiles)
> + 
> + #SET(CMAKE_REQUIRED_INCLUDES "/usr/include;/usr/local/include")
> +diff --git a/include/xconfig.h.in b/include/xconfig.h.in
> +index c130600..476c00b 100644
> +--- a/include/xconfig.h.in
> ++++ b/include/xconfig.h.in
> +@@ -233,7 +233,11 @@
> + /* If using network byte order             */
> + #cmakedefine WORDS_BIGENDIAN
> + /* If high bits come first in structures   */
> +-#cmakedefine BITFIELDS_HTOL
> ++#ifdef WORDS_BIGENDIAN
> ++#define BITFIELDS_HTOL
> ++#else
> ++#define BITFIELDS_LTOH
> ++#endif
> + #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
> + #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
> + 
> +-- 
> +2.1.0
> +
> -- 
> 2.1.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

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

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