This email list is read-only. Emails sent to this list will be discarded
----------------------------------
helix-dbus-server.bb | 54 --------------------------------
helix-dbus-server/no-oss-preload.patch | 11 ------
helix-libs.bb | 34 +++++---------------
3 files changed, 9 insertions(+), 90 deletions(-)
New commits:
commit d874044d995e6b51bc7396a31e4999f20b6c52f2
Author: Rusty Lynch <[EMAIL PROTECTED]>
Date: Tue Oct 21 09:41:14 2008 -0700
* removing the now defunct helix-dbus-server
* updating the helix-libs build to pull from a tarball release
Diff in this email is a maximum of 400 lines.
diff --git a/helix-dbus-server.bb b/helix-dbus-server.bb
deleted file mode 100644
index e940d88..0000000
--- a/helix-dbus-server.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Helix DBus Server"
-SECTION = "base"
-DEPENDS = "ribosome gconf alsa-lib glib-2.0 dbus dbus-glib gtk+ xcomposite"
-HOMEPAGE = "http://player.helixcommunity.org";
-LICENSE = "RPSL"
-
-RDEPENDS_${PN} = "helix-libs"
-
-PV="r0"
-
-S = "${WORKDIR}/helix-dbus-server"
-
-SRC_URI = "file://helix-dbus-server/no-oss-preload.patch;patch=1"
-
-export BUILD_ROOT=${STAGING_DIR_HOST}${libdir}/ribosome
-export BUILDRC=${BUILD_ROOT}/buildrc
-export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
-export BUILD=$BUILD_ROOT/bin/build.py
-
-do_fetch() {
- mkdir -p cvs/helix-dbus-server && cd cvs/helix-dbus-server
- ${BUILD} -h -mhxplay_gtk_atlas -Phelix-client-all-defines-free \
- player_dbus-server
- cd .. && cp -a helix-dbus-server ${WORKDIR}
-}
-
-do_compile() {
- ${BUILD} -k -trelease -mhxplay_gtk_atlas \
- -Phelix-client-all-defines-free \
- player_dbus-server
-}
-
-do_install() {
- install -d ${D}/${libdir}/helix-dbus-server/
- install -m 0755 ${S}/release/helix-dbus-server.bin \
- ${D}/${libdir}/helix-dbus-server
-
- cd player/dbus-server/data/
-
- sed -e "s|[EMAIL PROTECTED]@/|${bindir}/|" \
- < org.helixcommunity.HelixDbusServer.service.in \
- > org.helixcommunity.HelixDbusServer.service
- install -d ${D}/${datadir}/dbus-1/services/
- install -m 0755 org.helixcommunity.HelixDbusServer.service \
- ${D}/${datadir}/dbus-1/services/
-
- sed -e "s|[EMAIL PROTECTED]@/|${libdir}/helix-dbus-server/|" \
- < helix-dbus-server.in \
- > helix-dbus-server
- install -d ${D}/${bindir}
- install -m 0755 helix-dbus-server ${D}/${bindir}
-
- install -m 0644 hxdbussvrrc ${D}/${libdir}/helix-dbus-server/
-}
diff --git a/helix-dbus-server/no-oss-preload.patch
b/helix-dbus-server/no-oss-preload.patch
deleted file mode 100644
index 77c88db..0000000
--- a/helix-dbus-server/no-oss-preload.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: helix-dbus-server/player/dbus-server/data/helix-dbus-server.in
-===================================================================
---- helix-dbus-server.orig/player/dbus-server/data/helix-dbus-server.in
2008-10-05 17:29:42.000000000 -0700
-+++ helix-dbus-server/player/dbus-server/data/helix-dbus-server.in
2008-10-05 17:27:32.000000000 -0700
-@@ -4,5 +4,5 @@
- cp @libdir@/hxdbussvrrc $HOME/.hxdbussvrrc
- fi
-
--MIXER=/dev/nullmixer LD_PRELOAD="/usr/lib/libaoss.so" exec
@libdir@/helix-dbus-server.bin
-+HELIX_LIBS=/opt/helix/lib exec @libdir@/helix-dbus-server.bin
-
diff --git a/helix-libs.bb b/helix-libs.bb
index 46d6bf7..5f0646a 100644
--- a/helix-libs.bb
+++ b/helix-libs.bb
@@ -6,24 +6,16 @@ LICENSE = "RPSL"
PV="r4"
-SRC_URI = "file://helix-libs/hxclient.pc \
+SRC_URI =
"http://git.moblin.org/repos/users/rusty/helix-libs_atlas310_11212008.tar.bz2 \
file://helix-libs/helix-player.pc \
file://helix-libs/add-clutter.patch;patch=1"
-S = "${WORKDIR}/helix-libs"
+S = "${WORKDIR}/helix-libs_atlas310_11212008"
export BUILD_ROOT=${STAGING_DIR_HOST}${libdir}/ribosome
export BUILDRC=${BUILD_ROOT}/buildrc
export SYSTEM_ID=linux-2.2-libc6-gcc32-i586
export BUILD=$BUILD_ROOT/bin/build.py
-do_fetch[deptask] = "do_populate_staging"
-
-do_fetch() {
- mkdir -p cvs/helix-libs && cd cvs/helix-libs
- ${BUILD} -h -mclutter -Phelix-client-all-defines clutter
- cd .. && cp -a helix-libs ${WORKDIR}
-}
-
do_compile() {
${BUILD} -k -trelease -mclutter -Phelix-client-all-defines clutter
}
@@ -32,14 +24,11 @@ do_stage() {
mkdir -p ${STAGING_DIR_HOST}/opt/helix/lib
mkdir -p ${STAGING_DIR_HOST}/opt/helix/include
mkdir -p ${STAGING_DIR_HOST}/usr/lib/pkgconfig
- cp release/*.so ${STAGING_DIR_HOST}/opt/helix/lib/
- cp release/libhxclient.a ${STAGING_DIR_HOST}/opt/helix/lib/
- cp player/hxclientkit/pub/*.h ${STAGING_DIR_HOST}/opt/helix/include/
- cp clientapps/clutter/player.h ${STAGING_DIR_HOST}/opt/helix/include/
+ install -m 0644 clientapps/clutter/player.h
${STAGING_DIR_HOST}/opt/helix/include
+ install -m 0644 helix-player.pc ${STAGING_DIR_HOST}/usr/lib/pkgconfig
- cp hxclient.pc ${STAGING_DIR_HOST}/usr/lib/pkgconfig
- cp helix-player.pc ${STAGING_DIR_HOST}/usr/lib/pkgconfig
+ install -m 0644 release/*.so ${STAGING_DIR_HOST}/opt/helix/lib
install -d ${STAGING_DIR_HOST}${libdir}
install -m 0644 release/libhelix-player.so ${STAGING_DIR_HOST}${libdir}
@@ -49,21 +38,16 @@ do_install() {
mkdir -p ${D}/opt/helix/lib
mkdir -p ${D}/opt/helix/include
mkdir -p ${D}/usr/lib/pkgconfig
- cp release/*.so ${D}/opt/helix/lib/
- cp release/libhxclient.a ${D}/opt/helix/lib/
- cp player/hxclientkit/pub/*.h ${D}/opt/helix/include/
- cp clientapps/clutter/player.h ${D}/opt/helix/include/
+ install -m 0644 clientapps/clutter/player.h ${D}/opt/helix/include/
+ install -m 0644 helix-player.pc ${D}/usr/lib/pkgconfig
- cp hxclient.pc ${D}/usr/lib/pkgconfig
- cp helix-player.pc ${D}/usr/lib/pkgconfig
+ install -m 0644 release/*.so ${D}/opt/helix/lib
install -d ${D}${libdir}
install -m 0644 release/libhelix-player.so ${D}${libdir}
}
-FILES_${PN} = "/opt/helix/lib/*.so"
-FILES_${PN} += "/opt/helix/lib/libhxclient.a"
-FILES_${PN} += "/usr/lib"
+FILES_${PN} = "/usr/lib/libhelix-player.so"
FILES_${PN}-dev = "/usr/lib/pkgconfig"
FILES_${PN}-dev += "/opt/helix/include"
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
