All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] jack: swap to jack2
@ 2016-10-07  9:19 Andreas Müller
  2016-10-07  9:19 ` [PATCH 2/5] jack: remove portaudio PACKAGECONFIG Andreas Müller
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Andreas Müller @ 2016-10-07  9:19 UTC (permalink / raw)
  To: openembedded-devel

* works out of the box without modificatins to /etc/security/limits.conf neccessary
* move to git: ARM NEON support was introduced
* on RaspberryPi2 buffer sizes can be set to smallest accepted value without XRUN
  -> reduced latency compared to jack1

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-multimedia/jack/jack_0.125.0rc1.bb | 49 ----------------------
 meta-oe/recipes-multimedia/jack/jack_git.bb        | 33 +++++++++++++++
 2 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 meta-oe/recipes-multimedia/jack/jack_0.125.0rc1.bb
 create mode 100644 meta-oe/recipes-multimedia/jack/jack_git.bb

diff --git a/meta-oe/recipes-multimedia/jack/jack_0.125.0rc1.bb b/meta-oe/recipes-multimedia/jack/jack_0.125.0rc1.bb
deleted file mode 100644
index 07aab53..0000000
--- a/meta-oe/recipes-multimedia/jack/jack_0.125.0rc1.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "JACK is a low-latency audio server. It can \
-connect a number of different applications to an audio \
-device, as well as allowing them to share audio between \
-themselves."
-SECTION = "libs/multimedia"
-
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \
-                    file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \
-"
-
-DEPENDS = "libsamplerate0 libsndfile1 readline db"
-
-# Seems part of our code is shared with jack2
-SRC_URI = " \
-    git://github.com/jackaudio/jack1.git;name=jack \
-    git://github.com/jackaudio/example-clients.git;destsuffix=git/example-clients;name=example-clients \
-    git://github.com/jackaudio/tools.git;destsuffix=git/tools;name=tools \
-    git://github.com/jackaudio/headers.git;destsuffix=git/jack;name=headers \
-"
-SRCREV_jack = "1ff912463e5553c515ea45a411d136e775e32613"
-SRCREV_example-clients = "7fa089095c81e81dacd2554ae3184acc7f2d58ed"
-SRCREV_tools = "02ddc6ea2f16e41326c675b1bcfcd6335390b88e"
-SRCREV_headers = "07f1ecf1ce119d861ec631cb4a6a81a1ab1e5657"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-PACKAGECONFIG ??= "alsa"
-PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
-PACKAGECONFIG[portaudio] = "--enable-portaudio,--disable-portaudio,portaudio"
-
-EXTRA_OECONF = " \
-    --enable-force-install \
-    --enable-timestamps \
-    --disable-capabilities \
-    --disable-oldtrans \
-    --disable-coreaudio \
-    --disable-oss \
-"
-
-PACKAGES =+ "libjack jack-server jack-utils"
-
-FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
-FILES_jack-server = "${bindir}/jackd"
-FILES_jack-utils = "${bindir}/*"
-FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* "
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
new file mode 100644
index 0000000..34615b4
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "jackdmp is a C++ version of the JACK low-latency audio \
+server for multi-processor machines. It is a new implementation of the \
+JACK server core features that aims in removing some limitations of \
+the JACK1 design. The activation system has been changed for a data \
+flow model and lock-free programming techniques for graph access have \
+been used to have a more dynamic and robust system."
+SECTION = "libs/multimedia"
+
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+    file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \
+    file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \
+"
+
+DEPENDS = "libsamplerate0 libsndfile1 libopus readline"
+
+SRC_URI = "git://github.com/jackaudio/jack2.git"
+SRCREV = "364159f8212393442670b9c3b68b75aa39d98975"
+PV = "1.9.10+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+inherit waf pkgconfig
+
+PACKAGECONFIG ??= "alsa"
+PACKAGECONFIG[alsa] = "--alsa=yes,alsa=no,alsa-lib"
+PACKAGECONFIG[portaudio] = "--portaudio=yes,--portaudio=no,portaudio"
+
+PACKAGES =+ "libjack jack-server jack-utils"
+
+FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
+FILES_jack-server = "${bindir}/jackd"
+FILES_jack-utils = "${bindir}/*"
+FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* "
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/5] jack: remove portaudio PACKAGECONFIG
  2016-10-07  9:19 [PATCH 1/5] jack: swap to jack2 Andreas Müller
@ 2016-10-07  9:19 ` Andreas Müller
  2016-10-07 15:14   ` Khem Raj
  2016-10-07  9:19 ` [PATCH 3/5] a2jmidid: initial add v8 Andreas Müller
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2016-10-07  9:19 UTC (permalink / raw)
  To: openembedded-devel

portaudio backend is only available for windows builds - see README (and if set
it would cause a cyclic dependency with portaudio's jack PACKAGECONFIG)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-multimedia/jack/jack_git.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
index 34615b4..06e0322 100644
--- a/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -23,7 +23,6 @@ inherit waf pkgconfig
 
 PACKAGECONFIG ??= "alsa"
 PACKAGECONFIG[alsa] = "--alsa=yes,alsa=no,alsa-lib"
-PACKAGECONFIG[portaudio] = "--portaudio=yes,--portaudio=no,portaudio"
 
 PACKAGES =+ "libjack jack-server jack-utils"
 
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/5] a2jmidid: initial add v8
  2016-10-07  9:19 [PATCH 1/5] jack: swap to jack2 Andreas Müller
  2016-10-07  9:19 ` [PATCH 2/5] jack: remove portaudio PACKAGECONFIG Andreas Müller
@ 2016-10-07  9:19 ` Andreas Müller
  2016-10-07  9:19 ` [PATCH 4/5] florence: update 0.6.3 Andreas Müller
  2016-10-07  9:19 ` [PATCH 5/5] xdg-user-dirs: initial add 0.15 Andreas Müller
  3 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2016-10-07  9:19 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...-pthread-library-dependency-to-fix-linkin.patch | 43 ++++++++++++++++++++++
 meta-oe/recipes-multimedia/jack/a2jmidid_8.bb      | 22 +++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
 create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid_8.bb

diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
new file mode 100644
index 0000000..d17d311
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
@@ -0,0 +1,43 @@
+From 488dc9b00239976caac6bd9ed76b38d9d1659dd9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 4 Oct 2016 23:44:49 +0200
+Subject: [PATCH] wscript: add pthread library dependency to fix linking
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Stolen from [1]
+
+[1] http://pkgs.fedoraproject.org/cgit/rpms/a2jmidid.git/tree/a2jmidid-linking.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ wscript | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 664625b..66a532a 100644
+--- a/wscript
++++ b/wscript
+@@ -67,6 +67,7 @@ def configure(conf):
+         conf.env['DBUS_ENABLED'] = False
+ 
+     conf.env['LIB_DL'] = ['dl']
++    conf.env['LIB_PTHREAD'] = ['pthread']
+ 
+     #conf.check_header('expat.h', mandatory=True)
+     #conf.env['LIB_EXPAT'] = ['expat']
+@@ -152,7 +153,7 @@ def build(bld):
+ 
+     prog.includes = '.' # make waf dependency tracking work
+     prog.target = 'a2jmidid'
+-    prog.uselib = 'ALSA JACK DL'
++    prog.uselib = 'ALSA JACK DL PTHREAD'
+     if bld.env()['DBUS_ENABLED']:
+         prog.uselib += " DBUS-1"
+     prog = bld.create_obj('cc', 'program')
+-- 
+2.5.5
+
diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
new file mode 100644
index 0000000..d7e93b6
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
@@ -0,0 +1,22 @@
+SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI"
+SECTION = "libs/multimedia"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = " \
+    file://gpl2.txt;md5=751419260aa954499f7abaabaa882bbe \
+"
+
+DEPENDS = "alsa-lib jack dbus"
+
+SRC_URI = " \
+    http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \
+    file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \
+"
+SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd"
+SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f"
+
+inherit waf
+
+export LINKFLAGS="${LDFLAGS}"
+
+FILES_${PN} += "${datadir}/dbus-1/services"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 4/5] florence: update 0.6.3
  2016-10-07  9:19 [PATCH 1/5] jack: swap to jack2 Andreas Müller
  2016-10-07  9:19 ` [PATCH 2/5] jack: remove portaudio PACKAGECONFIG Andreas Müller
  2016-10-07  9:19 ` [PATCH 3/5] a2jmidid: initial add v8 Andreas Müller
@ 2016-10-07  9:19 ` Andreas Müller
  2016-10-07 11:55   ` Max Krummenacher
  2016-10-07  9:19 ` [PATCH 5/5] xdg-user-dirs: initial add 0.15 Andreas Müller
  3 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2016-10-07  9:19 UTC (permalink / raw)
  To: openembedded-devel

* patches were either leftovers or do not match the code
* DESCRIPTION -> shortened SUMMARY

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../florence/files/0001-Fix-glib-includes.patch    | 33 ----------------------
 .../florence/files/fix-no-atspi-compile.patch      | 30 --------------------
 .../{florence_0.5.4.bb => florence_0.6.3.bb}       | 15 +++++-----
 3 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
 delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
 rename meta-gnome/recipes-support/florence/{florence_0.5.4.bb => florence_0.6.3.bb} (51%)

diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
deleted file mode 100644
index 83e598e..0000000
--- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 15 May 2012 13:40:05 +0200
-Subject: [PATCH] Fix glib includes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Upstream-Status: unknown
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/trace.c |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/src/trace.c b/src/trace.c
-index 5ea5c13..774c56d 100644
---- a/src/trace.c
-+++ b/src/trace.c
-@@ -21,10 +21,7 @@
- 
- #include "trace.h"
- #include "system.h"
--#include <glib/gprintf.h>
--#include <glib/gutils.h>
--#include <glib/gslist.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <stdio.h>
- #include <stdarg.h>
- 
--- 
-1.7.6.5
-
diff --git a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch b/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
deleted file mode 100644
index 0bb5dee..0000000
--- a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/florence.c b/src/florence.c
-index b27c31b..feadefe 100644
---- a/src/florence.c
-+++ b/src/florence.c
-@@ -44,12 +44,6 @@
- /* exit signal */
- static int flo_exit=FALSE;
- 
--#ifdef ENABLE_AT_SPI2
--void flo_check_show (struct florence *florence, AtspiAccessible *obj);
--#else
--void flo_check_show (struct florence *florence, Accessible *obj);
--#endif
--
- /* Called on destroy event (systray quit or close window) */
- void flo_destroy (void)
- {
-@@ -61,6 +55,12 @@ void flo_destroy (void)
- }
- 
- #ifdef AT_SPI
-+#ifdef ENABLE_AT_SPI2
-+void flo_check_show (struct florence *florence, AtspiAccessible *obj);
-+#else
-+void flo_check_show (struct florence *florence, Accessible *obj);
-+#endif
-+
- /* Called to destroy the icon */
- void flo_icon_destroy (GtkWidget *widget, gpointer user_data)
- {
diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
similarity index 51%
rename from meta-gnome/recipes-support/florence/florence_0.5.4.bb
rename to meta-gnome/recipes-support/florence/florence_0.6.3.bb
index dfdb6bd..4c08b9f 100644
--- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
+++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
+SUMMARY = "Florence is a virtual keyboard for touch screens"
 HOMEPAGE = "http://florence.sourceforge.net/english.html"
 
 #NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
@@ -6,15 +6,14 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PR = "r1"
+DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"
 
-DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \
-           file://fix-no-atspi-compile.patch"
-SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7"
-SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
+SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
 
 inherit gettext autotools gconf pkgconfig
 
 EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
+
+FILES_${PN} += "${datadir}/glib-2.0/schemas"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 5/5] xdg-user-dirs: initial add 0.15
  2016-10-07  9:19 [PATCH 1/5] jack: swap to jack2 Andreas Müller
                   ` (2 preceding siblings ...)
  2016-10-07  9:19 ` [PATCH 4/5] florence: update 0.6.3 Andreas Müller
@ 2016-10-07  9:19 ` Andreas Müller
  3 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2016-10-07  9:19 UTC (permalink / raw)
  To: openembedded-devel

It lives in meta-qt5-extra for a while and I tested it in my images. It is a
nice helper for desktops so I suggest to move it to more common layer.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xdg-user-dirs/files/xdg-user-dirs.desktop      |  9 +++++++++
 .../xdg-user-dirs/xdg-user-dirs_0.15.bb            | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop
 create mode 100644 meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb

diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop b/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop
new file mode 100644
index 0000000..a9a22d3
--- /dev/null
+++ b/meta-oe/recipes-support/xdg-user-dirs/files/xdg-user-dirs.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=User folders update
+Exec=xdg-user-dirs-update
+StartupNotify=false
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
+
diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb
new file mode 100644
index 0000000..b94e0cc
--- /dev/null
+++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI = " \
+    http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
+    file://xdg-user-dirs.desktop \
+"
+SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d"
+SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786"
+
+inherit autotools gettext
+
+do_install_append () {
+    install -d ${D}${sysconfdir}/xdg/autostart
+    install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart
+}
+
+CONFFILES_${PN} += " \
+    ${sysconfdir}/xdg/user-dirs.conf \
+    ${sysconfdir}/xdg/user-dirs.defaults \
+"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 4/5] florence: update 0.6.3
  2016-10-07  9:19 ` [PATCH 4/5] florence: update 0.6.3 Andreas Müller
@ 2016-10-07 11:55   ` Max Krummenacher
  2016-10-07 14:20     ` Andreas Müller
  0 siblings, 1 reply; 11+ messages in thread
From: Max Krummenacher @ 2016-10-07 11:55 UTC (permalink / raw)
  To: openembedded-devel, schnitzeltony

Resent, this time from the correct account.

Hi

Am Freitag, den 07.10.2016, 11:19 +0200 schrieb Andreas Müller:
> * patches were either leftovers or do not match the code
> * DESCRIPTION -> shortened SUMMARY

0.5.x requires gtk 2 and gstreamer 0.10 while 0.6.x requires gtk 3 and
gstreamer 1.0.
Would be nice to see this in the commit message. I guess gtk+3 also
needs do go into DEPENDS, see below.

Maybe the move from gtk 2 to 3 would even justify to add a new recipe
florence3 while keeping the existing one?

In this initial attempt to go to 0.6.3 Alexander added 'gsettings' to
inherit, probably to address the #NOTICE in the recipe.
https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/
msg47990.html
 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../florence/files/0001-Fix-glib-includes.patch    | 33 ------------
> ----------
>  .../florence/files/fix-no-atspi-compile.patch      | 30 ------------
> --------
>  .../{florence_0.5.4.bb => florence_0.6.3.bb}       | 15 +++++-----
>  3 files changed, 7 insertions(+), 71 deletions(-)
>  delete mode 100644 meta-gnome/recipes-support/florence/files/0001
> -Fix-glib-includes.patch
>  delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no
> -atspi-compile.patch
>  rename meta-gnome/recipes-support/florence/{florence_0.5.4.bb =>
> florence_0.6.3.bb} (51%)
> 
> diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib
> -includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix
> -glib-includes.patch
> deleted file mode 100644
> index 83e598e..0000000
> --- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib
> -includes.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00
> 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <
> schnitzeltony@googlemail.com>
> -Date: Tue, 15 May 2012 13:40:05 +0200
> -Subject: [PATCH] Fix glib includes
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -Upstream-Status: unknown
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - src/trace.c |    5 +----
> - 1 files changed, 1 insertions(+), 4 deletions(-)
> -
> -diff --git a/src/trace.c b/src/trace.c
> -index 5ea5c13..774c56d 100644
> ---- a/src/trace.c
> -+++ b/src/trace.c
> -@@ -21,10 +21,7 @@
> - 
> - #include "trace.h"
> - #include "system.h"
> --#include <glib/gprintf.h>
> --#include <glib/gutils.h>
> --#include <glib/gslist.h>
> --#include <glib/gstrfuncs.h>
> -+#include <glib.h>
> - #include <stdio.h>
> - #include <stdarg.h>
> - 
> --- 
> -1.7.6.5
> -
> diff --git a/meta-gnome/recipes-support/florence/files/fix-no-atspi
> -compile.patch b/meta-gnome/recipes-support/florence/files/fix-no
> -atspi-compile.patch
> deleted file mode 100644
> index 0bb5dee..0000000
> --- a/meta-gnome/recipes-support/florence/files/fix-no-atspi
> -compile.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -diff --git a/src/florence.c b/src/florence.c
> -index b27c31b..feadefe 100644
> ---- a/src/florence.c
> -+++ b/src/florence.c
> -@@ -44,12 +44,6 @@
> - /* exit signal */
> - static int flo_exit=FALSE;
> - 
> --#ifdef ENABLE_AT_SPI2
> --void flo_check_show (struct florence *florence, AtspiAccessible
> *obj);
> --#else
> --void flo_check_show (struct florence *florence, Accessible *obj);
> --#endif
> --
> - /* Called on destroy event (systray quit or close window) */
> - void flo_destroy (void)
> - {
> -@@ -61,6 +55,12 @@ void flo_destroy (void)
> - }
> - 
> - #ifdef AT_SPI
> -+#ifdef ENABLE_AT_SPI2
> -+void flo_check_show (struct florence *florence, AtspiAccessible
> *obj);
> -+#else
> -+void flo_check_show (struct florence *florence, Accessible *obj);
> -+#endif
> -+
> - /* Called to destroy the icon */
> - void flo_icon_destroy (GtkWidget *widget, gpointer user_data)
> - {
> diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
> b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> similarity index 51%
> rename from meta-gnome/recipes-support/florence/florence_0.5.4.bb
> rename to meta-gnome/recipes-support/florence/florence_0.6.3.bb
> index dfdb6bd..4c08b9f 100644
> --- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
> +++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> @@ -1,4 +1,4 @@
> -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen
> -keyboard), which allows the user to input text through a
> touchscreen."
> +SUMMARY = "Florence is a virtual keyboard for touch screens"
>  HOMEPAGE = "http://florence.sourceforge.net/english.html"
>  
>  #NOTICE: If florence can't find its gconf settings, you need to
> start florence with --config for one time and save the configuration
> once.
> @@ -6,15 +6,14 @@ HOMEPAGE = "
> http://florence.sourceforge.net/english.html"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM =
> "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>  
> -PR = "r1"
> +DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo
> intltool-native gnome-doc-utils libnotify gstreamer1.0"

I guess on needs gtk+3 here now?

>  
> -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo
> intltool-native gnome-doc-utils libnotify gstreamer"
> -
> -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}
> -gtk2/florence-${PV}.tar.bz2 \
> -           file://fix-no-atspi-compile.patch"
> -SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7"
> -SRC_URI[sha256sum] =
> "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1"
> +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}
> -${PV}.tar.bz2"
> +SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
> +SRC_URI[sha256sum] =
> "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
>  
>  inherit gettext autotools gconf pkgconfig
>  
>  EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at
> -spi --without-panelapplet --without-xrecord"
> +
> +FILES_${PN} += "${datadir}/glib-2.0/schemas"


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 4/5] florence: update 0.6.3
  2016-10-07 11:55   ` Max Krummenacher
@ 2016-10-07 14:20     ` Andreas Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2016-10-07 14:20 UTC (permalink / raw)
  To: Max Krummenacher; +Cc: openembedded-devel

On Fri, Oct 7, 2016 at 1:55 PM, Max Krummenacher <max.oss.09@gmail.com> wrote:
> Resent, this time from the correct account.
>
> Hi
>
> Am Freitag, den 07.10.2016, 11:19 +0200 schrieb Andreas Müller:
>> * patches were either leftovers or do not match the code
>> * DESCRIPTION -> shortened SUMMARY
>
> 0.5.x requires gtk 2 and gstreamer 0.10 while 0.6.x requires gtk 3 and
> gstreamer 1.0.
> Would be nice to see this in the commit message. I guess gtk+3 also
> needs do go into DEPENDS, see below.
I did not see that there was a warning dragging in gtk3 - patch would
need update
>
> Maybe the move from gtk 2 to 3 would even justify to add a new recipe
> florence3 while keeping the existing one?
1. I updated florence because 0.5.4 is completely useless for me: It
moves around after each hide / buttons are improperly painted.
2. I don't like the idea of keeping around different versions. By this
we stick on unmaintained versions for reasons out of my interest.
3. After further tests I saw that 0.6.3's has other strange bugs

=> I suggest we forget this patch

Andreas


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/5] jack: remove portaudio PACKAGECONFIG
  2016-10-07  9:19 ` [PATCH 2/5] jack: remove portaudio PACKAGECONFIG Andreas Müller
@ 2016-10-07 15:14   ` Khem Raj
  2016-10-07 16:23     ` Andreas Müller
  0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2016-10-07 15:14 UTC (permalink / raw)
  To: OpenEmbedded Devel List

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]


> On Oct 7, 2016, at 2:19 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> 
> portaudio backend is only available for windows builds - see README (and if set
> it would cause a cyclic dependency with portaudio's jack PACKAGECONFIG)

should be unconditionally keep —portaudio=no ?

> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> meta-oe/recipes-multimedia/jack/jack_git.bb | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
> index 34615b4..06e0322 100644
> --- a/meta-oe/recipes-multimedia/jack/jack_git.bb
> +++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
> @@ -23,7 +23,6 @@ inherit waf pkgconfig
> 
> PACKAGECONFIG ??= "alsa"
> PACKAGECONFIG[alsa] = "--alsa=yes,alsa=no,alsa-lib"
> -PACKAGECONFIG[portaudio] = "--portaudio=yes,--portaudio=no,portaudio"
> 
> PACKAGES =+ "libjack jack-server jack-utils"
> 
> --
> 2.7.4
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/5] jack: remove portaudio PACKAGECONFIG
  2016-10-07 15:14   ` Khem Raj
@ 2016-10-07 16:23     ` Andreas Müller
  2016-10-07 22:12       ` Khem Raj
  0 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2016-10-07 16:23 UTC (permalink / raw)
  To: openembedded-devel

On Fri, Oct 7, 2016 at 5:14 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Oct 7, 2016, at 2:19 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>>
>> portaudio backend is only available for windows builds - see README (and if set
>> it would cause a cyclic dependency with portaudio's jack PACKAGECONFIG)
>
> should be unconditionally keep —portaudio=no ?
As long as we are not building for windows: No

Andreas


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/5] jack: remove portaudio PACKAGECONFIG
  2016-10-07 16:23     ` Andreas Müller
@ 2016-10-07 22:12       ` Khem Raj
  2016-10-07 23:05         ` Andreas Müller
  0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2016-10-07 22:12 UTC (permalink / raw)
  To: OpenEmbedded Devel List

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]


> On Oct 7, 2016, at 9:23 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> 
> On Fri, Oct 7, 2016 at 5:14 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> 
>>> On Oct 7, 2016, at 2:19 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>>> 
>>> portaudio backend is only available for windows builds - see README (and if set
>>> it would cause a cyclic dependency with portaudio's jack PACKAGECONFIG)
>> 
>> should be unconditionally keep —portaudio=no ?
> As long as we are not building for windows: No

does it default to no ? may be its better to be explicit

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/5] jack: remove portaudio PACKAGECONFIG
  2016-10-07 22:12       ` Khem Raj
@ 2016-10-07 23:05         ` Andreas Müller
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2016-10-07 23:05 UTC (permalink / raw)
  To: openembedded-devel

On Sat, Oct 8, 2016 at 12:12 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Oct 7, 2016, at 9:23 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>>
>> On Fri, Oct 7, 2016 at 5:14 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>>> On Oct 7, 2016, at 2:19 AM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>>>>
>>>> portaudio backend is only available for windows builds - see README (and if set
>>>> it would cause a cyclic dependency with portaudio's jack PACKAGECONFIG)
>>>
>>> should be unconditionally keep —portaudio=no ?
>> As long as we are not building for windows: No
>
> does it default to no ? may be its better to be explicit
Maybe - I'll prepare V2.

Andreas


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2016-10-07 23:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-07  9:19 [PATCH 1/5] jack: swap to jack2 Andreas Müller
2016-10-07  9:19 ` [PATCH 2/5] jack: remove portaudio PACKAGECONFIG Andreas Müller
2016-10-07 15:14   ` Khem Raj
2016-10-07 16:23     ` Andreas Müller
2016-10-07 22:12       ` Khem Raj
2016-10-07 23:05         ` Andreas Müller
2016-10-07  9:19 ` [PATCH 3/5] a2jmidid: initial add v8 Andreas Müller
2016-10-07  9:19 ` [PATCH 4/5] florence: update 0.6.3 Andreas Müller
2016-10-07 11:55   ` Max Krummenacher
2016-10-07 14:20     ` Andreas Müller
2016-10-07  9:19 ` [PATCH 5/5] xdg-user-dirs: initial add 0.15 Andreas Müller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.