Re: [ptxdist] [PATCH] add utility 'file' for determining file types
Hallo, Am 12.04.2011 23:45, schrieb Michael Olbrich: this patch is broken. Your email probram added some line-breaks. I assumed this would be the case. Was my first patch and I read somewhere: just import the output of `git format-patch` to your MUA and send it. Thunderbird seems to break it. I'll try another way next time. --- rules/file.in| 15 +++ rules/file.make | 102 ++ rules/host-file.in | 13 ++ rules/host-file.make | 73 +++ What's the host-file needed for? The tool calls itself when building. If I don't have it in the cross build environment the build fails. Just adding it as a host tool was the easiest solution without investigating the build process and patching it. This is definitely a cross compiler build issue. The get stage can be removed. I really need to update the templates for this... That's what I did, just use the templates created and adapt the necessary parts without removing anything else. Good to know this is good practice. please remove all the stages that are commented out. They are only generated in case the default needs to be modified. Will take some days, I don't know when I have time for it. +# vim: ft=make noet Because you quoted it anyway. I changed this line in the created make files. Just changing syntax is only one aspect of make files. Resetting expandtab (noet aka noexpandtab) is crucial because otherwise you can't create the tab characters needed in a Makefile. But this should be issue of another patch for the templates. ;) Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/4] [avrlib] remove multilib configuration
On 04/13/2011 12:07 AM, Michael Olbrich wrote: Hi, On Sat, Apr 09, 2011 at 11:41:57PM +0200, Stephan Linz wrote: Remove the unusually autoconf option '--enable-multilib'. With beginning of avr-libc version 1.7.x it is'n anymore present. This is not ok. The version is in the ptxconfig, and we have a avr toolchain with avr-libc version 1.6.2. What would happen here? If it's ok, fix the comment, otherwise make it conditional. I don't know anything about avr-libc, so I have no idea what the correct solution is. Make a switch to Kconfig that the user can select multilib in the avr-libc menu. btw: Juergen is an avr toolchain user. cheers, Marc -- 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
Re: [ptxdist] BlueZ libs and utils
On Fri, Apr 08, 2011 at 04:22:30PM +0200, EL MEHRAZ Haytem wrote: I am a new ptxdist user, I'm trying to include BlueZ Stack (BlueZ Libs and Utils) in my target Root File System using Ptxdist-2010.07.1. I have enabled the necessary options in kernel 2.6.24 and with Ptxdist I usually generate the RFS for my Target (X86). the problem is, i didn't find the related tools like hciconfig, hciattach, /etc/bluetooth and similars in my RFS. did I miss something?? Can anybody help me ? Did you enable BLUEZ_UTILS (install bluez tools)? Michael Yep and i got those things : target: bluez-libs.targetinstall install_init: preparing for image creation... install_init: @ARCH@ - arm ... done install_fixup: @PACKAGE@ - bluez-libs ... done. install_fixup: @PRIORITY@ - optional ... done. install_fixup: @VERSION@ - 3.7 ... done. install_fixup: @SECTION@ - base ... done. install_fixup: @AUTHOR@ - Robert Schwebel r.schwebel\@pengutronix.de install_fixup: @DEPENDS@ - ... done. install_fixup: @DESCRIPTION@ - missing ... done. # FIXME: wait for patch from Sandro Noel Packet bluez-libs is empty. not generating Finished target bluez-libs.targetinstall The same thing happens for bluez-utils. And infact, the related ipkg is not present in the Images directory. Any idea?? Thanks Michael. Haytem. -- 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 mailing list ptxdist@pengutronix.de
Re: [ptxdist] BlueZ libs and utils
On Fri, Apr 08, 2011 at 04:22:30PM +0200, EL MEHRAZ Haytem wrote: I am a new ptxdist user, I'm trying to include BlueZ Stack (BlueZ Libs and Utils) in my target Root File System using Ptxdist-2010.07.1. I have enabled the necessary options in kernel 2.6.24 and with Ptxdist I usually generate the RFS for my Target (X86). the problem is, i didn't find the related tools like hciconfig, hciattach, /etc/bluetooth and similars in my RFS. did I miss something?? Can anybody help me ? Did you enable BLUEZ_UTILS (install bluez tools)? Michael Yep and i got those things : target: bluez-libs.targetinstall Oups i made a copy/paste mistake .. install_init: @ARCH@ - X86 ... done Haytem. -- 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 mailing list ptxdist@pengutronix.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] migration from 2011.03.1 to 2011.04.0 fails because some script is not found
Hei hei, I just tried `ptxdist migrate` on our project and this worked fine. A `ptxdist go` however produced the following output afterwards: % ptxdist go /usr/local/lib/ptxdist-2011.04.0/scripts/libptxdist.sh: line 344: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh: No such file or directory ptxdist: error: failed to source lib: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh It returns with 1 then. I tried `ptxdist clean` afterwards and building from scratch, but the error stays the same. Could someone please help me debug this? O:-) Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] gstreamer update
The following changes since commit b583d35beb7c27164de336e8a32dca4e93992b2a: openssh: version bump 5.3p1 - 5.8p1 (2011-04-13 15:19:27 +0200) are available in the git repository at: http://git.pengutronix.de/git/rsc/ptxdist for-mainline Robert Schwebel (6): gstreamer: version bump 0.10.29 - 0.10.32 gst-plugins-base: version bump 0.10.29 - 0.10.32 gst-plugins-good: version bump 0.10.23 - 0.10.28 gst-plugins-bad: version bump 0.10.19 - 0.10.21 gst-plugins-ugly: version bump 0.10.15 - 0.10.17 gst-plugins-gl: version bump 0.10.1 - 0.10.2 .../add-RGB666-Support-to-ffmpegcolorspace.patch | 70 ++-- .../add-rgb666-support-to-videotestsrc.patch |0 .../series |0 .../disable-broken-example.diff|0 .../series |0 ...-reset-the-have_index-flag-at-transition-.patch |0 ...-destroy-open-buffers-when-changing-to-NU.patch | 23 ++ .../series |1 - rules/gst-plugins-bad.in | 62 +++-- rules/gst-plugins-bad.make | 16 - rules/gst-plugins-base.in |4 + rules/gst-plugins-base.make| 12 +++- rules/gst-plugins-gl.make |2 +- rules/gst-plugins-good.make|2 +- rules/gst-plugins-ugly.make|2 +- rules/gstreamer.make |7 +- 16 files changed, 129 insertions(+), 72 deletions(-) rename patches/{gst-plugins-base-0.10.29 = gst-plugins-base-0.10.32}/add-RGB666-Support-to-ffmpegcolorspace.patch (83%) rename patches/{gst-plugins-base-0.10.29 = gst-plugins-base-0.10.32}/add-rgb666-support-to-videotestsrc.patch (100%) rename patches/{gst-plugins-base-0.10.29 = gst-plugins-base-0.10.32}/series (100%) rename patches/{gst-plugins-gl-0.10.1 = gst-plugins-gl-0.10.2}/disable-broken-example.diff (100%) rename patches/{gst-plugins-gl-0.10.1 = gst-plugins-gl-0.10.2}/series (100%) rename patches/{gst-plugins-good-0.10.23 = gst-plugins-good-0.10.28}/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch (100%) rename patches/{gst-plugins-good-0.10.23 = gst-plugins-good-0.10.28}/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch (62%) rename patches/{gst-plugins-good-0.10.23 = gst-plugins-good-0.10.28}/series (50%) -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] gstreamer: version bump 0.10.29 - 0.10.32
The new version has the --enable-Bsymbolic switch, so we add it as well. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/gstreamer.make |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/gstreamer.make b/rules/gstreamer.make index edf6031..7909612 100644 --- a/rules/gstreamer.make +++ b/rules/gstreamer.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GSTREAMER) += gstreamer # # Paths and names # -GSTREAMER_VERSION := 0.10.29 +GSTREAMER_VERSION := 0.10.32 GSTREAMER := gstreamer-$(GSTREAMER_VERSION) GSTREAMER_SUFFIX := tar.bz2 GSTREAMER_URL := http://gstreamer.freedesktop.org/src/gstreamer/$(GSTREAMER).$(GSTREAMER_SUFFIX) @@ -61,7 +61,8 @@ GSTREAMER_AUTOCONF := \ --disable-gobject-cast-checks \ --disable-check \ --without-libiconv-prefix \ - --without-libintl-prefix + --without-libintl-prefix \ + --enable-Bsymbolic ifdef PTXCONF_GSTREAMER__DEBUG GSTREAMER_AUTOCONF += --enable-gst-debug @@ -93,7 +94,7 @@ endif # Target-Install # -GSTREAMER_LIB_VERSION := 0.25.0 +GSTREAMER_LIB_VERSION := 0.28.0 $(STATEDIR)/gstreamer.targetinstall: @$(call targetinfo) -- 1.7.2.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/6] gst-plugins-base: version bump 0.10.29 - 0.10.32
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.29/series|1 - .../add-RGB666-Support-to-ffmpegcolorspace.patch | 296 .../add-rgb666-support-to-videotestsrc.patch | 82 ++ patches/gst-plugins-base-0.10.32/series|1 + rules/gst-plugins-base.in |4 + rules/gst-plugins-base.make| 12 +- 8 files changed, 392 insertions(+), 382 deletions(-) delete mode 100644 patches/gst-plugins-base-0.10.29/add-RGB666-Support-to-ffmpegcolorspace.patch delete mode 100644 patches/gst-plugins-base-0.10.29/add-rgb666-support-to-videotestsrc.patch delete mode 100644 patches/gst-plugins-base-0.10.29/series create mode 100644 patches/gst-plugins-base-0.10.32/add-RGB666-Support-to-ffmpegcolorspace.patch create mode 100644 patches/gst-plugins-base-0.10.32/add-rgb666-support-to-videotestsrc.patch create mode 100644 patches/gst-plugins-base-0.10.32/series diff --git a/patches/gst-plugins-base-0.10.29/add-RGB666-Support-to-ffmpegcolorspace.patch b/patches/gst-plugins-base-0.10.29/add-RGB666-Support-to-ffmpegcolorspace.patch deleted file mode 100644 index b8e2b47..000 --- a/patches/gst-plugins-base-0.10.29/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) 0x3f;\ -+g = (v 6) 0x3f;\ -+b = v 0x3f;\ -+} -+ -+#define RGBA_OUT(d, r, g, b, a)\ -+{\ -+((uint32_t *)(d))[0] = ((r 2) 12) | ((g 2)
[ptxdist] [PATCH 3/6] gst-plugins-good: version bump 0.10.23 - 0.10.28
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- ...-reset-the-have_index-flag-at-transition-.patch | 26 ...-destroy-open-buffers-when-changing-to-NU.patch | 43 patches/gst-plugins-good-0.10.23/series|2 - ...-reset-the-have_index-flag-at-transition-.patch | 26 ...-destroy-open-buffers-when-changing-to-NU.patch | 36 patches/gst-plugins-good-0.10.28/series|1 + rules/gst-plugins-good.make|2 +- 7 files changed, 64 insertions(+), 72 deletions(-) delete mode 100644 patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch delete mode 100644 patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch delete mode 100644 patches/gst-plugins-good-0.10.23/series create mode 100644 patches/gst-plugins-good-0.10.28/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch create mode 100644 patches/gst-plugins-good-0.10.28/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch create mode 100644 patches/gst-plugins-good-0.10.28/series diff --git a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch b/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch deleted file mode 100644 index 687f19e..000 --- a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 15d09f55a687f5e5f26c5a5c7d9cabc36ee19512 Mon Sep 17 00:00:00 2001 -From: Michael Grzeschik m.grzesc...@pengutronix.de -Date: Wed, 23 Jun 2010 12:15:13 +0200 -Subject: [PATCH 1/2] [gstavidemux] reset the have_index flag at transition PAUSED_TO_READY - -If we restart the Stream in the case of doing a transition from -PAUSED_TO_READY and back with READY_TO_PAUSED aso. the duration of the video -will get calculated even if we have a avi header with that information. - -Signed-off-by: Michael Grzeschik m.grzesc...@pengutronix.de - gst/avi/gstavidemux.c |1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -Index: gst-plugins-good-0.10.23/gst/avi/gstavidemux.c -=== gst-plugins-good-0.10.23.orig/gst/avi/gstavidemux.c2010-06-23 17:36:48.0 +0200 -+++ gst-plugins-good-0.10.23/gst/avi/gstavidemux.c 2010-06-23 17:36:50.0 +0200 -@@ -5345,6 +5345,7 @@ - - switch (transition) { - case GST_STATE_CHANGE_PAUSED_TO_READY: -+ avi-have_index = FALSE; - gst_avi_demux_reset (avi); - break; - default: diff --git a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch b/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch deleted file mode 100644 index b4b08f7..000 --- a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 49e64005c4ed0a09ccf9ccb2b0e7521e64d21efd Mon Sep 17 00:00:00 2001 -From: Michael Grzeschik m.grzesc...@pengutronix.de -Date: Wed, 23 Jun 2010 11:47:43 +0200 -Subject: [PATCH 2/2] [gstv4l2sink] destroy open buffers when changing to NULL - -In the case we change the State from READY_TO_NULL the open buffers -still hold a open dup filedescriptor to the device, therefor the device -release function will not be called and the device probably answer with --EBUSY when we reopen it at transition NULL_TO_READY. - -Signed-off-by: Michael Grzeschik m.grzesc...@pengutronix.de - sys/v4l2/gstv4l2sink.c | 10 +++--- - 1 files changed, 3 insertions(+), 7 deletions(-) - -Index: gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c -=== gst-plugins-good-0.10.23.orig/sys/v4l2/gstv4l2sink.c 2010-06-23 17:36:47.0 +0200 -+++ gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c2010-06-23 17:36:55.0 +0200 -@@ -461,6 +461,8 @@ - } - break; - case GST_STATE_CHANGE_READY_TO_NULL: -+ gst_v4l2_buffer_pool_destroy(v4l2sink-pool); -+ v4l2sink-pool=NULL; - /* close the device */ - if (!gst_v4l2_object_stop (v4l2sink-v4l2object)) - return GST_STATE_CHANGE_FAILURE; -@@ -557,13 +559,7 @@ - } - - if (v4l2sink-pool) { --/* TODO: if we've already allocated buffers, we probably need to -- * do something here to free and reallocate -- * -- * gst_v4l2_object_stop_streaming() -- * gst_v4l2_buffer_pool_destroy() -- * -- */ -+ gst_v4l2_object_stop_streaming(v4l2sink-v4l2object); - GST_DEBUG_OBJECT (v4l2sink, warning, changing caps not supported yet); - return FALSE; - } diff --git a/patches/gst-plugins-good-0.10.23/series b/patches/gst-plugins-good-0.10.23/series deleted file mode
[ptxdist] [PATCH 5/6] gst-plugins-ugly: version bump 0.10.15 - 0.10.17
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/gst-plugins-ugly.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/gst-plugins-ugly.make b/rules/gst-plugins-ugly.make index 5ad4beb..256bfae 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.15 +GST_PLUGINS_UGLY_VERSION := 0.10.17 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) -- 1.7.2.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/6] gst-plugins-bad: version bump 0.10.19 - 0.10.21
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/gst-plugins-bad.in | 62 ++- rules/gst-plugins-bad.make | 16 --- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/rules/gst-plugins-bad.in b/rules/gst-plugins-bad.in index 94e4049..8d14f0e 100644 --- a/rules/gst-plugins-bad.in +++ b/rules/gst-plugins-bad.in @@ -50,6 +50,10 @@ config GST_PLUGINS_BAD_CAMERABIN bool prompt camerabin +config GST_PLUGINS_BAD_CAMERABIN2 + bool + prompt camerabin2 + config GST_PLUGINS_BAD_LEGACYRESAMPLE bool prompt legacyresample @@ -195,10 +199,6 @@ config GST_PLUGINS_BAD_SEGMENTCLIP bool prompt segmentclip -config GST_PLUGINS_BAD_SELECTOR - bool - prompt selector - config GST_PLUGINS_BAD_SIREN bool prompt siren @@ -219,10 +219,6 @@ config GST_PLUGINS_BAD_TTA bool prompt tta -config GST_PLUGINS_BAD_VALVE - bool - prompt valve - config GST_PLUGINS_BAD_VIDEOMEASURE bool prompt videomeasure @@ -526,5 +522,55 @@ config GST_PLUGINS_BAD_VP8 prompt vp8 depends on BROKEN +config GST_PLUGINS_BAD_COLOREFFECTS + bool + prompt coloreffects + depends on BROKEN + +config GST_PLUGINS_BAD_COLORSPACE + bool + prompt colorspace + depends on BROKEN + +config GST_PLUGINS_BAD_DVBSUBOVERLAY + bool + prompt dvbsuboverlay + depends on BROKEN + +config GST_PLUGINS_BAD_GAUDIEFFECTS + bool + prompt gaudieffects + depends on BROKEN + +config GST_PLUGINS_BAD_GEOMETRICTRANSFORMS + bool + prompt geometrictransforms + depends on BROKEN + +config GST_PLUGINS_BAD_INTERLACE + bool + prompt interlace + depends on BROKEN + +config GST_PLUGINS_BAD_IVFPARSE + bool + prompt ivfparse + depends on BROKEN + +config GST_PLUGINS_BAD_JP2DECIMATOR + bool + prompt jp2decimator + depends on BROKEN + +config GST_PLUGINS_BAD_VIDEOMAXRATE + bool + prompt videomaxrate + depends on BROKEN + +config GST_PLUGINS_BAD_Y4M + bool + prompt j4m + depends on BROKEN + endif diff --git a/rules/gst-plugins-bad.make b/rules/gst-plugins-bad.make index f81bb67..c4b90b3 100644 --- a/rules/gst-plugins-bad.make +++ b/rules/gst-plugins-bad.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD) += gst-plugins-bad # # Paths and names # -GST_PLUGINS_BAD_VERSION:= 0.10.19 +GST_PLUGINS_BAD_VERSION:= 0.10.21 GST_PLUGINS_BAD:= gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION) GST_PLUGINS_BAD_SUFFIX := tar.bz2 GST_PLUGINS_BAD_URL:= http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD).$(GST_PLUGINS_BAD_SUFFIX) @@ -45,6 +45,7 @@ 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_CAMERABIN2) += camerabin2 GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_LEGACYRESAMPLE) += legacyresample GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_BAYER)+= bayer GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_CDXAPARSE)+= cdxaparse @@ -88,13 +89,11 @@ GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_SCALETEMPO) += scaletempoplugi GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_SDP) += sdp GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_SDP) += sdpelem GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SEGMENTCLIP) += segmentclip -GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SELECTOR) += selector GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SIREN)+= siren GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SPEED)+= speed GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_SUBENC) += subenc GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_STEREO) += stereo GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_TTA) += tta -GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VALVE)+= valve GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VIDEOMEASURE) += videomeasure GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VIDEOSIGNAL) += videosignal GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_VMNC) += vmnc @@ -105,7 +104,6 @@ GST_PLUGINS_BAD_ENABLE-$(PTXCONF_GST_PLUGINS_BAD_QUICKTIME) += quicktime GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_VCD) += vcd GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_VCD) += vcdsrc GST_PLUGINS_BAD_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD_ALSA)+= alsa -GST_PLUGINS_BAD_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD_ALSA)
[ptxdist] [PATCH 6/6] gst-plugins-gl: version bump 0.10.1 - 0.10.2
Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- .../disable-broken-example.diff| 36 patches/gst-plugins-gl-0.10.1/series |1 - .../disable-broken-example.diff| 36 patches/gst-plugins-gl-0.10.2/series |1 + rules/gst-plugins-gl.make |2 +- 5 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 patches/gst-plugins-gl-0.10.1/disable-broken-example.diff delete mode 100644 patches/gst-plugins-gl-0.10.1/series create mode 100644 patches/gst-plugins-gl-0.10.2/disable-broken-example.diff create mode 100644 patches/gst-plugins-gl-0.10.2/series diff --git a/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff deleted file mode 100644 index a4f7647..000 --- a/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff +++ /dev/null @@ -1,36 +0,0 @@ -From: Michael Olbrich m.olbr...@pengutronix.de -Subject: make sure gtk example builds for non X gtk - -With this patch tests/examples/gtk/gstgtk.c will compile with non X gtk. -It won't do anything usefull, though. - -Not for upstream. - -Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de - - tests/examples/gtk/gstgtk.c |4 - 1 file changed, 4 deletions(-) - -Index: b/tests/examples/gtk/gstgtk.c -=== a/tests/examples/gtk/gstgtk.c -+++ b/tests/examples/gtk/gstgtk.c -@@ -7,8 +7,6 @@ - #include gdk/gdkx.h - #elif defined(GDK_WINDOWING_QUARTZ) - #include gdk/gdkquartz.h --#else --#error unimplemented GTK backend - #endif - - -@@ -23,8 +21,6 @@ gst_x_overlay_set_gtk_window (GstXOverla - (gulong)gdk_quartz_window_get_nswindow (window-window)); - #elif defined(GDK_WINDOWING_X11) - gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window-window)); --#else --#error unimplemented GTK backend - #endif - - } diff --git a/patches/gst-plugins-gl-0.10.1/series b/patches/gst-plugins-gl-0.10.1/series deleted file mode 100644 index e43a9ba..000 --- a/patches/gst-plugins-gl-0.10.1/series +++ /dev/null @@ -1 +0,0 @@ -disable-broken-example.diff diff --git a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff new file mode 100644 index 000..a4f7647 --- /dev/null +++ b/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff @@ -0,0 +1,36 @@ +From: Michael Olbrich m.olbr...@pengutronix.de +Subject: make sure gtk example builds for non X gtk + +With this patch tests/examples/gtk/gstgtk.c will compile with non X gtk. +It won't do anything usefull, though. + +Not for upstream. + +Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de + +--- + tests/examples/gtk/gstgtk.c |4 + 1 file changed, 4 deletions(-) + +Index: b/tests/examples/gtk/gstgtk.c +=== +--- a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c +@@ -7,8 +7,6 @@ + #include gdk/gdkx.h + #elif defined(GDK_WINDOWING_QUARTZ) + #include gdk/gdkquartz.h +-#else +-#error unimplemented GTK backend + #endif + + +@@ -23,8 +21,6 @@ gst_x_overlay_set_gtk_window (GstXOverla + (gulong)gdk_quartz_window_get_nswindow (window-window)); + #elif defined(GDK_WINDOWING_X11) + gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window-window)); +-#else +-#error unimplemented GTK backend + #endif + + } diff --git a/patches/gst-plugins-gl-0.10.2/series b/patches/gst-plugins-gl-0.10.2/series new file mode 100644 index 000..e43a9ba --- /dev/null +++ b/patches/gst-plugins-gl-0.10.2/series @@ -0,0 +1 @@ +disable-broken-example.diff diff --git a/rules/gst-plugins-gl.make b/rules/gst-plugins-gl.make index 828de69..f4764d3 100644 --- a/rules/gst-plugins-gl.make +++ b/rules/gst-plugins-gl.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GL) += gst-plugins-gl # # Paths and names # -GST_PLUGINS_GL_VERSION := 0.10.1 +GST_PLUGINS_GL_VERSION := 0.10.2 GST_PLUGINS_GL := gst-plugins-gl-$(GST_PLUGINS_GL_VERSION) GST_PLUGINS_GL_SUFFIX := tar.bz2 GST_PLUGINS_GL_URL := http://gstreamer.freedesktop.org/src/gst-plugins-gl/$(GST_PLUGINS_GL).$(GST_PLUGINS_GL_SUFFIX) -- 1.7.2.3 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] gstreamer update
Hi, On Wed, Apr 13, 2011 at 08:16:42PM +0200, Robert Schwebel wrote: gstreamer: version bump 0.10.29 - 0.10.32 gst-plugins-base: version bump 0.10.29 - 0.10.32 gst-plugins-good: version bump 0.10.23 - 0.10.28 gst-plugins-bad: version bump 0.10.19 - 0.10.21 gst-plugins-ugly: version bump 0.10.15 - 0.10.17 gst-plugins-gl: version bump 0.10.1 - 0.10.2 This is a brief update to the latest versions, I've tried to catch all new plugins and forward-port the patches. However, the series is untested on hardware. Erwin, do you have a chance to test the gl plugin? 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
Re: [ptxdist] migration from 2011.03.1 to 2011.04.0 fails because some script is not found
On 04/13/2011 05:53 PM, Alexander Dahl wrote: Hei hei, I just tried `ptxdist migrate` on our project and this worked fine. A `ptxdist go` however produced the following output afterwards: % ptxdist go /usr/local/lib/ptxdist-2011.04.0/scripts/libptxdist.sh: line 344: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh: No such file or directory ptxdist: error: failed to source lib: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh It returns with 1 then. I tried `ptxdist clean` afterwards and building from scratch, but the error stays the same. Could someone please help me debug this? O:-) Known bug - mol has fixed it today. Cheery-pick commit 05eef40ed8dc519509bac7717c1810d1eb99a66f or use this workaround: touch /home/adahl/Work/src/foo/scripts//lib/ptxd_make_nothing.sh cheers, Marc -- 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
Re: [ptxdist] migration from 2011.03.1 to 2011.04.0 fails because some script is not found
On 04/13/2011 08:26 PM, Marc Kleine-Budde wrote: On 04/13/2011 05:53 PM, Alexander Dahl wrote: Hei hei, I just tried `ptxdist migrate` on our project and this worked fine. A `ptxdist go` however produced the following output afterwards: % ptxdist go /usr/local/lib/ptxdist-2011.04.0/scripts/libptxdist.sh: line 344: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh: No such file or directory ptxdist: error: failed to source lib: /home/adahl/Work/src/foo/scripts//lib/ptxd_make_*.sh It returns with 1 then. I tried `ptxdist clean` afterwards and building from scratch, but the error stays the same. Could someone please help me debug this? O:-) Known bug - mol has fixed it today. Cheery-pick commit 05eef40ed8dc519509bac7717c1810d1eb99a66f or use this workaround: touch /home/adahl/Work/src/foo/scripts//lib/ptxd_make_nothing.sh or use: http://ptxdist.org/software/ptxdist/download/ptxdist-2011.04.1.tar.bz2 Marc -- 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] ptxdist-2011.04.1
Hello, after mol has fixed the some script is not found bug, I've released ptxdist-2011.04.1. It just fixes the problem. There's no need to update if 2011.04.0 is working for you. regards, Marc -- 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
Re: [ptxdist] [PATCH 4/4] [avrlib] remove multilib configuration
Am Mittwoch, 13. April 2011, um 09:01:47 schrieb Marc Kleine-Budde: On 04/13/2011 12:07 AM, Michael Olbrich wrote: Hi, On Sat, Apr 09, 2011 at 11:41:57PM +0200, Stephan Linz wrote: Remove the unusually autoconf option '--enable-multilib'. With beginning of avr-libc version 1.7.x it is'n anymore present. This is not ok. The version is in the ptxconfig, and we have a avr toolchain with avr-libc version 1.6.2. What would happen here? No problem here. You can rebuild the 1.6.2 version with this patch too. I don't know why OSELAS.Toolchain() have used '--enable-multilib' for avr-libc. That is not required. If it's ok, fix the comment, otherwise make it conditional. I don't know anything about avr-libc, so I have no idea what the correct solution is. Make a switch to Kconfig that the user can select multilib in the avr-libc menu. I think it is not required. Have a look to my OSELAS project on OBS: https://build.opensuse.org/project/monitor?project=home%3Arexut%3AOSELAS The package toolchain-avr-2011 presents both AVR toolchain configuration together in one deb package (1.6.2 and 1.7.1 based). The underlaying OSELAS.Toolchain() 2011.03.0 is patched with my changes here and it works. btw: Juergen is an avr toolchain user. cheers, Marc -- Viele Grüße, Stephan Linz __ MB-Ref: http://www.li-pro.de/xilinx_mb:mbref:start OpenDCC: http://www.li-pro.net/opendcc.phtml PC/M: http://www.li-pro.net/pcm.phtml CDK4AVR: http://cdk4avr.sourceforge.net/ CDK4NIOS: http://cdk4nios.sourceforge.net/ CDK4MSP: http://cdk4msp.sourceforge.net/ CPM4L: http://download.opensuse.org/repositories/home:/rexut:/CPM4L -- ptxdist mailing list ptxdist@pengutronix.de