Hi there,
I'd like to apply the following to stable:
1) opie-mediaplayer1-oe.patch
opie-mediaplayer1: Add 1.2.3 versions of mediaplayer1 and plugins
Applied to .dev in: 03740c225501e66bf2a7218536868643b53812ce
2) beecrypt-merge.patch
beecrypt: merge duplicate recipes
* Merge do_stage from portabase/beecrypt into beecrypt
* Delete portabase/beecrypt (patches no longer seem to be necessary)
Applied to .dev in: 88676b03209e4a8147b6f9ab4d6f5c66d0132128
3) metakit_fix_backport.patch
metakit: fix fetch path & library install/packaging
Applied to .dev in: f2ebdb1826372581987a96a662d30d97b544c438 &
c9cfaab10b1cc5547009c788d31c5e670d194bc9
Cheers,
Paul
#
# old_revision [d81d8ce4431b8e050518b3a6ddf8c6b828365238]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb"
# content [039055825fe8a376f21ef8f02c2372aa92abff1d]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1.inc"
# content [2e379a8e9a2d3bbb86e2740693bbc3fcde093f50]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb"
# content [4481782a4b2584f4f12e6e562174567a6d9b334c]
#
# add_file "packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb"
# content [385926d5a54356be44f7fd55a88a1cb30c6b5b05]
#
# add_file "packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb"
# content [ef5e42c5ffac57e185d7e39f5d68f4f2780687a3]
#
# add_file "packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb"
# content [4167ef554802cd18ee9db3001a1ff23a27d66635]
#
# add_file "packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb"
# content [ef5e42c5ffac57e185d7e39f5d68f4f2780687a3]
#
# patch "packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb"
# from [52ceee86d6d3f6944e1c0c2b412331062f6f41cc]
# to [b5121cb1d131c4e7469a666aa7f3d63c64856216]
#
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb 039055825fe8a376f21ef8f02c2372aa92abff1d
+++ packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb 039055825fe8a376f21ef8f02c2372aa92abff1d
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1.inc 2e379a8e9a2d3bbb86e2740693bbc3fcde093f50
+++ packages/opie-mediaplayer1/opie-mediaplayer1.inc 2e379a8e9a2d3bbb86e2740693bbc3fcde093f50
@@ -0,0 +1,8 @@
+DESCRIPTION = "The classic Opie media player (core+plugins)."
+LICENSE = "GPL"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+RDEPENDS = "opie-mediaplayer1-core"
+RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb 4481782a4b2584f4f12e6e562174567a6d9b334c
+++ packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb 4481782a4b2584f4f12e6e562174567a6d9b334c
@@ -0,0 +1,2 @@
+require ${PN}.inc
+
============================================================
--- packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb 385926d5a54356be44f7fd55a88a1cb30c6b5b05
+++ packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb 385926d5a54356be44f7fd55a88a1cb30c6b5b05
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://libmadplugin.pro"
============================================================
--- packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
+++ packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
============================================================
--- packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb 4167ef554802cd18ee9db3001a1ff23a27d66635
+++ packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb 4167ef554802cd18ee9db3001a1ff23a27d66635
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://vorbis.pro "
============================================================
--- packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
+++ packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb 52ceee86d6d3f6944e1c0c2b412331062f6f41cc
+++ packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b5121cb1d131c4e7469a666aa7f3d63c64856216
@@ -1,10 +1,3 @@
-DESCRIPTION = "The classic Opie media player (core+plugins)."
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-RDEPENDS = "opie-mediaplayer1-core"
-RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
-opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+require ${PN}.inc
PR = "r2"
#
# old_revision [d81d8ce4431b8e050518b3a6ddf8c6b828365238]
#
# delete "packages/portabase/beecrypt"
#
# delete "packages/portabase/beecrypt/config.m4"
#
# delete "packages/portabase/beecrypt/gas.patch"
#
# delete "packages/portabase/beecrypt/m4.diff"
#
# delete "packages/portabase/beecrypt_3.1.0.bb"
#
# patch "packages/beecrypt/beecrypt_3.1.0.bb"
# from [e4d0e9808e43d5b58b903a6dac43963d0ee8e67f]
# to [d5ab1c183ee6127b7c45e89f3d6d55742b826671]
#
============================================================
--- packages/beecrypt/beecrypt_3.1.0.bb e4d0e9808e43d5b58b903a6dac43963d0ee8e67f
+++ packages/beecrypt/beecrypt_3.1.0.bb d5ab1c183ee6127b7c45e89f3d6d55742b826671
@@ -6,7 +6,23 @@ SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/
HOMEPAGE="http://sourceforge.net/projects/beecrypt";
SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
+PR = "r2"
+
inherit autotools
acpaths=""
EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
+
+do_stage() {
+
+# oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR}
+ cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/
+ install -d ${STAGING_INCDIR}/beecrypt
+ for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
+ do
+ install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
+ done
+
+}
+
#
# old_revision [d81d8ce4431b8e050518b3a6ddf8c6b828365238]
#
# patch "packages/portabase/metakit_2.4.9.3.bb"
# from [c85f6db5fc147e0aa6563ada7788eefcafcf3d81]
# to [b3272474d623463c5bc361a2a75fe5d2af27902b]
#
============================================================
--- packages/portabase/metakit_2.4.9.3.bb c85f6db5fc147e0aa6563ada7788eefcafcf3d81
+++ packages/portabase/metakit_2.4.9.3.bb b3272474d623463c5bc361a2a75fe5d2af27902b
@@ -6,15 +6,18 @@ HOMEPAGE = "http://www.equi4.com/metakit
LICENSE = "MetaKit"
HOMEPAGE = "http://www.equi4.com/metakit.html";
-SRC_URI = "http://www.equi4.com/pub/mk/older/metakit-${PV}.tar.gz \
+SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
file://metakit-2.4.9.3.patch;patch=1"
-PR = "r1"
+PR = "r2"
+FILES_${PN} += " ${libdir}/*.so"
+
do_configure_prepend() {
cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/
}
+
do_configure () {
cd builds
@@ -41,10 +44,8 @@ do_configure () {
}
-
do_stage() {
-# oe_libinstall -a -C builds/.libs libmk4 ${STAGING_LIBDIR}
- cp builds/.libs/libmk4.a ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C builds/.libs libmk4 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/
for X in mk4.h mk4.inl
do
@@ -53,14 +54,12 @@ do_stage() {
}
-
-
do_compile () {
cd builds
oe_runmake
}
do_install() {
-
- :
+ oe_libinstall -so -C builds/.libs libmk4 ${D}${libdir}
}
+
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
