[oe-commits] org.oe.dev merge of '304f7e476fe8624db6410c0656b7dd8f78ad60f2'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Jan 5 10:48:40 UTC 2008
merge of '304f7e476fe8624db6410c0656b7dd8f78ad60f2'
and 'fcfb658bc0012d559f131ce8495a388677380d94'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8efc63b43d352dc8bc16998f5461a0649ac0a66d
ViewMTN: http://monotone.openembedded.org/revision/info/8efc63b43d352dc8bc16998f5461a0649ac0a66d
Files:
1
packages/gpsd/files/fic-gta01/gpsd
packages/linux/linux-omap2-git/defconfig
packages/linux/linux-omap2-git/omap2430sdp/defconfig
packages/linux/linux-omap2-git/defconfig.eabi
packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
packages/espeak
packages/linux/linux-omap2-git/omap2430sdp
packages/espeak/espeak_1.30.bb
packages/gpsd/files/fic-gta01/gps-hardware
packages/gpsd/files/gps-hardware
packages/portaudio/portaudio-v19_20071207.bb
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
contrib/angstrom/build-release.sh
packages/avahi/avahi.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
packages/gettext/gettext_0.14.1.bb
packages/gpsd/files/gpsd
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1
packages/xcursor-transparent-theme/files
packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
packages/gnome-mplayer/files/uchar-for-utf8-check.patch
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
Diffs:
#
# mt diff -r304f7e476fe8624db6410c0656b7dd8f78ad60f2 -r8efc63b43d352dc8bc16998f5461a0649ac0a66d
#
#
#
# delete "packages/gpsd/files/fic-gta01/gpsd"
#
# rename "packages/linux/linux-omap2-git/defconfig"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig"
#
# rename "packages/linux/linux-omap2-git/defconfig.eabi"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi"
#
# add_dir "packages/espeak"
#
# add_dir "packages/linux/linux-omap2-git/omap2430sdp"
#
# add_file "packages/espeak/espeak_1.30.bb"
# content [81d52cdf97440599166ddf3cf05b7e750c5bc59d]
#
# add_file "packages/gpsd/files/fic-gta01/gps-hardware"
# content [34ec43f27b84b7fd298431b678952fe476a19a9f]
#
# add_file "packages/gpsd/files/gps-hardware"
# content [f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3]
#
# add_file "packages/portaudio/portaudio-v19_20071207.bb"
# content [ca03af6ddd74b10b2908db9ff329c38c657cfe18]
#
# add_file "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
# content [5bed98a093c466a9bdc46c9b0e8c257398e39c24]
#
# patch "contrib/angstrom/build-release.sh"
# from [4b487748d08b4825735633a40285fee332e77b98]
# to [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
#
# patch "packages/avahi/avahi.inc"
# from [301235b5768fb7ab4d745a6a87896f738baadc10]
# to [3e4dfba2b48cd49083cfa3aa95d9a06656feebda]
#
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
# from [4cef25c35903aa641d2b356d6bdc6311c9fc90e4]
# to [4a9215b927629a12d9aa3f026971197474ede066]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
# to [7293581921c029392be4691314f4f9b6d79c1d09]
#
# patch "packages/gpsd/files/gpsd"
# from [46761ebb43a976a2d7df3d1f0f1c0c4ea805fb7a]
# to [2e08211a015d5617516112a6c4bb0f0bcd2a5a4f]
#
# patch "packages/gpsd/gpsd.inc"
# from [91e167633095484f711ff118e87bf2839f7105b2]
# to [650373a23ddc8159bfc209e03a8bb60a2f5c46e4]
#
# patch "packages/gpsd/gpsd_2.28.bb"
# from [afa8f306a4567c0d18884e4089b424ac63c0955a]
# to [19dc03378642fa1ee106c4bf1ba4f49118860903]
#
# patch "packages/gpsd/gpsd_2.34.bb"
# from [8e241bbd828101019cda7b30a6725fd6759f50f4]
# to [d07d745ca471b1b1cfe875690c9278e223ca2c9c]
#
# patch "packages/gpsd/gpsd_2.36.bb"
# from [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
# to [9cabcd04b6334d04f5b20d7585ad5d051f19a06f]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [aeea26005ee0a1b7bbc4d481def4b1c19ff8dec0]
# to [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
#
============================================================
--- packages/espeak/espeak_1.30.bb 81d52cdf97440599166ddf3cf05b7e750c5bc59d
+++ packages/espeak/espeak_1.30.bb 81d52cdf97440599166ddf3cf05b7e750c5bc59d
@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+#
+# Filename: espeak_1.30.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+
+DEPENDS = "portaudio-v19"
+
+######################################################################################
+
+PR = "r0"
+
+SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/${PN}-${PV}-source"
+
+FILES_${PN} += " /usr/share/espeak-data/ "
+
+do_configure() {
+ # espeak supports portaudio in APIs V18 and V19
+ cp ${S}/src/portaudio19.h ${S}/src/portaudio.h
+}
+
+do_compile() {
+ cd src
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${libdir}
+ install -d ${D}${includedir}
+ install -d ${D}/usr/share/espeak-data
+
+ install -m 0755 ${S}/src/espeak ${D}${bindir}
+ oe_libinstall -so -C src libespeak ${D}${libdir}
+
+ cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
+}
============================================================
--- packages/gpsd/files/fic-gta01/gps-hardware 34ec43f27b84b7fd298431b678952fe476a19a9f
+++ packages/gpsd/files/fic-gta01/gps-hardware 34ec43f27b84b7fd298431b678952fe476a19a9f
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: gps-hardware
+# Date: 20080103 (YMD)
+#
+#################################################################################
+#
+# 20080103 - v0.0.1 - Initial release
+
+if ! test -e /home/root/gllin/gllin
+then
+ echo -e "\n\ngllin GPS driver for Neo1973 not found,"
+ echo "please install the gllin package from"
+ echo "http://3rdparty.downloads.openmoko.org/gllin/"
+ echo ""
+ exit 1
+fi
+
+
+do_start() {
+ /home/root/gllin/gllin >/var/log/gllin.log 2>&1 &
+ sleep 1
+}
+
+do_stop() {
+ gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`"
+ test -n "$gllin_PIDs" && kill $gllin_PIDs
+}
+
+do_status() {
+ ps ax | grep -v grep | grep -q gllin && echo "ready" || echo "unknown"
+}
+
+case "$1" in
+ start) do_start ;;
+ stop) do_stop ;;
+ status) do_status ;;
+esac
============================================================
--- packages/gpsd/files/gps-hardware f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3
+++ packages/gpsd/files/gps-hardware f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3
@@ -0,0 +1,2 @@
+# This is a dummy file. Some machines use it to bring up integrated GPS
+# devices on demand.
============================================================
--- packages/portaudio/portaudio-v19_20071207.bb ca03af6ddd74b10b2908db9ff329c38c657cfe18
+++ packages/portaudio/portaudio-v19_20071207.bb ca03af6ddd74b10b2908db9ff329c38c657cfe18
@@ -0,0 +1,27 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+#
+# Filename: portaudio-v19_20071207.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "portaudio is a portable cross-platform Audio API"
+SECTION = "base"
+LICENSE = "GPL"
+
+PR = "r0"
+
+######################################################################################
+
+SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz"
+
+S = "${WORKDIR}/portaudio"
+
+inherit autotools
+
+do_stage() {
+ install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/
+ oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/
+}
============================================================
--- packages/speech-dispatcher/files/confSpeechd.conf_00.patch 5bed98a093c466a9bdc46c9b0e8c257398e39c24
+++ packages/speech-dispatcher/files/confSpeechd.conf_00.patch 5bed98a093c466a9bdc46c9b0e8c257398e39c24
@@ -0,0 +1,26 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig 2008-01-04 13:45:43.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in 2008-01-04 13:47:31.000000000 +0000
+@@ -129,10 +129,10 @@
+ # - configuration is the path to the config file of this module,
+ # either relative (to etc/speechd/modules/) or absolute
+
+-AddModule "espeak" "sd_espeak" "espeak.conf"
+-AddModule "festival" "sd_festival" "festival.conf"
+-AddModule "flite" "sd_flite" "flite.conf"
+-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
++#AddModule "espeak" "sd_espeak" "espeak.conf"
++#AddModule "festival" "sd_festival" "festival.conf"
++#AddModule "flite" "sd_flite" "flite.conf"
++AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic" "epos-generic.conf"
+ #AddModule "dtk-generic" "sd_generic" "dtk-generic.conf"
+ #AddModule "ibmtts" "sd_ibmtts" "ibmtts.conf"
+@@ -172,6 +172,6 @@
+
+ # There are some sample client settings
+
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+
============================================================
--- contrib/angstrom/build-release.sh 4b487748d08b4825735633a40285fee332e77b98
+++ contrib/angstrom/build-release.sh b708ec70fd4e4e0c2756d122aa95b1d653019a9e
@@ -1,6 +1,6 @@
#!/bin/bash
-DO_UCLIBC=0
+DO_UCLIBC=1
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -43,7 +49,7 @@ do_report_success() {
# No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
do
BUILD_MACHINE=$machine
BUILD_CLEAN="libtool-cross base-files"
============================================================
--- packages/avahi/avahi.inc 301235b5768fb7ab4d745a6a87896f738baadc10
+++ packages/avahi/avahi.inc 3e4dfba2b48cd49083cfa3aa95d9a06656feebda
@@ -6,7 +6,7 @@ PR = "r5"
LICENSE = "GPL"
PR = "r5"
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
# uclibc has no nss
RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
@@ -22,10 +22,14 @@ RDEPENDS_append = ""
RDEPENDS_append = ""
# TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_uclinux-uclibc = " -lintl"
+
PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
============================================================
--- packages/e2fsprogs/e2fsprogs_1.38.bb 4cef25c35903aa641d2b356d6bdc6311c9fc90e4
+++ packages/e2fsprogs/e2fsprogs_1.38.bb 4a9215b927629a12d9aa3f026971197474ede066
@@ -1,10 +1,12 @@ require e2fsprogs.inc
require e2fsprogs.inc
-PR = "r10"
+PR = "r11"
SRC_URI += "file://no-hardlinks.patch;patch=1"
-EXTRA_OECONF += " --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir} \
+ --disable-nls \
+ "
do_compile_prepend () {
find ./ -print|xargs chmod u=rwX
============================================================
--- packages/gettext/gettext_0.14.1.bb ae084090fcdd110056d5ce81e5ee0a81bd15fffa
+++ packages/gettext/gettext_0.14.1.bb 7293581921c029392be4691314f4f9b6d79c1d09
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "The GNU internationalization library."
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
PROVIDES = "virtual/libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -28,6 +28,20 @@ do_configure_prepend() {
install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
}
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
do_stage () {
autotools_stage_includes
oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/
============================================================
--- packages/gpsd/files/gpsd 46761ebb43a976a2d7df3d1f0f1c0c4ea805fb7a
+++ packages/gpsd/files/gpsd 2e08211a015d5617516112a6c4bb0f0bcd2a5a4f
@@ -29,9 +29,18 @@ start() {
# 2. We don't need all the logging crud that daemon/initlog sets
# up -- gpsd does its own syslog calls.
#
+
+ if test -x /etc/init.d/gps-hardware
+ then
+ if ! ( /etc/init.d/gps-hardware status | grep -q "ready" )
+ then
+ /etc/init.d/gps-hardware start
+ fi
+ fi
+
if [ -e "${GPS_DEV}" ]
then
- gpsd ${GPSD_OPTS} -p ${GPS_DEV}
+ gpsd ${GPSD_OPTS} ${GPS_DEV}
echo "success"
else
# User needs to symlink ${GPS_DEV} to the right thing
============================================================
--- packages/gpsd/gpsd.inc 91e167633095484f711ff118e87bf2839f7105b2
+++ packages/gpsd/gpsd.inc 650373a23ddc8159bfc209e03a8bb60a2f5c46e4
@@ -1,8 +1,9 @@ DEPENDS = "dbus-glib ncurses python"
DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "dbus-glib ncurses python"
+RDEPENDS = "gpsd-conf"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
@@ -11,6 +12,7 @@ SRC_URI = "http://download.berlios.de/gp
SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
file://gpsd-default \
+ file://gps-hardware \
file://gpsd"
inherit autotools update-rc.d
@@ -41,15 +43,29 @@ do_install_append() {
install -d ${D}/${sysconfdir}/init.d
install -d ${D}/dev
install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default
install -d ${D}/${sysconfdir}/default
- install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd
+ install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
}
-PACKAGES =+ "libgps python-pygps"
+pkg_postinst_${PN}-conf() {
+ update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
+ update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10
+}
-FILES_${PN} += "${sysconfdir}"
+pkg_postrm_${PN}-conf() {
+ update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
+ update-alternatives --remove gps-hardware ${sysconfdir}/init.d/gps-hardware.default
+}
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+PACKAGES =+ "libgps python-pygps gpsd-conf"
+
+PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}"
+
FILES_libgps = "${libdir}/*.so.*"
-CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
+FILES_gpsd-conf = "${sysconfdir}"
DESCRIPTION_python-pygps = "Python bindings to gpsd"
FILES_python-pygps = "${libdir}/*/site-packages/*"
============================================================
--- packages/gpsd/gpsd_2.28.bb afa8f306a4567c0d18884e4089b424ac63c0955a
+++ packages/gpsd/gpsd_2.28.bb 19dc03378642fa1ee106c4bf1ba4f49118860903
@@ -1,2 +1,2 @@ require gpsd.inc
require gpsd.inc
+PR = "r5"
-PR = "r4"
============================================================
--- packages/gpsd/gpsd_2.34.bb 8e241bbd828101019cda7b30a6725fd6759f50f4
+++ packages/gpsd/gpsd_2.34.bb d07d745ca471b1b1cfe875690c9278e223ca2c9c
@@ -1,4 +1,4 @@ require gpsd.inc
require gpsd.inc
-PR = "r6"
+PR = "r7"
============================================================
--- packages/gpsd/gpsd_2.36.bb fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf
+++ packages/gpsd/gpsd_2.36.bb 9cabcd04b6334d04f5b20d7585ad5d051f19a06f
@@ -1,3 +1,3 @@ require gpsd.inc
require gpsd.inc
+PR = "r1"
-PR = "r0"
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb aeea26005ee0a1b7bbc4d481def4b1c19ff8dec0
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb 4c119ef83390203d6cbc5962db26ac4ec8ed6733
@@ -5,12 +5,13 @@ RPROVIDES += "speechd"
DEPENDS = "flite libdotconf glib-2.0"
RPROVIDES += "speechd"
-PR = "r0"
+PR = "r1"
inherit autotools
SRC_URI = "http://w%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfcfb658bc0012d559f131ce8495a388677380d94 -r8efc63b43d352dc8bc16998f5461a0649ac0a66d
#
#
#
# rename "packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1"
# to "packages/xcursor-transparent-theme/files"
#
# add_file "packages/gnome-mplayer/files/non-utf8-id3-fallback.patch"
# content [be331e8a429578785b64fac01b7c17b2d423d0ad]
#
# add_file "packages/gnome-mplayer/files/uchar-for-utf8-check.patch"
# content [dd50b5684926b93e6f64361f6b3a9a63a3ee7d30]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
# content [96f40a33b74048e73d3054500e402469dc47f737]
#
# patch "packages/gnome-mplayer/gnome-mplayer_0.5.3.bb"
# from [b00f87db280275a3091590e1be9b6b2521f36643]
# to [39e57ed5f730fc922e3312502b843219942d12cf]
#
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
# from [f29e0cf247b2a273218db171e5ce4b72187cc304]
# to [c34de96207774639cc00196181f1fb56aadbf586]
#
============================================================
--- packages/gnome-mplayer/files/non-utf8-id3-fallback.patch be331e8a429578785b64fac01b7c17b2d423d0ad
+++ packages/gnome-mplayer/files/non-utf8-id3-fallback.patch be331e8a429578785b64fac01b7c17b2d423d0ad
@@ -0,0 +1,22 @@
+I found that on ARM/glibc 2.5/glib 2.12.something test in strip_unicode() doesn't
+really catch invalid utf-8 chars. Also, let's tell user where problem lies straight.
+
+Paul Sokolovsky <pmiscml at gmail.com>
+--- a/src/thread.c.org 2007-12-24 00:10:15.000000000 +0200
++++ a/src/thread.c 2008-01-04 22:04:30.000000000 +0200
+@@ -349,13 +349,11 @@
+ //g_idle_add(set_media_info, idledata);
+ utf8name = g_locale_to_utf8(parse[name],-1, NULL, NULL,NULL);
+ if (utf8name == NULL) {
+- strip_unicode(parse[name],strlen(parse[name]));
+- utf8name = g_strdup(parse[name]);
++ utf8name = g_strdup("<cannot convert to utf-8>");
+ }
+ utf8artist = g_locale_to_utf8(parse[artist],-1, NULL, NULL,NULL);
+ if (utf8artist == NULL) {
+- strip_unicode(parse[artist],strlen(parse[artist]));
+- utf8artist = g_strdup(parse[artist]);
++ utf8artist = g_strdup("<cannot convert to utf-8>");
+ }
+
+ message = g_markup_printf_escaped(_("<small>\n<b>Title:</b>\t%s\n<b>Artist:</b>\t%s\n<b>File:</b>\t%s\n</small>"),utf8name,utf8artist,idledata->info);
============================================================
--- packages/gnome-mplayer/files/uchar-for-utf8-check.patch dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
+++ packages/gnome-mplayer/files/uchar-for-utf8-check.patch dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
@@ -0,0 +1,22 @@
+--- a/src/support.c.org 2007-12-18 20:39:09.000000000 +0200
++++ a/src/support.c 2008-01-04 22:12:32.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ #include "support.h"
+
+-void strip_unicode(gchar * data, gsize len)
++void strip_unicode(guchar * data, gsize len)
+ {
+ gsize i = 0;
+
+--- a/src/support.h.org 2007-12-17 18:21:46.000000000 +0200
++++ a/src/support.h 2008-01-04 22:24:15.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
+-void strip_unicode(gchar * data, gsize len);
++void strip_unicode(guchar * data, gsize len);
+ gint play_file(gchar * filename, gint playlist);
+ gint detect_playlist(gchar * filename);
+ gint parse_playlist(gchar * filename);
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb 96f40a33b74048e73d3054500e402469dc47f737
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb 96f40a33b74048e73d3054500e402469dc47f737
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch cursor"
+SECTION = "x11/base"
+RREPLACES = "xcursor-transparent-theme"
+RPROVIDES = "xcursor-transparent-theme"
+PR="r2"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+ file://use-relative-symlinks.patch;patch=1 \
+ file://skip_watch_cursor.patch;patch=1"
+S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
+
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+
+inherit autotools
============================================================
--- packages/gnome-mplayer/gnome-mplayer_0.5.3.bb b00f87db280275a3091590e1be9b6b2521f36643
+++ packages/gnome-mplayer/gnome-mplayer_0.5.3.bb 39e57ed5f730fc922e3312502b843219942d12cf
@@ -1,12 +1,14 @@ RDEPENDS = "mplayer"
DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
LICENSE = "GPL"
DEPENDS = "gtk+ gconf dbus-glib"
RDEPENDS = "mplayer"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig gconf
SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
- file://1.patch;patch=1"
============================================================
--- packages/gnome-mplayer/gnome-mplayer_cvs.bb f29e0cf247b2a273218db171e5ce4b72187cc304
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb c34de96207774639cc00196181f1fb56aadbf586
@@ -5,7 +5,7 @@ PV = "0.5.3+cvs${SRCDATE}"
RDEPENDS = "mplayer"
SRCDATE = "20080101"
PV = "0.5.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig gconf
@@ -13,4 +13,6 @@ SRC_URI = "cvs://anonymous@dekorte.homei
SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
- file://1.patch;patch=1"
More information about the Openembedded-commits
mailing list