From 3a44790c6cc5b8926b1a4cc18ebd15eb890bee7a Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 7 May 2013 17:01:06 +0200 Subject: gst-plugins-bad1: version bump 1.0.6 -> 1.0.7 Signed-off-by: Michael Olbrich --- .../0001-remove-endianness-swapping.patch | 42 ------------------- .../0002-add-rgb666-support.patch | 49 ---------------------- patches/gst-plugins-bad-1.0.6/series | 5 --- .../0001-remove-endianness-swapping.patch | 42 +++++++++++++++++++ .../0002-add-rgb666-support.patch | 49 ++++++++++++++++++++++ patches/gst-plugins-bad-1.0.7/series | 5 +++ rules/gst-plugins-bad1.make | 4 +- 7 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 patches/gst-plugins-bad-1.0.6/0001-remove-endianness-swapping.patch delete mode 100644 patches/gst-plugins-bad-1.0.6/0002-add-rgb666-support.patch delete mode 100644 patches/gst-plugins-bad-1.0.6/series create mode 100644 patches/gst-plugins-bad-1.0.7/0001-remove-endianness-swapping.patch create mode 100644 patches/gst-plugins-bad-1.0.7/0002-add-rgb666-support.patch create mode 100644 patches/gst-plugins-bad-1.0.7/series diff --git a/patches/gst-plugins-bad-1.0.6/0001-remove-endianness-swapping.patch b/patches/gst-plugins-bad-1.0.6/0001-remove-endianness-swapping.patch deleted file mode 100644 index d9a018dc1..000000000 --- a/patches/gst-plugins-bad-1.0.6/0001-remove-endianness-swapping.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Luotao Fu -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 ---- - sys/fbdev/gstfbdevsink.c | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) - -diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c -index 639641d..6d06801 100644 ---- a/sys/fbdev/gstfbdevsink.c -+++ b/sys/fbdev/gstfbdevsink.c -@@ -153,21 +153,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; diff --git a/patches/gst-plugins-bad-1.0.6/0002-add-rgb666-support.patch b/patches/gst-plugins-bad-1.0.6/0002-add-rgb666-support.patch deleted file mode 100644 index c67a51d6d..000000000 --- a/patches/gst-plugins-bad-1.0.6/0002-add-rgb666-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Luotao Fu -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 ---- - sys/fbdev/gstfbdevsink.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c -index 6d06801..c181d94 100644 ---- a/sys/fbdev/gstfbdevsink.c -+++ b/sys/fbdev/gstfbdevsink.c -@@ -69,9 +69,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 "0x00000FC0" -+#define GST_VIDEO_BYTE3_MASK_18 "0x0000003F" -+#define __GST_VIDEO_CAPS_MAKE_18(R, G, B) \ -+ "video/x-raw-rgb, " \ -+ "bpp = (int) 32, " \ -+ "depth = (int) 18, " \ -+ "endianness = (int) BIG_ENDIAN, " \ -+ "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_18 ", " \ -+ "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_18 ", " \ -+ "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_18 ", " \ -+ "width = " GST_VIDEO_SIZE_RANGE ", " \ -+ "height = " GST_VIDEO_SIZE_RANGE ", " \ -+ "framerate = " GST_VIDEO_FPS_RANGE -+ -+#define GST_VIDEO_CAPS_RGB666 \ -+ __GST_VIDEO_CAPS_MAKE_18 (1, 2, 3) -+ - #define GST_FBDEV_TEMPLATE_CAPS \ - GST_VIDEO_CAPS_RGB_15 \ - ";" GST_VIDEO_CAPS_RGB_16 \ -+ ";" GST_VIDEO_CAPS_RGB666 \ - ";" GST_VIDEO_CAPS_BGR \ - ";" GST_VIDEO_CAPS_BGRx \ - ";" GST_VIDEO_CAPS_xBGR \ diff --git a/patches/gst-plugins-bad-1.0.6/series b/patches/gst-plugins-bad-1.0.6/series deleted file mode 100644 index df79e0e87..000000000 --- a/patches/gst-plugins-bad-1.0.6/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-remove-endianness-swapping.patch -0002-add-rgb666-support.patch -# 1413e470cafaa03b8e10e20c4e57dbdc - git-ptx-patches magic diff --git a/patches/gst-plugins-bad-1.0.7/0001-remove-endianness-swapping.patch b/patches/gst-plugins-bad-1.0.7/0001-remove-endianness-swapping.patch new file mode 100644 index 000000000..d9a018dc1 --- /dev/null +++ b/patches/gst-plugins-bad-1.0.7/0001-remove-endianness-swapping.patch @@ -0,0 +1,42 @@ +From: Luotao Fu +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 +--- + sys/fbdev/gstfbdevsink.c | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c +index 639641d..6d06801 100644 +--- a/sys/fbdev/gstfbdevsink.c ++++ b/sys/fbdev/gstfbdevsink.c +@@ -153,21 +153,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; diff --git a/patches/gst-plugins-bad-1.0.7/0002-add-rgb666-support.patch b/patches/gst-plugins-bad-1.0.7/0002-add-rgb666-support.patch new file mode 100644 index 000000000..c67a51d6d --- /dev/null +++ b/patches/gst-plugins-bad-1.0.7/0002-add-rgb666-support.patch @@ -0,0 +1,49 @@ +From: Luotao Fu +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 +--- + sys/fbdev/gstfbdevsink.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c +index 6d06801..c181d94 100644 +--- a/sys/fbdev/gstfbdevsink.c ++++ b/sys/fbdev/gstfbdevsink.c +@@ -69,9 +69,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 "0x00000FC0" ++#define GST_VIDEO_BYTE3_MASK_18 "0x0000003F" ++#define __GST_VIDEO_CAPS_MAKE_18(R, G, B) \ ++ "video/x-raw-rgb, " \ ++ "bpp = (int) 32, " \ ++ "depth = (int) 18, " \ ++ "endianness = (int) BIG_ENDIAN, " \ ++ "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_18 ", " \ ++ "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_18 ", " \ ++ "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_18 ", " \ ++ "width = " GST_VIDEO_SIZE_RANGE ", " \ ++ "height = " GST_VIDEO_SIZE_RANGE ", " \ ++ "framerate = " GST_VIDEO_FPS_RANGE ++ ++#define GST_VIDEO_CAPS_RGB666 \ ++ __GST_VIDEO_CAPS_MAKE_18 (1, 2, 3) ++ + #define GST_FBDEV_TEMPLATE_CAPS \ + GST_VIDEO_CAPS_RGB_15 \ + ";" GST_VIDEO_CAPS_RGB_16 \ ++ ";" GST_VIDEO_CAPS_RGB666 \ + ";" GST_VIDEO_CAPS_BGR \ + ";" GST_VIDEO_CAPS_BGRx \ + ";" GST_VIDEO_CAPS_xBGR \ diff --git a/patches/gst-plugins-bad-1.0.7/series b/patches/gst-plugins-bad-1.0.7/series new file mode 100644 index 000000000..df79e0e87 --- /dev/null +++ b/patches/gst-plugins-bad-1.0.7/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-remove-endianness-swapping.patch +0002-add-rgb666-support.patch +# 1413e470cafaa03b8e10e20c4e57dbdc - git-ptx-patches magic diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make index 021e64595..658af6c52 100644 --- a/rules/gst-plugins-bad1.make +++ b/rules/gst-plugins-bad1.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BAD1) += gst-plugins-bad1 # # Paths and names # -GST_PLUGINS_BAD1_VERSION := 1.0.6 -GST_PLUGINS_BAD1_MD5 := 5fe353942c6e5adac23f35542b131484 +GST_PLUGINS_BAD1_VERSION := 1.0.7 +GST_PLUGINS_BAD1_MD5 := d1493d1219b836a8cbf54f4fba962420 GST_PLUGINS_BAD1 := gst-plugins-bad-$(GST_PLUGINS_BAD1_VERSION) GST_PLUGINS_BAD1_SUFFIX := tar.xz GST_PLUGINS_BAD1_URL := http://gstreamer.freedesktop.org/src/gst-plugins-bad/$(GST_PLUGINS_BAD1).$(GST_PLUGINS_BAD1_SUFFIX) -- cgit v1.2.3