[oe] [PATCH][meta-oe 1/8] Revert "gst123: move to nonworking directory"
Martin Jansa
martin.jansa at gmail.com
Tue Oct 6 22:30:35 UTC 2015
* Use PNBLACKLIST instead
This reverts commit b6643c81bdee1165cdd5f301570c4e6fe58a18d3.
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../gstreamer/files/display.patch | 60 ++++++++++++++++++++++
.../recipes-multimedia/gstreamer/gst123_0.3.1.bb | 17 ++++++
.../nonworking/gstreamer/files/display.patch | 60 ----------------------
.../nonworking/gstreamer/gst123_0.3.1.bb | 15 ------
4 files changed, 77 insertions(+), 75 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/gstreamer/files/display.patch
create mode 100644 meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb
delete mode 100644 meta-multimedia/recipes-multimedia/nonworking/gstreamer/files/display.patch
delete mode 100644 meta-multimedia/recipes-multimedia/nonworking/gstreamer/gst123_0.3.1.bb
diff --git a/meta-multimedia/recipes-multimedia/gstreamer/files/display.patch b/meta-multimedia/recipes-multimedia/gstreamer/files/display.patch
new file mode 100644
index 0000000..61b0e6c
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/gstreamer/files/display.patch
@@ -0,0 +1,60 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+From 3e46d2e501da68d929bb5f26900a292a5fc04a1f Mon Sep 17 00:00:00 2001
+From: Stefan Westerfeld <stefan at space.twc.de>
+Date: Mon, 23 Apr 2012 03:10:22 +0200
+Subject: [PATCH] Fix time display updates (broken by introduction of quiet
+ mode).
+
+---
+ src/gst123.cc | 1 +
+ src/msg.cc | 7 +++++++
+ src/msg.h | 1 +
+ 3 files changed, 9 insertions(+)
+
+diff --git a/src/gst123.cc b/src/gst123.cc
+index 20e91e5..ce5876d 100644
+--- a/src/gst123.cc
++++ b/src/gst123.cc
+@@ -640,6 +640,7 @@ cb_print_position (gpointer *data)
+ else
+ blanks += " ";
+ Msg::print ("%s%s\r", status.c_str(), blanks.c_str());
++ Msg::flush();
+ }
+
+ /* call me again */
+diff --git a/src/msg.cc b/src/msg.cc
+index 547cd90..33cada2 100644
+--- a/src/msg.cc
++++ b/src/msg.cc
+@@ -41,6 +41,13 @@ print (const char *format, ...)
+ }
+ }
+
++void
++flush()
++{
++ if (!Options::the().quiet)
++ fflush (stdout);
++}
++
+ }
+
+ }
+diff --git a/src/msg.h b/src/msg.h
+index e0ced24..5bebac0 100644
+--- a/src/msg.h
++++ b/src/msg.h
+@@ -27,6 +27,7 @@ namespace Msg
+ {
+
+ void print (const char *format, ...);
++void flush();
+
+ }
+
+--
+1.7.9.5
+
diff --git a/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb b/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb
new file mode 100644
index 0000000..47f1d9f
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Flexible CLI player in the spirit of mpg123, based on GStreamer"
+HOMEPAGE = "http://space.twc.de/~stefan/gst123.php"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+ file://src/gst123.cc;beginline=1;endline=19;md5=05d2f5d54b985b986c26af931d2084f8"
+
+DEPENDS = "libx11 gstreamer gst-plugins-base gtk+ ncurses"
+
+SRC_URI = "http://space.twc.de/~stefan/gst123/${BPN}-${PV}.tar.bz2 \
+ file://display.patch"
+
+SRC_URI[md5sum] = "1e77767c9d6fecee5641f95804f160fe"
+SRC_URI[sha256sum] = "89d1de025eca0466c125dcd6a11b64341bdf98ee4c03c3e5a12321d77cb8b0ce"
+
+inherit autotools
+
+PNBLACKLIST[gst123] ?= "gst123 is still "sometimes" using wrong sysroot"
diff --git a/meta-multimedia/recipes-multimedia/nonworking/gstreamer/files/display.patch b/meta-multimedia/recipes-multimedia/nonworking/gstreamer/files/display.patch
deleted file mode 100644
index 61b0e6c..0000000
--- a/meta-multimedia/recipes-multimedia/nonworking/gstreamer/files/display.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton at intel.com>
-
-From 3e46d2e501da68d929bb5f26900a292a5fc04a1f Mon Sep 17 00:00:00 2001
-From: Stefan Westerfeld <stefan at space.twc.de>
-Date: Mon, 23 Apr 2012 03:10:22 +0200
-Subject: [PATCH] Fix time display updates (broken by introduction of quiet
- mode).
-
----
- src/gst123.cc | 1 +
- src/msg.cc | 7 +++++++
- src/msg.h | 1 +
- 3 files changed, 9 insertions(+)
-
-diff --git a/src/gst123.cc b/src/gst123.cc
-index 20e91e5..ce5876d 100644
---- a/src/gst123.cc
-+++ b/src/gst123.cc
-@@ -640,6 +640,7 @@ cb_print_position (gpointer *data)
- else
- blanks += " ";
- Msg::print ("%s%s\r", status.c_str(), blanks.c_str());
-+ Msg::flush();
- }
-
- /* call me again */
-diff --git a/src/msg.cc b/src/msg.cc
-index 547cd90..33cada2 100644
---- a/src/msg.cc
-+++ b/src/msg.cc
-@@ -41,6 +41,13 @@ print (const char *format, ...)
- }
- }
-
-+void
-+flush()
-+{
-+ if (!Options::the().quiet)
-+ fflush (stdout);
-+}
-+
- }
-
- }
-diff --git a/src/msg.h b/src/msg.h
-index e0ced24..5bebac0 100644
---- a/src/msg.h
-+++ b/src/msg.h
-@@ -27,6 +27,7 @@ namespace Msg
- {
-
- void print (const char *format, ...);
-+void flush();
-
- }
-
---
-1.7.9.5
-
diff --git a/meta-multimedia/recipes-multimedia/nonworking/gstreamer/gst123_0.3.1.bb b/meta-multimedia/recipes-multimedia/nonworking/gstreamer/gst123_0.3.1.bb
deleted file mode 100644
index 6c495b2..0000000
--- a/meta-multimedia/recipes-multimedia/nonworking/gstreamer/gst123_0.3.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Flexible CLI player in the spirit of mpg123, based on GStreamer"
-HOMEPAGE = "http://space.twc.de/~stefan/gst123.php"
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
- file://src/gst123.cc;beginline=1;endline=19;md5=05d2f5d54b985b986c26af931d2084f8"
-
-DEPENDS = "libx11 gstreamer gst-plugins-base gtk+ ncurses"
-
-SRC_URI = "http://space.twc.de/~stefan/gst123/${BPN}-${PV}.tar.bz2 \
- file://display.patch"
-
-SRC_URI[md5sum] = "1e77767c9d6fecee5641f95804f160fe"
-SRC_URI[sha256sum] = "89d1de025eca0466c125dcd6a11b64341bdf98ee4c03c3e5a12321d77cb8b0ce"
-
-inherit autotools
--
2.6.0
More information about the Openembedded-devel
mailing list