summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/cacao/cacao-native_0.99.3.bb (renamed from packages/cacao/cacao-native_0.99.2.bb)2
-rw-r--r--packages/cacao/cacao_0.99.3.bb (renamed from packages/cacao/cacao_0.99.2.bb)7
-rw-r--r--packages/cacao/cacaoh-native_0.99.3.bb (renamed from packages/cacao/cacaoh-native_0.99.2.bb)2
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb6
-rw-r--r--packages/ffmpeg/omapfbplay_git.bb2
-rw-r--r--packages/gnash/gnash-minimal_cvs.bb2
-rw-r--r--packages/gnash/gnash_0.8.3.bb2
-rw-r--r--packages/gstreamer/gst-ffmpeg_0.10.4.bb2
-rw-r--r--packages/openmax/libomxil-bellagio_0.9.0.bb2
-rw-r--r--packages/opie-sh/files/.mtn2git_empty0
-rw-r--r--packages/opie-sh/files/opie-sh-fsmounter-name.patch11
-rw-r--r--packages/opie-sh/files/opie-sh-path.patch214
-rw-r--r--packages/opie-sh/opie-sh.inc6
-rw-r--r--packages/opie-sh/opie-sh_1.2.3.bb4
14 files changed, 246 insertions, 16 deletions
diff --git a/packages/cacao/cacao-native_0.99.2.bb b/packages/cacao/cacao-native_0.99.3.bb
index 1fd4ed8296..0e4d9e5935 100644
--- a/packages/cacao/cacao-native_0.99.2.bb
+++ b/packages/cacao/cacao-native_0.99.3.bb
@@ -2,6 +2,6 @@ require cacao-native.inc
PR = "r0"
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f"
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
diff --git a/packages/cacao/cacao_0.99.2.bb b/packages/cacao/cacao_0.99.3.bb
index f982047685..9817a7ceed 100644
--- a/packages/cacao/cacao_0.99.2.bb
+++ b/packages/cacao/cacao_0.99.3.bb
@@ -1,8 +1,9 @@
require cacao.inc
-PR = "r2"
+PR = "r0"
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f \
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
file://cacao-codegen-arm1.patch;patch=1 \
file://cacao-codegen-arm2.patch;patch=1 \
- "
+ "
+
diff --git a/packages/cacao/cacaoh-native_0.99.2.bb b/packages/cacao/cacaoh-native_0.99.3.bb
index 594e79f7de..d2d833dff3 100644
--- a/packages/cacao/cacaoh-native_0.99.2.bb
+++ b/packages/cacao/cacaoh-native_0.99.3.bb
@@ -2,4 +2,4 @@ require cacaoh-native.inc
PR = "r0"
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f"
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index c4f4677dea..d12bfd7c1d 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
PE = "1"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r32"
+PR = "r33"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
@@ -16,8 +16,8 @@ FFBRANCH_arm = "arm"
FFBRANCH ?= "master"
# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
-SRCREV = "b06c88bbec744970e023a03abed314f10d6936da"
-SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d"
+SRCREV = "adcf5e23c16d4c26f6e0e9b7eba8bbbd487e1cf5"
+SRCREV_arm = "2e95f2adfbb11d033b5736d79f5beacf202ad993"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index efa81fd50a..8c3d0dac36 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
inherit module-base
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index 992998bf55..80564ebe7e 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,7 +1,7 @@
require gnash-minimal.inc
-PR = "r1"
+PR = "r2"
PV = "0.8.3+cvs${SRCDATE}"
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index cc8de96995..87ea15878f 100644
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,6 @@
require gnash.inc
-PR = "r2"
+PR = "r3"
EXTRA_OECONF += " --without-included-ltdl \
--with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index 556214283a..087d5ff670 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "LGPL"
HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
-PR = "r5"
+PR = "r6"
inherit autotools pkgconfig
diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb
index ca9e4fbade..edfcde03d2 100644
--- a/packages/openmax/libomxil-bellagio_0.9.0.bb
+++ b/packages/openmax/libomxil-bellagio_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim
LICENSE = "LGPLv2"
DEPENDS = "libmad alsa-lib ffmpeg"
-PR = "r3"
+PR = "r4"
SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz"
diff --git a/packages/opie-sh/files/.mtn2git_empty b/packages/opie-sh/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-sh/files/.mtn2git_empty
diff --git a/packages/opie-sh/files/opie-sh-fsmounter-name.patch b/packages/opie-sh/files/opie-sh-fsmounter-name.patch
new file mode 100644
index 0000000000..ccdea20f23
--- /dev/null
+++ b/packages/opie-sh/files/opie-sh-fsmounter-name.patch
@@ -0,0 +1,11 @@
+--- ../../apps/Opie-SH/filesystem_mounter.desktop 7 Mar 2004 12:33:12 -0000 1.8
++++ ../../apps/Opie-SH/filesystem_mounter.desktop 21 Sep 2008 13:14:03 -0000
+@@ -2,7 +2,7 @@
+ Exec=filesystem_mounter.sh
+ Icon=opie-sh-scripts/fsmounter
+ Type=Application
+-Name=
++Name=Filesystem Mounter
+ Comment=Frontend to mount/unmount filesystems
+ Name[es]=Montador
+ Comment[es]=Interfaz para montar/desmontar sistemas de ficheros
diff --git a/packages/opie-sh/files/opie-sh-path.patch b/packages/opie-sh/files/opie-sh-path.patch
new file mode 100644
index 0000000000..f4ea0c1886
--- /dev/null
+++ b/packages/opie-sh/files/opie-sh-path.patch
@@ -0,0 +1,214 @@
+Index: opie-sh/scripts/diskfree.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/diskfree.sh,v
+retrieving revision 1.3
+diff -u -d -r1.3 diskfree.sh
+--- opie-sh/scripts/diskfree.sh 14 Aug 2004 12:05:39 -0000 1.3
++++ opie-sh/scripts/diskfree.sh 21 Sep 2008 13:22:55 -0000
+@@ -17,7 +17,7 @@
+ # 20020524-5 - bugfix
+ # 20020524-1 - initial release
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ # there must be a better way to do this with sed, but i had no time
+ # time to look into this yet...
+Index: opie-sh/scripts/filesystem_mounter.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/filesystem_mounter.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 filesystem_mounter.sh
+--- opie-sh/scripts/filesystem_mounter.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/filesystem_mounter.sh 21 Sep 2008 13:22:55 -0000
+@@ -22,7 +22,7 @@
+ # 20020517-1 - nicer fullscreen, added about, tried icon
+ #
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ ######################################################################
+ # subroutines
+Index: opie-sh/scripts/killproc.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/killproc.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 killproc.sh
+--- opie-sh/scripts/killproc.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/killproc.sh 21 Sep 2008 13:22:55 -0000
+@@ -18,7 +18,7 @@
+ # 20020519-1 - added icon to output
+ # 20020517-1 - nicer fullscreen, added about, tried icon
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ ######################################################################
+ # subroutines
+Index: opie-sh/scripts/launcher_refresh.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/launcher_refresh.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 launcher_refresh.sh
+--- opie-sh/scripts/launcher_refresh.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/launcher_refresh.sh 21 Sep 2008 13:22:55 -0000
+@@ -14,7 +14,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ launcher_refresh() {
+ ( echo "<img src=$OPIEDIR/pics/opie-sh-scripts/launcher_refresh.png>"
+@@ -36,9 +36,9 @@
+ #
+ # main
+
+-$OPIEDIR/bin/qcop QPE/TaskBar "reloadInputMethods()"
+-#$OPIEDIR/bin/qcop QPE/System "restart()"
+-$OPIEDIR/bin/qcop QPE/System "linkChanged(QString)"
++/usr/bin/qcop QPE/TaskBar "reloadInputMethods()"
++#/usr/bin/qcop QPE/System "restart()"
++/usr/bin/qcop QPE/System "linkChanged(QString)"
+
+ launcher_refresh
+ cleanup
+Index: opie-sh/scripts/logviewer.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/logviewer.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 logviewer.sh
+--- opie-sh/scripts/logviewer.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/logviewer.sh 21 Sep 2008 13:22:55 -0000
+@@ -17,7 +17,7 @@
+ # 20020526-1a - initial release...
+ #
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+ INITPATH=/etc/init.d
+
+ ######################################################################
+Index: opie-sh/scripts/microkbd.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/microkbd.sh,v
+retrieving revision 1.1
+diff -u -d -r1.1 microkbd.sh
+--- opie-sh/scripts/microkbd.sh 18 Oct 2004 22:00:20 -0000 1.1
++++ opie-sh/scripts/microkbd.sh 21 Sep 2008 13:22:55 -0000
+@@ -19,7 +19,7 @@
+ # 20020517-2 - bugfixed fullscreen, added info about ifconfig
+ # 20020517-1 - added about, fullscreen and icon
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ ######################################################################
+ # subroutines
+Index: opie-sh/scripts/opie-sh-ssh-askpass.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 opie-sh-ssh-askpass.sh
+--- opie-sh/scripts/opie-sh-ssh-askpass.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/opie-sh-ssh-askpass.sh 21 Sep 2008 13:22:55 -0000
+@@ -2,7 +2,7 @@
+
+ # opie-sh-ssh-askpass -- ssh-askpass utility using opie-sh
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ exec $OPIE_SH -i -p -t "OpenSSH" -g -L "<SMALL>$@" 2>/dev/null
+
+Index: opie-sh/scripts/opie-sh-wavelanchooser.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 opie-sh-wavelanchooser.sh
+--- opie-sh/scripts/opie-sh-wavelanchooser.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/opie-sh-wavelanchooser.sh 21 Sep 2008 13:22:55 -0000
+@@ -19,7 +19,7 @@
+ # 20020524-1 - initial working release planned
+ #
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ about() {
+ ( echo "<img src=$OPIEDIR/pics/opie-sh-scripts/qtwavelan.png>"
+Index: opie-sh/scripts/rsyncme.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/rsyncme.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 rsyncme.sh
+--- opie-sh/scripts/rsyncme.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/rsyncme.sh 21 Sep 2008 13:22:55 -0000
+@@ -18,7 +18,7 @@
+ #
+
+ CFG=$OPIEDIR/share/config/rsyncme.cfg
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ update_cfg() {
+ # check if dir is in CFG and if not add it
+Index: opie-sh/scripts/service_manager.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/service_manager.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 service_manager.sh
+--- opie-sh/scripts/service_manager.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/service_manager.sh 21 Sep 2008 13:22:55 -0000
+@@ -19,7 +19,7 @@
+ # 20020517-1 - added about and fullscreen
+ #
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+ INITPATH=/etc/init.d
+
+ ######################################################################
+Index: opie-sh/scripts/stowctrl.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/stowctrl.sh,v
+retrieving revision 1.2
+diff -u -d -r1.2 stowctrl.sh
+--- opie-sh/scripts/stowctrl.sh 14 Aug 2004 12:05:39 -0000 1.2
++++ opie-sh/scripts/stowctrl.sh 21 Sep 2008 13:22:55 -0000
+@@ -19,7 +19,7 @@
+ # 20020517-2 - bugfixed fullscreen, added info about ifconfig
+ # 20020517-1 - added about, fullscreen and icon
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ ######################################################################
+ # subroutines
+Index: opie-sh/scripts/usbnetctrl.sh
+===================================================================
+RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/usbnetctrl.sh,v
+retrieving revision 1.3
+diff -u -d -r1.3 usbnetctrl.sh
+--- opie-sh/scripts/usbnetctrl.sh 14 Aug 2004 12:05:39 -0000 1.3
++++ opie-sh/scripts/usbnetctrl.sh 21 Sep 2008 13:22:55 -0000
+@@ -18,7 +18,7 @@
+ # 20020517-2 - bugfixed fullscreen, added info about ifconfig
+ # 20020517-1 - added about, fullscreen and icon
+
+-OPIE_SH=$OPIEDIR/bin/opie-sh
++OPIE_SH=opie-sh
+
+ ######################################################################
+ # subroutines
+@@ -30,7 +30,7 @@
+ echo "activate / deactivate the usbnet-driver (on ipaq)"
+ echo "<p>"
+ echo "To use it at first, you need to change the ifconfig"
+- echo "line in $OPIEDIR/bin/usbnetctrl.sh."
++ echo "line in $0."
+ ) | $OPIE_SH -t "usbnet control" -f &
+ SCREENCLEAN=$!
+ sleep 1
diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc
index dbc032ecc6..3818a21953 100644
--- a/packages/opie-sh/opie-sh.inc
+++ b/packages/opie-sh/opie-sh.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
APPNAME = "opie-sh"
APPTYPE = "binary"
-PR = "r2"
+PR = "r3"
S = "${WORKDIR}/${APPNAME}"
@@ -25,6 +25,7 @@ do_install() {
install -m 0644 ${WORKDIR}/help/${APPNAME}/*.html ${D}${palmtopdir}/help/${APPNAME}/
install -d ${D}${palmtopdir}/share/config
install -m 0644 ${WORKDIR}/share/config/*.cfg ${D}${palmtopdir}/share/config/
+ rm -f ${D}${palmtopdir}/pics/opie-sh-scripts/kbdctrl.png
}
PACKAGES += " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \
@@ -59,4 +60,5 @@ FILES_opie-sh-ssh-askpass = " ${palmtopdir}/bin/opie-sh-ssh-askpass.sh"
FILES_opie-sh-stowawayctrl = " ${palmtopdir}/bin/stowctrl.sh ${palmtopdir}/apps/Opie-SH/stowctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/stowctrl.png"
FILES_opie-sh-usbnetctrl = " ${palmtopdir}/bin/usbnetctrl.sh ${palmtopdir}/apps/Opie-SH/usbnetctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/usbnetctrl.png"
FILES_opie-sh-wavelanchooser = " ${palmtopdir}/bin/opie-sh-wavelanchooser.sh ${palmtopdir}/apps/Opie-SH/opie-sh-wavelanchooser.desktop ${palmtopdir}/pics/opie-sh-scripts/qtwavelan.png"
-FILES_opie-sh = " ${palmtopdir}/bin/opie-sh-howto.sh ${palmtopdir}/bin/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/opie-sh/*.html"
+FILES_${PN} = " ${palmtopdir}/bin/opie-sh-howto.sh ${bindir}/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/help/opie-sh/*.html"
+
diff --git a/packages/opie-sh/opie-sh_1.2.3.bb b/packages/opie-sh/opie-sh_1.2.3.bb
index 6843ad7aac..377aa887dd 100644
--- a/packages/opie-sh/opie-sh_1.2.3.bb
+++ b/packages/opie-sh/opie-sh_1.2.3.bb
@@ -6,4 +6,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
${HANDHELDS_CVS};tag=${TAG};module=opie/help \
${HANDHELDS_CVS};tag=${TAG};module=opie/share \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/bin"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/bin \
+ file://opie-sh-path.patch;patch=1 \
+ file://opie-sh-fsmounter-name.patch;patch=1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:38:55 +0000