Patchwork [1/2] qmmp: update to 0.5.2

login
register
mail settings
Submitter Xiaofeng Yan
Date Nov. 7, 2011, 11:57 a.m.
Message ID <fea248bae1ee38a8c74392d47bf4480cb405cfae.1320665106.git.xiaofeng.yan@windriver.com>
Download mbox | patch
Permalink /patch/14391/
State New
Headers show

Comments

Xiaofeng Yan - Nov. 7, 2011, 11:57 a.m.
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>

qmmp: remove old recipe and add new recipe

Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library>   with the Description: Qmmp<Group>  plugin for %s"

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   47 ----------------------------
 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb |   54 +++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
 create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
Koen Kooi - Nov. 7, 2011, 11:58 a.m.
Op 7 nov. 2011, om 12:57 heeft Xiaofeng Yan het volgende geschreven:

> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> 
> qmmp: remove old recipe and add new recipe
> 
> Use do_split_package for each grouping and name them correctly besides updating package.
> The format to name plugins of qmmp:
> qmmp-plugin-<group>-<library>   with the Description: Qmmp<Group>  plugin for %s"
> 
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   47 ----------------------------
> 
> -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"

> 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..035b50f
> --- /dev/null
> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
> @@ -0,0 +1,54 @@
> +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 = "r0"
> +
> +DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"

RDEPENDS go below do_install, like in the old recipe. The variable follow the task order, so DEPENDS goes at the top, RDEPENDS (do_package) goes down below do_install.

regards,

Koen
Xiaofeng Yan - Nov. 7, 2011, 12:01 p.m.
On 2011?11?07? 19:58, Koen Kooi wrote:
> Op 7 nov. 2011, om 12:57 heeft Xiaofeng Yan het volgende geschreven:
>
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> qmmp: remove old recipe and add new recipe
>>
>> Use do_split_package for each grouping and name them correctly besides updating package.
>> The format to name plugins of qmmp:
>> qmmp-plugin-<group>-<library>    with the Description: Qmmp<Group>   plugin for %s"
>>
>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> ---
>> meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   47 ----------------------------
>>
>> -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"
>> 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..035b50f
>> --- /dev/null
>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>> @@ -0,0 +1,54 @@
>> +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 = "r0"
>> +
>> +DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
> RDEPENDS go below do_install, like in the old recipe. The variable follow the task order, so DEPENDS goes at the top, RDEPENDS (do_package) goes down below do_install.
>
Hi koen,

Thank you for finding my fault, but in this recipe , do_install use 
default mode. I should put RDEPENDS below  FILES_${PN}, right?
> regards,
>
> Koen
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - Nov. 7, 2011, 12:11 p.m.
Op 7 nov. 2011, om 13:01 heeft Xiaofeng Yan het volgende geschreven:

> On 2011?11?07? 19:58, Koen Kooi wrote:
>> Op 7 nov. 2011, om 12:57 heeft Xiaofeng Yan het volgende geschreven:
>> 
>> 
>>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>>> 
>>> 
>>> qmmp: remove old recipe and add new recipe
>>> 
>>> Use do_split_package for each grouping and name them correctly besides updating package.
>>> The format to name plugins of qmmp:
>>> qmmp-plugin-<group>-<library>   with the Description: Qmmp<Group>  plugin for %s"
>>> 
>>> Signed-off-by: Xiaofeng Yan 
>>> <xiaofeng.yan@windriver.com>
>>> 
>>> ---
>>> meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   47 ----------------------------
>>> 
>>> -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"
>>> 
>>> 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..035b50f
>>> --- /dev/null
>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>> @@ -0,0 +1,54 @@
>>> +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 = "r0"
>>> +
>>> +DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
>>> 
>> RDEPENDS go below do_install, like in the old recipe. The variable follow the task order, so DEPENDS goes at the top, RDEPENDS (do_package) goes down below do_install.
>> 
>> 
> Hi koen,
> 
> Thank you for finding my fault, but in this recipe , do_install use default mode. I should put RDEPENDS below  FILES_${PN}, right?

Yes please.

regards,

Koen
Xiaofeng Yan - Nov. 7, 2011, 12:24 p.m.
On 2011?11?07? 20:11, Koen Kooi wrote:
> Op 7 nov. 2011, om 13:01 heeft Xiaofeng Yan het volgende geschreven:
>
>> On 2011?11?07? 19:58, Koen Kooi wrote:
>>> Op 7 nov. 2011, om 12:57 heeft Xiaofeng Yan het volgende geschreven:
>>>
>>>
>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>
>>>>
>>>> qmmp: remove old recipe and add new recipe
>>>>
>>>> Use do_split_package for each grouping and name them correctly besides updating package.
>>>> The format to name plugins of qmmp:
>>>> qmmp-plugin-<group>-<library>    with the Description: Qmmp<Group>   plugin for %s"
>>>>
>>>> Signed-off-by: Xiaofeng Yan
>>>> <xiaofeng.yan@windriver.com>
>>>>
>>>> ---
>>>> meta/recipes-qt/qt-apps/qmmp_0.5.1.bb |   47 ----------------------------
>>>>
>>>> -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"
>>>>
>>>> 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..035b50f
>>>> --- /dev/null
>>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>> @@ -0,0 +1,54 @@
>>>> +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 = "r0"
>>>> +
>>>> +DEPENDS = "taglib libmad libvorbis libogg alsa-lib"
>>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
>>>>
>>> RDEPENDS go below do_install, like in the old recipe. The variable follow the task order, so DEPENDS goes at the top, RDEPENDS (do_package) goes down below do_install.
>>>
>>>
>> Hi koen,
>>
>> Thank you for finding my fault, but in this recipe , do_install use default mode. I should put RDEPENDS below  FILES_${PN}, right?
> Yes please.
>
Thanks, I modified my fault.

> regards,
>
> Koen
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
deleted file mode 100644
index 948c32a..0000000
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.1.bb
+++ /dev/null
@@ -1,47 +0,0 @@ 
-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 = "r0"
-
-DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
-RDEPENDS_${PN} += "taglib alsa-lib curl"
-
-SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "7934c069256bf2fc4ab762ad2683db2f"
-SRC_URI[sha256sum] = "16ab0334f368a5ef14d631a1d43d7cae876ee06b7185643377b5e9cfd6143099"
-
-
-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} = "${bindir}/qmmp ${libdir}/*.so* \ 
-               ${libdir}/qmmp/PlaylistFormats/*.so \
-               ${libdir}/qmmp/Output/libalsa.so \
-               ${libdir}/qmmp/Transports/libhttp.so \
-               ${libdir}/qmmp/Visual/libanalyzer.so \
-               ${datadir}/icons/* \
-               ${datadir}/qmmp/images/* \
-               ${datadir}/applications/qmmp.desktop \
-               "
-
-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"
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..035b50f
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -0,0 +1,54 @@ 
+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 = "r0"
+
+DEPENDS = "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"
+
+
+inherit qmake2 cmake qt4x11
+
+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 \
+                        "
+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 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.lower() + '-%s', 'Qmmp' + plug_dir  + 'plugin for %s')
+} 
+
+FILES_${PN} = "\
+		${bindir}/qmmp \
+                ${libdir}/lib*${SOLIBS} \ 
+		${datadir}/icons/* \
+                ${datadir}/qmmp/images/* \
+                ${datadir}/applications/* \
+		"
+
+FILES_${PN}-dbg += "\
+                ${libdir}/qmmp/*/.debug/* \
+               "
+