* [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
@ 2011-07-08 2:11 Dongxiao Xu
2011-07-08 2:11 ` [PATCH 1/2] fltk: add this recipe for alsa-tools build Dongxiao Xu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Dongxiao Xu @ 2011-07-08 2:11 UTC (permalink / raw)
To: openembedded-core
Hi Saul,
This pull request fixes the alsa-tools recipe build error.
Please help to review and pull.
[YOCTO #1038]
Thanks,
Dongxiao
The following changes since commit 2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2:
pulseaudio: add 0.9.23 (2011-07-07 13:45:32 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools
Dongxiao Xu (2):
fltk: add this recipe for alsa-tools build
alsa-tools: Fix recipe build error.
.../alsa/alsa-tools-1.0.24.1/autotools.patch | 31 ++++++++++++++++
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 16 +++++++--
.../fltk/fltk-1.1.10/disable_test.patch | 18 +++++++++
meta/recipes-multimedia/fltk/fltk_1.1.10.bb | 38 ++++++++++++++++++++
4 files changed, 100 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
create mode 100644 meta/recipes-multimedia/fltk/fltk-1.1.10/disable_test.patch
create mode 100644 meta/recipes-multimedia/fltk/fltk_1.1.10.bb
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] fltk: add this recipe for alsa-tools build
2011-07-08 2:11 [PATCH 0/2][PULL] alsa-tools: Fix recipe build error Dongxiao Xu
@ 2011-07-08 2:11 ` Dongxiao Xu
2011-07-08 2:11 ` [PATCH 2/2] alsa-tools: Fix recipe build error Dongxiao Xu
2011-07-08 15:45 ` [PATCH 0/2][PULL] " Richard Purdie
2 siblings, 0 replies; 6+ messages in thread
From: Dongxiao Xu @ 2011-07-08 2:11 UTC (permalink / raw)
To: openembedded-core
alsa-tools has dependency on fltk.
Import this recipe from open-embedded.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../fltk/fltk-1.1.10/disable_test.patch | 18 +++++++++
meta/recipes-multimedia/fltk/fltk_1.1.10.bb | 38 ++++++++++++++++++++
2 files changed, 56 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-multimedia/fltk/fltk-1.1.10/disable_test.patch
create mode 100644 meta/recipes-multimedia/fltk/fltk_1.1.10.bb
diff --git a/meta/recipes-multimedia/fltk/fltk-1.1.10/disable_test.patch b/meta/recipes-multimedia/fltk/fltk-1.1.10/disable_test.patch
new file mode 100644
index 0000000..0221503
--- /dev/null
+++ b/meta/recipes-multimedia/fltk/fltk-1.1.10/disable_test.patch
@@ -0,0 +1,18 @@
+Disable the test component.
+Derived from OE.
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile 2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile 2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) src fluid test documentation
++DIRS = $(IMAGEDIRS) src fluid documentation
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
diff --git a/meta/recipes-multimedia/fltk/fltk_1.1.10.bb b/meta/recipes-multimedia/fltk/fltk_1.1.10.bb
new file mode 100644
index 0000000..bd25344
--- /dev/null
+++ b/meta/recipes-multimedia/fltk/fltk_1.1.10.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130"
+
+PR = "r0"
+
+SRC_URI = "http://ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
+ file://disable_test.patch \
+ "
+
+S = "${WORKDIR}/fltk-${PV}"
+
+inherit lib_package autotools binconfig
+
+TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2"
+
+EXTRA_OECONF = "--enable-shared \
+ --enable-threads \
+ --enable-xdbe --enable-xft --enable-gl \
+ --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+ oe_runconf
+}
+
+python populate_packages_prepend () {
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)
+}
+
+LEAD_SONAME = "libfltk.so"
+
+SRC_URI[md5sum] = "a1765594bc427ff892e36089fe1fa672"
+SRC_URI[sha256sum] = "37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] alsa-tools: Fix recipe build error.
2011-07-08 2:11 [PATCH 0/2][PULL] alsa-tools: Fix recipe build error Dongxiao Xu
2011-07-08 2:11 ` [PATCH 1/2] fltk: add this recipe for alsa-tools build Dongxiao Xu
@ 2011-07-08 2:11 ` Dongxiao Xu
2011-07-08 15:45 ` [PATCH 0/2][PULL] " Richard Purdie
2 siblings, 0 replies; 6+ messages in thread
From: Dongxiao Xu @ 2011-07-08 2:11 UTC (permalink / raw)
To: openembedded-core
1. Fix the autoreconf error with gtk2 and alsa.
2. Add libtool sysroot path while configuration.
3. Remove one element in alsa-tools which depends on qt2.
[YOCTO #1038]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../alsa/alsa-tools-1.0.24.1/autotools.patch | 31 ++++++++++++++++++++
.../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 16 ++++++++--
2 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
new file mode 100644
index 0000000..27e887a
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
@@ -0,0 +1,31 @@
+Add aclocal path to the autoreconf command.
+Remove qlo10k1 element which depends on qt2.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile
+--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800
++++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-08 09:49:11.177665001 +0800
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+
+-autoreconf -fi || exit 1
++autoreconf -fi $ACLOCAL_FLAGS || exit 1
+ export CFLAGS='-O2 -Wall -pipe -g'
+ echo "CFLAGS=$CFLAGS"
+ echo "./configure $@"
+diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
+--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
++++ alsa-tools-1.0.24.1/Makefile 2011-07-08 09:48:39.157665001 +0800
+@@ -2,8 +2,7 @@
+ TOP = .
+ SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
+ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
+- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
+- hwmixvolume
++ us428control usx2yloader vxloader echomixer ld10k1 hwmixvolume
+
+ all:
+ @for i in $(SUBDIRS); do \
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
index 5b3ea98..d370d3c 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
@@ -3,15 +3,25 @@ BROKEN = "1"
DESCRIPTION = "Alsa Tools"
SECTION = "console/utils"
LICENSE = "GPLv2"
-DEPENDS = "alsa-lib ncurses"
+DEPENDS = "alsa-lib ncurses gtk+ fltk"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
+ file://autotools.patch"
SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd"
SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05"
inherit autotools
+
+do_compile_prepend() {
+ subdirs="envy24control rmedigicontrol echomixer"
+ for i in $subdirs; do
+ mv ${S}/${i}/aclocal.m4 ${S}/${i}/acinclude.m4
+ done
+}
+
+EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
2011-07-08 2:11 [PATCH 0/2][PULL] alsa-tools: Fix recipe build error Dongxiao Xu
2011-07-08 2:11 ` [PATCH 1/2] fltk: add this recipe for alsa-tools build Dongxiao Xu
2011-07-08 2:11 ` [PATCH 2/2] alsa-tools: Fix recipe build error Dongxiao Xu
@ 2011-07-08 15:45 ` Richard Purdie
2011-07-12 5:24 ` Xu, Dongxiao
2 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2011-07-08 15:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-07-08 at 10:11 +0800, Dongxiao Xu wrote:
> Hi Saul,
>
> This pull request fixes the alsa-tools recipe build error.
> Please help to review and pull.
>
> [YOCTO #1038]
>
> Thanks,
> Dongxiao
>
> The following changes since commit 2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2:
>
> pulseaudio: add 0.9.23 (2011-07-07 13:45:32 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools
>
> Dongxiao Xu (2):
> fltk: add this recipe for alsa-tools build
> alsa-tools: Fix recipe build error.
I'd like to understand whether we need gtk and fltk tools from
alsa-tools at this point in time?
Could we just disable those?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
2011-07-08 15:45 ` [PATCH 0/2][PULL] " Richard Purdie
@ 2011-07-12 5:24 ` Xu, Dongxiao
2011-07-12 6:57 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Xu, Dongxiao @ 2011-07-12 5:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Richard,
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Friday, July 08, 2011 11:45 PM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
>
> On Fri, 2011-07-08 at 10:11 +0800, Dongxiao Xu wrote:
> > Hi Saul,
> >
> > This pull request fixes the alsa-tools recipe build error.
> > Please help to review and pull.
> >
> > [YOCTO #1038]
> >
> > Thanks,
> > Dongxiao
> >
> > The following changes since commit
> 2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2:
> >
> > pulseaudio: add 0.9.23 (2011-07-07 13:45:32 +0100)
> >
> > are available in the git repository at:
> > git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
> >
> > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools
> >
> > Dongxiao Xu (2):
> > fltk: add this recipe for alsa-tools build
> > alsa-tools: Fix recipe build error.
>
> I'd like to understand whether we need gtk and fltk tools from alsa-tools at this
> point in time?
>
> Could we just disable those?
I added those dependencies in since alsa-tools is not in our reference images (sato, sato-sdk, etc.), and it may not impact our daily builds.
Actually alsa-tools is a set of subprojects, we can disable certain sub-projects in alsa-tools to avoid including gtk and fltk.
Thanks,
Dongxiao
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
2011-07-12 5:24 ` Xu, Dongxiao
@ 2011-07-12 6:57 ` Saul Wold
0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-07-12 6:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/11/2011 10:24 PM, Xu, Dongxiao wrote:
> Hi Richard,
>
>> -----Original Message-----
>> From: openembedded-core-bounces@lists.openembedded.org
>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>> Richard Purdie
>> Sent: Friday, July 08, 2011 11:45 PM
>> To: Patches and discussions about the oe-core layer
>> Subject: Re: [OE-core] [PATCH 0/2][PULL] alsa-tools: Fix recipe build error
>>
>> On Fri, 2011-07-08 at 10:11 +0800, Dongxiao Xu wrote:
>>> Hi Saul,
>>>
>>> This pull request fixes the alsa-tools recipe build error.
>>> Please help to review and pull.
>>>
>>> [YOCTO #1038]
>>>
>>> Thanks,
>>> Dongxiao
>>>
>>> The following changes since commit
>> 2c79c9eb7ef8ef0aef8c3096c3c4387e28e56ea2:
>>>
>>> pulseaudio: add 0.9.23 (2011-07-07 13:45:32 +0100)
>>>
>>> are available in the git repository at:
>>> git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
>>>
>>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools
>>>
>>> Dongxiao Xu (2):
>>> fltk: add this recipe for alsa-tools build
>>> alsa-tools: Fix recipe build error.
>>
>> I'd like to understand whether we need gtk and fltk tools from alsa-tools at this
>> point in time?
>>
>> Could we just disable those?
>
> I added those dependencies in since alsa-tools is not in our reference images (sato, sato-sdk, etc.), and it may not impact our daily builds.
>
> Actually alsa-tools is a set of subprojects, we can disable certain sub-projects in alsa-tools to avoid including gtk and fltk.
>
Which subprojects would you need to disable, there are others that use
alsa-tools which is why it's in core.
Sau!
> Thanks,
> Dongxiao
>
>>
>> Cheers,
>>
>> Richard
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-12 7:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-08 2:11 [PATCH 0/2][PULL] alsa-tools: Fix recipe build error Dongxiao Xu
2011-07-08 2:11 ` [PATCH 1/2] fltk: add this recipe for alsa-tools build Dongxiao Xu
2011-07-08 2:11 ` [PATCH 2/2] alsa-tools: Fix recipe build error Dongxiao Xu
2011-07-08 15:45 ` [PATCH 0/2][PULL] " Richard Purdie
2011-07-12 5:24 ` Xu, Dongxiao
2011-07-12 6:57 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox