* [PATCH 01/18] utils.bbclass: add name to SRC_URI[{md5, sha256}sum]
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 02/18] glib-2.0: add sed-native to DEPENDS Andreas Oberritter
` (18 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* When a checksum is missing or invalid, print strings which can be
copied into a recipe without modification.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
classes/utils.bbclass | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/classes/utils.bbclass b/classes/utils.bbclass
index 1c636be..c9c8e02 100644
--- a/classes/utils.bbclass
+++ b/classes/utils.bbclass
@@ -126,7 +126,21 @@ def setup_checksum_deps(d):
d.setVarFlag("do_fetch", "depends", "%s %s" %
(depends, "shasum-native:do_populate_sysroot"))
-def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, data):
+def base_get_hash_flags(params):
+ try:
+ name = params["name"]
+ except KeyError:
+ name = ""
+ if name:
+ md5flag = "%s.md5sum" % name
+ sha256flag = "%s.sha256sum" % name
+ else:
+ md5flag = "md5sum"
+ sha256flag = "sha256sum"
+
+ return (md5flag, sha256flag)
+
+def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, params, data):
strict_checking = True
if bb.data.getVar("OE_STRICT_CHECKSUMS", data, True) != "1":
strict_checking = False
@@ -161,17 +175,19 @@ def base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256s
if not ufile:
raise Exception("Creating %s.sum failed" % uname)
- ufile.write("SRC_URI[md5sum] = \"%s\"\nSRC_URI[sha256sum] = \"%s\"\n" % (md5data, sha256data))
+ (md5flag, sha256flag) = base_get_hash_flags(params)
+ ufile.write("SRC_URI[%s] = \"%s\"\nSRC_URI[%s] = \"%s\"\n" % (md5flag, md5data, sha256flag, sha256data))
ufile.close()
bb.note("This package has no checksums, please add to recipe")
- bb.note("\nSRC_URI[md5sum] = \"%s\"\nSRC_URI[sha256sum] = \"%s\"\n" % (md5data, sha256data))
+ bb.note("\nSRC_URI[%s] = \"%s\"\nSRC_URI[%s] = \"%s\"\n" % (md5flag, md5data, sha256flag, sha256data))
# fail for strict, continue for disabled strict checksums
return not strict_checking
if (expected_md5sum and expected_md5sum != md5data) or (expected_sha256sum and expected_sha256sum != sha256data):
+ (md5flag, sha256flag) = base_get_hash_flags(params)
bb.note("The checksums for '%s' did not match.\nExpected MD5: '%s' and Got: '%s'\nExpected SHA256: '%s' and Got: '%s'" % (localpath, expected_md5sum, md5data, expected_sha256sum, sha256data))
- bb.note("Your checksums:\nSRC_URI[md5sum] = \"%s\"\nSRC_URI[sha256sum] = \"%s\"\n" % (md5data, sha256data))
+ bb.note("Your checksums:\nSRC_URI[%s] = \"%s\"\nSRC_URI[%s] = \"%s\"\n" % (md5flag, md5data, sha256flag, sha256data))
return False
return True
@@ -180,16 +196,7 @@ def base_get_checksums(pn, pv, src_uri, localpath, params, data):
# Try checksum from recipe and then parse checksums.ini
# and try PN-PV-SRC_URI first and then try PN-SRC_URI
# we rely on the get method to create errors
- try:
- name = params["name"]
- except KeyError:
- name = ""
- if name:
- md5flag = "%s.md5sum" % name
- sha256flag = "%s.sha256sum" % name
- else:
- md5flag = "md5sum"
- sha256flag = "sha256sum"
+ (md5flag, sha256flag) = base_get_hash_flags(params)
expected_md5sum = bb.data.getVarFlag("SRC_URI", md5flag, data)
expected_sha256sum = bb.data.getVarFlag("SRC_URI", sha256flag, data)
@@ -240,7 +247,7 @@ def base_get_checksums(pn, pv, src_uri, localpath, params, data):
def base_chk_file(pn, pv, src_uri, localpath, params, data):
(expected_md5sum, expected_sha256sum) = base_get_checksums(pn, pv, src_uri, localpath, params, data)
- return base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, data)
+ return base_chk_file_checksum(localpath, src_uri, expected_md5sum, expected_sha256sum, params, data)
oedebug() {
test $# -ge 2 || {
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 02/18] glib-2.0: add sed-native to DEPENDS
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
2010-09-29 20:36 ` [PATCH 01/18] utils.bbclass: add name to SRC_URI[{md5, sha256}sum] Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 03/18] libmad-0.15.1b: fix compile with gcc-4.4 (mipsel) Andreas Oberritter
` (17 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* The recipe uses sed in do_install_append().
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/glib-2.0/glib.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/recipes/glib-2.0/glib.inc b/recipes/glib-2.0/glib.inc
index 5cc697f..38e5ea4 100644
--- a/recipes/glib-2.0/glib.inc
+++ b/recipes/glib-2.0/glib.inc
@@ -6,7 +6,7 @@ UNIX-like platforms, Windows, OS/2 and BeOS."
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "glib-2.0-native gtk-doc sed-native"
DEPENDS += "virtual/libiconv virtual/libintl"
PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils "
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 03/18] libmad-0.15.1b: fix compile with gcc-4.4 (mipsel)
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
2010-09-29 20:36 ` [PATCH 01/18] utils.bbclass: add name to SRC_URI[{md5, sha256}sum] Andreas Oberritter
2010-09-29 20:36 ` [PATCH 02/18] glib-2.0: add sed-native to DEPENDS Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-30 13:46 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 04/18] libsigc++-1.2: fix installation Andreas Oberritter
` (16 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libmad/files/mips-fix-gcc-4.4.0.patch | 38 +++++++++++++++++++++++++
recipes/libmad/libmad_0.15.1b.bb | 3 +-
2 files changed, 40 insertions(+), 1 deletions(-)
create mode 100644 recipes/libmad/files/mips-fix-gcc-4.4.0.patch
diff --git a/recipes/libmad/files/mips-fix-gcc-4.4.0.patch b/recipes/libmad/files/mips-fix-gcc-4.4.0.patch
new file mode 100644
index 0000000..9438392
--- /dev/null
+++ b/recipes/libmad/files/mips-fix-gcc-4.4.0.patch
@@ -0,0 +1,38 @@
+diff -Naur libmad-0.15.1b.orig/fixed.h libmad-0.15.1b/fixed.h
+--- libmad-0.15.1b.orig/fixed.h 2004-02-17 03:02:03.000000000 +0100
++++ libmad-0.15.1b/fixed.h 2009-07-11 16:42:48.000000000 +0200
+@@ -22,6 +22,14 @@
+ # ifndef LIBMAD_FIXED_H
+ # define LIBMAD_FIXED_H
+
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __MAD_GNUC_PREREQ(maj, min) \
++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __MAD_GNUC_PREREQ(maj, min) 0
++#endif
++
+ # if SIZEOF_INT >= 4
+ typedef signed int mad_fixed_t;
+
+@@ -303,10 +311,19 @@
+ * This MIPS version is fast and accurate; the disposition of the least
+ * significant bit depends on OPT_ACCURACY via mad_f_scale64().
+ */
++#if __MAD_GNUC_PREREQ (4,4)
++# define MAD_F_MLX(hi, lo, x, y) \
++ do { \
++ mad_fixed64_t __ll = (mad_fixed64_t)(x) * (y); \
++ hi = __ll >> 32; \
++ lo = __ll; \
++ } while (0)
++#else
+ # define MAD_F_MLX(hi, lo, x, y) \
+ asm ("mult %2,%3" \
+ : "=l" (lo), "=h" (hi) \
+ : "%r" (x), "r" (y))
++#endif
+
+ # if defined(HAVE_MADD_ASM)
+ # define MAD_F_MLA(hi, lo, x, y) \
diff --git a/recipes/libmad/libmad_0.15.1b.bb b/recipes/libmad/libmad_0.15.1b.bb
index bab40d0..3c5359d 100644
--- a/recipes/libmad/libmad_0.15.1b.bb
+++ b/recipes/libmad/libmad_0.15.1b.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "libid3tag"
LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
file://add-pkgconfig.patch \
@@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
S = "${WORKDIR}/libmad-${PV}"
SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch"
+SRC_URI_append_mipsel = " file://mips-fix-gcc-4.4.0.patch"
inherit autotools pkgconfig
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 04/18] libsigc++-1.2: fix installation
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (2 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 03/18] libmad-0.15.1b: fix compile with gcc-4.4 (mipsel) Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-10-01 11:07 ` [PATCH v2] " Andreas Oberritter
2010-09-29 20:36 ` [PATCH 05/18] mc-4.6.2: use cd instead of pushd and popd Andreas Oberritter
` (15 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* install complains about method_slot.h, which is mentioned twice
inside Makefile.am.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libsigc++-1.2/files/fix-install.patch | 11 +++++++++++
recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb | 3 ++-
recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb | 3 ++-
3 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 recipes/libsigc++-1.2/files/fix-install.patch
diff --git a/recipes/libsigc++-1.2/files/fix-install.patch b/recipes/libsigc++-1.2/files/fix-install.patch
new file mode 100644
index 0000000..e795d3f
--- /dev/null
+++ b/recipes/libsigc++-1.2/files/fix-install.patch
@@ -0,0 +1,11 @@
+--- libsigc++-1.2.7/sigc++/Makefile.am.orig 2010-09-24 12:03:24.000000000 +0000
++++ libsigc++-1.2.7/sigc++/Makefile.am 2010-09-24 12:03:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ sigc_built_h = bind_return.h \
+ object_slot.h retype_return.h slot.h bind.h \
+ class_slot.h hide.h retype.h signal.h \
+- method_slot.h method_slot.h
++ method_slot.h
+
+ built_sources = $(sigc_built_cc) $(sigc_built_h)
+ dist_sources = $(sigc_fixed_cc) $(sigc_fixed_h)
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
index 2c32f14..6b347e5 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
@@ -1,10 +1,11 @@
DESCRIPTION = "A library for loose coupling of C++ method calls"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
LICENSE = "GPL LGPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \
file://autofoo.patch \
+ file://fix-install.patch \
file://pkgconfig.patch"
S = "${WORKDIR}/libsigc++-${PV}"
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
index c68105b..179d5a6 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "A library for loose coupling of C++ method calls"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL LGPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \
file://autofoo.patch \
+ file://fix-install.patch \
file://disable-tests.patch"
S = "${WORKDIR}/libsigc++-${PV}"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH v2] libsigc++-1.2: fix installation
2010-09-29 20:36 ` [PATCH 04/18] libsigc++-1.2: fix installation Andreas Oberritter
@ 2010-10-01 11:07 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-01 11:07 UTC (permalink / raw)
To: openembedded-devel
* install complains about method_slot.h, which is mentioned twice
inside Makefile.am.
* v2: Added header to patch.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libsigc++-1.2/files/fix-install.patch | 15 +++++++++++++++
recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb | 3 ++-
recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb | 3 ++-
3 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 recipes/libsigc++-1.2/files/fix-install.patch
diff --git a/recipes/libsigc++-1.2/files/fix-install.patch b/recipes/libsigc++-1.2/files/fix-install.patch
new file mode 100644
index 0000000..1cdfedb
--- /dev/null
+++ b/recipes/libsigc++-1.2/files/fix-install.patch
@@ -0,0 +1,15 @@
+upstream: unmaintained
+
+| ...build/tmp/sysroots/i686-linux/usr/bin/install: will not overwrite just-created `...build/tmp/work/mipsel-oe-linux/libsigc++-1.2-1.2.5-r2/image/usr/include/sigc++-1.2/sigc++/method_slot.h' with `method_slot.h'
+
+--- libsigc++-1.2.7/sigc++/Makefile.am.orig 2010-09-24 12:03:24.000000000 +0000
++++ libsigc++-1.2.7/sigc++/Makefile.am 2010-09-24 12:03:30.000000000 +0000
+@@ -12,7 +12,7 @@
+ sigc_built_h = bind_return.h \
+ object_slot.h retype_return.h slot.h bind.h \
+ class_slot.h hide.h retype.h signal.h \
+- method_slot.h method_slot.h
++ method_slot.h
+
+ built_sources = $(sigc_built_cc) $(sigc_built_h)
+ dist_sources = $(sigc_fixed_cc) $(sigc_fixed_h)
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
index 2c32f14..6b347e5 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.5.bb
@@ -1,10 +1,11 @@
DESCRIPTION = "A library for loose coupling of C++ method calls"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
LICENSE = "GPL LGPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/libsigc/libsigc++-${PV}.tar.gz \
file://autofoo.patch \
+ file://fix-install.patch \
file://pkgconfig.patch"
S = "${WORKDIR}/libsigc++-${PV}"
diff --git a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
index c68105b..179d5a6 100644
--- a/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
+++ b/recipes/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
@@ -2,10 +2,11 @@ DESCRIPTION = "A library for loose coupling of C++ method calls"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL LGPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \
file://autofoo.patch \
+ file://fix-install.patch \
file://disable-tests.patch"
S = "${WORKDIR}/libsigc++-${PV}"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 05/18] mc-4.6.2: use cd instead of pushd and popd
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (3 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 04/18] libsigc++-1.2: fix installation Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x Andreas Oberritter
` (14 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* pushd and popd aren't compatible with dash.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/mc/mc_4.6.2.bb | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb
index 85a2cce..18aea70 100644
--- a/recipes/mc/mc_4.6.2.bb
+++ b/recipes/mc/mc_4.6.2.bb
@@ -1,5 +1,5 @@
require mc.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
HOMEPAGE = "http://www.midnight-commander.org/"
# most of these fixes were copied from openSUSE Factory.
@@ -34,8 +34,7 @@ do_unpack_append() {
bb.build.exec_func('do_utf8_conversion', d)
}
do_utf8_conversion() {
- pwd
- pushd lib
+ cd ${S}/lib
iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint
iconv -f iso8859-1 -t utf-8 -o mc.hint.es.tmp mc.hint.es && mv mc.hint.es.tmp mc.hint.es
iconv -f iso8859-1 -t utf-8 -o mc.hint.it.tmp mc.hint.it && mv mc.hint.it.tmp mc.hint.it
@@ -48,35 +47,27 @@ do_utf8_conversion() {
iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk
iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp mc.hint.zh
iconv -f iso8859-5 -t utf-8 -o mc.menu.sr.tmp mc.menu.sr && mv mc.menu.sr.tmp mc.menu.sr
- popd
# convert docs to utf-8
- pushd doc
- pushd es
+ cd ${S}/doc/es
iconv -f iso8859-1 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
- popd
- pushd hu
+ cd ${S}/doc/hu
iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
- popd
- pushd it
+ cd ${S}/doc/it
iconv -f iso8859-1 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
- popd
- pushd pl
+ cd ${S}/doc/pl
iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
- popd
- pushd ru
+ cd ${S}/doc/ru
iconv -f koi8-r -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
- popd
- pushd sr
+ cd ${S}/doc/sr
iconv -f iso8859-5 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
iconv -f iso8859-5 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
iconv -f iso8859-5 -t utf-8 -o mcserv.8.in.tmp mcserv.8.in && mv mcserv.8.in.tmp mcserv.8.in
- popd
- popd
+ cd ${S}
}
do_configure_prepend() {
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (4 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 05/18] mc-4.6.2: use cd instead of pushd and popd Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-30 8:49 ` Paul Menzel
2010-09-29 20:36 ` [PATCH 07/18] python-twisted-8.2.0: reduce package size Andreas Oberritter
` (13 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../netkit-base-0.17/gcc4_buildfix.patch | 11 +++++++++++
recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
2 files changed, 13 insertions(+), 1 deletions(-)
create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
new file mode 100644
index 0000000..f284f1a
--- /dev/null
+++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
@@ -0,0 +1,11 @@
+--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
+@@ -771,7 +771,7 @@
+ return;
+ }
+
+-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+
+ /*
+ * sep->se_wait may be holding the pid of a daemon
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index c9864ae..4e70164 100644
--- a/recipes/netkit-base/netkit-base_0.17.bb
+++ b/recipes/netkit-base/netkit-base_0.17.bb
@@ -1,11 +1,12 @@
SECTION = "base"
DESCRIPTION = "netkit-base includes the inetd daemon."
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
file://configure.patch \
file://mconfig.patch \
+ file://gcc4_buildfix.patch \
file://init \
file://inetd.conf"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x
2010-09-29 20:36 ` [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x Andreas Oberritter
@ 2010-09-30 8:49 ` Paul Menzel
2010-10-01 10:58 ` [PATCH 05/16] " Andreas Oberritter
` (2 more replies)
0 siblings, 3 replies; 37+ messages in thread
From: Paul Menzel @ 2010-09-30 8:49 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3317 bytes --]
Am Mittwoch, den 29.09.2010, 20:36 +0000 schrieb Andreas Oberritter:
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> .../netkit-base-0.17/gcc4_buildfix.patch | 11 +++++++++++
> recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
> 2 files changed, 13 insertions(+), 1 deletions(-)
> create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
>
> diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
> new file mode 100644
> index 0000000..f284f1a
As written in my answer to your introductory message [1], it would be
nice to add a patch header [2].
> --- /dev/null
> +++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
> @@ -0,0 +1,11 @@
> +--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
> ++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
> +@@ -771,7 +771,7 @@
> + return;
> + }
> +
> +-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
> ++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
> +
> + /*
> + * sep->se_wait may be holding the pid of a daemon
> diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
> index c9864ae..4e70164 100644
> --- a/recipes/netkit-base/netkit-base_0.17.bb
> +++ b/recipes/netkit-base/netkit-base_0.17.bb
> @@ -1,11 +1,12 @@
> SECTION = "base"
> DESCRIPTION = "netkit-base includes the inetd daemon."
> LICENSE = "BSD"
> -PR = "r1"
> +PR = "r2"
>
> SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
> file://configure.patch \
> file://mconfig.patch \
> + file://gcc4_buildfix.patch \
> file://init \
> file://inetd.conf"
I build tested your patch for `MACHINE = "beagleboard"` for the
distributions `minimal-{libc,eglibc,uclibc}` and it worked. It compiled
for `angstrom-2008.1` but failed with a quality assurance warning which
probably has been there before and is for a separate patch.
$ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.package_do_package.4223
ERROR: QA Issue with netkit-base: No GNU_HASH in the elf binary: '/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd'
FATAL: QA run found fatal errors. Please consider fixing them.
ERROR: Error in executing python function in: /oe/openembedded/recipes/netkit-base/netkit-base_0.17.bb
ERROR: Exception:<type 'exceptions.SystemExit'> Message:1
ERROR: Printing the environment of the function
ERROR: Function do_package_qa failed
$ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.qa_package
LDFLAGS ignored, netkit-base, /work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Thanks,
Paul
[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-September/024859.html
[2] http://wiki.openembedded.net/index.php/Push_patches_upstream
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH 05/16] netkit-base-0.17: fix compile with gcc-4.x
2010-09-30 8:49 ` Paul Menzel
@ 2010-10-01 10:58 ` Andreas Oberritter
2010-10-01 11:05 ` [PATCH v2] " Andreas Oberritter
2010-10-03 0:31 ` [PATCH 06/18] " Khem Raj
2 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-01 10:58 UTC (permalink / raw)
To: openembedded-devel
* v2: Added header to patch.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
.../netkit-base-0.17/gcc4_buildfix.patch | 19 +++++++++++++++++++
recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletions(-)
create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
new file mode 100644
index 0000000..b5b476c
--- /dev/null
+++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
@@ -0,0 +1,19 @@
+upstream: unmaintained
+source: org.openembedded.dreambox fb4bee1268b9a0600fd6236ac0e9245f17b33f95
+
+| servtab.c: In function 'loadconfigent':
+| servtab.c:785:4: error: lvalue required as left operand of assignment
+[...]
+| servtab.c:798:4: error: lvalue required as left operand of assignment
+
+--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
+@@ -771,7 +771,7 @@
+ return;
+ }
+
+-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+
+ /*
+ * sep->se_wait may be holding the pid of a daemon
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index c9864ae..4e70164 100644
--- a/recipes/netkit-base/netkit-base_0.17.bb
+++ b/recipes/netkit-base/netkit-base_0.17.bb
@@ -1,11 +1,12 @@
SECTION = "base"
DESCRIPTION = "netkit-base includes the inetd daemon."
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
file://configure.patch \
file://mconfig.patch \
+ file://gcc4_buildfix.patch \
file://init \
file://inetd.conf"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH v2] netkit-base-0.17: fix compile with gcc-4.x
2010-09-30 8:49 ` Paul Menzel
2010-10-01 10:58 ` [PATCH 05/16] " Andreas Oberritter
@ 2010-10-01 11:05 ` Andreas Oberritter
2010-10-01 14:06 ` Andreas Oberritter
2010-10-03 0:31 ` [PATCH 06/18] " Khem Raj
2 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-01 11:05 UTC (permalink / raw)
To: openembedded-devel
* v2: Added header to patch.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
* Resent with correct subject line.
.../netkit-base-0.17/gcc4_buildfix.patch | 19 +++++++++++++++++++
recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletions(-)
create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
new file mode 100644
index 0000000..b5b476c
--- /dev/null
+++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
@@ -0,0 +1,19 @@
+upstream: unmaintained
+source: org.openembedded.dreambox fb4bee1268b9a0600fd6236ac0e9245f17b33f95
+
+| servtab.c: In function 'loadconfigent':
+| servtab.c:785:4: error: lvalue required as left operand of assignment
+[...]
+| servtab.c:798:4: error: lvalue required as left operand of assignment
+
+--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
+@@ -771,7 +771,7 @@
+ return;
+ }
+
+-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+
+ /*
+ * sep->se_wait may be holding the pid of a daemon
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index c9864ae..4e70164 100644
--- a/recipes/netkit-base/netkit-base_0.17.bb
+++ b/recipes/netkit-base/netkit-base_0.17.bb
@@ -1,11 +1,12 @@
SECTION = "base"
DESCRIPTION = "netkit-base includes the inetd daemon."
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
file://configure.patch \
file://mconfig.patch \
+ file://gcc4_buildfix.patch \
file://init \
file://inetd.conf"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH v2] netkit-base-0.17: fix compile with gcc-4.x
2010-10-01 11:05 ` [PATCH v2] " Andreas Oberritter
@ 2010-10-01 14:06 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-01 14:06 UTC (permalink / raw)
To: openembedded-devel
On 01.10.2010 13:05, Andreas Oberritter wrote:
> * v2: Added header to patch.
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> * Resent with correct subject line.
>
> .../netkit-base-0.17/gcc4_buildfix.patch | 19 +++++++++++++++++++
> recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
> 2 files changed, 21 insertions(+), 1 deletions(-)
> create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
Btw., this patch supersedes a similar patch sent by Pieter Grimmerink
in 2009: http://patchwork.openembedded.org/patch/1187/
Best regards,
Andreas
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x
2010-09-30 8:49 ` Paul Menzel
2010-10-01 10:58 ` [PATCH 05/16] " Andreas Oberritter
2010-10-01 11:05 ` [PATCH v2] " Andreas Oberritter
@ 2010-10-03 0:31 ` Khem Raj
2010-10-04 13:52 ` [PATCH v3] " Andreas Oberritter
2 siblings, 1 reply; 37+ messages in thread
From: Khem Raj @ 2010-10-03 0:31 UTC (permalink / raw)
To: openembedded-devel
On Thu, Sep 30, 2010 at 1:49 AM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Am Mittwoch, den 29.09.2010, 20:36 +0000 schrieb Andreas Oberritter:
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>> .../netkit-base-0.17/gcc4_buildfix.patch | 11 +++++++++++
>> recipes/netkit-base/netkit-base_0.17.bb | 3 ++-
>> 2 files changed, 13 insertions(+), 1 deletions(-)
>> create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
>>
>> diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
>> new file mode 100644
>> index 0000000..f284f1a
>
> As written in my answer to your introductory message [1], it would be
> nice to add a patch header [2].
>
>> --- /dev/null
>> +++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
>> @@ -0,0 +1,11 @@
>> +--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
>> ++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
>> +@@ -771,7 +771,7 @@
>> + return;
>> + }
>> +
>> +-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
>> ++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
>> +
>> + /*
>> + * sep->se_wait may be holding the pid of a daemon
>> diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
>> index c9864ae..4e70164 100644
>> --- a/recipes/netkit-base/netkit-base_0.17.bb
>> +++ b/recipes/netkit-base/netkit-base_0.17.bb
>> @@ -1,11 +1,12 @@
>> SECTION = "base"
>> DESCRIPTION = "netkit-base includes the inetd daemon."
>> LICENSE = "BSD"
>> -PR = "r1"
>> +PR = "r2"
>>
>> SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
>> file://configure.patch \
>> file://mconfig.patch \
>> + file://gcc4_buildfix.patch \
>> file://init \
>> file://inetd.conf"
>
> I build tested your patch for `MACHINE = "beagleboard"` for the
> distributions `minimal-{libc,eglibc,uclibc}` and it worked. It compiled
> for `angstrom-2008.1` but failed with a quality assurance warning which
> probably has been there before and is for a separate patch.
>
> $ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.package_do_package.4223
> ERROR: QA Issue with netkit-base: No GNU_HASH in the elf binary: '/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd'
> FATAL: QA run found fatal errors. Please consider fixing them.
> ERROR: Error in executing python function in: /oe/openembedded/recipes/netkit-base/netkit-base_0.17.bb
> ERROR: Exception:<type 'exceptions.SystemExit'> Message:1
> ERROR: Printing the environment of the function
> ERROR: Function do_package_qa failed
>
> $ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.qa_package
> LDFLAGS ignored, netkit-base, /work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd
>
Could you also fix this error ?
add TARGET_CC_ARCH += "${LDFLAGS}"
in recipe that probably should be enough
-khem
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v3] netkit-base-0.17: fix compile with gcc-4.x
2010-10-03 0:31 ` [PATCH 06/18] " Khem Raj
@ 2010-10-04 13:52 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-04 13:52 UTC (permalink / raw)
To: openembedded-devel
* v2: Added header to patch.
* v3: Set CFLAGS and LDFLAGS correctly.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
I decided to patch the file MCONFIG instead. LD was unused and CFLAGS was set
to a wrong value, too.
.../netkit-base-0.17/gcc4_buildfix.patch | 19 +++++++++++++++++++
recipes/netkit-base/netkit-base_0.17.bb | 9 +++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
new file mode 100644
index 0000000..b5b476c
--- /dev/null
+++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
@@ -0,0 +1,19 @@
+upstream: unmaintained
+source: org.openembedded.dreambox fb4bee1268b9a0600fd6236ac0e9245f17b33f95
+
+| servtab.c: In function 'loadconfigent':
+| servtab.c:785:4: error: lvalue required as left operand of assignment
+[...]
+| servtab.c:798:4: error: lvalue required as left operand of assignment
+
+--- bla/inetd/servtab.c 2000-07-22 22:20:50.000000000 +0200
++++ bla/inetd/servtab.c 2006-03-01 15:26:46.000000000 +0100
+@@ -771,7 +771,7 @@
+ return;
+ }
+
+-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+
+ /*
+ * sep->se_wait may be holding the pid of a daemon
diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
index c9864ae..8ab8935 100644
--- a/recipes/netkit-base/netkit-base_0.17.bb
+++ b/recipes/netkit-base/netkit-base_0.17.bb
@@ -1,11 +1,12 @@
SECTION = "base"
DESCRIPTION = "netkit-base includes the inetd daemon."
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
file://configure.patch \
file://mconfig.patch \
+ file://gcc4_buildfix.patch \
file://init \
file://inetd.conf"
@@ -17,7 +18,11 @@ INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ."
EXTRA_OEMAKE = "-C inetd"
do_compile () {
- oe_runmake 'CC=${CC}' 'LD=${LD}' all
+ sed -e 's:^CC=.*:CC=${CC}:' \
+ -e 's:^CFLAGS=.*:CFLAGS=${CFLAGS}:' \
+ -e 's:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:' \
+ -i ${S}/MCONFIG
+ oe_runmake
}
do_install () {
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 07/18] python-twisted-8.2.0: reduce package size
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (5 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-10-25 12:48 ` [PATCH resend] " Andreas Oberritter
2010-09-29 20:36 ` [PATCH 08/18] python-pyopenssl-0.8: " Andreas Oberritter
` (12 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* Don't install *.{bat,c,h}
* Move more tests to FILES_${PN}-test
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/python/python-twisted_8.2.0.bb | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/recipes/python/python-twisted_8.2.0.bb b/recipes/python/python-twisted_8.2.0.bb
index 7ecbf6c..3f8b657 100644
--- a/recipes/python/python-twisted_8.2.0.bb
+++ b/recipes/python/python-twisted_8.2.0.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.twistedmatrix.com"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-${PV}.tar.bz2 "
S = "${WORKDIR}/Twisted-${PV}"
@@ -43,11 +43,17 @@ RDEPENDS_${PN} += "\
${PN}-words \
"
+do_install_append() {
+ # remove some useless files before packaging
+ find ${D} -name "*.bat" -o -name "*.c" -o -name "*.h" -exec rm {} \;
+}
+
ALLOW_EMPTY = "1"
FILES_${PN} = ""
FILES_${PN}-test = " \
${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
+ ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
"
FILES_${PN}-protocols = " \
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 08/18] python-pyopenssl-0.8: reduce package size
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (6 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 07/18] python-twisted-8.2.0: reduce package size Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-10-25 12:49 ` [PATCH resend] " Andreas Oberritter
2010-09-29 20:36 ` [PATCH 09/18] cdrkit: update from 1.1.9 to 1.1.10 Andreas Oberritter
` (11 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* Move tests to FILES_${PN}-test.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/python/python-pyopenssl_0.8.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/recipes/python/python-pyopenssl_0.8.bb b/recipes/python/python-pyopenssl_0.8.bb
index 74e2ae9..bdbb6b2 100644
--- a/recipes/python/python-pyopenssl_0.8.bb
+++ b/recipes/python/python-pyopenssl_0.8.bb
@@ -4,14 +4,18 @@ PRIORITY = "optional"
LICENSE = "LGPL"
SRCNAME = "pyOpenSSL"
DEPENDS = "openssl"
-PR = "ml1"
+PR = "ml2"
SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
+
RDEPENDS_${PN} = "python-threading"
+RDEPENDS_${PN}-tests = "${PN}"
SRC_URI[md5sum] = "00377690f224d9e59c833fb0459603f4"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH resend] python-pyopenssl-0.8: reduce package size
2010-09-29 20:36 ` [PATCH 08/18] python-pyopenssl-0.8: " Andreas Oberritter
@ 2010-10-25 12:49 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-25 12:49 UTC (permalink / raw)
To: openembedded-devel
* Move tests to FILES_${PN}-test.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/python/python-pyopenssl_0.8.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/recipes/python/python-pyopenssl_0.8.bb b/recipes/python/python-pyopenssl_0.8.bb
index 74e2ae9..bdbb6b2 100644
--- a/recipes/python/python-pyopenssl_0.8.bb
+++ b/recipes/python/python-pyopenssl_0.8.bb
@@ -4,14 +4,18 @@ PRIORITY = "optional"
LICENSE = "LGPL"
SRCNAME = "pyOpenSSL"
DEPENDS = "openssl"
-PR = "ml1"
+PR = "ml2"
SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
+
RDEPENDS_${PN} = "python-threading"
+RDEPENDS_${PN}-tests = "${PN}"
SRC_URI[md5sum] = "00377690f224d9e59c833fb0459603f4"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 09/18] cdrkit: update from 1.1.9 to 1.1.10
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (7 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 08/18] python-pyopenssl-0.8: " Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 10/18] libungif-4.1.3: reduce package size, build without X11 Andreas Oberritter
` (10 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* 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@opendreambox.org>
---
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(-)
create mode 100644 recipes/cdrkit/cdrkit_1.1.10.bb
delete mode 100644 recipes/cdrkit/cdrkit_1.1.9.bb
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)
+
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 10/18] libungif-4.1.3: reduce package size, build without X11
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (8 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 09/18] cdrkit: update from 1.1.9 to 1.1.10 Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 11/18] tremor-20041119: Add pkgconfig file, provide libvorbisidec Andreas Oberritter
` (9 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* Move static libraries to FILES_${PN}-dev.
* Add --without-x to configure flags.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libungif/libungif_4.1.3.bb | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/recipes/libungif/libungif_4.1.3.bb b/recipes/libungif/libungif_4.1.3.bb
index f53008b..9f033cc 100644
--- a/recipes/libungif/libungif_4.1.3.bb
+++ b/recipes/libungif/libungif_4.1.3.bb
@@ -2,20 +2,25 @@ SECTION = "libs"
DESCRIPTION = "shared library for GIF images"
SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
PACKAGES += "${PN}-utils"
-FILES_${PN} = "${libdir}"
+FILES_${PN} = "${libdir}/*.so*"
+FILES_${PN}-dev += "\
+ ${libdir}/libungif.a \
+ ${libdir}/libungif.la \
+"
FILES_${PN}-utils = "${bindir}"
inherit autotools
+EXTRA_OECONF = "--without-x"
+
do_stage() {
oe_libinstall -so -C lib/.libs libungif ${STAGING_LIBDIR}
install -m 0644 lib/gif_lib.h ${STAGING_INCDIR}/
-
}
SRC_URI[md5sum] = "8c198831cc0495596c78134b8849e9ad"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 11/18] tremor-20041119: Add pkgconfig file, provide libvorbisidec
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (9 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 10/18] libungif-4.1.3: reduce package size, build without X11 Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 12/18] util-linux-ng: Don't depend on udev unless selected as IMAGE_DEV_MANAGER Andreas Oberritter
` (8 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/tremor/tremor/pkgconfig.patch | 22 ++++++++++++++++++++++
recipes/tremor/tremor_20041119.bb | 9 ++++++---
2 files changed, 28 insertions(+), 3 deletions(-)
create mode 100644 recipes/tremor/tremor/pkgconfig.patch
diff --git a/recipes/tremor/tremor/pkgconfig.patch b/recipes/tremor/tremor/pkgconfig.patch
new file mode 100644
index 0000000..f864cb8
--- /dev/null
+++ b/recipes/tremor/tremor/pkgconfig.patch
@@ -0,0 +1,22 @@
+--- Tremor/configure.in 2006-09-03 01:19:30.000000000 +0200
++++ Tremor-fixed/configure.in 2006-09-03 12:13:33.339593728 +0200
+@@ -106,4 +106,4 @@
+ AC_SUBST(DEBUG)
+ AC_SUBST(PROFILE)
+
+-AC_OUTPUT(Makefile)
++AC_OUTPUT([Makefile vorbisidec.pc])
+--- Tremor/vorbisidec.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ Tremor-fixed/vorbisidec.pc.in 2006-09-03 12:16:38.313473424 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: vorbisidec
++Description: Vorbis audio decoder
++Requires:
++Version: 20041119
++Libs: -L${libdir} -lvorbisidec
++Cflags: -I${includedir}
diff --git a/recipes/tremor/tremor_20041119.bb b/recipes/tremor/tremor_20041119.bb
index 889b981..42155ab 100644
--- a/recipes/tremor/tremor_20041119.bb
+++ b/recipes/tremor/tremor_20041119.bb
@@ -4,16 +4,19 @@ DEPENDS = "libogg"
DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
LICENSE = "BSD"
SRCDATE = "${PV}"
-PR = "r1"
+PR = "r2"
# tremor makes heavy use of non-thumb-compatible inline asm.
ARM_INSTRUCTION_SET = "arm"
-SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
+PROVIDES += "libvorbisidec"
+
+SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http \
+ file://pkgconfig.patch"
S = "${WORKDIR}/Tremor"
-inherit autotools
+inherit autotools pkgconfig
EXTRA_OECONF=" --enable-shared --disable-rpath "
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 12/18] util-linux-ng: Don't depend on udev unless selected as IMAGE_DEV_MANAGER
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (10 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 11/18] tremor-20041119: Add pkgconfig file, provide libvorbisidec Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 13/18] libcddb-1.3.2: initial recipe Andreas Oberritter
` (7 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/util-linux-ng/util-linux-ng.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index b5dd25b..c65849e 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
SECTION = "base"
LICENSE = "GPL"
-DEPENDS = "udev zlib ncurses virtual/libintl"
+DEPENDS = "${@base_conditional('IMAGE_DEV_MANAGER', 'udev', 'udev', '', d)} zlib ncurses virtual/libintl"
DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
inherit autotools gettext
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 13/18] libcddb-1.3.2: initial recipe
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (11 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 12/18] util-linux-ng: Don't depend on udev unless selected as IMAGE_DEV_MANAGER Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-10-03 20:37 ` Frans Meulenbroeks
2010-09-29 20:36 ` [PATCH 14/18] cdparanoia: create libcdparanoia packages Andreas Oberritter
` (6 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libcddb/libcddb_1.3.2.bb | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 recipes/libcddb/libcddb_1.3.2.bb
diff --git a/recipes/libcddb/libcddb_1.3.2.bb b/recipes/libcddb/libcddb_1.3.2.bb
new file mode 100644
index 0000000..8539569
--- /dev/null
+++ b/recipes/libcddb/libcddb_1.3.2.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "A library for accessing a CDDB server"
+HOMEPAGE = "http://libcddb.sourceforge.net"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPLv2"
+MAINTAINER = "Andreas Frisch <andreas.frisch@multimedia-labs.de>"
+
+SRC_URI = "http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+SRC_URI[md5sum] = "8bb4a6f542197e8e9648ae597cd6bc8a"
+SRC_URI[sha256sum] = "35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
+
+inherit autotools pkgconfig
+
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH 13/18] libcddb-1.3.2: initial recipe
2010-09-29 20:36 ` [PATCH 13/18] libcddb-1.3.2: initial recipe Andreas Oberritter
@ 2010-10-03 20:37 ` Frans Meulenbroeks
0 siblings, 0 replies; 37+ messages in thread
From: Frans Meulenbroeks @ 2010-10-03 20:37 UTC (permalink / raw)
To: openembedded-devel
2010/9/29 Andreas Oberritter <obi@opendreambox.org>:
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> recipes/libcddb/libcddb_1.3.2.bb | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
> create mode 100644 recipes/libcddb/libcddb_1.3.2.bb
>
> diff --git a/recipes/libcddb/libcddb_1.3.2.bb b/recipes/libcddb/libcddb_1.3.2.bb
> new file mode 100644
> index 0000000..8539569
> --- /dev/null
> +++ b/recipes/libcddb/libcddb_1.3.2.bb
> @@ -0,0 +1,14 @@
> +DESCRIPTION = "A library for accessing a CDDB server"
> +HOMEPAGE = "http://libcddb.sourceforge.net"
> +SECTION = "libs"
> +PRIORITY = "optional"
> +LICENSE = "LGPLv2"
> +MAINTAINER = "Andreas Frisch <andreas.frisch@multimedia-labs.de>"
> +
> +SRC_URI = "http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
> +
> +SRC_URI[md5sum] = "8bb4a6f542197e8e9648ae597cd6bc8a"
> +SRC_URI[sha256sum] = "35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
> +
> +inherit autotools pkgconfig
> +
> --
build and tested this (and the libcdio patch), then pushed it.
saw a patch from koen, but actually that one is not really good either.
both libcdio and libcddb do not depend on each other, the issue is
that they come with example progs that depend on both.
I suggest splitting the recipe in a real lib recipe (which does not
depend on the other) and a recipe for the examples (which then could
depend on both libcdio and libcddb).
Frans
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 14/18] cdparanoia: create libcdparanoia packages
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (12 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 13/18] libcddb-1.3.2: initial recipe Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:56 ` Frans Meulenbroeks
2010-09-29 20:36 ` [PATCH 15/18] sispmctl-2.7: initial recipe Andreas Oberritter
` (5 subsequent siblings)
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* Create separate packages for the libraries, which
use a different license than the executable:
"The cdparanoia command line tool versions 10.1 and later are
distributed under the GNU General Public Licence v2.0 or, at your
option, any later version of the GPL."
"The 10.1 and later release versions of the cdda-interface and
cdda-paranoia libraries are distributed the GNU Lesser General Public
License v2.1 or, at your option, any later version of the GNU LGPL."
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/cdparanoia/cdparanoia_10.2.bb | 14 ++++++++++++++
recipes/cdparanoia/cdparanoia_svn.bb | 15 ++++++++++++++-
2 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/recipes/cdparanoia/cdparanoia_10.2.bb b/recipes/cdparanoia/cdparanoia_10.2.bb
index 7bb6035..894c038 100644
--- a/recipes/cdparanoia/cdparanoia_10.2.bb
+++ b/recipes/cdparanoia/cdparanoia_10.2.bb
@@ -2,6 +2,7 @@
# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \
file://fixes10.patch \
@@ -17,6 +18,19 @@ S = "${WORKDIR}/cdparanoia-III-10.2"
inherit autotools
+PACKAGES += "libcdparanoia libcdparanoia-dev libcdparanoia-static"
+
+LICENSE_libcdparanoia = "LGPLv2.1"
+LICENSE_libcdparanoia-dev = "LGPLv2.1"
+LICENSE_libcdparanoia-static = "LGPLv2.1"
+
+FILES_${PN} = "${bindir}/*"
+FILES_${PN}-dev = ""
+FILES_${PN}-static = ""
+FILES_libcdparanoia = "${libdir}/lib*${SOLIBS}"
+FILES_libcdparanoia-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
+FILES_libcdparanoia-static = "${libdir}/*.a"
+
do_install() {
oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb
index 0f81d6c..5610450 100644
--- a/recipes/cdparanoia/cdparanoia_svn.bb
+++ b/recipes/cdparanoia/cdparanoia_svn.bb
@@ -2,7 +2,7 @@
# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
-PR = "r2"
+PR = "r3"
LICENSE = "GPL"
PV = "10.2+svnr${SRCPV}"
@@ -21,6 +21,19 @@ PARALLEL_MAKE = ""
inherit autotools
+PACKAGES += "libcdparanoia libcdparanoia-dev libcdparanoia-static"
+
+LICENSE_libcdparanoia = "LGPLv2.1"
+LICENSE_libcdparanoia-dev = "LGPLv2.1"
+LICENSE_libcdparanoia-static = "LGPLv2.1"
+
+FILES_${PN} = "${bindir}/*"
+FILES_${PN}-dev = ""
+FILES_${PN}-static = ""
+FILES_libcdparanoia = "${libdir}/lib*${SOLIBS}"
+FILES_libcdparanoia-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
+FILES_libcdparanoia-static = "${libdir}/*.a"
+
do_install() {
oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH 14/18] cdparanoia: create libcdparanoia packages
2010-09-29 20:36 ` [PATCH 14/18] cdparanoia: create libcdparanoia packages Andreas Oberritter
@ 2010-09-29 20:56 ` Frans Meulenbroeks
2010-09-29 21:15 ` Andreas Oberritter
0 siblings, 1 reply; 37+ messages in thread
From: Frans Meulenbroeks @ 2010-09-29 20:56 UTC (permalink / raw)
To: openembedded-devel
2010/9/29 Andreas Oberritter <obi@opendreambox.org>:
> * Create separate packages for the libraries, which
> use a different license than the executable:
>
> "The cdparanoia command line tool versions 10.1 and later are
> distributed under the GNU General Public Licence v2.0 or, at your
> option, any later version of the GPL."
>
> "The 10.1 and later release versions of the cdda-interface and
> cdda-paranoia libraries are distributed the GNU Lesser General Public
> License v2.1 or, at your option, any later version of the GNU LGPL."
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> recipes/cdparanoia/cdparanoia_10.2.bb | 14 ++++++++++++++
> recipes/cdparanoia/cdparanoia_svn.bb | 15 ++++++++++++++-
> 2 files changed, 28 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/cdparanoia/cdparanoia_10.2.bb b/recipes/cdparanoia/cdparanoia_10.2.bb
> index 7bb6035..894c038 100644
> --- a/recipes/cdparanoia/cdparanoia_10.2.bb
> +++ b/recipes/cdparanoia/cdparanoia_10.2.bb
> @@ -2,6 +2,7 @@
> # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
> # Released under the MIT license (see packages/COPYING)
> LICENSE = "GPL"
> +PR = "r1"
>
> SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \
> file://fixes10.patch \
> @@ -17,6 +18,19 @@ S = "${WORKDIR}/cdparanoia-III-10.2"
>
> inherit autotools
>
> +PACKAGES += "libcdparanoia libcdparanoia-dev libcdparanoia-static"
> +
> +LICENSE_libcdparanoia = "LGPLv2.1"
> +LICENSE_libcdparanoia-dev = "LGPLv2.1"
> +LICENSE_libcdparanoia-static = "LGPLv2.1"
> +
> +FILES_${PN} = "${bindir}/*"
> +FILES_${PN}-dev = ""
> +FILES_${PN}-static = ""
> +FILES_libcdparanoia = "${libdir}/lib*${SOLIBS}"
> +FILES_libcdparanoia-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
> +FILES_libcdparanoia-static = "${libdir}/*.a"
> +
> do_install() {
> oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
> INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
> diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb
> index 0f81d6c..5610450 100644
> --- a/recipes/cdparanoia/cdparanoia_svn.bb
> +++ b/recipes/cdparanoia/cdparanoia_svn.bb
> @@ -2,7 +2,7 @@
> # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
> # Released under the MIT license (see packages/COPYING)
>
> -PR = "r2"
> +PR = "r3"
> LICENSE = "GPL"
>
> PV = "10.2+svnr${SRCPV}"
> @@ -21,6 +21,19 @@ PARALLEL_MAKE = ""
>
> inherit autotools
>
> +PACKAGES += "libcdparanoia libcdparanoia-dev libcdparanoia-static"
> +
> +LICENSE_libcdparanoia = "LGPLv2.1"
> +LICENSE_libcdparanoia-dev = "LGPLv2.1"
> +LICENSE_libcdparanoia-static = "LGPLv2.1"
> +
> +FILES_${PN} = "${bindir}/*"
> +FILES_${PN}-dev = ""
> +FILES_${PN}-static = ""
> +FILES_libcdparanoia = "${libdir}/lib*${SOLIBS}"
> +FILES_libcdparanoia-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV}"
> +FILES_libcdparanoia-static = "${libdir}/*.a"
> +
> do_install() {
> oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
> INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
> --
> 1.7.1
>
I feel there should be an
RDEPENDS_${PN} += "libcdparanioa"
to add the dependency that is now created (if i recall correctly
cdparanoia is statically build).
There is no -doc package?
Other wise this one looks fine to me. Will test tomorrow (time permitting).
Frans
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH 14/18] cdparanoia: create libcdparanoia packages
2010-09-29 20:56 ` Frans Meulenbroeks
@ 2010-09-29 21:15 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 21:15 UTC (permalink / raw)
To: openembedded-devel
On 29.09.2010 22:56, Frans Meulenbroeks wrote:
> I feel there should be an
> RDEPENDS_${PN} += "libcdparanioa"
> to add the dependency that is now created (if i recall correctly
> cdparanoia is statically build).
The dependency is generated automatically by shlibdeps. The executable
gets linked dynamically.
> There is no -doc package?
There is cdparanoia-doc, wich only contains a man page for the
executable. I left it to the default.
> Other wise this one looks fine to me. Will test tomorrow (time permitting).
Thanks!
Best regards,
Andreas
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 15/18] sispmctl-2.7: initial recipe
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (13 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 14/18] cdparanoia: create libcdparanoia packages Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 16/18] module.bbclass: fix dependency on specific kernel Andreas Oberritter
` (4 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/sispmctl/sispmctl_2.7.bb | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 recipes/sispmctl/sispmctl_2.7.bb
diff --git a/recipes/sispmctl/sispmctl_2.7.bb b/recipes/sispmctl/sispmctl_2.7.bb
new file mode 100644
index 0000000..43d6238
--- /dev/null
+++ b/recipes/sispmctl/sispmctl_2.7.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Control Gembird SIS-PM programmable power outlet strips"
+AUTHOR = "Mondrian Nuessle <nuessle@uni-mannheim.de>"
+HOMEPAGE = "http://sispmctl.sourceforge.net/"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "libusb"
+
+SRC_URI = "http://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+SRC_URI[md5sum] = "2457f76cd129f880634f3381be0aeb76"
+SRC_URI[sha256sum] = "d24d34fc7e14992ac822cef3c5567b04a077cfc96252b0a6fb238c8a272c16f4"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-webless"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 16/18] module.bbclass: fix dependency on specific kernel
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (14 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 15/18] sispmctl-2.7: initial recipe Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 17/18] libxmlccwrap-0.0.12: initial recipe Andreas Oberritter
` (3 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
* Previously, the kernel version did not show up in the
generated control file (debian ipk).
* Use the same format as in kernel.bbclass.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
classes/module.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/classes/module.bbclass b/classes/module.bbclass
index 83463ac..fe577cc 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -1,4 +1,4 @@
-RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules"
+RDEPENDS += "kernel-${KERNEL_VERSION} update-modules"
DEPENDS += "virtual/kernel"
inherit module-base
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 17/18] libxmlccwrap-0.0.12: initial recipe
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (15 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 16/18] module.bbclass: fix dependency on specific kernel Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-29 20:36 ` [PATCH 18/18] mjpegtools-1.9.0: " Andreas Oberritter
` (2 subsequent siblings)
19 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5867 bytes --]
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
recipes/libxmlccwrap/files/disable_libxslt.patch | 96 ++++++++++++++++++++
.../libxmlccwrap/files/dont_build_unneeded.patch | 6 ++
.../files/fix_assignment_operator.patch | 10 ++
recipes/libxmlccwrap/libxmlccwrap_0.0.12.bb | 20 ++++
4 files changed, 132 insertions(+), 0 deletions(-)
create mode 100644 recipes/libxmlccwrap/files/disable_libxslt.patch
create mode 100644 recipes/libxmlccwrap/files/dont_build_unneeded.patch
create mode 100644 recipes/libxmlccwrap/files/fix_assignment_operator.patch
create mode 100644 recipes/libxmlccwrap/libxmlccwrap_0.0.12.bb
diff --git a/recipes/libxmlccwrap/files/disable_libxslt.patch b/recipes/libxmlccwrap/files/disable_libxslt.patch
new file mode 100644
index 0000000..b178641
--- /dev/null
+++ b/recipes/libxmlccwrap/files/disable_libxslt.patch
@@ -0,0 +1,96 @@
+diff -Naur libxmlccwrap-0.0.12_org/configure.ac libxmlccwrap-0.0.12/configure.ac
+--- libxmlccwrap-0.0.12_org/configure.ac 2005-07-28 21:27:58.000000000 +0200
++++ libxmlccwrap-0.0.12/configure.ac 2007-10-29 15:36:49.000000000 +0100
+@@ -15,7 +15,7 @@
+ AM_PROG_LIBTOOL
+
+ AC_CHECK_LIB(xml2,main)
+-AC_CHECK_LIB(xslt,main)
++#AC_CHECK_LIB(xslt,main)
+
+ AC_OUTPUT([Makefile \
+ xmlccwrap/Makefile \
+diff -Naur libxmlccwrap-0.0.12_org/xmlccwrap/xmlccwrap.cc libxmlccwrap-0.0.12/xmlccwrap/xmlccwrap.cc
+--- libxmlccwrap-0.0.12_org/xmlccwrap/xmlccwrap.cc 2003-12-18 23:48:08.000000000 +0100
++++ libxmlccwrap-0.0.12/xmlccwrap/xmlccwrap.cc 2007-10-24 22:54:15.000000000 +0200
+@@ -23,8 +23,10 @@
+ #include <libxml/tree.h>
+ #include <libxml/HTMLparser.h>
+ #include <libxml/encoding.h>
++/*
+ #include <libxslt/xsltutils.h>
+ #include <libxslt/transform.h>
++*/
+ #include "xmlccwrap.h"
+ #include "libxmlexport.h"
+
+@@ -47,7 +49,7 @@
+ Element *readnode(xmlNodePtr);
+ void writenode(xmlDocPtr, Element *, xmlNodePtr, int = 0);
+
+-
++/*
+ XSLTTree::XSLTTree()
+ {
+ xsltP = 0;
+@@ -83,7 +85,7 @@
+ {
+ return xsltP;
+ }
+-
++*/
+
+ XMLTree::XMLTree() : _filename(), _root(), _compression(0)
+ { }
+@@ -380,7 +382,7 @@
+ return retval;
+ }
+
+-
++/*
+ bool XMLTree::xslt(const XSLTTree & xsltTree, const std::string & outputfile, ParameterMap & parameterMap)
+ {
+ bool ret = false;
+@@ -425,7 +427,7 @@
+ ParameterMap parameterMap;
+ return xslt(xsltTree, outputfile, parameterMap);
+ }
+-
++*/
+
+ const std::string & XMLTree::getErrorString()
+ {
+diff -Naur libxmlccwrap-0.0.12_org/xmlccwrap/xmlccwrap.h libxmlccwrap-0.0.12/xmlccwrap/xmlccwrap.h
+--- libxmlccwrap-0.0.12_org/xmlccwrap/xmlccwrap.h 2003-12-18 23:42:37.000000000 +0100
++++ libxmlccwrap-0.0.12/xmlccwrap/xmlccwrap.h 2007-10-24 22:54:15.000000000 +0200
+@@ -43,7 +41,7 @@
+ typedef std::multimap<std::string, std::string> ParameterMap;
+ typedef ParameterMap::value_type ValuePair;
+
+-
++/*
+ class XSLTTree
+ {
+ private:
+@@ -60,7 +58,7 @@
+ bool read(const std::string &fn);
+ const void * exportxsltStylesheetPtr() const;
+ };
+-
++*/
+
+ class XMLTree
+ {
+@@ -102,10 +100,10 @@
+ bool write(const std::string &fn);
+ const std::string & writeBuffer() const;
+
+-
++/*
+ bool xslt(const XSLTTree & xsltTree, const std::string & outputfile, ParameterMap & parameterMap);
+ bool xslt(const XSLTTree & xsltTree, const std::string & outputfile);
+-
++*/
+ const std::string & getErrorString();
+ };
+
diff --git a/recipes/libxmlccwrap/files/dont_build_unneeded.patch b/recipes/libxmlccwrap/files/dont_build_unneeded.patch
new file mode 100644
index 0000000..69eaa15
--- /dev/null
+++ b/recipes/libxmlccwrap/files/dont_build_unneeded.patch
@@ -0,0 +1,6 @@
+diff -Naur libxmlccwrap-0.0.12_org/Makefile.am libxmlccwrap-0.0.12/Makefile.am
+--- libxmlccwrap-0.0.12_org/Makefile.am 2002-12-11 23:18:41.000000000 +0100
++++ libxmlccwrap-0.0.12/Makefile.am 2007-10-29 15:35:11.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = xmlccwrap html testlib
++SUBDIRS = xmlccwrap
diff --git a/recipes/libxmlccwrap/files/fix_assignment_operator.patch b/recipes/libxmlccwrap/files/fix_assignment_operator.patch
new file mode 100644
index 0000000..1d64590
--- /dev/null
+++ b/recipes/libxmlccwrap/files/fix_assignment_operator.patch
@@ -0,0 +1,10 @@
+--- libxmlccwrap-0.0.12_org/xmlccwrap/xmlccwrap.cc 2003-12-18 23:48:08.000000000 +0100
++++ libxmlccwrap-0.0.12/xmlccwrap/xmlccwrap.cc 2007-10-24 22:54:15.000000000 +0200
+@@ -498,6 +500,7 @@
+ for (ElementIterator curnode = nodes.begin(); curnode != nodes.end(); curnode++)
+ add
+ (**curnode);
++ return *this;
+ }
+
+
diff --git a/recipes/libxmlccwrap/libxmlccwrap_0.0.12.bb b/recipes/libxmlccwrap/libxmlccwrap_0.0.12.bb
new file mode 100644
index 0000000..1860a85
--- /dev/null
+++ b/recipes/libxmlccwrap/libxmlccwrap_0.0.12.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "A small libxml2 c++ wrapper"
+AUTHOR = "Jürgen Rinas <jrinas@gmx.de>"
+HOMEPAGE = "http://www.ant.uni-bremen.de/whomes/rinas/libxmlccwrap/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "libxml2"
+
+SRC_URI = "http://www.ant.uni-bremen.de/whomes/rinas/libxmlccwrap/download/${P}.tar.gz \
+ file://dont_build_unneeded.patch \
+ file://disable_libxslt.patch \
+ file://fix_assignment_operator.patch"
+
+SRC_URI[md5sum] = "9f8bbad3452d704603246273b2dda758"
+SRC_URI[sha256sum] = "38fb5f75f8b7dad1c8d535cc7b18ea9f1603e14a8b9256a2f60cf721513dc299"
+
+inherit autotools
+
+FILES_${PN} = "${libdir}/${P}${SOLIBSDEV}"
+FILES_${PN}-dev = "${includedir} ${libdir}/${PN}${SOLIBSDEV} ${libdir}/*.la"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH 18/18] mjpegtools-1.9.0: initial recipe
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (16 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 17/18] libxmlccwrap-0.0.12: initial recipe Andreas Oberritter
@ 2010-09-29 20:36 ` Andreas Oberritter
2010-09-30 7:53 ` Paul Menzel
2010-09-29 21:02 ` [PATCH 00/18] Patches from opendreambox.org Frans Meulenbroeks
2010-09-29 22:40 ` Paul Menzel
19 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-09-29 20:36 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../mjpegtools/files/mjpegtools-fix-include.patch | 65 ++++++++++++++++++++
.../files/mjpegtools-remove-sdl-dependency.patch | 15 +++++
.../files/mjpegtools-v4l-doesnt-mean-x11.patch | 12 ++++
recipes/mjpegtools/mjpegtools_1.9.0.bb | 18 ++++++
4 files changed, 110 insertions(+), 0 deletions(-)
create mode 100644 recipes/mjpegtools/files/mjpegtools-fix-include.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
create mode 100644 recipes/mjpegtools/mjpegtools_1.9.0.bb
diff --git a/recipes/mjpegtools/files/mjpegtools-fix-include.patch b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
new file mode 100644
index 0000000..b5ff90a
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
@@ -0,0 +1,65 @@
+Index: mjpegtools-1.9.0rc3/lavtools/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/lavtools/Makefile.am 2008-04-09 00:44:57.000000000 +0200
++++ mjpegtools-1.9.0rc3/lavtools/Makefile.am 2008-04-09 01:03:10.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvcorrect/Makefile.am 2008-04-09 01:01:15.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am 2008-04-09 01:01:21.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvscaler/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvscaler/Makefile.am 2008-04-09 01:01:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvscaler/Makefile.am 2008-04-09 01:01:50.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+Index: mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mdenoise/Makefile.am 2008-04-09 01:03:16.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am 2008-04-09 01:03:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+ AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+
+-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/y4mutils/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mutils/Makefile.am 2008-04-09 01:03:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mutils/Makefile.am 2008-04-09 01:03:48.000000000 +0200
+@@ -3,7 +3,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+ AM_CFLAGS = @PROGRAM_NOPIC@
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
diff --git a/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
new file mode 100644
index 0000000..fe855d3
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
@@ -0,0 +1,15 @@
+Index: mjpegtools-1.9.0rc3/configure.ac
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/configure.ac 2008-04-09 00:35:08.000000000 +0200
++++ mjpegtools-1.9.0rc3/configure.ac 2008-04-09 00:35:18.000000000 +0200
+@@ -275,10 +275,6 @@
+ dnl Check for the SDL library (for software playback)
+ dnl (defines SDL_CFLAGS and SDL_LIBS)
+ dnl ********************************************************************
+-AM_PATH_SDL(1.1.3,
+- [have_sdl=true
+- AC_DEFINE(HAVE_SDL, 1, [SDL library present]) ],
+- [have_sdl=false])
+ AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue)
+
+ dnl ***
diff --git a/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
new file mode 100644
index 0000000..a6a537c
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
@@ -0,0 +1,12 @@
+--- mjpegtools-1.9.0/lavtools/Makefile.am.orig 2010-09-29 19:36:46.000000000 +0000
++++ mjpegtools-1.9.0/lavtools/Makefile.am 2010-09-29 19:37:55.000000000 +0000
+@@ -58,9 +58,6 @@
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+ liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+-if HAVE_V4L
+- liblavplay_la_LIBADD += ${X_LIBS} -lX11
+-endif
+ liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+
+ # *********************************************************************
diff --git a/recipes/mjpegtools/mjpegtools_1.9.0.bb b/recipes/mjpegtools/mjpegtools_1.9.0.bb
new file mode 100644
index 0000000..3552b6e
--- /dev/null
+++ b/recipes/mjpegtools/mjpegtools_1.9.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "MJPEG video capture/editting/playback MPEG encoding"
+HOMEPAGE = "http://sourceforge.net/projects/mjpeg/"
+SECTION = "optional"
+LICENSE = "GPLv2"
+
+SRC_URI = " \
+ ${SOURCEFORGE_MIRROR}/mjpeg/${P}.tar.gz \
+ file://mjpegtools-fix-include.patch \
+ file://mjpegtools-remove-sdl-dependency.patch \
+ file://mjpegtools-v4l-doesnt-mean-x11.patch \
+ "
+
+SRC_URI[md5sum] = "309a6fcf0900a010d6a9c1e91afc2f5c"
+SRC_URI[sha256sum] = "a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* Re: [PATCH 18/18] mjpegtools-1.9.0: initial recipe
2010-09-29 20:36 ` [PATCH 18/18] mjpegtools-1.9.0: " Andreas Oberritter
@ 2010-09-30 7:53 ` Paul Menzel
2010-10-01 10:55 ` [PATCH v2] " Andreas Oberritter
0 siblings, 1 reply; 37+ messages in thread
From: Paul Menzel @ 2010-09-30 7:53 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2700 bytes --]
Am Mittwoch, den 29.09.2010, 20:36 +0000 schrieb Andreas Oberritter:
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> .../mjpegtools/files/mjpegtools-fix-include.patch | 65 ++++++++++++++++++++
> .../files/mjpegtools-remove-sdl-dependency.patch | 15 +++++
> .../files/mjpegtools-v4l-doesnt-mean-x11.patch | 12 ++++
> recipes/mjpegtools/mjpegtools_1.9.0.bb | 18 ++++++
> 4 files changed, 110 insertions(+), 0 deletions(-)
> create mode 100644 recipes/mjpegtools/files/mjpegtools-fix-include.patch
> create mode 100644 recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
> create mode 100644 recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
> create mode 100644 recipes/mjpegtools/mjpegtools_1.9.0.bb
[…]
> diff --git a/recipes/mjpegtools/mjpegtools_1.9.0.bb b/recipes/mjpegtools/mjpegtools_1.9.0.bb
> new file mode 100644
> index 0000000..3552b6e
> --- /dev/null
> +++ b/recipes/mjpegtools/mjpegtools_1.9.0.bb
> @@ -0,0 +1,18 @@
> +DESCRIPTION = "MJPEG video capture/editting/playback MPEG encoding"
> +HOMEPAGE = "http://sourceforge.net/projects/mjpeg/"
> +SECTION = "optional"
> +LICENSE = "GPLv2"
> +
> +SRC_URI = " \
> + ${SOURCEFORGE_MIRROR}/mjpeg/${P}.tar.gz \
> + file://mjpegtools-fix-include.patch \
> + file://mjpegtools-remove-sdl-dependency.patch \
> + file://mjpegtools-v4l-doesnt-mean-x11.patch \
> + "
> +
> +SRC_URI[md5sum] = "309a6fcf0900a010d6a9c1e91afc2f5c"
> +SRC_URI[sha256sum] = "a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711"
> +
> +inherit autotools
> +
> +EXTRA_OECONF = "--without-x"
Using minimal (eglibc) and building mjpegtools from scratch I got
[…]
| checking for jpeg_start_compress in -ljpeg... no
| configure: error: JPEG 6b library missing - Go to http://www.ijg.org/
| ERROR: Function do_configure failed
NOTE: package mjpegtools-1.9.0-r0: task do_configure: Failed
[…]
Adding `DEPENDS = jpeg` fixed this for me.
I build your recipe with this addition for minimal-{libc,eglibc,uclibc}
and angstrom-2008.1 on `MACHINE = "beagleboard"` and it worked. I just
saw the following warning.
NOTE: package mjpegtools-1.9.0-r0: task do_populate_sysroot: Succeeded
NOTE: Multiple libraries (libmplex2-1.9.so.0, liblavfile-1.9.so.0, libmpeg2encpp-1.9.so.0, liblavrec-1.9.so.0, liblavplay-1.9.so.0, liblavjpeg-1.9.so.0, libmjpegutils-1.9.so.0) found and LEAD_SONAME not defined
I have not run tested this recipe though.
With the DEPENDS change this patch is
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread* [PATCH v2] mjpegtools-1.9.0: initial recipe
2010-09-30 7:53 ` Paul Menzel
@ 2010-10-01 10:55 ` Andreas Oberritter
2010-10-25 12:53 ` [PATCH v2 resend] " Andreas Oberritter
0 siblings, 1 reply; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-01 10:55 UTC (permalink / raw)
To: openembedded-devel
* v2: Added jpeg to DEPENDS.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
.../mjpegtools/files/mjpegtools-fix-include.patch | 65 ++++++++++++++++++++
.../files/mjpegtools-remove-sdl-dependency.patch | 15 +++++
.../files/mjpegtools-v4l-doesnt-mean-x11.patch | 12 ++++
recipes/mjpegtools/mjpegtools_1.9.0.bb | 19 ++++++
4 files changed, 111 insertions(+), 0 deletions(-)
create mode 100644 recipes/mjpegtools/files/mjpegtools-fix-include.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
create mode 100644 recipes/mjpegtools/mjpegtools_1.9.0.bb
diff --git a/recipes/mjpegtools/files/mjpegtools-fix-include.patch b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
new file mode 100644
index 0000000..b5ff90a
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
@@ -0,0 +1,65 @@
+Index: mjpegtools-1.9.0rc3/lavtools/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/lavtools/Makefile.am 2008-04-09 00:44:57.000000000 +0200
++++ mjpegtools-1.9.0rc3/lavtools/Makefile.am 2008-04-09 01:03:10.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvcorrect/Makefile.am 2008-04-09 01:01:15.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am 2008-04-09 01:01:21.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvscaler/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvscaler/Makefile.am 2008-04-09 01:01:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvscaler/Makefile.am 2008-04-09 01:01:50.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+Index: mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mdenoise/Makefile.am 2008-04-09 01:03:16.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am 2008-04-09 01:03:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+ AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+
+-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/y4mutils/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mutils/Makefile.am 2008-04-09 01:03:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mutils/Makefile.am 2008-04-09 01:03:48.000000000 +0200
+@@ -3,7 +3,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+ AM_CFLAGS = @PROGRAM_NOPIC@
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
diff --git a/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
new file mode 100644
index 0000000..fe855d3
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
@@ -0,0 +1,15 @@
+Index: mjpegtools-1.9.0rc3/configure.ac
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/configure.ac 2008-04-09 00:35:08.000000000 +0200
++++ mjpegtools-1.9.0rc3/configure.ac 2008-04-09 00:35:18.000000000 +0200
+@@ -275,10 +275,6 @@
+ dnl Check for the SDL library (for software playback)
+ dnl (defines SDL_CFLAGS and SDL_LIBS)
+ dnl ********************************************************************
+-AM_PATH_SDL(1.1.3,
+- [have_sdl=true
+- AC_DEFINE(HAVE_SDL, 1, [SDL library present]) ],
+- [have_sdl=false])
+ AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue)
+
+ dnl ***
diff --git a/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
new file mode 100644
index 0000000..a6a537c
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
@@ -0,0 +1,12 @@
+--- mjpegtools-1.9.0/lavtools/Makefile.am.orig 2010-09-29 19:36:46.000000000 +0000
++++ mjpegtools-1.9.0/lavtools/Makefile.am 2010-09-29 19:37:55.000000000 +0000
+@@ -58,9 +58,6 @@
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+ liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+-if HAVE_V4L
+- liblavplay_la_LIBADD += ${X_LIBS} -lX11
+-endif
+ liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+
+ # *********************************************************************
diff --git a/recipes/mjpegtools/mjpegtools_1.9.0.bb b/recipes/mjpegtools/mjpegtools_1.9.0.bb
new file mode 100644
index 0000000..1c1da47
--- /dev/null
+++ b/recipes/mjpegtools/mjpegtools_1.9.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "MJPEG video capture/editting/playback MPEG encoding"
+HOMEPAGE = "http://sourceforge.net/projects/mjpeg/"
+SECTION = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "jpeg"
+
+SRC_URI = " \
+ ${SOURCEFORGE_MIRROR}/mjpeg/${P}.tar.gz \
+ file://mjpegtools-fix-include.patch \
+ file://mjpegtools-remove-sdl-dependency.patch \
+ file://mjpegtools-v4l-doesnt-mean-x11.patch \
+ "
+
+SRC_URI[md5sum] = "309a6fcf0900a010d6a9c1e91afc2f5c"
+SRC_URI[sha256sum] = "a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [PATCH v2 resend] mjpegtools-1.9.0: initial recipe
2010-10-01 10:55 ` [PATCH v2] " Andreas Oberritter
@ 2010-10-25 12:53 ` Andreas Oberritter
0 siblings, 0 replies; 37+ messages in thread
From: Andreas Oberritter @ 2010-10-25 12:53 UTC (permalink / raw)
To: openembedded-devel
* v2: Added jpeg to DEPENDS.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
.../mjpegtools/files/mjpegtools-fix-include.patch | 65 ++++++++++++++++++++
.../files/mjpegtools-remove-sdl-dependency.patch | 15 +++++
.../files/mjpegtools-v4l-doesnt-mean-x11.patch | 12 ++++
recipes/mjpegtools/mjpegtools_1.9.0.bb | 19 ++++++
4 files changed, 111 insertions(+), 0 deletions(-)
create mode 100644 recipes/mjpegtools/files/mjpegtools-fix-include.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
create mode 100644 recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
create mode 100644 recipes/mjpegtools/mjpegtools_1.9.0.bb
diff --git a/recipes/mjpegtools/files/mjpegtools-fix-include.patch b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
new file mode 100644
index 0000000..b5ff90a
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-fix-include.patch
@@ -0,0 +1,65 @@
+Index: mjpegtools-1.9.0rc3/lavtools/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/lavtools/Makefile.am 2008-04-09 00:44:57.000000000 +0200
++++ mjpegtools-1.9.0rc3/lavtools/Makefile.am 2008-04-09 01:03:10.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils $(LIBQUICKTIME_CFLAGS)
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvcorrect/Makefile.am 2008-04-09 01:01:15.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvcorrect/Makefile.am 2008-04-09 01:01:21.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/yuvscaler/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/yuvscaler/Makefile.am 2008-04-09 01:01:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/yuvscaler/Makefile.am 2008-04-09 01:01:50.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+Index: mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mdenoise/Makefile.am 2008-04-09 01:03:16.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mdenoise/Makefile.am 2008-04-09 01:03:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+ AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
+
+-INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
+Index: mjpegtools-1.9.0rc3/y4mutils/Makefile.am
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/y4mutils/Makefile.am 2008-04-09 01:03:43.000000000 +0200
++++ mjpegtools-1.9.0rc3/y4mutils/Makefile.am 2008-04-09 01:03:48.000000000 +0200
+@@ -3,7 +3,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+ AM_CFLAGS = @PROGRAM_NOPIC@
+-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/utils
++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
+
+ LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
+ if HAVE_ALTIVEC
diff --git a/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
new file mode 100644
index 0000000..fe855d3
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-remove-sdl-dependency.patch
@@ -0,0 +1,15 @@
+Index: mjpegtools-1.9.0rc3/configure.ac
+===================================================================
+--- mjpegtools-1.9.0rc3.orig/configure.ac 2008-04-09 00:35:08.000000000 +0200
++++ mjpegtools-1.9.0rc3/configure.ac 2008-04-09 00:35:18.000000000 +0200
+@@ -275,10 +275,6 @@
+ dnl Check for the SDL library (for software playback)
+ dnl (defines SDL_CFLAGS and SDL_LIBS)
+ dnl ********************************************************************
+-AM_PATH_SDL(1.1.3,
+- [have_sdl=true
+- AC_DEFINE(HAVE_SDL, 1, [SDL library present]) ],
+- [have_sdl=false])
+ AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xtrue)
+
+ dnl ***
diff --git a/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
new file mode 100644
index 0000000..a6a537c
--- /dev/null
+++ b/recipes/mjpegtools/files/mjpegtools-v4l-doesnt-mean-x11.patch
@@ -0,0 +1,12 @@
+--- mjpegtools-1.9.0/lavtools/Makefile.am.orig 2010-09-29 19:36:46.000000000 +0000
++++ mjpegtools-1.9.0/lavtools/Makefile.am 2010-09-29 19:37:55.000000000 +0000
+@@ -58,9 +58,6 @@
+ liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
+ liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
+ liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)
+-if HAVE_V4L
+- liblavplay_la_LIBADD += ${X_LIBS} -lX11
+-endif
+ liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
+
+ # *********************************************************************
diff --git a/recipes/mjpegtools/mjpegtools_1.9.0.bb b/recipes/mjpegtools/mjpegtools_1.9.0.bb
new file mode 100644
index 0000000..1c1da47
--- /dev/null
+++ b/recipes/mjpegtools/mjpegtools_1.9.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "MJPEG video capture/editting/playback MPEG encoding"
+HOMEPAGE = "http://sourceforge.net/projects/mjpeg/"
+SECTION = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "jpeg"
+
+SRC_URI = " \
+ ${SOURCEFORGE_MIRROR}/mjpeg/${P}.tar.gz \
+ file://mjpegtools-fix-include.patch \
+ file://mjpegtools-remove-sdl-dependency.patch \
+ file://mjpegtools-v4l-doesnt-mean-x11.patch \
+ "
+
+SRC_URI[md5sum] = "309a6fcf0900a010d6a9c1e91afc2f5c"
+SRC_URI[sha256sum] = "a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x"
--
1.7.1
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: [PATCH 00/18] Patches from opendreambox.org
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (17 preceding siblings ...)
2010-09-29 20:36 ` [PATCH 18/18] mjpegtools-1.9.0: " Andreas Oberritter
@ 2010-09-29 21:02 ` Frans Meulenbroeks
2010-09-29 22:40 ` Paul Menzel
19 siblings, 0 replies; 37+ messages in thread
From: Frans Meulenbroeks @ 2010-09-29 21:02 UTC (permalink / raw)
To: openembedded-devel
2010/9/29 Andreas Oberritter <obi@opendreambox.org>:
> Hello,
>
> in order to synchronize our work with upstream, I've prepared some
> patches. More patches will follow. You can cherry-pick or pull them
> from git, if you like:
>
> git://git.opendreambox.org/git/obi/openembedded.git for-upstream
>
> I'm submitting patches to OE for the first time, so please be patient
> if I've missed some guideline or the like.
>
> Best regards,
> Andreas
Thanks for your patches.
I've peeked into a few of them (mainly the cd and python related
ones). They look good. Will test them tomorrow (time permitting) and
if they are ok I'll ack & push them.
I hope someone else will pick up the patches I am not familiar with.
Frans.
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [PATCH 00/18] Patches from opendreambox.org
2010-09-29 20:36 [PATCH 00/18] Patches from opendreambox.org Andreas Oberritter
` (18 preceding siblings ...)
2010-09-29 21:02 ` [PATCH 00/18] Patches from opendreambox.org Frans Meulenbroeks
@ 2010-09-29 22:40 ` Paul Menzel
19 siblings, 0 replies; 37+ messages in thread
From: Paul Menzel @ 2010-09-29 22:40 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2535 bytes --]
Dear Andreas,
Am Mittwoch, den 29.09.2010, 20:36 +0000 schrieb Andreas Oberritter:
> in order to synchronize our work with upstream, I've prepared some
> patches. More patches will follow. You can cherry-pick or pull them
> from git, if you like:
>
> git://git.opendreambox.org/git/obi/openembedded.git for-upstream
thank you for your patches. I took a quick glance and as far as I can
judge it they are of very high quality.
I will build test your changes on minimal-{libc,eglibc,uclibc} and
Ȧngström 2008.1 and report back.
> I'm submitting patches to OE for the first time, so please be patient
> if I've missed some guideline or the like.
I have some minor nitpicks and comments.
1. When you add patches please add a short header to the patch files
[1][2]. If you could spend the time to submit patches upstream that
would be great.
I think that applies to the following recipes.
[PATCH 03/18] libmad-0.15.1b: fix compile with gcc-4.4 (mipsel)
http://patchwork.openembedded.org/patch/3110/
[PATCH 04/18] libsigc++-1.2: fix installation
http://patchwork.openembedded.org/patch/3106/
[PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x
http://patchwork.openembedded.org/patch/3115/
[PATCH 09/18] cdrkit: update from 1.1.9 to 1.1.10
http://patchwork.openembedded.org/patch/3112/
[PATCH 11/18] tremor-20041119: Add pkgconfig file, provide libvorbisidec
http://patchwork.openembedded.org/patch/3103/
[PATCH 17/18] libxmlccwrap-0.0.12: initial recipe
http://patchwork.openembedded.org/patch/3109/
[PATCH 18/18] mjpegtools-1.9.0: initial recipe
http://patchwork.openembedded.org/patch/3108/
2. I do not know if you did this, but for new recipes you can sanitize
them using `oestylize.py` [3].
3. It is not demanded by the commit policy, but if you fix compile or
other errors, I would prefer to see the relevant log of the failed build
in the commit message.
4. You could note in your patches what machines and distributions you
used for building and testing your changes.
5. Please remember to update the patch queue if appropriate [4].
Thanks a lot again for your patches. I am looking forward to more.
Thanks,
Paul
[1] http://wiki.openembedded.net/index.php/Push_patches_upstream
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/eglibc/files/eglibc-dont-cache-slibdir.patch
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/contrib/oe-stylize.py
[4] http://wiki.openembedded.net/index.php/Patchwork
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 37+ messages in thread