[oe-commits] Andreas Oberritter : cdrkit: update from 1.1.9 to 1.1.10

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: d3cf329f4dc97fb7468e9ea46fe926db5f7bded0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d3cf329f4dc97fb7468e9ea46fe926db5f7bded0

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Wed Sep 29 10:36:25 2010 +0000

cdrkit: update from 1.1.9 to 1.1.10

* 1.1.9 had conflicts with (e)glibc.
* 1.1.10 was released on 2009/10/11 and is the latest version.

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/cdrkit/cdrkit_1.1.10.bb    |   14 ++++++++++++++
 recipes/cdrkit/cdrkit_1.1.9.bb     |   22 ----------------------
 recipes/cdrkit/files/xconfig.patch |   10 ++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/recipes/cdrkit/cdrkit_1.1.10.bb b/recipes/cdrkit/cdrkit_1.1.10.bb
new file mode 100644
index 0000000..dad20f1
--- /dev/null
+++ b/recipes/cdrkit/cdrkit_1.1.10.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A set of tools for CD recording"
+HOMEPAGE = "http://www.cdrkit.org"
+DEPENDS = "libcap2 bzip2"
+LICENSE = "GPLv2"
+
+SRC_URI = " \
+	http://cdrkit.org/releases/${P}.tar.gz;name=archive \
+	file://xconfig.patch \
+"
+
+inherit cmake
+
+SRC_URI[archive.md5sum] = "3c25505d567113c269dc6e71640646d8"
+SRC_URI[archive.sha256sum] = "8b6e90b4068cac6f3a75a501d7a85aba6583b2dc34f434e3eb62d29104b107e5"
diff --git a/recipes/cdrkit/cdrkit_1.1.9.bb b/recipes/cdrkit/cdrkit_1.1.9.bb
deleted file mode 100644
index 2986328..0000000
--- a/recipes/cdrkit/cdrkit_1.1.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# cdrkit build file
-
-LICENSE="GPLv2"
-DESCRIPTION="A set of tools for CD recording"
-HOMEPAGE="http://www.cdrkit.org"
-
-PARALLEL_MAKE = ""
-DEPENDS = "libcap"
-SRC_URI="http://cdrkit.org/releases/cdrkit-${PV}.tar.gz \
-	file://xconfig.patch"
-
-S="${WORKDIR}/cdrkit-${PV}"
-PR = "r2"
-
-inherit cmake 
-
-do_install() {
-	oe_runmake install DESTDIR="${D}"
-}
-
-SRC_URI[md5sum] = "cbc0647e5d85f0e8fb3a692ba1d42edd"
-SRC_URI[sha256sum] = "d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2"
diff --git a/recipes/cdrkit/files/xconfig.patch b/recipes/cdrkit/files/xconfig.patch
index 5af1a37..866b602 100644
--- a/recipes/cdrkit/files/xconfig.patch
+++ b/recipes/cdrkit/files/xconfig.patch
@@ -13,3 +13,13 @@
  #define	HAVE_C_BIGENDIAN	/* Flag that WORDS_BIGENDIAN test was done */
  #define	HAVE_C_BITFIELDS	/* Flag that BITFIELDS_HTOL test was done  */
  
+--- cdrkit-1.1.9/include/CMakeLists.txt.orig	2010-09-27 23:17:34.000000000 +0000
++++ cdrkit-1.1.9/include/CMakeLists.txt	2010-09-27 23:17:58.000000000 +0000
+@@ -35,7 +35,6 @@
+ 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)
+