summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/packagehistory.bbclass3
-rw-r--r--conf/checksums.ini4
-rw-r--r--recipes/binutils/binutils-cross-sdk_2.17.bb3
-rw-r--r--recipes/gstreamer/gst-plugins-bad_0.10.12.bb11
-rw-r--r--recipes/gstreamer/gst-plugins-bad_0.10.9.bb14
-rw-r--r--recipes/gstreamer/gst-plugins-good/fix-unit-scale-asseration.patch33
-rw-r--r--recipes/gstreamer/gst-plugins-good_0.10.15.bb14
-rw-r--r--recipes/gstreamer/gstreamer_0.10.23.bb2
-rw-r--r--recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/stk5-baseboard_c_vesa640.patch40
-rw-r--r--recipes/linux/linux_2.6.29+2.6.30-rc4.bb6
-rw-r--r--recipes/live555/live555_20090602.bb16
-rw-r--r--recipes/mplayer/mplayer_svn.bb8
-rw-r--r--recipes/mythtv/mythtv_svn.bb17
-rw-r--r--recipes/opie-taskbar/opie-taskbar.inc1
-rw-r--r--recipes/opie-taskbar/opie-taskbar/server-pro-1.2.4.patch67
-rw-r--r--recipes/opie-taskbar/opie-taskbar/server-pro-old.patch76
-rw-r--r--recipes/opie-taskbar/opie-taskbar/server.pro84
-rw-r--r--recipes/opie-taskbar/opie-taskbar_1.2.2.bb4
-rw-r--r--recipes/opie-taskbar/opie-taskbar_1.2.3.bb4
-rw-r--r--recipes/opie-taskbar/opie-taskbar_1.2.4.bb4
-rw-r--r--recipes/opie-taskbar/opie-taskbar_cvs.bb3
-rw-r--r--recipes/schroedinger/schroedinger_1.0.5.bb6
22 files changed, 305 insertions, 115 deletions
diff --git a/classes/packagehistory.bbclass b/classes/packagehistory.bbclass
index fdc47cb9b4..b435149d22 100644
--- a/classes/packagehistory.bbclass
+++ b/classes/packagehistory.bbclass
@@ -2,8 +2,7 @@
inherit package
PACKAGEFUNCS += "emit_pkghistory"
-PKGHIST_DIR = "${TMPDIR}/pkghistory/"
-
+PKGHIST_DIR = "${TMPDIR}/pkghistory/${BASEPKG_TARGET_SYS}/"
#
# Called during do_package to write out metadata about this package
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5e635c3198..e19a0ff1b7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9886,6 +9886,10 @@ sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
md5=a861ccbb90a176d1242608502f45f0ac
sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.15.tar.bz2]
+md5=19bc6cc07951b3382d1ac8525b20e83f
+sha256=831f450a0fa18c881b00ec50e8916ed66ca0fecb53cd1939f0abcc02930f9847
+
[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
md5=03d3d0b5f19014fe0065234a3ea65ee6
sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
diff --git a/recipes/binutils/binutils-cross-sdk_2.17.bb b/recipes/binutils/binutils-cross-sdk_2.17.bb
new file mode 100644
index 0000000000..2f13b264a1
--- /dev/null
+++ b/recipes/binutils/binutils-cross-sdk_2.17.bb
@@ -0,0 +1,3 @@
+require binutils_${PV}.bb
+require binutils-cross-sdk.inc
+PR = "${INC_PR}.1"
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.12.bb b/recipes/gstreamer/gst-plugins-bad_0.10.12.bb
new file mode 100644
index 0000000000..c7aa008d61
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.12.bb
@@ -0,0 +1,11 @@
+require gst-plugins.inc
+
+SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
+ file://ivorbis-thumb.patch;patch=1"
+
+DEPENDS += "gst-plugins-base openssl directfb"
+
+do_compile_prepend() {
+ # work around missing files in upstream tarball (upstream bug #454078)
+ install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/
+}
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.9.bb b/recipes/gstreamer/gst-plugins-bad_0.10.9.bb
new file mode 100644
index 0000000000..fdcc240dd7
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.9.bb
@@ -0,0 +1,14 @@
+require gst-plugins.inc
+PR = "r2"
+
+SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
+ file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \
+ file://ivorbis-thumb.patch;patch=1"
+
+DEPENDS += "gst-plugins-base openssl"
+EXTRA_OECONF += " ac_cv_openssldir=no"
+
+do_compile_prepend() {
+ # work around missing files in upstream tarball (upstream bug #454078)
+ install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/
+}
diff --git a/recipes/gstreamer/gst-plugins-good/fix-unit-scale-asseration.patch b/recipes/gstreamer/gst-plugins-good/fix-unit-scale-asseration.patch
new file mode 100644
index 0000000000..749c4918a9
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-good/fix-unit-scale-asseration.patch
@@ -0,0 +1,33 @@
+diff -uNr gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c gst-plugins-good-0.10.15.new/sys/v4l2/gstv4l2src.c
+--- gst-plugins-good-0.10.15/sys/v4l2/gstv4l2src.c 2009-05-11 19:00:07.000000000 -0500
++++ gst-plugins-good-0.10.15.new/sys/v4l2/gstv4l2src.c 2009-06-22 09:51:50.000000000 -0500
+@@ -1377,14 +1377,22 @@
+ timestamp = gst_clock_get_time (clock) - timestamp;
+ gst_object_unref (clock);
+
+- latency =
+- gst_util_uint64_scale_int (GST_SECOND, v4l2src->fps_d,
+- v4l2src->fps_n);
++ /* we must have a framerate */
++ if (v4l2src->fps_n <= 0 || v4l2src->fps_d <= 0) {
++ GST_WARNING_OBJECT (src,
++ "Can't give latency since framerate isn't fixated !");
++ timestamp = GST_CLOCK_TIME_NONE;
++ }
++ else {
++ latency =
++ gst_util_uint64_scale_int (GST_SECOND, v4l2src->fps_d,
++ v4l2src->fps_n);
+
+- if (timestamp > latency)
+- timestamp -= latency;
+- else
+- timestamp = 0;
++ if (timestamp > latency)
++ timestamp -= latency;
++ else
++ timestamp = 0;
++ }
+ }
+
+ /* FIXME: use the timestamp from the buffer itself! */
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.15.bb b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
new file mode 100644
index 0000000000..ff4d11bc08
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
@@ -0,0 +1,14 @@
+require gst-plugins.inc
+
+PR = "r3"
+
+SRC_URI += "file://fix-unit-scale-asseration.patch;patch=1"
+
+OE_ALLOW_INSECURE_DOWNLOADS = "1"
+inherit gconf
+
+DEPENDS += "gst-plugins-base openssl popt"
+
+PACKAGES =+ "gst-plugin-gconfelements"
+FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"
+
diff --git a/recipes/gstreamer/gstreamer_0.10.23.bb b/recipes/gstreamer/gstreamer_0.10.23.bb
index 906aa239ac..22bc2172ed 100644
--- a/recipes/gstreamer/gstreamer_0.10.23.bb
+++ b/recipes/gstreamer/gstreamer_0.10.23.bb
@@ -1,5 +1,7 @@
require gstreamer.inc
+EXTRA_OECONF += "ac_cv_func_register_printf_function=no"
+
do_configure_prepend() {
sed -i -e s:docs::g Makefile.am
}
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/stk5-baseboard_c_vesa640.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/stk5-baseboard_c_vesa640.patch
new file mode 100644
index 0000000000..c3eb357dda
--- /dev/null
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/stk5-baseboard_c_vesa640.patch
@@ -0,0 +1,40 @@
+--- a/arch/arm/mach-mx2/stk5-baseboard.c.orig 2009-07-17 00:57:10.000000000 +0200
++++ b/arch/arm/mach-mx2/stk5-baseboard.c 2009-07-16 13:02:20.000000000 +0200
+@@ -613,6 +613,37 @@
+
+ static struct imx_fb_platform_data stk5_fb_data[] __initdata = {
+ {
++ /* VESA 640x480@60 */
++ .init = stk5_gpio_lcdc_active,
++ .exit = stk5_gpio_lcdc_inactive,
++ .lcd_power = NULL,
++ .backlight_power = NULL,
++
++ .pixclock = 39721,
++
++ .xres = 640,
++ .yres = 480,
++
++ .bpp = 16,
++
++ .hsync_len = 64,
++ .right_margin = 24,
++ .left_margin = 40,
++
++ .vsync_len = 2,
++ .lower_margin = 11,
++ .upper_margin = 32,
++
++ .pcr = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 |
++ PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL | PCR_SCLK_SEL,
++ .dmacr = 0x80040060,
++
++ .cmap_greyscale = 0,
++ .cmap_inverse = 0,
++ .cmap_static = 0,
++
++ .fixed_screen_cpu = NULL,
++ }, {
+ #if 1
+ //.fb_mode = "Xenarc_700_Y-18",
+ .init = stk5_gpio_lcdc_active,
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
index d014298dc2..0217587661 100644
--- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
+++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
@@ -3,7 +3,7 @@ require linux.inc
KERNEL_RELEASE = "2.6.30-rc4"
OLD_KERNEL_RELEASE = "2.6.29"
PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}"
-PR = "r4"
+PR = "r5"
S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}"
@@ -32,5 +32,5 @@ SRC_URI_append_afeb9260 = " \
"
SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \
- file://linux-2.6.30-rc4-karo3.diff;patch=1"
-
+ file://linux-2.6.30-rc4-karo3.diff;patch=1 \
+ file://stk5-baseboard_c_vesa640.patch;patch=1"
diff --git a/recipes/live555/live555_20090602.bb b/recipes/live555/live555_20090602.bb
index 8d1a314f35..c6438bce6e 100644
--- a/recipes/live555/live555_20090602.bb
+++ b/recipes/live555/live555_20090602.bb
@@ -7,6 +7,8 @@ HOMEPAGE = "http://live.com/"
LICENSE = "LGPL"
SECTION = "devel"
+PR = "r1"
+
SRC_URI = "http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz \
file://config.linux-cross"
@@ -36,7 +38,17 @@ do_install() {
}
do_stage () {
- cp -a ${D}${includedir}/* ${STAGING_INCDIR}
- cp -a ${D}${libdir}/* ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/
+ install -d ${STAGING_LIBDIR}/
+
+ # Find all the headers
+ for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
+ install ${i} ${STAGING_INCDIR}/
+ done
+
+ # Find the libs *.a
+ for i in $(find . -name "*.a") ; do
+ install ${i} ${STAGING_LIBDIR}
+ done
}
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 3042a3ced0..dfb73536de 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -37,7 +37,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
PV = "0.0+1.0rc2+svnr${SRCREV}"
-PR = "r10"
+PR = "r12"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -76,7 +76,7 @@ EXTRA_OECONF = " \
--enable-rtc \
--enable-network \
--disable-smb \
- --disable-live \
+ --enable-live \
--disable-dvdnav \
--enable-dvdread \
--disable-dvdread-internal \
@@ -169,7 +169,8 @@ EXTRA_OECONF = " \
--disable-win32waveout \
--enable-select \
\
- "
+ --extra-libs=' -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++' \
+"
EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
--disable-encoder=vorbis_encoder"
@@ -215,7 +216,6 @@ do_configure() {
cat ${WORKDIR}/configh >> ${S}/config.h
cat ${WORKDIR}/configmak ${OPTSMAK} >> ${S}/config.mak
-
}
do_compile () {
diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb
index 5272bb6e81..5fbbc4e354 100644
--- a/recipes/mythtv/mythtv_svn.bb
+++ b/recipes/mythtv/mythtv_svn.bb
@@ -8,14 +8,14 @@ PV = "0.21+0.22rc+svnr${SRCREV}"
PR = "r0"
REALPV = "0.22"
-SRCREV = "20923"
+SRCREV = "20947"
SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
S = "${WORKDIR}/mythtv"
QMAKE_PROFILES = "mythtv.pro"
-mythlibs = "mythdb mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
@@ -49,10 +49,12 @@ EXTRA_MYTHTVCONF ?= ""
EXTRA_OECONF = " \
--cross-prefix=${TARGET_PREFIX} \
+ --sysroot=${STAGING_DIR_HOST} \
--prefix=${prefix} \
\
--arch=${TARGET_ARCH} \
--extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+ --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
--extra-ldflags="${TARGET_LDFLAGS}" \
${EXTRA_MYTHTVCONF} \
"
@@ -63,7 +65,7 @@ do_configure_prepend() {
./configure --qmake=qmake2 \
--disable-altivec \
- --disable-opengl-video \
+ --disable-opengl \
--disable-stripping \
--disable-xvmc \
--enable-v4l \
@@ -71,15 +73,8 @@ do_configure_prepend() {
--enable-dvb \
--enable-libmp3lame \
--dvb-path=${STAGING_INCDIR} \
- --with-bindings= \
+ --without-bindings=perl,python \
${EXTRA_OECONF}
-
- sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
- mv settings.pro.new settings.pro
- for pro in ${S}/*/*pro ${S}/*/*/*pro ${S}/*/*/*/*pro ; do
- sed -i -e s:opengl::g $pro
- done
- sed -i /.SUBDIR/d ${S}/bindings/*pro
}
python populate_packages_prepend () {
diff --git a/recipes/opie-taskbar/opie-taskbar.inc b/recipes/opie-taskbar/opie-taskbar.inc
index 4f43e550b9..3d8ca17b7f 100644
--- a/recipes/opie-taskbar/opie-taskbar.inc
+++ b/recipes/opie-taskbar/opie-taskbar.inc
@@ -17,7 +17,6 @@ inherit opie
do_configure_prepend() {
ln -s ${WORKDIR}/calibrate ${S}/calibrate
ln -s ${WORKDIR}/mediummount ${S}/mediummount
- install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro
}
do_stage() {
diff --git a/recipes/opie-taskbar/opie-taskbar/server-pro-1.2.4.patch b/recipes/opie-taskbar/opie-taskbar/server-pro-1.2.4.patch
new file mode 100644
index 0000000000..ca7e4f50bc
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/server-pro-1.2.4.patch
@@ -0,0 +1,67 @@
+--- launcher/server.pro 2009-07-17 21:10:14.000000000 +0100
++++ launcher/server.pro 2009-07-17 21:16:43.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ CONFIG += qt warn_on
+
+-DESTDIR = $$(OPIEDIR)/bin
++DESTDIR =
+
+ HEADERS += server.h \
+ qrr.h \
+@@ -20,7 +20,7 @@
+ shutdownimpl.h \
+ launcher.h \
+ launcherview.h \
+- $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
++ calibrate/calibrate.h \
+ startmenu.h \
+ transferserver.h \
+ qcopbridge.h \
+@@ -31,7 +31,7 @@
+ serverapp.h \
+ qprocess.h \
+ screensaver.h \
+- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
++ mediummount/mediumwidget.h \
+ mediadlg.h
+
+ SOURCES += server.cpp \
+@@ -50,7 +50,7 @@
+ shutdownimpl.cpp \
+ launcher.cpp \
+ launcherview.cpp \
+- $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
++ calibrate/calibrate.cpp \
+ transferserver.cpp \
+ packageslave.cpp \
+ irserver.cpp \
+@@ -63,20 +63,20 @@
+ qprocess.cpp \
+ qprocess_unix.cpp \
+ screensaver.cpp \
+- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
++ mediummount/mediumwidget.cc \
+ mediadlg.cpp
+
+
+-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
+-DEPENDPATH += $(OPIEDIR)/core/apps/calibrate
++INCLUDEPATH += calibrate
++DEPENDPATH += calibrate
+
+-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
+-DEPENDPATH += $(OPIEDIR)/rsync
++INCLUDEPATH += $(OPIEDIR)/include rsync
++DEPENDPATH += rsync
+
+-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
+-DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
++INCLUDEPATH += mediummount
++DEPENDPATH += mediummount
+
+-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
++LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
+ TARGET = qpe
+
+ ## not ready for use yet
diff --git a/recipes/opie-taskbar/opie-taskbar/server-pro-old.patch b/recipes/opie-taskbar/opie-taskbar/server-pro-old.patch
new file mode 100644
index 0000000000..18aaeafa00
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/server-pro-old.patch
@@ -0,0 +1,76 @@
+--- launcher/server.pro 2009-07-17 21:17:31.000000000 +0100
++++ launcher/server.pro 2009-07-17 21:16:43.000000000 +0100
+@@ -2,10 +2,10 @@
+
+ CONFIG += qt warn_on
+
+-DESTDIR = $$(OPIEDIR)/bin
++DESTDIR =
+
+ HEADERS += server.h \
+- qrr.h \
++ qrr.h \
+ serverinterface.h \
+ launchertab.h \
+ documentlist.h \
+@@ -20,7 +20,7 @@
+ shutdownimpl.h \
+ launcher.h \
+ launcherview.h \
+- $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
++ calibrate/calibrate.h \
+ startmenu.h \
+ transferserver.h \
+ qcopbridge.h \
+@@ -31,11 +31,11 @@
+ serverapp.h \
+ qprocess.h \
+ screensaver.h \
+- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
++ mediummount/mediumwidget.h \
+ mediadlg.h
+
+ SOURCES += server.cpp \
+- qrr.cpp \
++ qrr.cpp \
+ serverinterface.cpp \
+ launchertab.cpp \
+ documentlist.cpp \
+@@ -50,7 +50,7 @@
+ shutdownimpl.cpp \
+ launcher.cpp \
+ launcherview.cpp \
+- $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
++ calibrate/calibrate.cpp \
+ transferserver.cpp \
+ packageslave.cpp \
+ irserver.cpp \
+@@ -63,20 +63,20 @@
+ qprocess.cpp \
+ qprocess_unix.cpp \
+ screensaver.cpp \
+- $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
++ mediummount/mediumwidget.cc \
+ mediadlg.cpp
+
+
+-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
+-DEPENDPATH += $(OPIEDIR)/core/apps/calibrate
++INCLUDEPATH += calibrate
++DEPENDPATH += calibrate
+
+-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
+-DEPENDPATH += $(OPIEDIR)/rsync
++INCLUDEPATH += $(OPIEDIR)/include rsync
++DEPENDPATH += rsync
+
+-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
+-DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
++INCLUDEPATH += mediummount
++DEPENDPATH += mediummount
+
+-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
++LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
+ TARGET = qpe
+
+ ## not ready for use yet
diff --git a/recipes/opie-taskbar/opie-taskbar/server.pro b/recipes/opie-taskbar/opie-taskbar/server.pro
deleted file mode 100644
index 2dee9a973a..0000000000
--- a/recipes/opie-taskbar/opie-taskbar/server.pro
+++ /dev/null
@@ -1,84 +0,0 @@
-TEMPLATE = app
-
-CONFIG += qt warn_on
-
-DESTDIR =
-
-HEADERS += server.h \
- qrr.h \
- serverinterface.h \
- launchertab.h \
- documentlist.h \
- appicons.h \
- taskbar.h \
- runningappbar.h \
- applauncher.h \
- stabmon.h \
- inputmethods.h \
- systray.h \
- wait.h \
- shutdownimpl.h \
- launcher.h \
- launcherview.h \
- calibrate/calibrate.h \
- startmenu.h \
- transferserver.h \
- qcopbridge.h \
- packageslave.h \
- irserver.h \
- firstuse.h \
- syncdialog.h \
- serverapp.h \
- qprocess.h \
- screensaver.h \
- mediummount/mediumwidget.h \
- mediadlg.h
-
-SOURCES += server.cpp \
- qrr.cpp \
- serverinterface.cpp \
- launchertab.cpp \
- documentlist.cpp \
- appicons.cpp \
- taskbar.cpp \
- runningappbar.cpp \
- applauncher.cpp \
- stabmon.cpp \
- inputmethods.cpp \
- systray.cpp \
- wait.cpp \
- shutdownimpl.cpp \
- launcher.cpp \
- launcherview.cpp \
- calibrate/calibrate.cpp \
- transferserver.cpp \
- packageslave.cpp \
- irserver.cpp \
- qcopbridge.cpp \
- startmenu.cpp \
- main.cpp \
- firstuse.cpp \
- syncdialog.cpp \
- serverapp.cpp \
- qprocess.cpp \
- qprocess_unix.cpp \
- screensaver.cpp \
- mediummount/mediumwidget.cc \
- mediadlg.cpp
-
-
-INCLUDEPATH += calibrate
-DEPENDPATH += calibrate
-
-INCLUDEPATH += $(OPIEDIR)/include rsync
-DEPENDPATH += rsync
-
-INCLUDEPATH += mediummount
-DEPENDPATH += mediummount
-
-
-TARGET = qpe
-
-LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
-
-include ( $(OPIEDIR)/include.pro )
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.2.bb b/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
index 497bff0953..ad2952f3e2 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r7"
+PR = "r8"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -9,5 +9,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/root \
${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
file://nomax.patch;patch=1;pnum=3 \
- file://server.pro \
+ file://server-pro-old.patch;patch=1 \
"
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
index c22e3bed5f..360e3f4c62 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.3.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -12,6 +12,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
file://no-builtin-qss-startup.patch;patch=1 \
file://kbdlocks-runtime.patch;patch=1 \
file://restart-from-bindir.patch;patch=1 \
- file://server.pro \
+ file://server-pro-old.patch;patch=1 \
file://firstuse-path.patch;patch=1 \
"
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
index c22e3bed5f..aa6db3ca36 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -12,6 +12,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
file://no-builtin-qss-startup.patch;patch=1 \
file://kbdlocks-runtime.patch;patch=1 \
file://restart-from-bindir.patch;patch=1 \
- file://server.pro \
+ file://server-pro-1.2.4.patch;patch=1 \
file://firstuse-path.patch;patch=1 \
"
diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb
index 08c4d3bbec..3422bbe180 100644
--- a/recipes/opie-taskbar/opie-taskbar_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r17"
+PR = "r18"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -16,3 +16,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
file://server-pro-cvs.patch;patch=1 \
file://firstuse-path.patch;patch=1 \
"
+
diff --git a/recipes/schroedinger/schroedinger_1.0.5.bb b/recipes/schroedinger/schroedinger_1.0.5.bb
index 66d24c1d97..476c2965e6 100644
--- a/recipes/schroedinger/schroedinger_1.0.5.bb
+++ b/recipes/schroedinger/schroedinger_1.0.5.bb
@@ -1,8 +1,12 @@
require schroedinger.inc
-PR = "r2"
+PR = "r3"
inherit autotools_stage
AUTOTOOLS_STAGE_PKGCONFIG = "1"
+PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev gst-plugin-schroedinger"
+FILES_gst-plugin-schroedinger = "${libdir}/gstreamer-0.10/*.so"
+FILES_gst-plugin-schroedinger-dbg = "${libdir}/gstreamer-0.10/.debug"
+FILES_gst-plugin-schroedinger-dev = "${libdir}/gstreamer-0.10/*.*a"