* [PATCH 0/2] update packages
@ 2011-10-18 5:21 Xiaofeng Yan
2011-10-18 5:21 ` [PATCH 1/2] qmmp: update to 0.5.2 Xiaofeng Yan
2011-10-18 5:22 ` [PATCH 2/2] libx11-diet: update to 1.4.4 Xiaofeng Yan
0 siblings, 2 replies; 11+ messages in thread
From: Xiaofeng Yan @ 2011-10-18 5:21 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Update packages "qmmp" and "libx11-diet".
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/update
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/update
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (2):
qmmp: update to 0.5.2
libx11-diet: update to 1.4.4
.../xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff | 540 ++++++++++++++++++++
.../libx11-diet-1.4.4/fix-disable-xlocale.diff | 16 +
.../libx11-diet-1.4.4/fix-utf8-wrong-define.patch | 17 +
.../xorg-lib/libx11-diet-1.4.4/include_fix.patch | 25 +
.../xorg-lib/libx11-diet-1.4.4/nodolt.patch | 14 +
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 31 ++
.../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 27 +
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 ++
8 files changed, 719 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] qmmp: update to 0.5.2 2011-10-18 5:21 [PATCH 0/2] update packages Xiaofeng Yan @ 2011-10-18 5:21 ` Xiaofeng Yan 2011-10-18 5:35 ` Saul Wold 2011-10-18 5:22 ` [PATCH 2/2] libx11-diet: update to 1.4.4 Xiaofeng Yan 1 sibling, 1 reply; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-18 5:21 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> The new version of qmmp can run on core-image-sato by test. $qmmp *.mp3 Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 +++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb new file mode 100644 index 0000000..f31409b --- /dev/null +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb @@ -0,0 +1,49 @@ +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library" +HOMEPAGE = "http://qmmp.ylsoftware.com" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +SECTION = "multimedia" + +PR = "r3" + +PROVIDES = "qmmp" +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" + +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" +SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" + + +PARALLEL_MAKE = "" + +inherit qmake2 cmake + +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ + " + +FILES_${PN} =+ "\ + ${libdir}/qmmp/*/*.so \ + ${datadir}/icons/* \ + ${datadir}/qmmp/images/* \ + ${datadir}/applications/qmmp.desktop \ + " + +FILES_${PN}-dbg += "\ + ${libdir}/qmmp/*/.debug/* \ + " + +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" + +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" +RDEPENDS_${PN}-plugin-input-mad = "libmad" +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-18 5:21 ` [PATCH 1/2] qmmp: update to 0.5.2 Xiaofeng Yan @ 2011-10-18 5:35 ` Saul Wold 2011-10-18 5:44 ` Xiaofeng Yan 0 siblings, 1 reply; 11+ messages in thread From: Saul Wold @ 2011-10-18 5:35 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > The new version of qmmp can run on core-image-sato by test. > $qmmp *.mp3 > > Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> > --- > meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 +++++++++++++++++++++++++++++++++ > 1 files changed, 49 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb > > diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb > new file mode 100644 > index 0000000..f31409b > --- /dev/null > +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb > @@ -0,0 +1,49 @@ > +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library" > +HOMEPAGE = "http://qmmp.ylsoftware.com" > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" > +SECTION = "multimedia" > + > +PR = "r3" > + > +PROVIDES = "qmmp" > +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" > +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" > + > +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" > + > +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" > +SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" > + > + > +PARALLEL_MAKE = "" > + > +inherit qmake2 cmake > + > +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ > + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ > + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ > + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ > + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ > + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ > + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ > + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ > + " > + > +FILES_${PN} =+ "\ > + ${libdir}/qmmp/*/*.so \ > + ${datadir}/icons/* \ > + ${datadir}/qmmp/images/* \ > + ${datadir}/applications/qmmp.desktop \ > + " > + Xiaofeng, I was looking into this also, I think it would be better to split all the various plugins into separate packages using do_split_packages(), in the packages.bbclass. I started with this code: > PACKAGES_DYNAMIC = "qmmp-plugin-*" > > python populate_packages_prepend () { > qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) > > do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') > } But have not completed it yet, if you have time to investigate further and complete this correctly, there might be a problem with using multiple Regular expressions in the do_split_packages code, but I have not fully debugged this yet. Please let me know if you can complete this task. Thanks Sau! > +FILES_${PN}-dbg += "\ > + ${libdir}/qmmp/*/.debug/* \ > + " > + > +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" > + > +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" > +RDEPENDS_${PN}-plugin-input-mad = "libmad" > +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" > +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-18 5:35 ` Saul Wold @ 2011-10-18 5:44 ` Xiaofeng Yan 2011-10-19 10:31 ` Xiaofeng Yan 0 siblings, 1 reply; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-18 5:44 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On 2011年10月18日 13:35, Saul Wold wrote: > On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: >> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >> >> The new version of qmmp can run on core-image-sato by test. >> $qmmp *.mp3 >> >> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >> --- >> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 >> +++++++++++++++++++++++++++++++++ >> 1 files changed, 49 insertions(+), 0 deletions(-) >> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >> >> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >> new file mode 100644 >> index 0000000..f31409b >> --- /dev/null >> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >> @@ -0,0 +1,49 @@ >> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, >> written with help of Qt library" >> +HOMEPAGE = "http://qmmp.ylsoftware.com" >> +LICENSE = "GPLv2" >> +LIC_FILES_CHKSUM = >> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" >> +SECTION = "multimedia" >> + >> +PR = "r3" >> + >> +PROVIDES = "qmmp" >> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" >> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" >> + >> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" >> + >> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" >> +SRC_URI[sha256sum] = >> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" >> + >> + >> +PARALLEL_MAKE = "" >> + >> +inherit qmake2 cmake >> + >> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ >> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ >> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ >> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ >> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ >> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ >> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ >> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ >> + " >> + >> +FILES_${PN} =+ "\ >> + ${libdir}/qmmp/*/*.so \ >> + ${datadir}/icons/* \ >> + ${datadir}/qmmp/images/* \ >> + ${datadir}/applications/qmmp.desktop \ >> + " >> + > Xiaofeng, > > I was looking into this also, I think it would be better to split all > the various plugins into separate packages using do_split_packages(), in > the packages.bbclass. > > I started with this code: >> PACKAGES_DYNAMIC = "qmmp-plugin-*" >> >> python populate_packages_prepend () { >> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >> >> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', >> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') >> } > > But have not completed it yet, if you have time to investigate further > and complete this correctly, there might be a problem with using > multiple Regular expressions in the do_split_packages code, but I have > not fully debugged this yet. > > Please let me know if you can complete this task. > Thanks for your reply and I will investigate it according to your suggestion. Thanks Yan > Thanks > Sau! > > >> +FILES_${PN}-dbg += "\ >> + ${libdir}/qmmp/*/.debug/* \ >> + " >> + >> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" >> + >> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >> +RDEPENDS_${PN}-plugin-input-mad = "libmad" >> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" >> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-18 5:44 ` Xiaofeng Yan @ 2011-10-19 10:31 ` Xiaofeng Yan 2011-10-19 23:18 ` Saul Wold 0 siblings, 1 reply; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-19 10:31 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 5137 bytes --] On 2011年10月18日 13:44, Xiaofeng Yan wrote: > On 2011年10月18日 13:35, Saul Wold wrote: >> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: >>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>> >>> The new version of qmmp can run on core-image-sato by test. >>> $qmmp *.mp3 >>> >>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>> --- >>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 >>> +++++++++++++++++++++++++++++++++ >>> 1 files changed, 49 insertions(+), 0 deletions(-) >>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>> >>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>> new file mode 100644 >>> index 0000000..f31409b >>> --- /dev/null >>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>> @@ -0,0 +1,49 @@ >>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an >>> audio-player, written with help of Qt library" >>> +HOMEPAGE = "http://qmmp.ylsoftware.com" >>> +LICENSE = "GPLv2" >>> +LIC_FILES_CHKSUM = >>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" >>> +SECTION = "multimedia" >>> + >>> +PR = "r3" >>> + >>> +PROVIDES = "qmmp" >>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" >>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" >>> + >>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" >>> + >>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" >>> +SRC_URI[sha256sum] = >>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" >>> + >>> + >>> +PARALLEL_MAKE = "" >>> + >>> +inherit qmake2 cmake >>> + >>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ >>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ >>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ >>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ >>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ >>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ >>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ >>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ >>> + " >>> + >>> +FILES_${PN} =+ "\ >>> + ${libdir}/qmmp/*/*.so \ >>> + ${datadir}/icons/* \ >>> + ${datadir}/qmmp/images/* \ >>> + ${datadir}/applications/qmmp.desktop \ >>> + " >>> + >> Xiaofeng, >> >> I was looking into this also, I think it would be better to split all >> the various plugins into separate packages using do_split_packages(), in >> the packages.bbclass. >> >> I started with this code: >>> PACKAGES_DYNAMIC = "qmmp-plugin-*" >>> >>> python populate_packages_prepend () { >>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >>> >>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', >>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') >>> } >> >> But have not completed it yet, if you have time to investigate >> further and complete this correctly, there might be a problem with >> using multiple Regular expressions in the do_split_packages code, but >> I have not fully debugged this yet. >> >> Please let me know if you can complete this task. >> Hi saul, The following is my modification to qmmp_0.5.2.bb. Please review it. I want to get a reply about how to ship files in ${datadir} for qmmp. I shipped them to FILES_${PN} because qmmp need these files when starting up. Do you think that they should be packaged like qmmp-plugin-* ? Please give me your suggestion and I will modify this file. PACKAGES_DYNAMIC += "qmmp-plugin-*" python populate_packages_prepend () { qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$', 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='') } FILES_${PN} = "\ ${bindir}/qmmp \ ${libdir}/lib*${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/* \ " FILES_${PN}-dbg += "\ ${libdir}/qmmp/*/.debug/* \ " PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis " FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" RDEPENDS_${PN}-plugin-input-mad = "libmad" FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" Thanks Yan > Thanks for your reply and I will investigate it according to your > suggestion. > > Thanks > Yan >> Thanks >> Sau! >> >> >>> +FILES_${PN}-dbg += "\ >>> + ${libdir}/qmmp/*/.debug/* \ >>> + " >>> + >>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" >>> + >>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >>> +RDEPENDS_${PN}-plugin-input-mad = "libmad" >>> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" >>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >> >> > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core [-- Attachment #2: Type: text/html, Size: 9072 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-19 10:31 ` Xiaofeng Yan @ 2011-10-19 23:18 ` Saul Wold 2011-10-20 2:27 ` Xiaofeng Yan 2011-10-20 11:46 ` Xiaofeng Yan 0 siblings, 2 replies; 11+ messages in thread From: Saul Wold @ 2011-10-19 23:18 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 10/19/2011 03:31 AM, Xiaofeng Yan wrote: > On 2011年10月18日 13:44, Xiaofeng Yan wrote: >> On 2011年10月18日 13:35, Saul Wold wrote: >>> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: >>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>> >>>> The new version of qmmp can run on core-image-sato by test. >>>> $qmmp *.mp3 >>>> >>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>> --- >>>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 >>>> +++++++++++++++++++++++++++++++++ >>>> 1 files changed, 49 insertions(+), 0 deletions(-) >>>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>> >>>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>> new file mode 100644 >>>> index 0000000..f31409b >>>> --- /dev/null >>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>> @@ -0,0 +1,49 @@ >>>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an >>>> audio-player, written with help of Qt library" >>>> +HOMEPAGE = "http://qmmp.ylsoftware.com" >>>> +LICENSE = "GPLv2" >>>> +LIC_FILES_CHKSUM = >>>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" >>>> +SECTION = "multimedia" >>>> + >>>> +PR = "r3" >>>> + >>>> +PROVIDES = "qmmp" >>>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" >>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" >>>> + >>>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" >>>> + >>>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" >>>> +SRC_URI[sha256sum] = >>>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" >>>> + >>>> + >>>> +PARALLEL_MAKE = "" >>>> + >>>> +inherit qmake2 cmake >>>> + >>>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ >>>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ >>>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ >>>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ >>>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ >>>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ >>>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ >>>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ >>>> + " >>>> + >>>> +FILES_${PN} =+ "\ >>>> + ${libdir}/qmmp/*/*.so \ >>>> + ${datadir}/icons/* \ >>>> + ${datadir}/qmmp/images/* \ >>>> + ${datadir}/applications/qmmp.desktop \ >>>> + " >>>> + >>> Xiaofeng, >>> >>> I was looking into this also, I think it would be better to split all >>> the various plugins into separate packages using do_split_packages(), in >>> the packages.bbclass. >>> >>> I started with this code: >>>> PACKAGES_DYNAMIC = "qmmp-plugin-*" >>>> >>>> python populate_packages_prepend () { >>>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >>>> >>>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', >>>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') >>>> } >>> >>> But have not completed it yet, if you have time to investigate >>> further and complete this correctly, there might be a problem with >>> using multiple Regular expressions in the do_split_packages code, but >>> I have not fully debugged this yet. >>> >>> Please let me know if you can complete this task. >>> > Hi saul, > > The following is my modification to qmmp_0.5.2.bb. Please review it. > I want to get a reply about how to ship files in ${datadir} for qmmp. I > shipped them to FILES_${PN} because qmmp need these files when starting > up. Do you think that they should be packaged like qmmp-plugin-* ? > > Please give me your suggestion and I will modify this file. > > > PACKAGES_DYNAMIC += "qmmp-plugin-*" > > > python populate_packages_prepend () { > qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) > do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$', > 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='') > } > Ah, I see you added the recursive flag, I was trying to capture the plugin group (Input, Ouput, Effect, ...) in the package name incase there was name conflict, also to match the mad and vorbis naming below. If using multiple RE expressions in the re match does not work, then we should make do_split_package for each grouping and name them correctly qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> plugin for %s" > FILES_${PN} = "\ I think this should be a += > ${bindir}/qmmp \ > ${libdir}/lib*${SOLIBS} \ These 2 should go away (part of default FILES_${PN} > ${datadir}/icons/* \ > ${datadir}/qmmp/images/* \ > ${datadir}/applications/* \ > " There are added via the += above. > > FILES_${PN}-dbg += "\ > ${libdir}/qmmp/*/.debug/* \ > " > These should be picked up by the do_split_package above I believe > PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis " > > FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" > RDEPENDS_${PN}-plugin-input-mad = "libmad" > FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" > RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" > Ideally the above PACKAGES and FILES_ go away and the default actions take over. Thanks for looking into this. Sau! > > > Thanks > Yan >> Thanks for your reply and I will investigate it according to your >> suggestion. >> >> Thanks >> Yan >>> Thanks >>> Sau! >>> >>> >>>> +FILES_${PN}-dbg += "\ >>>> + ${libdir}/qmmp/*/.debug/* \ >>>> + " >>>> + >>>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" >>>> + >>>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >>>> +RDEPENDS_${PN}-plugin-input-mad = "libmad" >>>> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" >>>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >>> >>> >> >> >> _______________________________________________ >> 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] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-19 23:18 ` Saul Wold @ 2011-10-20 2:27 ` Xiaofeng Yan 2011-10-20 11:46 ` Xiaofeng Yan 1 sibling, 0 replies; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-20 2:27 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On 2011年10月20日 07:18, Saul Wold wrote: > On 10/19/2011 03:31 AM, Xiaofeng Yan wrote: >> On 2011年10月18日 13:44, Xiaofeng Yan wrote: >>> On 2011年10月18日 13:35, Saul Wold wrote: >>>> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: >>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>>> >>>>> The new version of qmmp can run on core-image-sato by test. >>>>> $qmmp *.mp3 >>>>> >>>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>>> --- >>>>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 >>>>> +++++++++++++++++++++++++++++++++ >>>>> 1 files changed, 49 insertions(+), 0 deletions(-) >>>>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> >>>>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> new file mode 100644 >>>>> index 0000000..f31409b >>>>> --- /dev/null >>>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> @@ -0,0 +1,49 @@ >>>>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an >>>>> audio-player, written with help of Qt library" >>>>> +HOMEPAGE = "http://qmmp.ylsoftware.com" >>>>> +LICENSE = "GPLv2" >>>>> +LIC_FILES_CHKSUM = >>>>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" >>>>> +SECTION = "multimedia" >>>>> + >>>>> +PR = "r3" >>>>> + >>>>> +PROVIDES = "qmmp" >>>>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" >>>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" >>>>> + >>>>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" >>>>> + >>>>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" >>>>> +SRC_URI[sha256sum] = >>>>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" >>>>> + >>>>> + >>>>> +PARALLEL_MAKE = "" >>>>> + >>>>> +inherit qmake2 cmake >>>>> + >>>>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ >>>>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ >>>>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ >>>>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ >>>>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ >>>>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ >>>>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ >>>>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ >>>>> + " >>>>> + >>>>> +FILES_${PN} =+ "\ >>>>> + ${libdir}/qmmp/*/*.so \ >>>>> + ${datadir}/icons/* \ >>>>> + ${datadir}/qmmp/images/* \ >>>>> + ${datadir}/applications/qmmp.desktop \ >>>>> + " >>>>> + >>>> Xiaofeng, >>>> >>>> I was looking into this also, I think it would be better to split all >>>> the various plugins into separate packages using >>>> do_split_packages(), in >>>> the packages.bbclass. >>>> >>>> I started with this code: >>>>> PACKAGES_DYNAMIC = "qmmp-plugin-*" >>>>> >>>>> python populate_packages_prepend () { >>>>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >>>>> >>>>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', >>>>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') >>>>> } >>>> >>>> But have not completed it yet, if you have time to investigate >>>> further and complete this correctly, there might be a problem with >>>> using multiple Regular expressions in the do_split_packages code, but >>>> I have not fully debugged this yet. >>>> >>>> Please let me know if you can complete this task. >>>> >> Hi saul, >> >> The following is my modification to qmmp_0.5.2.bb. Please review it. >> I want to get a reply about how to ship files in ${datadir} for qmmp. I >> shipped them to FILES_${PN} because qmmp need these files when starting >> up. Do you think that they should be packaged like qmmp-plugin-* ? >> >> Please give me your suggestion and I will modify this file. >> >> >> PACKAGES_DYNAMIC += "qmmp-plugin-*" >> >> >> python populate_packages_prepend () { >> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >> do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$', >> 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='') >> } >> > Ah, I see you added the recursive flag, I was trying to capture the > plugin group (Input, Ouput, Effect, ...) in the package name incase > there was name conflict, also to match the mad and vorbis naming below. > > If using multiple RE expressions in the re match does not work, then > we should make do_split_package for each grouping and name them correctly > qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> > plugin for %s" > >> FILES_${PN} = "\ > I think this should be a += >> ${bindir}/qmmp \ >> ${libdir}/lib*${SOLIBS} \ > These 2 should go away (part of default FILES_${PN} >> ${datadir}/icons/* \ >> ${datadir}/qmmp/images/* \ >> ${datadir}/applications/* \ >> " > There are added via the += above. > I agree with your comment >> >> FILES_${PN}-dbg += "\ >> ${libdir}/qmmp/*/.debug/* \ >> " >> > These should be picked up by the do_split_package above I believe > I will use do_split_package to split up them . >> PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis " >> >> FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >> RDEPENDS_${PN}-plugin-input-mad = "libmad" >> FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" >> RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >> > Ideally the above PACKAGES and FILES_ go away and the default actions > take over. > I will continue looking into them and push this bb file to OE-core after modifying defects. Thanks for your reply Thanks Yan > Thanks for looking into this. > > Sau! > >> >> >> Thanks >> Yan >>> Thanks for your reply and I will investigate it according to your >>> suggestion. >>> >>> Thanks >>> Yan >>>> Thanks >>>> Sau! >>>> >>>> >>>>> +FILES_${PN}-dbg += "\ >>>>> + ${libdir}/qmmp/*/.debug/* \ >>>>> + " >>>>> + >>>>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" >>>>> + >>>>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >>>>> +RDEPENDS_${PN}-plugin-input-mad = "libmad" >>>>> +FILES_${PN}-plugin-input-vorbis = >>>>> "${libdir}/qmmp/Input/libvorbis.so" >>>>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >>>> >>>> >>> >>> >>> _______________________________________________ >>> 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] 11+ messages in thread
* Re: [PATCH 1/2] qmmp: update to 0.5.2 2011-10-19 23:18 ` Saul Wold 2011-10-20 2:27 ` Xiaofeng Yan @ 2011-10-20 11:46 ` Xiaofeng Yan 1 sibling, 0 replies; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-20 11:46 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 10144 bytes --] On 2011年10月20日 07:18, Saul Wold wrote: > On 10/19/2011 03:31 AM, Xiaofeng Yan wrote: >> On 2011年10月18日 13:44, Xiaofeng Yan wrote: >>> On 2011年10月18日 13:35, Saul Wold wrote: >>>> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote: >>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>>> >>>>> The new version of qmmp can run on core-image-sato by test. >>>>> $qmmp *.mp3 >>>>> >>>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >>>>> --- >>>>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49 >>>>> +++++++++++++++++++++++++++++++++ >>>>> 1 files changed, 49 insertions(+), 0 deletions(-) >>>>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> >>>>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> new file mode 100644 >>>>> index 0000000..f31409b >>>>> --- /dev/null >>>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb >>>>> @@ -0,0 +1,49 @@ >>>>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an >>>>> audio-player, written with help of Qt library" >>>>> +HOMEPAGE = "http://qmmp.ylsoftware.com" >>>>> +LICENSE = "GPLv2" >>>>> +LIC_FILES_CHKSUM = >>>>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" >>>>> +SECTION = "multimedia" >>>>> + >>>>> +PR = "r3" >>>>> + >>>>> +PROVIDES = "qmmp" >>>>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" >>>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl" >>>>> + >>>>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2" >>>>> + >>>>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6" >>>>> +SRC_URI[sha256sum] = >>>>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec" >>>>> + >>>>> + >>>>> +PARALLEL_MAKE = "" >>>>> + >>>>> +inherit qmake2 cmake >>>>> + >>>>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ >>>>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ >>>>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ >>>>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ >>>>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ >>>>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ >>>>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ >>>>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ >>>>> + " >>>>> + >>>>> +FILES_${PN} =+ "\ >>>>> + ${libdir}/qmmp/*/*.so \ >>>>> + ${datadir}/icons/* \ >>>>> + ${datadir}/qmmp/images/* \ >>>>> + ${datadir}/applications/qmmp.desktop \ >>>>> + " >>>>> + >>>> Xiaofeng, >>>> >>>> I was looking into this also, I think it would be better to split all >>>> the various plugins into separate packages using >>>> do_split_packages(), in >>>> the packages.bbclass. >>>> >>>> I started with this code: >>>>> PACKAGES_DYNAMIC = "qmmp-plugin-*" >>>>> >>>>> python populate_packages_prepend () { >>>>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >>>>> >>>>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$', >>>>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='') >>>>> } >>>> >>>> But have not completed it yet, if you have time to investigate >>>> further and complete this correctly, there might be a problem with >>>> using multiple Regular expressions in the do_split_packages code, but >>>> I have not fully debugged this yet. >>>> >>>> Please let me know if you can complete this task. >>>> >> Hi saul, >> >> The following is my modification to qmmp_0.5.2.bb. Please review it. >> I want to get a reply about how to ship files in ${datadir} for qmmp. I >> shipped them to FILES_${PN} because qmmp need these files when starting >> up. Do you think that they should be packaged like qmmp-plugin-* ? >> >> Please give me your suggestion and I will modify this file. >> >> >> PACKAGES_DYNAMIC += "qmmp-plugin-*" >> >> >> python populate_packages_prepend () { >> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) >> do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$', >> 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='') >> } >> > Ah, I see you added the recursive flag, I was trying to capture the > plugin group (Input, Ouput, Effect, ...) in the package name incase > there was name conflict, also to match the mad and vorbis naming below. > > If using multiple RE expressions in the re match does not work, then > we should make do_split_package for each grouping and name them correctly > qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> > plugin for %s" > Hi Saul, I find .debug can't be packaged to rpm package because it is invisible directory. In current OE-core .debug was shipped to FILES_${PN}-dbg, for example , gtk+ ,qt4-x11-free If we want to split up .debug/* to single package, we can rename .debug to debug to make this directory visible, then debug directory can be split up to single package. Please review the following two mode. _Mode 1: Ship .debug to FILES_${PN}-dbg_ PACKAGES_DYNAMIC = "qmmp-plugin-* " python populate_packages_prepend () { import os qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) gd = bb.data.expand('${D}/${libdir}/qmmp', d) plug_dirs = os.listdir(gd) /# for makeing do_split_package for each grouping and name them correctly # qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> plugin for %s" # I use the following method./ for plug_dir in plug_dirs: g_plug_dir = os.path.join(qmmp_libdir,plug_dir) do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin for %s') } /# if I don't point files to ship file to ${PN}, then FILE_${PN} will get files in usr/lib/qmmp and qmmp-plug-* will not get files. / FILES_${PN} = "\ ${bindir}/qmmp \ ${libdir}/lib*${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/* \ " FILES_${PN}-dbg += "\ ${libdir}/qmmp/*/.debug/* \ " ================================================================================= _ Mode 2: Split up .debug to sub-packages_ PACKAGES_DYNAMIC = "qmmp-plugin-* qmmp-debug-plugin-*" python populate_packages_prepend () { import os qmmp_libdir = bb.data.expand('${libdir}/qmmp', d) qmmp_pkgd = bb.data.expand('${WORKDIR}/package/${libdir}/qmmp', d) gd = bb.data.expand('${D}/${libdir}/qmmp', d) plug_dirs = os.listdir(gd) for plug_dir in plug_dirs: /#rename .debug to debug/ if os.path.exists( qmmp_pkgd + '/' + plug_dir + '/.debug'): os.rename(qmmp_pkgd + '/' + plug_dir + '/.debug',qmmp_pkgd + '/' + plug_dir + '/debug') g_plug_dir = os.path.join(qmmp_libdir,plug_dir) do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin for %s') /#split up .debug to sub-packages/ g_plug_debug_dir = os.path.join(g_plug_dir,'debug') do_split_packages(d, g_plug_debug_dir, '^lib(.*)\.so$', 'qmmp-debug-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin debug for %s') } / # if I don't point files to ship file to ${PN}, then FILE_${PN} will get files in usr/lib/qmmp and qmmp-plug-* will not get files./ /I check gtk+ and qt4-x11-free and find that they adopt the following method without using default mode./ FILES_${PN} = "\ ${bindir}/qmmp \ ${libdir}/lib*${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/* \ " Do you have any comment for above code. If have, I will continue looking into modification method according to your suggestion. Do you think we should select which method? Thanks Yan >> FILES_${PN} = "\ > I think this should be a += >> ${bindir}/qmmp \ >> ${libdir}/lib*${SOLIBS} \ > These 2 should go away (part of default FILES_${PN} >> ${datadir}/icons/* \ >> ${datadir}/qmmp/images/* \ >> ${datadir}/applications/* \ >> " > There are added via the += above. > >> >> FILES_${PN}-dbg += "\ >> ${libdir}/qmmp/*/.debug/* \ >> " >> > These should be picked up by the do_split_package above I believe > >> PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis " >> >> FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >> RDEPENDS_${PN}-plugin-input-mad = "libmad" >> FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so" >> RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >> > Ideally the above PACKAGES and FILES_ go away and the default actions > take over. > > Thanks for looking into this. > > Sau! > >> >> >> Thanks >> Yan >>> Thanks for your reply and I will investigate it according to your >>> suggestion. >>> >>> Thanks >>> Yan >>>> Thanks >>>> Sau! >>>> >>>> >>>>> +FILES_${PN}-dbg += "\ >>>>> + ${libdir}/qmmp/*/.debug/* \ >>>>> + " >>>>> + >>>>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" >>>>> + >>>>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so" >>>>> +RDEPENDS_${PN}-plugin-input-mad = "libmad" >>>>> +FILES_${PN}-plugin-input-vorbis = >>>>> "${libdir}/qmmp/Input/libvorbis.so" >>>>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg" >>>> >>>> >>> >>> >>> _______________________________________________ >>> 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 > > [-- Attachment #2: Type: text/html, Size: 17888 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] libx11-diet: update to 1.4.4 2011-10-18 5:21 [PATCH 0/2] update packages Xiaofeng Yan 2011-10-18 5:21 ` [PATCH 1/2] qmmp: update to 0.5.2 Xiaofeng Yan @ 2011-10-18 5:22 ` Xiaofeng Yan 1 sibling, 0 replies; 11+ messages in thread From: Xiaofeng Yan @ 2011-10-18 5:22 UTC (permalink / raw) To: openembedded-core From: Xiaofeng Yan <xiaofeng.yan@windriver.com> core-image-sato based on libx11-diet can run on qemu by test. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> --- .../xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff | 540 ++++++++++++++++++++ .../libx11-diet-1.4.4/fix-disable-xlocale.diff | 16 + .../libx11-diet-1.4.4/fix-utf8-wrong-define.patch | 17 + .../xorg-lib/libx11-diet-1.4.4/include_fix.patch | 25 + .../xorg-lib/libx11-diet-1.4.4/nodolt.patch | 14 + .../libx11-diet-1.4.4/x11_disable_makekeys.patch | 31 ++ .../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 27 + 7 files changed, 670 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff new file mode 100644 index 0000000..91ab180 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff @@ -0,0 +1,540 @@ +Upstream-Status: Pending + +Index: libX11-1.3/src/imConv.c +=================================================================== +--- libX11-1.3.orig/src/imConv.c ++++ libX11-1.3/src/imConv.c +@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ _XimGetLocaleCode ( + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -106,6 +108,7 @@ _XimGetLocaleCode ( + * terminating NUL byte. Return 0 if the keysym is not representable in the + * locale + */ ++#ifdef XLOCALE + /*ARGSUSED*/ + int + _XimGetCharCode ( +@@ -135,6 +138,7 @@ _XimGetCharCode ( + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +Index: libX11-1.3/src/X18NCMSstubs.c +=================================================================== +--- /dev/null ++++ libX11-1.3/src/X18NCMSstubs.c +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include <stdlib.h> ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include <X11/Xlocale.h> ++#include <X11/Xos.h> ++#ifdef WIN32 ++#undef close ++#endif ++#include <X11/Xutil.h> ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ ; ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +Index: libX11-1.3/src/Makefile.am +=================================================================== +--- libX11-1.3.orig/src/Makefile.am ++++ libX11-1.3/src/Makefile.am +@@ -335,6 +335,8 @@ if THRSTUBS + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -342,7 +344,8 @@ EXTRA_DIST = \ + $(x11data_DATA) \ + os2Stubs.c \ + udcInf.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + if XCB + libX11_la_SOURCES += \ +Index: libX11-1.3/src/locking.c +=================================================================== +--- libX11-1.3.orig/src/locking.c ++++ libX11-1.3/src/locking.c +@@ -66,7 +66,9 @@ in this Software without prior written a + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -594,9 +596,11 @@ Status XInitThreads(void) + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; +Index: libX11-1.3/configure.ac +=================================================================== +--- libX11-1.3.orig/configure.ac ++++ libX11-1.3/configure.ac +@@ -289,7 +289,14 @@ else + fi + AC_SUBST(KEYSYMDEF) + +-AM_CONDITIONAL(UDC, test xfalse = xtrue) ++AC_ARG_ENABLE(udc, ++ AC_HELP_STRING([--disable-udc], ++ [Disable Xlib support for UDC *EXPERIMENTAL*]), ++ [UDC=$enableval],[UDC=yes]) ++AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) ++if test x"$UDC" = "xyes"; then ++ AC_DEFINE(UDC,1,[Include support for UDC]) ++fi + + AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff new file mode 100644 index 0000000..7dcdd6a --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff @@ -0,0 +1,16 @@ +Upstream-Status: Pending + +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch new file mode 100644 index 0000000..26d3349 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h +@@ -103,7 +103,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch new file mode 100644 index 0000000..b3bcbab --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/include_fix.patch @@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch new file mode 100644 index 0000000..cc05fdc --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/nodolt.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +Index: libX11-1.2.1/configure.ac +=================================================================== +--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 ++++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 +@@ -20,7 +20,6 @@ + + # Checks for programs. + AC_PROG_LIBTOOL +-DOLT + AC_PROG_CC + XORG_CWARNFLAGS + diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch new file mode 100644 index 0000000..70ee695 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch @@ -0,0 +1,31 @@ +--- + src/util/Makefile.am | 21 ----------------- + 1 file changed, 21 deletions(-) + +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -1,24 +1,3 @@ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh + +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb new file mode 100644 index 0000000..df2a47f --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb @@ -0,0 +1,27 @@ +require libx11.inc + +DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ +this version." + +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" + +PR = "r5" + +SRC_URI += "file://x11_disable_makekeys.patch \ + file://X18NCMSstubs.diff \ + file://fix-disable-xlocale.diff \ + file://fix-utf8-wrong-define.patch \ + " + + +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" + +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau libx11 xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" +CFLAGS += "-D_GNU_SOURCE" + -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 0/2] Update packages
@ 2011-10-19 8:53 wenzong.fan
2011-10-19 23:32 ` Saul Wold
0 siblings, 1 reply; 11+ messages in thread
From: wenzong.fan @ 2011-10-19 8:53 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
Update ccache/chkconfig to latest version.
The following changes since commit b4757833c3548b5ee3a1cce58e2f059b3f63cb09:
Martin Jansa (1):
fontconfig: fix fix-pkgconfig.patch
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/update_pkgs
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/update_pkgs
Wenzong Fan (2):
ccache: update to 3.1.6
chkconfig: Update to 1.3.55
.../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
.../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/2] Update packages 2011-10-19 8:53 [PATCH 0/2] Update packages wenzong.fan @ 2011-10-19 23:32 ` Saul Wold 0 siblings, 0 replies; 11+ messages in thread From: Saul Wold @ 2011-10-19 23:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 10/19/2011 01:53 AM, wenzong.fan@windriver.com wrote: > From: Wenzong Fan<wenzong.fan@windriver.com> > > Update ccache/chkconfig to latest version. > > The following changes since commit b4757833c3548b5ee3a1cce58e2f059b3f63cb09: > Martin Jansa (1): > fontconfig: fix fix-pkgconfig.patch > Please update the distro_tracking_fields file when updates recipes. Thanks Sau! > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib wenzong/update_pkgs > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/update_pkgs > > Wenzong Fan (2): > ccache: update to 3.1.6 > chkconfig: Update to 1.3.55 > > .../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++-- > .../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%) > rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%) > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-10-20 11:54 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-18 5:21 [PATCH 0/2] update packages Xiaofeng Yan 2011-10-18 5:21 ` [PATCH 1/2] qmmp: update to 0.5.2 Xiaofeng Yan 2011-10-18 5:35 ` Saul Wold 2011-10-18 5:44 ` Xiaofeng Yan 2011-10-19 10:31 ` Xiaofeng Yan 2011-10-19 23:18 ` Saul Wold 2011-10-20 2:27 ` Xiaofeng Yan 2011-10-20 11:46 ` Xiaofeng Yan 2011-10-18 5:22 ` [PATCH 2/2] libx11-diet: update to 1.4.4 Xiaofeng Yan -- strict thread matches above, loose matches on Subject: below -- 2011-10-19 8:53 [PATCH 0/2] Update packages wenzong.fan 2011-10-19 23:32 ` Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox