summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser_0.14.bb54
-rw-r--r--packages/gpe-mini-browser/gpe-mini-browser_0.21.bb (renamed from packages/gpe-mini-browser/gpe-mini-browser_0.11.bb)12
-rw-r--r--packages/gsm/files/htcuniversal/default2
-rw-r--r--packages/gsm/files/universal-wcdma.patch29
-rw-r--r--packages/gsm/files/vendor-qc-v0.patch38
-rw-r--r--packages/gsm/libgsmd_svn.bb8
-rw-r--r--packages/libmimedir/libmimedir_0.3.1.bb4
-rw-r--r--packages/libmimedir/libmimedir_svn.bb3
-rw-r--r--packages/perl/perl-5.8.8/Makefile.SH.patch63
-rw-r--r--packages/perl/perl-5.8.8/Makefile.patch30
-rw-r--r--packages/perl/perl-5.8.8/generate-sh.patch2
-rw-r--r--packages/perl/perl-5.8.8/installperl.patch15
-rw-r--r--packages/perl/perl_5.8.8.bb10
13 files changed, 176 insertions, 94 deletions
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb
deleted file mode 100644
index 68d0fbfb98..0000000000
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-require gpe-mini-browser.inc
-
-PR = "r0"
-
-SRC_URI = "http://handhelds.org/~philippe/gpe-mini-browser-${PV}.tar.bz2"
-DEPENDS = "osb-nrcit"
-
-S = "${WORKDIR}/gpe-mini-browser"
-
-inherit autotools
-
-do_install() {
- # install -d ${D}${docdir}/gpe
- # install -m 0644 ${S}/gpe-mini-browser.html ${D}${docdir}/gpe/
- install -d ${D}/usr/share/applications
- install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop
- install -d ${D}/usr/share/pixmaps
- install -m 0644 ${S}/gpe-mini-browser.png ${D}/usr/share/pixmaps/gpe-mini-browser.png
- autotools_do_install
-}
-
-pkg_postinst_${PN}-doc () {
- #!/bin/sh
- if [ "x$D" != "x" ]; then
- if [ -e /etc/gpe/gpe-help.conf ]; then
- echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
- else
- echo [Help] >> /etc/gpe/gpe-help.conf
- echo gpe-mini-browser= /usr/share/doc/gpe/gpe-mini-browser.html >> /etc/gpe/gpe-help.conf
- fi
- if [ -x /usr/bin/gpe-helpindex ]; then
- echo generating help-index
- gpe-helpindex
- else
- echo not generating index for gpe-mini-browser
- fi
- fi
-}
-
-pkg_postrm_${PN}-doc () {
- #!/bin/sh
- if [ -e /etc/gpe/gpe-help.conf ]; then
- sed '/^\<gpe-mini-browser\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf
- mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf
- fi
- if [ -x /usr/bin/gpe-helpindex ]; then
- echo generating help-index
- gpe-helpindex
- else
- echo not generating index for gpe-mini-browser
- fi
-}
-
-
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
index faa6bca828..20732ea5b2 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_0.21.bb
@@ -1,18 +1,16 @@
require gpe-mini-browser.inc
-PR = "r0"
-
-SRC_URI = "http://stag.mind.be/gpe-mini-browser-${PV}.tar.bz2"
+SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.gz"
+DEPENDS = "osb-nrcit sqlite libgpewidget"
+RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
-DEPENDS = "libgpelaunch libgpewidget osb-nrcit"
+PR = "r0"
-S = "${WORKDIR}/gpe-mini-browser"
+S = "${WORKDIR}/gpe-mini-browser-${PV}"
inherit autotools
do_install() {
- # install -d ${D}${docdir}/gpe
- # install -m 0644 ${S}/gpe-mini-browser.html ${D}${docdir}/gpe/
install -d ${D}/usr/share/applications
install -m 0644 ${S}/gpe-mini-browser.desktop ${D}/usr/share/applications/gpe-mini-browser.desktop
install -d ${D}/usr/share/pixmaps
diff --git a/packages/gsm/files/htcuniversal/default b/packages/gsm/files/htcuniversal/default
index 3c9a8da949..b09d433d1e 100644
--- a/packages/gsm/files/htcuniversal/default
+++ b/packages/gsm/files/htcuniversal/default
@@ -1,6 +1,6 @@
# gsmd This shell script configures for the gsmd init script.
-GSMD_OPTS="-s 115200 -F"
+GSMD_OPTS="-s 115200 -F -w 1"
# If your GSM device needs to be powered up, uncomment and modify the next line
#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
diff --git a/packages/gsm/files/universal-wcdma.patch b/packages/gsm/files/universal-wcdma.patch
new file mode 100644
index 0000000000..a162ce2326
--- /dev/null
+++ b/packages/gsm/files/universal-wcdma.patch
@@ -0,0 +1,29 @@
+Index: gsm/src/gsmd/vendor_qc.c
+===================================================================
+--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-13 20:13:47.000000000 +0200
++++ gsm/src/gsmd/vendor_qc.c 2007-06-13 20:45:19.000000000 +0200
+@@ -69,8 +69,15 @@
+ return -EIO;
+ }
+
++static int wcdma_parse(char *buf, int len, const char *param,
++ struct gsmd *gsmd)
++{
++ return 0;
++}
++
+ static const struct gsmd_unsolicit qc_unsolicit[] = {
+ { "@HTCCSQ", &htccsq_parse }, /* Signal Quality */
++ { "[WCDMA]", &wcdma_parse }, /* ignore [WCDMA] messages */
+
+ /* FIXME: parse the below and generate the respective events */
+
+@@ -97,7 +109,7 @@
+
+ struct gsmd_vendor_plugin gsmd_vendor_plugin = {
+ .name = "Qualcomm msm6250",
+- .ext_chars = "@",
++ .ext_chars = "@[",
+ .num_unsolicit = ARRAY_SIZE(qc_unsolicit),
+ .unsolicit = qc_unsolicit,
+ .detect = &qc_detect,
diff --git a/packages/gsm/files/vendor-qc-v0.patch b/packages/gsm/files/vendor-qc-v0.patch
new file mode 100644
index 0000000000..8306f8a66e
--- /dev/null
+++ b/packages/gsm/files/vendor-qc-v0.patch
@@ -0,0 +1,38 @@
+Index: gsm/src/gsmd/vendor_qc.c
+===================================================================
+--- gsm.orig/src/gsmd/vendor_qc.c 2007-06-13 20:13:47.000000000 +0200
++++ gsm/src/gsmd/vendor_qc.c 2007-06-13 20:45:19.000000000 +0200
+@@ -81,6 +88,9 @@
+ {
+ /* FIXME: do actual detection of vendor if we have multiple vendors */
+ /* open /proc/cpuinfo and check for HTC Universal? */
++
++ /* The Qualcomm chip starts in V0 mode */
++ g->flags |= GSMD_FLAG_V0;
+ return 1;
+ }
+
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm.orig/src/gsmd/gsmd.c 2007-06-13 20:13:47.000000000 +0200
++++ gsm/src/gsmd/gsmd.c 2007-06-13 20:49:54.000000000 +0200
+@@ -62,7 +62,8 @@
+ {
+ struct gsmd_alive_priv *alp = ctx;
+
+- if (!strcmp(resp, "OK"))
++ if (!strcmp(resp, "OK") ||
++ ((alp->gsmd->flags & GSMD_FLAG_V0) && resp[0] == '0'))
+ alp->alive_responded = 1;
+ return 0;
+ }
+@@ -201,7 +202,8 @@
+ {
+ struct gsmd *gsmd = ctx;
+
+- if (strcmp(resp, "OK")) {
++ if (strcmp(resp, "OK") &&
++ (!(gsmd->flags & GSMD_FLAG_V0) || resp[0] != '0')) {
+ gsmd_log(GSMD_FATAL, "response '%s' to initial command invalid", resp);
+ exit(5);
+ }
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 230d4d6fe5..7fc54a5afb 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,15 +4,17 @@ LICENSE = "GPL"
SECTION = "libs/gsm"
PROVIDES += "gsmd"
PV = "0.0+svn${SRCDATE}"
-PR = "r13"
+PR = "r14"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
file://default \
file://extreplychars.patch;patch=1 \
file://getopt-wait-interpreter-ready.patch;patch=1 \
- file://alive-start-if-interpreter-ready.patch;patch=1 \
- file://tihtc-csq-fix.patch;patch=1"
+ file://alive-start-if-interpreter-ready.patch;patch=1 \
+ file://tihtc-csq-fix.patch;patch=1 \
+ file://vendor-qc-v0.patch;patch=1 \
+ file://universal-wcdma.patch;patch=1"
S = "${WORKDIR}/gsm"
diff --git a/packages/libmimedir/libmimedir_0.3.1.bb b/packages/libmimedir/libmimedir_0.3.1.bb
index 5238cb7ef3..ff7ec3ec45 100644
--- a/packages/libmimedir/libmimedir_0.3.1.bb
+++ b/packages/libmimedir/libmimedir_0.3.1.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
DEPENDS = "intltool-native"
-PR = "r2"
+PR = "r3"
DEFAULT_PREFERENCE = "1"
@@ -21,4 +21,4 @@ autotools_stage_all
PACKAGES += "libmimedir-utils"
FILES_libmimedir-utils = "${bindir}"
-FILES_${PN} = "${libdir}"
+FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libmimedir/libmimedir_svn.bb b/packages/libmimedir/libmimedir_svn.bb
index c640f13e8f..8bd7cc47ca 100644
--- a/packages/libmimedir/libmimedir_svn.bb
+++ b/packages/libmimedir/libmimedir_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "intltool-native"
DEFAULT_PREFERENCE = "-1"
PV = "0.4.1+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "${GPE_SVN}"
@@ -24,4 +24,5 @@ do_stage() {
PACKAGES += "libmimedir-utils"
FILES_libmimedir-utils = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/perl/perl-5.8.8/Makefile.SH.patch b/packages/perl/perl-5.8.8/Makefile.SH.patch
index c674ce9ee5..a30074be2b 100644
--- a/packages/perl/perl-5.8.8/Makefile.SH.patch
+++ b/packages/perl/perl-5.8.8/Makefile.SH.patch
@@ -1,6 +1,37 @@
---- perl-5.8.8/Makefile.SH 2007/04/20 12:43:33 1.1
-+++ perl-5.8.8/Makefile.SH 2007/04/20 15:20:40
-@@ -129,18 +129,7 @@
+Index: perl-5.8.8/Makefile.SH
+===================================================================
+--- perl-5.8.8.orig/Makefile.SH 2006-01-24 23:49:44.000000000 +1100
++++ perl-5.8.8/Makefile.SH 2007-06-14 13:29:37.000000000 +1000
+@@ -43,12 +43,12 @@
+ true)
+ # Prefix all runs of 'miniperl' and 'perl' with
+ # $ldlibpth so that ./perl finds *this* shared libperl.
+- case "$LD_LIBRARY_PATH" in
+- '')
+- ldlibpth="LD_LIBRARY_PATH=`pwd`";;
+- *)
+- ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
+- esac
++# case "$LD_LIBRARY_PATH" in
++# '')
++# ldlibpth="LD_LIBRARY_PATH=`pwd`";;
++# *)
++# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
++# esac
+
+ pldlflags="$cccdlflags"
+ static_target='static_pic'
+@@ -108,7 +108,8 @@
+ ldlibpth=''
+ ;;
+ *)
+- eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
++# We compile in the library path in OE from cross-compile, so lets not do this
++# eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
+ ;;
+ esac
+ # Strip off any trailing :'s
+@@ -129,18 +130,7 @@
# INSTALL file, under "Building a shared perl library".
# If there is no pre-existing $libperl, we don't need
# to do anything further.
@@ -20,7 +51,7 @@
;;
os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
;;
-@@ -401,9 +390,19 @@
+@@ -401,9 +391,19 @@
.c.s:
$(CCCMDSRC) -S $*.c
@@ -43,7 +74,7 @@
.PHONY: all compile translators utilities
-@@ -413,10 +412,10 @@
+@@ -413,10 +413,10 @@
cd x2p; $(MAKE) compile;
cd pod; $(MAKE) compile;
@@ -56,7 +87,7 @@
@echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
-@@ -550,7 +549,7 @@
+@@ -550,7 +550,7 @@
case "$useshrplib" in
true)
$spitshell >>Makefile <<'!NO!SUBS!'
@@ -65,7 +96,7 @@
!NO!SUBS!
case "$osname" in
aix)
-@@ -591,7 +590,9 @@
+@@ -591,7 +591,9 @@
$(CC) -o miniperl $(CLDFLAGS) \
`echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
@@ -76,7 +107,7 @@
!NO!SUBS!
;;
next4*)
-@@ -599,7 +600,9 @@
+@@ -599,7 +601,9 @@
miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
@@ -87,7 +118,7 @@
!NO!SUBS!
;;
darwin*)
-@@ -620,7 +623,9 @@
+@@ -620,7 +624,9 @@
-@rm -f miniperl.xok
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
@@ -98,7 +129,7 @@
!NO!SUBS!
;;
*)
-@@ -629,7 +634,9 @@
+@@ -629,7 +635,9 @@
-@rm -f miniperl.xok
$(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
@@ -109,7 +140,7 @@
!NO!SUBS!
;;
esac
-@@ -766,7 +773,7 @@
+@@ -766,7 +774,7 @@
# We need to autosplit in two steps because VOS can't handle so many args
#
.PHONY: preplibrary
@@ -118,7 +149,7 @@
@sh ./makedir lib/auto
@echo " AutoSplitting perl library"
$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
-@@ -775,35 +782,35 @@
+@@ -775,35 +783,35 @@
autosplit_lib_modules(@ARGV)' lib/*/*.pm
$(MAKE) lib/re.pm
@@ -161,7 +192,7 @@
-@test -f extra.pods && rm -f `cat extra.pods`
-@rm -f extra.pods
-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -850,18 +857,7 @@
+@@ -850,18 +858,7 @@
INSTALL_DEPENDENCE = all
install.perl: $(INSTALL_DEPENDENCE) installperl
@@ -181,7 +212,7 @@
# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.
-@@ -978,16 +974,16 @@
+@@ -978,16 +975,16 @@
#
# DynaLoader may be needed for extensions that use Makefile.PL.
@@ -202,7 +233,7 @@
@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
-@@ -1125,7 +1121,7 @@
+@@ -1125,7 +1122,7 @@
test_prep_pre: preplibrary utilities $(nonxs_ext)
@@ -211,7 +242,7 @@
PERL=./perl $(MAKE) _test_prep
_test_tty:
-@@ -1238,7 +1234,7 @@
+@@ -1238,7 +1235,7 @@
# Can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
diff --git a/packages/perl/perl-5.8.8/Makefile.patch b/packages/perl/perl-5.8.8/Makefile.patch
index c78a39b178..cf5cca19a0 100644
--- a/packages/perl/perl-5.8.8/Makefile.patch
+++ b/packages/perl/perl-5.8.8/Makefile.patch
@@ -1,5 +1,7 @@
---- perl-5.8.8/Cross/Makefile 2007/04/06 00:47:46 1.1
-+++ perl-5.8.8/Cross/Makefile 2007/04/06 00:48:04
+Index: perl-5.8.8/Cross/Makefile
+===================================================================
+--- perl-5.8.8.orig/Cross/Makefile 2004-01-13 07:44:01.000000000 +1100
++++ perl-5.8.8/Cross/Makefile 2007-06-14 12:40:44.000000000 +1000
@@ -12,7 +12,7 @@
export CC = $(CROSS)gcc
@@ -9,7 +11,29 @@
export STRIP = $(CROSS)strip
export AR = $(CROSS)ar
export RANLIB = $(CROSS)ranlib
-@@ -58,11 +58,11 @@
+@@ -34,21 +34,6 @@
+ all:
+ @echo Please read the README file before doing anything else.
+
+-gen_patch:
+- diff -Bbur ../Makefile.SH Makefile.SH > Makefile.SH.patch
+- diff -Bbur ../installperl installperl > installperl.patch
+-
+-patch:
+- cd .. ; if [ ! -e ./CROSS_PATCHED ] ; then \
+- patch -p1 < Cross/Makefile.SH.patch; \
+- patch -p1 < Cross/installperl.patch ; mv installperl installperl-patched; \
+- sed -e 's/XXSTRIPXX/$(SYS)/' installperl-patched > installperl; \
+- touch CROSS_PATCHED ; fi
+-
+-dry_patch:
+- cd .. ; patch --dry-run -p1 < Cross/Makefile.SH.patch; \
+- patch --dry-run -p1 < Cross/installperl.patch; \
+-
+ perl:
+ @echo Perl cross-build directory is $(TOPDIR)
+ @echo Target arch is $(SYS)
+@@ -58,11 +43,11 @@
$(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh
cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more
cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library
diff --git a/packages/perl/perl-5.8.8/generate-sh.patch b/packages/perl/perl-5.8.8/generate-sh.patch
index 50ce00b42f..ceb74196d6 100644
--- a/packages/perl/perl-5.8.8/generate-sh.patch
+++ b/packages/perl/perl-5.8.8/generate-sh.patch
@@ -35,7 +35,7 @@ Index: perl-5.8.8/Cross/generate_config_sh
+ $value =~ s/^\'//;
+ $value =~ s/\'$//;
+ # Remove -I/usr/local/... from the value
-+ $value =~ s#\W-I/usr/local/\w+\W##g;
++ $value =~ s#\W-I/usr/local/\w+\W# #g;
+ # Prepend env var (OE setting) to value
+ print("$key=\'$ENV{$envvar} $value\'\n");
+ }
diff --git a/packages/perl/perl-5.8.8/installperl.patch b/packages/perl/perl-5.8.8/installperl.patch
new file mode 100644
index 0000000000..ff52bc3a9c
--- /dev/null
+++ b/packages/perl/perl-5.8.8/installperl.patch
@@ -0,0 +1,15 @@
+Index: perl-5.8.8/installperl
+===================================================================
+--- perl-5.8.8.orig/installperl 2007-06-14 12:36:23.000000000 +1000
++++ perl-5.8.8/installperl 2007-06-14 12:38:39.000000000 +1000
+@@ -3,8 +3,8 @@
+ BEGIN {
+ require 5.004;
+ chdir '..' if !-d 'lib' and -d '../lib';
+- @INC = 'lib';
+- $ENV{PERL5LIB} = 'lib';
++# @INC = 'lib';
++# $ENV{PERL5LIB} = 'lib';
+ }
+
+ use strict;
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index edd0618a86..93b7c8ddd8 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -5,14 +5,15 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r20"
+PR = "r22"
# Major part of version
PVM = "5.8"
SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://Makefile.patch;patch=1 \
- file://Makefile.SH.patch \
+ file://Makefile.SH.patch;patch=1 \
+ file://installperl.patch;patch=1 \
file://perl-dynloader.patch;patch=1 \
file://perl-moreconfig.patch;patch=1 \
file://letgcc-find-errno.patch;patch=1 \
@@ -44,9 +45,8 @@ do_configure() {
# Make hostperl in build directory be the native perl
cp -f ${HOSTPERL} hostperl
- # This is silly - should just patch Makefile.SH directly
+ # Do out work in the cross subdir
cd Cross
- cp -f ${WORKDIR}/Makefile.SH.patch .
# Generate configuration
rm -f config.sh-${TARGET_ARCH}-${TARGET_OS}
@@ -88,8 +88,6 @@ do_configure() {
rm -f config
echo "ARCH = ${TARGET_ARCH}" > config
echo "OS = ${TARGET_OS}" >> config
-
- oe_runmake patch
}
do_compile() {
if test "${MACHINE}" != "native"; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 02:22:21 +0000