Re: [ptxdist] [PATCH 4] Add mpg123 rule/in file.
On Wed, Jun 02, 2010 at 11:23:49PM +0200, Juergen Kilb wrote: Signed-off-by: Jürgen Kilb j.k...@phytec.de Applied. mol -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnetpm: build-fixes
On Fri, May 28, 2010 at 04:36:45PM +0200, Wolfram Sang wrote: On Fri, May 28, 2010 at 01:37:50PM +0200, Michael Olbrich wrote: On Fri, May 28, 2010 at 07:27:26AM +0200, Wolfram Sang wrote: Due to the handmade configure, these dependencies need to be met always. Also, remove the now obsolete PNG2PNM-option. Why is PNG2PNM obsolete? does this tool not exist anymore? It wasn't used in the makefile. I think its only use was for the libpng-dependency, but this needs to be always on, independent of the PNG2PNM selection. So it became obsolete. I could have added it to the makefile, but I mainly needed the build-fix, not that program. Is this a show-stopper? :) -- Pengutronix e.K. | Wolfram Sang| Industrial Linux Solutions | http://www.pengutronix.de/ | signature.asc Description: Digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] [pureftpd] needs libcrypt
Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- rules/pureftpd.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/pureftpd.in b/rules/pureftpd.in index c00eef0..aba67a0 100644 --- a/rules/pureftpd.in +++ b/rules/pureftpd.in @@ -2,6 +2,7 @@ menuconfig PUREFTPD tristate prompt pureftpd + select LIBC_CRYPT help Pure-FTPd is a fast, production-quality, standards-conformant FTP server based upon Troll-FTPd. Features include chrooted -- 1.6.4.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnetpm: build-fixes
On Thu, Jun 03, 2010 at 02:05:17PM +0200, Wolfram Sang wrote: On Fri, May 28, 2010 at 04:36:45PM +0200, Wolfram Sang wrote: On Fri, May 28, 2010 at 01:37:50PM +0200, Michael Olbrich wrote: On Fri, May 28, 2010 at 07:27:26AM +0200, Wolfram Sang wrote: Due to the handmade configure, these dependencies need to be met always. Also, remove the now obsolete PNG2PNM-option. Why is PNG2PNM obsolete? does this tool not exist anymore? It wasn't used in the makefile. I think its only use was for the libpng-dependency, but this needs to be always on, independent of the PNG2PNM selection. So it became obsolete. I could have added it to the makefile, but I mainly needed the build-fix, not that program. Is this a show-stopper? :) I commited a better patch, that avoids the unused dependencies. mol -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [libusb] Bump version to 1.0.8
Signed-off-by: Remy Bohmer li...@bohmer.net --- rules/libusb.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/libusb.make b/rules/libusb.make index 3075798..aa14659 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # # Paths and names # -LIBUSB_VERSION := 1.0.6 +LIBUSB_VERSION := 1.0.8 LIBUSB := libusb-$(LIBUSB_VERSION) LIBUSB_SUFFIX := tar.bz2 LIBUSB_URL := $(PTXCONF_SETUP_SFMIRROR)/libusb/$(LIBUSB).$(LIBUSB_SUFFIX) -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [libusb] Bump version to 1.0.8
On Thu, Jun 03, 2010 at 07:55:31PM +0200, Remy Bohmer wrote: Signed-off-by: Remy Bohmer li...@bohmer.net --- rules/libusb.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/libusb.make b/rules/libusb.make index 3075798..aa14659 100644 --- a/rules/libusb.make +++ b/rules/libusb.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LIBUSB) += libusb # # Paths and names # -LIBUSB_VERSION := 1.0.6 +LIBUSB_VERSION := 1.0.8 libusb-1.0.6 has patches, are they obsolete? rsc -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] [lshw] add new packet
Adds the Hardware Lister package to ptxdist
A patch is added for the package to make the xml output
compatibility with a xml-parser using tinyxpath.
Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
Signed-off-by: Remy Bohmer li...@bohmer.net
---
.../replace_reserved_xml_keyword.patch | 33
patches/lshw-B.02.14/series|1 +
rules/lshw.in | 21 +
rules/lshw.make| 85
4 files changed, 140 insertions(+), 0 deletions(-)
create mode 100644 patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
create mode 100644 patches/lshw-B.02.14/series
create mode 100644 rules/lshw.in
create mode 100644 rules/lshw.make
diff --git a/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
new file mode 100644
index 000..f508ce7
--- /dev/null
+++ b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
@@ -0,0 +1,33 @@
+Replace keyword node with hwnode for TinyXpath compatibility
+
+It turns out that within TinyXpath 'node' is a reserved key-word.
+Replace it with 'hwnode' when printing to xml.
+
+Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
+Signed-off-by: Remy Bohmer li...@bohmer.net
+---
+ src/core/hw.cc |4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: lshw-B.02.14/src/core/hw.cc
+===
+--- lshw-B.02.14.orig/src/core/hw.cc 2009-10-14 14:49:33.0 +0200
lshw-B.02.14/src/core/hw.cc2009-10-14 14:49:49.0 +0200
+@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out node id=\ getId() \;
++out hwnode id=\ getId() \;
+ if (disabled())
+ out disabled=\true\;
+ if (claimed())
+@@ -1596,7 +1596,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out /node endl;
++out /hwnode endl;
+ }
+
+ return out.str();
diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series
new file mode 100644
index 000..e0ad077
--- /dev/null
+++ b/patches/lshw-B.02.14/series
@@ -0,0 +1 @@
+replace_reserved_xml_keyword.patch
diff --git a/rules/lshw.in b/rules/lshw.in
new file mode 100644
index 000..8cbe128
--- /dev/null
+++ b/rules/lshw.in
@@ -0,0 +1,21 @@
+## SECTION=shell_and_console
+
+menuconfig LSHW
+ bool
+ prompt lshw
+ select GTK if LSHW_GUI
+ help
+ lshw (Hardware Lister) is a small tool to provide detailed information
+ on the hardware configuration of the machine. It can report exact
+ memory configuration, firmware version, mainboard configuration, CPU
+ version and speed, cache configuration, bus speed, etc.
+
+if LSHW
+
+config LSHW_GUI
+ bool
+ default n
+ prompt install GUI
+
+endif
+
diff --git a/rules/lshw.make b/rules/lshw.make
new file mode 100644
index 000..8ab63de
--- /dev/null
+++ b/rules/lshw.make
@@ -0,0 +1,85 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Bart vdr. Meulen bartvdrmeu...@gmail.com
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LSHW) += lshw
+
+#
+# Paths and names
+#
+LSHW_VERSION := B.02.14
+LSHW := lshw-$(LSHW_VERSION)
+LSHW_SUFFIX:= tar.gz
+LSHW_URL := http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX)
+LSHW_SOURCE:= $(SRCDIR)/$(LSHW).$(LSHW_SUFFIX)
+LSHW_DIR := $(BUILDDIR)/$(LSHW)
+LSHW_LICENSE := GPLv2
+
+#
+# Get
+#
+
+$(LSHW_SOURCE):
+ @$(call targetinfo)
+ @$(call get, LSHW)
+
+#
+# Prepare
+#
+
+LSHW_CONF_TOOL := NO
+LSHW_MAKE_OPT := $(CROSS_ENV_PROGS) all
+LSHW_INSTALL_OPT := $(CROSS_ENV_PROGS) install
+ifdef PTXCONF_LSHW_GUI
+ LSHW_MAKE_OPT+=gui
+ LSHW_INSTALL_OPT+=install-gui
+endif
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/lshw.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, lshw)
+ @$(call install_fixup, lshw,PACKAGE,lshw)
+ @$(call install_fixup, lshw,PRIORITY,optional)
+ @$(call install_fixup, lshw,VERSION,$(LSHW_VERSION))
+ @$(call install_fixup, lshw,SECTION,base)
+ @$(call install_fixup,
[ptxdist] Hopefully last round of gstreamer patches
Hi,
Michael has reworked the gst targetinstall stages, I've added his series
ontop of my last one. So here is the whole series again, let's hope that
we cached all issues now.
The following changes since commit 01006cfdfedab01290db859e77146dabefafccdc:
[dfu-utils] version bump to first release 0.1 (2010-06-03 20:47:10 +0200)
are available in the git repository at:
http://git.pengutronix.de/git/rsc/ptxdist for-mainline
Michael Olbrich (4):
[gst-plugins-base] cleanup targetinstall
[gst-plugins-good] explicitly install all selected plugins
[gst-plugins-bad] explicitly install all selected plugins
[gst-plugins-ugly] explicitly install all selected plugins
Robert Schwebel (5):
[gstreamer] version bump 0.10.25 - 0.10.29
[gst-plugins-base] version bump 0.10.25 - 0.10.29
[gst-plugins-good] version bump 0.10.17 - 0.10.23
[gst-plugins-bad] version bump 0.10.17 - 0.10.19
[gst-plugins-ugly] version bump 0.10.13 - 0.10.15
.../0002--remove-endianness-swapping.patch | 11 +-
.../0003--add-rgb666-support.patch | 11 +-
.../bayer2rgb_configurable_first_line.diff | 20 ++--
.../series |0
.../add-RGB666-Support-to-ffmpegcolorspace.patch |0
.../add-rgb666-support-to-videotestsrc.patch |0
.../series |0
.../0001-do-not-poison-gst_trace_add_entry.patch | 29
patches/gstreamer-0.10.25/series |1 -
rules/gst-plugins-bad.in | 86 +++
rules/gst-plugins-bad.make | 76 +++
rules/gst-plugins-base.in | 30 +++--
rules/gst-plugins-base.make| 150 +---
rules/gst-plugins-good.in | 67 +-
rules/gst-plugins-good.make| 72 ++
rules/gst-plugins-ugly.make| 39 +++--
rules/gstreamer.make | 46 +++---
rules/qt4.in |1 -
18 files changed, 334 insertions(+), 305 deletions(-)
rename patches/{gst-plugins-bad-0.10.17 =
gst-plugins-bad-0.10.19}/0002--remove-endianness-swapping.patch (84%)
rename patches/{gst-plugins-bad-0.10.17 =
gst-plugins-bad-0.10.19}/0003--add-rgb666-support.patch (90%)
rename patches/{gst-plugins-bad-0.10.17 =
gst-plugins-bad-0.10.19}/bayer2rgb_configurable_first_line.diff (87%)
rename patches/{gst-plugins-bad-0.10.17 = gst-plugins-bad-0.10.19}/series
(100%)
rename patches/{gst-plugins-base-0.10.25 =
gst-plugins-base-0.10.29}/add-RGB666-Support-to-ffmpegcolorspace.patch (100%)
rename patches/{gst-plugins-base-0.10.25 =
gst-plugins-base-0.10.29}/add-rgb666-support-to-videotestsrc.patch (100%)
rename patches/{gst-plugins-base-0.10.25 = gst-plugins-base-0.10.29}/series
(100%)
delete mode 100644
patches/gstreamer-0.10.25/0001-do-not-poison-gst_trace_add_entry.patch
delete mode 100644 patches/gstreamer-0.10.25/series
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 3/9] [gst-plugins-good] version bump 0.10.17 - 0.10.23
Reviewed configure options while being there. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/gst-plugins-good.in | 55 +-- rules/gst-plugins-good.make | 12 ++--- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in index 7929887..127faf2 100644 --- a/rules/gst-plugins-good.in +++ b/rules/gst-plugins-good.in @@ -75,9 +75,13 @@ if GST_PLUGINS_GOOD bool prompt cutter - config GST_PLUGINS_GOOD_DEBUG + config GST_PLUGINS_GOOD_DEBUGUTILS + bool + prompt debugutils + + config GST_PLUGINS_GOOD_DEINTERLACE bool - prompt debug + prompt deinterlace config GST_PLUGINS_GOOD_EFFECTV bool @@ -87,6 +91,10 @@ if GST_PLUGINS_GOOD bool prompt equalizer + config GST_PLUGINS_GOOD_FLV + bool + prompt flv + config GST_PLUGINS_GOOD_ID3DEMUX bool prompt id3demux @@ -111,6 +119,10 @@ if GST_PLUGINS_GOOD bool prompt goom2k1 + config GST_PLUGINS_GOOD_IMAGEFREEZE + bool + prompt imagefreeze + config GST_PLUGINS_GOOD_LAW bool prompt law @@ -147,10 +159,18 @@ if GST_PLUGINS_GOOD bool prompt rtp + config GST_PLUGINS_GOOD_RTPMANAGER + bool + prompt rtpmanager + config GST_PLUGINS_GOOD_RTSP bool prompt rtsp + config GST_PLUGINS_GOOD_SHAPEWIPE + bool + prompt shapewipe + config GST_PLUGINS_GOOD_SMPTE bool prompt smpte @@ -183,22 +203,6 @@ if GST_PLUGINS_GOOD bool prompt wavparse - config GST_PLUGINS_GOOD_DEBUGUTILS - bool - prompt debugutils - - config GST_PLUGINS_GOOD_DEINTERLACE - bool - prompt deinterlace - - config GST_PLUGINS_GOOD_FLV - bool - prompt flv - - config GST_PLUGINS_GOOD_RTPMANAGER - bool - prompt rtpmanager - config GST_PLUGINS_GOOD_Y4M bool prompt y4m @@ -207,11 +211,6 @@ if GST_PLUGINS_GOOD comment plugins with dependencies # - - config GST_PLUGINS_GOOD_DIRECTDRAW - bool - depends on GST_PLUGINS_GOOD_BROKEN - prompt directdraw - config GST_PLUGINS_GOOD_DIRECTSOUND bool depends on GST_PLUGINS_GOOD_BROKEN @@ -222,6 +221,11 @@ if GST_PLUGINS_GOOD depends on GST_PLUGINS_GOOD_BROKEN prompt oss + config GST_PLUGINS_GOOD_OSS4 + bool + depends on GST_PLUGINS_GOOD_BROKEN + prompt oss4 + config GST_PLUGINS_GOOD_SUNAUDIO bool depends on GST_PLUGINS_GOOD_BROKEN @@ -267,11 +271,6 @@ if GST_PLUGINS_GOOD bool prompt cairo - config GST_PLUGINS_GOOD_CDIO - bool - depends on GST_PLUGINS_GOOD_BROKEN - prompt cdio - config GST_PLUGINS_GOOD_ESD bool depends on GST_PLUGINS_GOOD_BROKEN diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make index 508258a..d0ffb34 100644 --- a/rules/gst-plugins-good.make +++ b/rules/gst-plugins-good.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD) += gst-plugins-good # # Paths and names # -GST_PLUGINS_GOOD_VERSION := 0.10.17 +GST_PLUGINS_GOOD_VERSION := 0.10.23 GST_PLUGINS_GOOD := gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION) GST_PLUGINS_GOOD_SUFFIX:= tar.bz2 GST_PLUGINS_GOOD_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD).$(GST_PLUGINS_GOOD_SUFFIX) @@ -54,6 +54,7 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_INTERLEAVE)+= interleave GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLX)+= flx GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM) += goom GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM2K1)+= goom2k1 +GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_IMAGEFREEZE)+= imagefreeze GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LAW)+= law GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LEVEL) += level GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MATROSKA) += matroska @@ -65,6 +66,7 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_REPLAYGAIN)+= replaygain GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTP)
[ptxdist] [PATCH 2/9] [gst-plugins-base] version bump 0.10.25 - 0.10.29
While being there, reworked the option list from the configure --help
output.
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de
---
.../add-RGB666-Support-to-ffmpegcolorspace.patch | 296
.../add-rgb666-support-to-videotestsrc.patch | 82 --
patches/gst-plugins-base-0.10.25/series|1 -
.../add-RGB666-Support-to-ffmpegcolorspace.patch | 296
.../add-rgb666-support-to-videotestsrc.patch | 82 ++
patches/gst-plugins-base-0.10.29/series|1 +
rules/gst-plugins-base.in | 30 ++-
rules/gst-plugins-base.make| 60 +++--
rules/qt4.in |1 -
9 files changed, 435 insertions(+), 414 deletions(-)
delete mode 100644
patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
delete mode 100644
patches/gst-plugins-base-0.10.25/add-rgb666-support-to-videotestsrc.patch
delete mode 100644 patches/gst-plugins-base-0.10.25/series
create mode 100644
patches/gst-plugins-base-0.10.29/add-RGB666-Support-to-ffmpegcolorspace.patch
create mode 100644
patches/gst-plugins-base-0.10.29/add-rgb666-support-to-videotestsrc.patch
create mode 100644 patches/gst-plugins-base-0.10.29/series
diff --git
a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
b/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
deleted file mode 100644
index b8e2b47..000
---
a/patches/gst-plugins-base-0.10.25/add-RGB666-Support-to-ffmpegcolorspace.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From: Luotao Fu l...@pengutronix.de
-Date: Thu, 11 Dec 2008 17:02:52 +0100
-Subject: [PATCH] added RGB666 Support to ffmpegcolorspace
-
-This one adds RGB666 Support to ffmpegcolorspace
-Still very hacky, need to be enhanced before submitting to mainline
-
-Signed-off-by: Luotao Fu l...@pengutronix.de
- gst/ffmpegcolorspace/avcodec.h |1
- gst/ffmpegcolorspace/gstffmpegcodecmap.c | 26 ++-
- gst/ffmpegcolorspace/imgconvert.c| 70
+--
- 3 files changed, 90 insertions(+), 7 deletions(-)
-
-Index: gst/ffmpegcolorspace/avcodec.h
-===
gst/ffmpegcolorspace/avcodec.h.orig
-+++ gst/ffmpegcolorspace/avcodec.h
-@@ -87,6 +87,7 @@ enum PixelFormat {
- PIX_FMT_UYVY411, /// Packed pixel, Cb Y0 Y1 Cr Y2 Y3
-
- PIX_FMT_AYUV, /// Packed pixel, A0 Y0 Cb Cr
-+PIX_FMT_RGB666,
- PIX_FMT_NB
- };
-
-Index: gst/ffmpegcolorspace/imgconvert.c
-===
gst/ffmpegcolorspace/imgconvert.c.orig
-+++ gst/ffmpegcolorspace/imgconvert.c
-@@ -409,8 +409,18 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_N
- /* .x_chroma_shift = */ 0,
- /* .y_chroma_shift = */ 0,
- /*.depth = */ 8
-+ },
-+ /* [PIX_FMT_RGB666] = */ {
-+/* .format = */ PIX_FMT_RGB666,
-+/* .name = */ rgb666,
-+/* .nb_channels= */ 4,
-+/* .color_type = */ FF_COLOR_RGB,
-+/* .pixel_type = */ FF_PIXEL_PLANAR,
-+/* .is_alpha = */ 0,
-+/* .x_chroma_shift = */ 0,
-+/* .y_chroma_shift = */ 0,
-+/* .depth = */ 6,
- }
--
- };
-
- /* returns NULL if not found */
-@@ -419,7 +429,6 @@ PixFmtInfo *
- get_pix_fmt_info (enum PixelFormat format)
- {
- int i;
--
- for (i = 0; i sizeof (pix_fmt_info) / sizeof (pix_fmt_info[0]); i++) {
- if (pix_fmt_info[i].format == format) {
- return pix_fmt_info + i;
-@@ -594,6 +603,8 @@ avg_bits_per_pixel (int pix_fmt)
- case PIX_FMT_RGB555:
- bits = 16;
- break;
-+ case PIX_FMT_RGB666:
-+bits = 8 * pf-nb_channels;
- case PIX_FMT_UYVY411:
- bits = 12;
- break;
-@@ -603,7 +614,9 @@ avg_bits_per_pixel (int pix_fmt)
- }
- break;
- case FF_PIXEL_PLANAR:
-- if (pf-x_chroma_shift == 0 pf-y_chroma_shift == 0) {
-+ if(pix_fmt == PIX_FMT_RGB666) {
-+ bits = 8 * pf-nb_channels;
-+ } else if (pf-x_chroma_shift == 0 pf-y_chroma_shift == 0) {
- bits = pf-depth * pf-nb_channels;
- } else {
- bits = pf-depth + ((2 * pf-depth)
-@@ -661,7 +674,6 @@ avcodec_find_best_pix_fmt (int pix_fmt_m
- ~FF_LOSS_DEPTH,
- 0,
- };
--
- /* try with successive loss */
- i = 0;
- for (;;) {
-@@ -1768,6 +1780,37 @@ bitcopy_n (unsigned int a, int n)
-
- #include imgconvert_template.h
-
-+/* rgb666 handling */
-+
-+#define RGB_NAME rgb666
-+#define FMT_RGB666
-+
-+#define RGB_IN(r, g, b, s)\
-+{\
-+unsigned int v = ((const uint32_t *)(s))[0];\
-+r = (v 12) 0x3f;\
-+g = (v 6) 0x3f;\
-+b = v 0x3f;\
-+}
-+
-+#define RGBA_IN(r, g, b, a, s)\
-+{\
-+unsigned int v = ((const uint32_t *)(s))[0];\
-+a = 0xff;\
-+r = (v 12)
[ptxdist] [PATCH 5/9] [gst-plugins-ugly] version bump 0.10.13 - 0.10.15
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/gst-plugins-ugly.make | 12 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rules/gst-plugins-ugly.make b/rules/gst-plugins-ugly.make index a8daaa6..3cfacf4 100644 --- a/rules/gst-plugins-ugly.make +++ b/rules/gst-plugins-ugly.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_UGLY) += gst-plugins-ugly # # Paths and names # -GST_PLUGINS_UGLY_VERSION := 0.10.13 +GST_PLUGINS_UGLY_VERSION := 0.10.15 GST_PLUGINS_UGLY:= gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION) GST_PLUGINS_UGLY_SUFFIX := tar.bz2 GST_PLUGINS_UGLY_URL:= http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$(GST_PLUGINS_UGLY).$(GST_PLUGINS_UGLY_SUFFIX) @@ -61,8 +61,10 @@ GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_X264) += x264 GST_PLUGINS_UGLY_CONF_TOOL := autoconf GST_PLUGINS_UGLY_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ ---disable-rpath \ + --enable-option-checking \ + --enable-silent-rules \ --disable-nls \ +--disable-rpath \ --disable-debug \ --disable-profiling \ --disable-valgrind \ @@ -71,8 +73,10 @@ GST_PLUGINS_UGLY_CONF_OPT:= \ --enable-external \ --enable-experimental \ --disable-gtk-doc \ - --with-package-origin=PTXDist \ - --enable-shave + --with-package-origin=PTXDist + +# --enable-gobject-cast-checks=[no/auto/yes] Enable GObject cast checks + # # the --with-plugins sadly only applies to depencyless plugings # and when no plugins are sellected it builds them all. So -- 1.7.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/9] [gst-plugins-bad] version bump 0.10.17 - 0.10.19
Reworked configure options while being there.
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de
V4:
* re-added mpegtsmux, mpegpsmux, mpegvideoparse
---
.../0002--remove-endianness-swapping.patch | 45
.../0003--add-rgb666-support.patch | 52 -
.../bayer2rgb_configurable_first_line.diff | 120
patches/gst-plugins-bad-0.10.17/series |3 -
.../0002--remove-endianness-swapping.patch | 42 +++
.../0003--add-rgb666-support.patch | 49
.../bayer2rgb_configurable_first_line.diff | 120
patches/gst-plugins-bad-0.10.19/series |3 +
rules/gst-plugins-bad.in | 63 ++-
rules/gst-plugins-bad.make | 28 +++--
10 files changed, 266 insertions(+), 259 deletions(-)
delete mode 100644
patches/gst-plugins-bad-0.10.17/0002--remove-endianness-swapping.patch
delete mode 100644
patches/gst-plugins-bad-0.10.17/0003--add-rgb666-support.patch
delete mode 100644
patches/gst-plugins-bad-0.10.17/bayer2rgb_configurable_first_line.diff
delete mode 100644 patches/gst-plugins-bad-0.10.17/series
create mode 100644
patches/gst-plugins-bad-0.10.19/0002--remove-endianness-swapping.patch
create mode 100644
patches/gst-plugins-bad-0.10.19/0003--add-rgb666-support.patch
create mode 100644
patches/gst-plugins-bad-0.10.19/bayer2rgb_configurable_first_line.diff
create mode 100644 patches/gst-plugins-bad-0.10.19/series
diff --git
a/patches/gst-plugins-bad-0.10.17/0002--remove-endianness-swapping.patch
b/patches/gst-plugins-bad-0.10.17/0002--remove-endianness-swapping.patch
deleted file mode 100644
index 154950e..000
--- a/patches/gst-plugins-bad-0.10.17/0002--remove-endianness-swapping.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Luotao Fu l...@pengutronix.de
-Date: Thu, 11 Dec 2008 11:57:48 +0100
-Subject: [PATCH] remove endianness swapping
-
- Swapping r- g- and bmask here is weird. It turns i.E. RGB888 to BGR888. For
- formats like RGB666 it turns the mask into a mess. Seems that gstreamer
- treat all True color as Big Endian. Still I doubt that it makes sense to
- swap the masks. I'm however not quite sure about this, comments are highly
- welcome.
-
-Signed-off-by: Luotao Fu l...@pengutronix.de
- sys/fbdev/gstfbdevsink.c | 14 +-
- 1 files changed, 1 insertions(+), 13 deletions(-)
-
-diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
-index c9a7e14..c01e5b6 100644
sys/fbdev/gstfbdevsink.c
-+++ sys/fbdev/gstfbdevsink.c
-@@ -158,21 +158,9 @@ gst_fbdevsink_getcaps (GstBaseSink * bsink)
-
- switch (fbdevsink-varinfo.bits_per_pixel) {
- case 32:
-- /* swap endian of masks */
-- rmask = swapendian (rmask);
-- gmask = swapendian (gmask);
-- bmask = swapendian (bmask);
-+case 24:
- endianness = 4321;
- break;
--case 24:{
-- /* swap red and blue masks */
-- uint32_t t = rmask;
--
-- rmask = bmask;
-- bmask = t;
-- endianness = 4321;
-- break;
--}
- case 15:
- case 16:
- endianness = 1234;
---
-1.5.6.5
-
diff --git a/patches/gst-plugins-bad-0.10.17/0003--add-rgb666-support.patch
b/patches/gst-plugins-bad-0.10.17/0003--add-rgb666-support.patch
deleted file mode 100644
index bb6eb67..000
--- a/patches/gst-plugins-bad-0.10.17/0003--add-rgb666-support.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Luotao Fu l...@pengutronix.de
-Date: Thu, 11 Dec 2008 12:03:59 +0100
-Subject: [PATCH] add rgb666 support
-
- This one adds support for rgb666 to fbdevsink. It's an exotic format, but
still
- can be found on especially some embedded devices. The Modelines are taken
- directly from video.h of the video plugin, which is included by gstdevsink.
- It'd probably be cleaner to split this in a separate patch for plugins-base.
- I put the stuffs together for now for easier review. Patches for some sources
- with rgb666 capability are coming soon.
-
-Signed-off-by: Luotao Fu l...@pengutronix.de
- sys/fbdev/gstfbdevsink.c | 19 +++
- 1 files changed, 19 insertions(+), 0 deletions(-)
-
-diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
-index c01e5b6..e764c5e 100644
sys/fbdev/gstfbdevsink.c
-+++ sys/fbdev/gstfbdevsink.c
-@@ -76,9 +76,28 @@ static GstCaps *gst_fbdevsink_getcaps (GstBaseSink * bsink);
-
- static GstVideoSinkClass *parent_class = NULL;
-
-+#define GST_VIDEO_BYTE1_MASK_18 0x0003F000
-+#define GST_VIDEO_BYTE2_MASK_18 0x0FC0
-+#define GST_VIDEO_BYTE3_MASK_18 0x003F
-+#define __GST_VIDEO_CAPS_MAKE_18(R, G, B) \
-+video/x-raw-rgb, \
-+bpp = (int) 32, \
-+depth = (int) 18, \
-+endianness = (int) BIG_ENDIAN,
[ptxdist] [PATCH 6/9] [gst-plugins-base] cleanup targetinstall
From: Michael Olbrich m.olbr...@pengutronix.de Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de --- rules/gst-plugins-base.make | 90 ++ 1 files changed, 30 insertions(+), 60 deletions(-) diff --git a/rules/gst-plugins-base.make b/rules/gst-plugins-base.make index 38a62a5..d721a67 100644 --- a/rules/gst-plugins-base.make +++ b/rules/gst-plugins-base.make @@ -255,153 +255,123 @@ $(STATEDIR)/gst-plugins-base.targetinstall: done ifdef PTXCONF_GST_PLUGINS_BASE_APP - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstapp.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstapp.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_ADDER - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstadder.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstadder.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_AUDIOCONVERT - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstaudioconvert.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstaudioconvert.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_AUDIORATE - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstaudiorate.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstaudiorate.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_AUDIORESAMPLE - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstaudioresample.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstaudioresample.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_AUDIOTESTSRC - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstaudiotestsrc.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstaudiotestsrc.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_DECODEBIN - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstdecodebin.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstdecodebin.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_DECODEBIN_2 - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstdecodebin2.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstdecodebin2.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_FFMPEGCOLORSPACE - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstffmpegcolorspace.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstffmpegcolorspace.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_GDP - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstgdp.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstgdp.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_PLAYBACK - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstplaybin.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstplaybin.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_SUBPARSE - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgstsubparse.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgstsubparse.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_TCP - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgsttcp.so, \ + @$(call install_copy, gst-plugins-base, 0, 0, 0644, -, \ /usr/lib/gstreamer-0.10/libgsttcp.so) endif ifdef PTXCONF_GST_PLUGINS_BASE_TYPEFIND - @$(call install_copy, gst-plugins-base, 0, 0, 0644, \ - $(PKGDIR)/$(GST_PLUGINS_BASE)/usr/lib/gstreamer-0.10/libgsttypefindfunctions.so, \ + @$(call install_copy, gst-plugins-base, 0, 0,
[ptxdist] [PATCH 8/9] [gst-plugins-bad] explicitly install all selected plugins
From: Michael Olbrich m.olbr...@pengutronix.de also disable broken plugins revealed by this change. Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de --- rules/gst-plugins-bad.in | 25 ++--- rules/gst-plugins-bad.make | 50 +--- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/rules/gst-plugins-bad.in b/rules/gst-plugins-bad.in index 4c96607..94e4049 100644 --- a/rules/gst-plugins-bad.in +++ b/rules/gst-plugins-bad.in @@ -38,6 +38,10 @@ config GST_PLUGINS_BAD_ASFMUX bool prompt asfmux +config GST_PLUGINS_BAD_AUDIOPARSERS + bool + prompt audioparsers + config GST_PLUGINS_BAD_AUTOCONVERT bool prompt autoconvert @@ -233,19 +237,19 @@ config GST_PLUGINS_BAD_VMNC config GST_PLUGINS_BAD_DIRECTSOUND bool - prompt directsound + # windows only config GST_PLUGINS_BAD_DIRECTDRAW bool - prompt directdraw + # windows only config GST_PLUGINS_BAD_OSX_VIDEO bool - prompt osx_video + # OSX only config GST_PLUGINS_BAD_QUICKTIME bool - prompt quicktime + # OSX only config GST_PLUGINS_BAD_VCD bool @@ -315,6 +319,8 @@ config GST_PLUGINS_BAD_DIVX config GST_PLUGINS_BAD_RESINDVD bool + # needs dvdnav dvdread + depends on BROKEN prompt resindvd config GST_PLUGINS_BAD_METADATA @@ -373,10 +379,14 @@ config GST_PLUGINS_BAD_LV2 config GST_PLUGINS_BAD_LIBMMS bool + # needs libmms + depends on BROKEN prompt libmms config GST_PLUGINS_BAD_MODPLUG bool + # needs libmodplug + depends on BROKEN prompt modplug config GST_PLUGINS_BAD_MIMIC @@ -445,6 +455,8 @@ config GST_PLUGINS_BAD_SDL config GST_PLUGINS_BAD_SNDFILE bool + # needs sndfile + depends on BROKEN prompt sndfile config GST_PLUGINS_BAD_SOUNDTOUCH @@ -469,6 +481,9 @@ config GST_PLUGINS_BAD_SWFDEC config GST_PLUGINS_BAD_THEORADEC bool + # this is disabled in the source code (0.10.19) + # recheck in later versions + depends on BROKEN prompt theoradec config GST_PLUGINS_BAD_XVID @@ -497,6 +512,8 @@ config GST_PLUGINS_BAD_VDPAU config GST_PLUGINS_BAD_SCHRO bool + # needs schroedinger-1.0 + depends on BROKEN prompt schro config GST_PLUGINS_BAD_ZBAR diff --git a/rules/gst-plugins-bad.make b/rules/gst-plugins-bad.make index de226d5..00554ff 100644 --- a/rules/gst-plugins-bad.make +++ b/rules/gst-plugins-bad.make @@ -41,6 +41,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ADPCMDEC) += adpcmdec GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ADPCMENC) += adpcmenc GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_AIFF) += aiff GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ASFMUX) += asfmux +GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_AUDIOPARSERS)+= audioparsers +GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_AUDIOPARSERS)+= audioparsersbad GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_AUTOCONVERT) += autoconvert GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CAMERABIN)+= camerabin GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LEGACYRESAMPLE) += legacyresample @@ -48,7 +50,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_BAYER) += bayer GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CDXAPARSE)+= cdxaparse GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DATAURISRC) += dataurisrc GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DCCP) += dccp -GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS) += debugutils +GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS) += debugutils +GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_DEBUGUTILS) += debugutilsbad GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DTMF) += dtmf GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_DVDSPU) += dvdspu GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_FESTIVAL) += festival @@ -59,7 +62,8 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_HDVPARSE) += hdvparse GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_ID3TAG) += id3tag GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_INVTELECINE) += invtelecine GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_JPEGFORMAT) += jpegformat -GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB) += librfb +GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB) += librfb +GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_LIBRFB) += rfbsrc GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LIVEADDER)+= liveadder GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_MPEGDEMUX)+= mpegdemux GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_MPEGTSMUX)+= mpegtsmux @@ -74,10 +78,15 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_PCAPPARSE) +=
[ptxdist] [PATCH 9/9] [gst-plugins-ugly] explicitly install all selected plugins
From: Michael Olbrich m.olbr...@pengutronix.de
Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
---
rules/gst-plugins-ugly.make | 27 ---
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/rules/gst-plugins-ugly.make b/rules/gst-plugins-ugly.make
index 3cfacf4..115d103 100644
--- a/rules/gst-plugins-ugly.make
+++ b/rules/gst-plugins-ugly.make
@@ -35,13 +35,15 @@ $(GST_PLUGINS_UGLY_SOURCE):
# Prepare
#
-GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) +=
asfdemux
+GST_PLUGINS_UGLY_ENABLEC-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) +=
asfdemux
+GST_PLUGINS_UGLY_ENABLEP-$(PTXCONF_GST_PLUGINS_UGLY_ASFDEMUX) += asf
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_DVDLPCMDEC) +=
dvdlpcmdec
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_DVDSUB) +=
dvdsub
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_IEC958) +=
iec958
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_MPEGAUDIOPARSE) +=
mpegaudioparse
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_MPEGSTREAM) +=
mpegstream
-GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
realmedia
+GST_PLUGINS_UGLY_ENABLEC-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
realmedia
+GST_PLUGINS_UGLY_ENABLEP-$(PTXCONF_GST_PLUGINS_UGLY_REALMEDIA) +=
rmdemux
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_SYNAESTHESIA) +=
synaesthesia
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_A52DEC) +=
a52dec
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_AMRNB) += amrnb
@@ -55,6 +57,10 @@ GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_SID)
+= sidplay
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_TWOLAME)+=
twolame
GST_PLUGINS_UGLY_ENABLE-$(PTXCONF_GST_PLUGINS_UGLY_X264) += x264
+GST_PLUGINS_UGLY_ENABLEC-y += $(GST_PLUGINS_UGLY_ENABLE-y)
+GST_PLUGINS_UGLY_ENABLEC- += $(GST_PLUGINS_UGLY_ENABLE-)
+GST_PLUGINS_UGLY_ENABLEP-y += $(GST_PLUGINS_UGLY_ENABLE-y)
+
#
# autoconf
#
@@ -83,12 +89,12 @@ GST_PLUGINS_UGLY_CONF_OPT := \
# --with-plugins is useless, so we generate a --enable-*
# and --disable-* below
#
-ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLE-y)),)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-$(subst
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_UGLY_ENABLE-y)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLEC-y)),)
+GST_PLUGINS_UGLY_CONF_OPT += --enable-$(subst
$(space),$(space)--enable-,$(strip $(GST_PLUGINS_UGLY_ENABLEC-y)))
endif
-ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLE-)),)
-GST_PLUGINS_UGLY_CONF_OPT += --disable-$(subst
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_UGLY_ENABLE-)))
+ifneq ($(call remove_quotes,$(GST_PLUGINS_UGLY_ENABLEC-)),)
+GST_PLUGINS_UGLY_CONF_OPT += --disable-$(subst
$(space),$(space)--disable-,$(strip $(GST_PLUGINS_UGLY_ENABLEC-)))
endif
#
@@ -108,11 +114,10 @@ $(STATEDIR)/gst-plugins-ugly.targetinstall:
@$(call install_fixup, gst-plugins-ugly,DESCRIPTION,missing)
# install all activated plugins
- @if [ -d $(GST_PLUGINS_UGLY_PKGDIR)/usr/lib/gstreamer-0.10/ ]; then \
- cd $(GST_PLUGINS_UGLY_PKGDIR) for plugin in `find
./usr/lib/gstreamer-0.10/ -name *.so`; do \
- $(call install_copy, gst-plugins-ugly, 0, 0, 0644, -,
/$$plugin); \
- done \
- fi
+ @for plugin in $(GST_PLUGINS_UGLY_ENABLEP-y); do \
+ $(call install_copy, gst-plugins-ugly, 0, 0, 0644, -, \
+ /usr/lib/gstreamer-0.10/libgst$${plugin}.so); \
+ done
@$(call install_finish, gst-plugins-ugly)
--
1.7.1
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] [syslogng] needs libnsl
both applied. mol On Thu, Jun 03, 2010 at 02:54:02PM +0200, Alexander Stein wrote: Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- rules/syslogng.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/syslogng.in b/rules/syslogng.in index f50fb08..52847b2 100644 --- a/rules/syslogng.in +++ b/rules/syslogng.in @@ -6,6 +6,7 @@ menuconfig SYSLOGNG prompt syslog-ng select EVENTLOG select GLIB + select LIBC_NSL select LIBC_RT select LIBNET if SYSLOGNG_SPOOF_SOURCE select TCPWRAPPER if SYSLOGNG_TCP_WRAPPER -- 1.6.4.4 -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [gnupg] requires zlib
applied. mol On Thu, Jun 03, 2010 at 03:35:54PM +0200, Alexander Stein wrote: --- rules/gnupg.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/gnupg.in b/rules/gnupg.in index 65eeb90..15e2071 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -2,6 +2,7 @@ config GNUPG tristate prompt gnupg + select ZLIB help GnuPG - The GNU Privacy Guard suite of programs -- 1.6.4.4 -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 7/9] [gst-plugins-good] explicitly install all selected plugins
From: Michael Olbrich m.olbr...@pengutronix.de Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de --- rules/gst-plugins-good.in | 12 +--- rules/gst-plugins-good.make | 60 +- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in index 127faf2..e5d11cc 100644 --- a/rules/gst-plugins-good.in +++ b/rules/gst-plugins-good.in @@ -245,17 +245,19 @@ if GST_PLUGINS_GOOD bool prompt gst_v4l2 + config GST_PLUGINS_GOOD_XVIDEO + bool + depends on GST_PLUGINS_GOOD_GST_V4L2 + prompt xvideo support + config GST_PLUGINS_GOOD_X bool prompt x config GST_PLUGINS_GOOD_XSHM bool - prompt xshm - - config GST_PLUGINS_GOOD_XVIDEO - bool - prompt xvideo + depends on GST_PLUGINS_GOOD_X + prompt xshm support config GST_PLUGINS_GOOD_AALIB bool diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make index d0ffb34..5abdf0e 100644 --- a/rules/gst-plugins-good.make +++ b/rules/gst-plugins-good.make @@ -36,14 +36,16 @@ $(GST_PLUGINS_GOOD_SOURCE): # GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOFILTER)+= videofilter -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA) += alpha +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA) += alpha +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA) += alpha alphacolor GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_APETAG) += apetag GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUDIOFX)+= audiofx GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUPARSE)+= auparse GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUTODETECT) += autodetect GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AVI)+= avi GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_CUTTER) += cutter -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DEBUGUTILS) += debugutils +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_DEBUGUTILS)+= debugutils +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_DEBUGUTILS)+= debug navigationtest GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DEINTERLACE)+= deinterlace GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_EFFECTV)+= effectv GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_EQUALIZER) += equalizer @@ -51,11 +53,13 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLV) += flv GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ID3DEMUX) += id3demux GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_ICYDEMUX) += icydemux GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_INTERLEAVE) += interleave -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_FLX)+= flx +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_FLX) += flx +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_FLX) += flxdec GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM) += goom GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GOOM2K1)+= goom2k1 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_IMAGEFREEZE)+= imagefreeze -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LAW)+= law +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_LAW) += law +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_LAW) += alaw mulaw GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LEVEL) += level GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MATROSKA) += matroska GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MONOSCOPE) += monoscope @@ -75,29 +79,35 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOCROP) += videocrop GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_VIDEOMIXER) += videomixer GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVENC) += wavenc GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_WAVPARSE) += wavparse -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_Y4M)+= y4m +GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_Y4M) += y4m +GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_Y4M) += y4menc GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_DIRECTSOUND)+= directsound GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS)+= oss GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS4) += oss4 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SUNAUDIO) += sunaudio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_AUDIO) += osx_audio GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_VIDEO) += osx_video -GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GST_V4L2)
Re: [ptxdist] [PATCH] [lshw] add new packet
Michael Olbrich wrote:
On Thu, Jun 03, 2010 at 09:48:47PM +0200, Remy Bohmer wrote:
Adds the Hardware Lister package to ptxdist
A patch is added for the package to make the xml output
compatibility with a xml-parser using tinyxpath.
Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
Signed-off-by: Remy Bohmer li...@bohmer.net
---
.../replace_reserved_xml_keyword.patch | 33
patches/lshw-B.02.14/series|1 +
rules/lshw.in | 21 +
rules/lshw.make| 85
4 files changed, 140 insertions(+), 0 deletions(-)
create mode 100644 patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
create mode 100644 patches/lshw-B.02.14/series
create mode 100644 rules/lshw.in
create mode 100644 rules/lshw.make
diff --git a/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
new file mode 100644
index 000..f508ce7
--- /dev/null
+++ b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
@@ -0,0 +1,33 @@
+Replace keyword node with hwnode for TinyXpath compatibility
+
+It turns out that within TinyXpath 'node' is a reserved key-word.
+Replace it with 'hwnode' when printing to xml.
+
+Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
+Signed-off-by: Remy Bohmer li...@bohmer.net
+---
+ src/core/hw.cc |4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: lshw-B.02.14/src/core/hw.cc
+===
+--- lshw-B.02.14.orig/src/core/hw.cc2009-10-14 14:49:33.0
+0200
lshw-B.02.14/src/core/hw.cc 2009-10-14 14:49:49.0 +0200
+@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out node id=\ getId() \;
++out hwnode id=\ getId() \;
+ if (disabled())
+ out disabled=\true\;
+ if (claimed())
+@@ -1596,7 +1596,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out /node endl;
++out /hwnode endl;
+ }
+
+ return out.str();
diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series
new file mode 100644
index 000..e0ad077
--- /dev/null
+++ b/patches/lshw-B.02.14/series
@@ -0,0 +1 @@
+replace_reserved_xml_keyword.patch
diff --git a/rules/lshw.in b/rules/lshw.in
new file mode 100644
index 000..8cbe128
--- /dev/null
+++ b/rules/lshw.in
@@ -0,0 +1,21 @@
+## SECTION=shell_and_console
+
+menuconfig LSHW
+bool
+prompt lshw
+select GTK if LSHW_GUI
+help
+ lshw (Hardware Lister) is a small tool to provide detailed information
+ on the hardware configuration of the machine. It can report exact
+ memory configuration, firmware version, mainboard configuration, CPU
+ version and speed, cache configuration, bus speed, etc.
+
+if LSHW
+
+config LSHW_GUI
+bool
+default n
+prompt install GUI
+
+endif
+
diff --git a/rules/lshw.make b/rules/lshw.make
new file mode 100644
index 000..8ab63de
--- /dev/null
+++ b/rules/lshw.make
@@ -0,0 +1,85 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Bart vdr. Meulen bartvdrmeu...@gmail.com
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LSHW) += lshw
+
+#
+# Paths and names
+#
+LSHW_VERSION:= B.02.14
+LSHW:= lshw-$(LSHW_VERSION)
+LSHW_SUFFIX := tar.gz
+LSHW_URL:= http://www.ezix.org/software/files/$(LSHW).$(LSHW_SUFFIX)
+LSHW_SOURCE := $(SRCDIR)/$(LSHW).$(LSHW_SUFFIX)
+LSHW_DIR:= $(BUILDDIR)/$(LSHW)
+LSHW_LICENSE:= GPLv2
+
+#
+# Get
+#
+
+$(LSHW_SOURCE):
+@$(call targetinfo)
+@$(call get, LSHW)
+
+#
+# Prepare
+#
+
+LSHW_CONF_TOOL := NO
+LSHW_MAKE_OPT := $(CROSS_ENV_PROGS) all
+LSHW_INSTALL_OPT := $(CROSS_ENV_PROGS) install
This doesn't work here without the -rpath-link from LDFLAGS (in
CROSS_ENV_FLAGS) linking fails here. You probably need to set
LSHW*_ENv := $(CROSS_ENV)
and provided a patch that merges things correctly.
+ifdef PTXCONF_LSHW_GUI
+LSHW_MAKE_OPT+=gui
+LSHW_INSTALL_OPT+=install-gui
Don't indent and align with tab:=space
But use += and not := :)
Marc
+endif
+
+#
Re: [ptxdist] [ptxdist-commit] [git:ptxdist-master] in older bash versions read does not support -i
Moin,
Michael Olbrich wrote:
From: Michael Olbrich m.olbr...@pengutronix.de
Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de
[frog...@hardanger:OSELAS.BSP-Pengutronix-AllYes-trunk]$ ./p newpackage file
ptxdist: creating a new 'file' package:
ptxdist: enter package name...: foo
ptxdist: enter version number.: bar
ptxdist: enter package author.: baz
./p: line 1113: read: -i: invalid option
read: usage: read [-ers] [-u fd] [-t timeout] [-p prompt] [-a array] [-n
nchars] [-d delim] [name ...]
That message looks scary :) How can this be fixed.
Marc
---
bin/ptxdist |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index ac6b5ab..49e6556 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1099,10 +1099,15 @@ newpackage() {
;;
esac
+ local iargs
+ if echo | read -i foo -p bar -e /dev/null 21; then
+ iargs=(-i ${PTXCONF_SETUP_USER_NAME}
${PTXCONF_SETUP_USER_EMAIL})
+ else
+ iargs=()
+ fi
local author
read -e -p ${PTXDIST_LOG_PROMPT}enter package author.: \
- -i ${PTXCONF_SETUP_USER_NAME} ${PTXCONF_SETUP_USER_EMAIL} \
- author
+ ${iar...@]} author
local section
read -e -p ${PTXDIST_LOG_PROMPT}enter package section: \
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions| Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917- |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v2] [lshw] add new packet
Adds the Hardware Lister package to ptxdist
A patch is added for the package to make the xml output
compatibility with a xml-parser using tinyxpath.
Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
Signed-off-by: Remy Bohmer li...@bohmer.net
---
patches/lshw-B.02.14/fix-cross-compile.patch | 43 ++
.../replace_reserved_xml_keyword.patch | 33
patches/lshw-B.02.14/series|2 +
rules/lshw.in | 21 +
rules/lshw.make| 85
5 files changed, 184 insertions(+), 0 deletions(-)
create mode 100644 patches/lshw-B.02.14/fix-cross-compile.patch
create mode 100644 patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
create mode 100644 patches/lshw-B.02.14/series
create mode 100644 rules/lshw.in
create mode 100644 rules/lshw.make
diff --git a/patches/lshw-B.02.14/fix-cross-compile.patch
b/patches/lshw-B.02.14/fix-cross-compile.patch
new file mode 100644
index 000..bfcce62
--- /dev/null
+++ b/patches/lshw-B.02.14/fix-cross-compile.patch
@@ -0,0 +1,43 @@
+fix cross-compilation
+
+Signed-off-by: Remy Bohmer li...@bohmer.net
+---
+ src/Makefile | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: lshw-B.02.14/src/Makefile
+===
+--- lshw-B.02.14.orig/src/Makefile
lshw-B.02.14/src/Makefile
+@@ -18,10 +18,10 @@ export DATADIR
+ CXX?=c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\$(PREFIX)\ -DSBINDIR=\$(SBINDIR)\
-DMANDIR=\$(MANDIR)\ -DDATADIR=\$(DATADIR)\
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-LDFLAGS=-L./core/ -g
++CXXFLAGS= ${CPPFLAGS} -g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++MYLDFLAGS:= ${LDFLAGS} -L./core/ -g
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+- LDFLAGS+= -Wl,--as-needed
++ MYLDFLAGS+= -Wl,--as-needed
+ endif
+ LDSTATIC=-static
+ LIBS=-llshw -lresolv
+@@ -38,7 +38,7 @@ core:
+ +make -C core all
+
+ $(PACKAGENAME): core $(PACKAGENAME).o
+- $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
++ $(CXX) $(MYLDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+
+ .PHONY: gui
+ gui: core
+@@ -52,7 +52,7 @@ nologo:
+ static: $(PACKAGENAME)-static
+
+ $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
+- $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
++ $(CXX) $(LDSTATIC) $(MYLDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+ $(STRIP) $@
+
+ .PHONY: compressed
diff --git a/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
new file mode 100644
index 000..f508ce7
--- /dev/null
+++ b/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
@@ -0,0 +1,33 @@
+Replace keyword node with hwnode for TinyXpath compatibility
+
+It turns out that within TinyXpath 'node' is a reserved key-word.
+Replace it with 'hwnode' when printing to xml.
+
+Signed-off-by: Bart vdr. Meulen bartvdrmeu...@gmail.com
+Signed-off-by: Remy Bohmer li...@bohmer.net
+---
+ src/core/hw.cc |4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: lshw-B.02.14/src/core/hw.cc
+===
+--- lshw-B.02.14.orig/src/core/hw.cc 2009-10-14 14:49:33.0 +0200
lshw-B.02.14/src/core/hw.cc2009-10-14 14:49:49.0 +0200
+@@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out node id=\ getId() \;
++out hwnode id=\ getId() \;
+ if (disabled())
+ out disabled=\true\;
+ if (claimed())
+@@ -1596,7 +1596,7 @@ string hwNode::asXML(unsigned level)
+ if(visible(getClassName()))
+ {
+ out spaces(2*level);
+-out /node endl;
++out /hwnode endl;
+ }
+
+ return out.str();
diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series
new file mode 100644
index 000..4b21b99
--- /dev/null
+++ b/patches/lshw-B.02.14/series
@@ -0,0 +1,2 @@
+fix-cross-compile.patch
+replace_reserved_xml_keyword.patch
diff --git a/rules/lshw.in b/rules/lshw.in
new file mode 100644
index 000..bdfe968
--- /dev/null
+++ b/rules/lshw.in
@@ -0,0 +1,21 @@
+## SECTION=shell_and_console
+
+menuconfig LSHW
+ tristate
+ prompt lshw
+ select GTK if LSHW_GUI
+ help
+ lshw (Hardware Lister) is a small tool to provide detailed information
+ on the hardware configuration of the machine. It can report exact
+ memory configuration, firmware version, mainboard configuration, CPU
+ version and speed, cache configuration, bus speed, etc.
+
+if LSHW
+
+config LSHW_GUI
+ bool
+ default n
+ prompt install GUI
+
+endif
+
diff --git a/rules/lshw.make b/rules/lshw.make
new file mode 100644
index 000..388f213
--- /dev/null
+++
