diff options
34 files changed, 639 insertions, 106 deletions
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc index 1f39916f4f..ffcbbc2217 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -176,7 +176,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}+cvs20070922" PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 0544dd4bd5..1bac841a6e 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r2" +PR = "r3" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/hx4700/.mtn2git_empty b/packages/alsa/alsa-state/hx4700/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/alsa/alsa-state/hx4700/.mtn2git_empty diff --git a/packages/alsa/alsa-state/hx4700/asound.state b/packages/alsa/alsa-state/hx4700/asound.state new file mode 100644 index 0000000000..98661f5e3a --- /dev/null +++ b/packages/alsa/alsa-state/hx4700/asound.state @@ -0,0 +1,37 @@ +state.'hx4700 Audio' { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'Master Playback Volume' + value.0 205 + value.1 205 + } + control.2 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Master Playback Switch' + value true + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 127' + iface MIXER + name 'Mic Capture Gain' + value 16 + } + control.4 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mic Boost (+20dB)' + value true + } +} diff --git a/packages/alsa/alsa-state/magician/.mtn2git_empty b/packages/alsa/alsa-state/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/alsa/alsa-state/magician/.mtn2git_empty diff --git a/packages/alsa/alsa-state/magician/asound.state b/packages/alsa/alsa-state/magician/asound.state new file mode 100644 index 0000000000..edc85dd364 --- /dev/null +++ b/packages/alsa/alsa-state/magician/asound.state @@ -0,0 +1,202 @@ +state.Magician { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'Playback Volume' + value.0 205 + value.1 205 + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'Mixer Volume' + value.0 255 + value.1 0 + } + control.3 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Flat + comment.item.1 Minimum1 + comment.item.2 Minimum2 + comment.item.3 Maximum + iface MIXER + name 'Sound Processing Filter Mode' + value Flat + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 3' + iface MIXER + name 'Treble Volume' + value.0 0 + value.1 0 + } + control.5 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + iface MIXER + name 'Bass Volume' + value.0 0 + value.1 0 + } + control.6 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 + comment.item.0 None + comment.item.1 '32kHz' + comment.item.2 '44.1kHz' + comment.item.3 '48kHz' + comment.item.4 '96kHz' + iface MIXER + name 'Playback De-emphasis' + value.0 None + value.1 None + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + iface MIXER + name 'Capture Volume' + value.0 0 + value.1 0 + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 15' + iface MIXER + name 'Line Capture Volume' + value.0 0 + value.1 0 + } + control.9 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 11' + iface MIXER + name 'Mic Capture Volume' + value 0 + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Playback Switch' + value.0 true + value.1 false + } + control.11 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Capture Switch' + value true + } + control.12 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'AGC Timing' + value 0 + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + iface MIXER + name 'AGC Target level' + value 3 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'AGC Switch' + value false + } + control.15 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name Silence + value false + } + control.16 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Silence Detection' + value false + } + control.17 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Direct + comment.item.1 Mixer + iface MIXER + name 'Output Mux' + value Direct + } + control.18 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Line + comment.item.1 Mic + iface MIXER + name 'Input Mux' + value Line + } + control.19 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Headphone Switch' + value false + } + control.20 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Speaker Switch' + value true + } + control.21 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Call Mic' + comment.item.1 'Headset Mic' + iface MIXER + name 'Input Select' + value 'Call Mic' + } +} diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb new file mode 100644 index 0000000000..d3f6509151 --- /dev/null +++ b/packages/cairo/cairo-directfb_1.4.8.bb @@ -0,0 +1,17 @@ +require cairo.inc + +DEPENDS = "directfb libsm libpng fontconfig" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ + file://cairo_directfb_is_similar-typo.patch;patch=1 \ + " + +EXTRA_OECONF += " --enable-directfb \ + --disable-xlib \ + --disable-win32" + +LDFLAGS_append += " -ldirectfb" +CFLAGS_append += " -I${STAGING_INCDIR}/directfb" + +PR = "r0" + +S = "${WORKDIR}/cairo-${PV}" diff --git a/packages/cairo/files/cairo_directfb_is_similar-typo.patch b/packages/cairo/files/cairo_directfb_is_similar-typo.patch new file mode 100644 index 0000000000..10c81464f0 --- /dev/null +++ b/packages/cairo/files/cairo_directfb_is_similar-typo.patch @@ -0,0 +1,11 @@ +--- cairo-1.4.8/src/cairo-directfb-surface.c~org 2007-09-22 19:34:35.000000000 -0400 ++++ cairo-1.4.8/src/cairo-directfb-surface.c 2007-09-22 19:36:01.000000000 -0400 +@@ -1572,7 +1572,7 @@ + NULL, /* show_glyphs */ + #endif + NULL, /* snapshot */ +- _cairo_directfb_is_similar, ++ _cairo_directfb_surface_is_similar, + NULL /* reset */ + }; + diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb new file mode 100644 index 0000000000..bbda02e900 --- /dev/null +++ b/packages/directfb/directfb_1.1.0.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "DirectFB is a thin library that provides developers \ +with hardware graphics acceleration, input device handling and \ +abstraction, an integrated windowing system with support for \ +translucent windows and multiple display layers on top of the \ +Linux framebuffer device." +SECTION = "libs" +LICENSE = "LGPL" +HOMEPAGE = "http://directfb.org" +DEPENDS = "jpeg libpng freetype zlib tslib" +PR = "r0" +RV = "1.1-0" + +SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ + file://fix-pkgconfig-cflags.patch;patch=1 \ + file://fix-font-missing-char.patch;patch=1 \ + file://getpagesize.patch;patch=1 \ + file://fix-includes.patch;patch=1 \ + file://mkdfiff.patch;patch=1" + +S = "${WORKDIR}/DirectFB-${PV}" + +LDFLAGS_append =" -lts -lm" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-gfxdrivers=none \ + --enable-libmpeg3=no \ + --enable-freetype=yes \ + --enable-sdl=no \ + --disable-x11 \ + " + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \ + ${libdir}/directfb-${RV}/*/.debug/*.so \ + " + +FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \ + ${libdir}/directfb-${RV}/inputdrivers/*.la \ + ${libdir}/directfb-${RV}/interfaces/*/*.la \ + ${libdir}/directfb-${RV}/wm/*.la \ + " + + +FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \ + ${libdir}/directfb-${RV}/inputdrivers/*.so \ + ${libdir}/directfb-${RV}/interfaces/*/*.so \ + ${libdir}/directfb-${RV}/wm/*.so \ + ${datadir}/directfb-1.1.0 \ + " diff --git a/packages/directfb/files/fix-font-missing-char.patch b/packages/directfb/files/fix-font-missing-char.patch new file mode 100644 index 0000000000..4c5e5883f4 --- /dev/null +++ b/packages/directfb/files/fix-font-missing-char.patch @@ -0,0 +1,11 @@ +--- git/src/media/idirectfbfont.c~org 2007-07-10 10:35:46.000000000 -0400 ++++ git/src/media/idirectfbfont.c 2007-07-10 10:36:09.000000000 -0400 +@@ -497,7 +497,7 @@ + + if (width<max_width && string >= end) { + *ret_next_line = NULL; +- *ret_str_length = length-1; ++ *ret_str_length = length; + *ret_width = width; + + return DFB_OK; diff --git a/packages/directfb/files/fix-pkgconfig-cflags.patch b/packages/directfb/files/fix-pkgconfig-cflags.patch new file mode 100644 index 0000000000..0273b58ec5 --- /dev/null +++ b/packages/directfb/files/fix-pkgconfig-cflags.patch @@ -0,0 +1,45 @@ +diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-internal.pc.in +--- DirectFB-1.0.0~org/directfb-internal.pc.in 2003-07-04 13:30:22.000000000 -0400 ++++ DirectFB-1.0.0/directfb-internal.pc.in 2007-03-16 22:34:17.000000000 -0400 +@@ -8,4 +8,4 @@ + Description: Third party module support package for DirectFB. + Version: @VERSION@ + Requires: directfb = @VERSION@ +-Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ ++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} +diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in +--- DirectFB-1.0.0~org/directfb.pc.in 2004-08-04 12:28:20.000000000 -0400 ++++ DirectFB-1.0.0/directfb.pc.in 2007-03-16 22:31:33.000000000 -0400 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: fusion direct + Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@ +-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ ++Cflags: @THREADFLAGS@ -I${includedir} +diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in +--- DirectFB-1.0.0~org/lib/direct/direct.pc.in 2005-11-23 09:18:59.000000000 -0500 ++++ DirectFB-1.0.0/lib/direct/direct.pc.in 2007-03-16 22:32:13.000000000 -0400 +@@ -7,4 +7,4 @@ + Description: DirectFB base development library + Version: @VERSION@ + Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@ +-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ ++Cflags: @THREADFLAGS@ -I${includedir} +diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in +--- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in 2004-05-19 07:30:56.000000000 -0400 ++++ DirectFB-1.0.0/lib/fusion/fusion.pc.in 2007-03-16 22:32:34.000000000 -0400 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: direct + Libs: -L${libdir} -lfusion +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir} +diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in +--- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in 2004-05-19 07:31:28.000000000 -0400 ++++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in 2007-03-16 22:32:55.000000000 -0400 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: direct + Libs: -L${libdir} -lvoodoo +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir} diff --git a/packages/directfb/fusionsound_1.1.0+git20070709.bb b/packages/directfb/fusionsound_1.1.0+git20070709.bb new file mode 100644 index 0000000000..54e2ba211f --- /dev/null +++ b/packages/directfb/fusionsound_1.1.0+git20070709.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "FusionSound for DirectFB" +DEPENDS = "directfb" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \ +" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +CFLAGS_append += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal" + +#Below are some of the configure options +EXTRA_OECONF = " \ + --disable-ieee-floats \ + --disable-precision \ + --enable-linear-filter \ + --disable-dithering \ + --enable-debug \ + --enable-examples \ + --enable-module \ + --disable-timidity \ + --disable-wave \ + --enable-vorbis \ + --enable-tremor \ + --disable-mad \ + --disable-cdda \ + --disable-playlist \ + " + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_fusionsound-dbg_append = " ${libdir}/directfb-1.1-0/*/*/.debug/*.so \ + ${libdir}/directfb-1.1-0/*/.debug/*.so \ + " + +FILES_fusionsound-dev_append = " ${libdir}/directfb-1.1-0/interfaces/*/*.la \ + ${libdir}/directfb-1.1-0/snddrivers/*.la \ + " + +FILES_fusionsound_append = " ${libdir}/directfb-1.1-0/interfaces/*/*.so \ + ${libdir}/directfb-1.1-0/snddrivers/*.so \ + " + diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index 64e8a486e0..7e7111539b 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -1,22 +1,24 @@ DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage" -DEPENDS = "libusb-native" +DEPENDS = "libusb-native virtual/kernel" SECTION = "devel" AUTHOR = "Harald Welte" LICENSE = "GPL" PR = "r1" -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "1" -REV = "1922" +REV = "2060" PV = "0.1.0+r${REV}" SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}" S = "${WORKDIR}/boot_usb" -inherit native + +inherit module-base +#inherit native do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c -I${STAGING_KERNEL_DIR}/include } do_deploy() { diff --git a/packages/ezx/ezxd_svn.bb b/packages/ezx/ezxd_svn.bb index 56bc1c05bf..8b3390cea9 100644 --- a/packages/ezx/ezxd_svn.bb +++ b/packages/ezx/ezxd_svn.bb @@ -4,7 +4,7 @@ SECTION = "devel" AUTHOR = "Daniel Ribeiro" PV = "0.0+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \ file://ezxd.init \ @@ -21,8 +21,11 @@ do_configure() { sed -i -e s:CROSS:CC:g Makefile } -do_install() { - install -d ${D}${bindir} +fakeroot do_install() { + install -d ${D}/dev/input + mknod ${D}/dev/input/uinput c 10 223 + + install -d ${D}${bindir} install -m 755 ezxd ${D}${bindir} install -d ${D}${libdir}/ezxd @@ -33,3 +36,5 @@ do_install() { install -m 0755 ${WORKDIR}/ezxd.init ${D}${sysconfdir}/init.d/ezxd } +FILES_${PN} += "/dev" + diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index a504be42fa..c75db61a9a 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCDATE}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 2cab1101ca..d982c6b595 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -4,7 +4,7 @@ LICENSE = "nokia" PRIORITY = "optional" SECTION = "gpe" -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCDATE}" PR = "r0" DEPENDS = "curl librsvg osb-nrcore pango" diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index 402638d28e..5ca22d3083 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -2,7 +2,7 @@ require osb-nrcore.inc DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCDATE}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ diff --git a/packages/guichan/.mtn2git_empty b/packages/guichan/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/guichan/.mtn2git_empty diff --git a/packages/guichan/guichan_0.7.1.bb b/packages/guichan/guichan_0.7.1.bb new file mode 100644 index 0000000000..28c5c8e948 --- /dev/null +++ b/packages/guichan/guichan_0.7.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A portable C++ GUI library designed for games using Allegro, HGE, OpenGL, OpenLayer and/or SDL." +HOMEPAGE = "http://guichan.sourceforge.net" +DEPENDS = "virtual/libsdl libsdl-image" + +SRC_URI = "http://guichan.googlecode.com/files/guichan-0.7.1.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--disable-opengl --disable-glut --disable-allegro \ + --enable-sdlimage --enable-sdl" + +PACKAGES =+ "libguichan libguichan-sdl" + +FILES_libguichan = "${libdir}/libguichan.so.*" +FILES_libguichan-sdl = "${libdir}/libguichan_sdl.so.*" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/hal/hal-info_20070618.bb b/packages/hal/hal-info_20070618.bb new file mode 100644 index 0000000000..690dbe614d --- /dev/null +++ b/packages/hal/hal-info_20070618.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Hardware Abstraction Layer device information" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL AFL" + +SRC_URI = "http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-recall --disable-video" + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + + +PACKAGE_ARCH = "all" +FILES_${PN} += "${datadir}/hal/" diff --git a/packages/hal/hal-info_git.bb b/packages/hal/hal-info_git.bb index 597107fe2b..2812f19fe0 100644 --- a/packages/hal/hal-info_git.bb +++ b/packages/hal/hal-info_git.bb @@ -6,6 +6,7 @@ LICENSE = "GPL AFL" PV = "${SRCDATE}+git" PR = "r1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git" @@ -17,4 +18,4 @@ EXTRA_OECONF = "--disable-recall --disable-video" PACKAGE_ARCH = "all" -FILES_${PN} += "/usr/share/hal/" +FILES_${PN} += "${datadir}/hal/" diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb deleted file mode 100644 index a403e1a629..0000000000 --- a/packages/imagemagick/imagemagick_6.2.9.bb +++ /dev/null @@ -1,33 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/utils" -DEPENDS = "tiff" -DESCRIPTION = "ImageMagick is an image convertion tools" - -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \ - file://PerlMagic_MakePatch;patch=1" - -S = "${WORKDIR}/ImageMagick-${PV}" -PR="r1" - -inherit autotools binconfig - -EXTRA_OECONF="--without-x" -EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl" - -LEAD_SONAME="libMagick.so.*" - -FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ - ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ - ${libdir}/ImageMagick-${PV}/config/ \ - ${datadir}/ImageMagick-${PV}" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" - -do_stage() { - oe_libinstall -so -a libMagick ${STAGING_LIBDIR} - oe_libinstall -so -a libWand ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/wand/ - install -d ${STAGING_INCDIR}/magick/ - install -m 0644 wand/*.h ${STAGING_INCDIR}/wand/ - install -m 0644 magick/*.h ${STAGING_INCDIR}/magick/ -} diff --git a/packages/imagemagick/imagemagick_6.3.5-10.bb b/packages/imagemagick/imagemagick_6.3.5-10.bb new file mode 100644 index 0000000000..56229802ac --- /dev/null +++ b/packages/imagemagick/imagemagick_6.3.5-10.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "ImageMagick is an image convertion tools" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "tiff" +PR = "r1" + +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ + file://PerlMagic_MakePatch;patch=1 \ + file://makefile-am.patch;patch=1 \ + file://binconfig-fixes.patch;patch=1 " + +IMVER = "6.3.5" + +S = "${WORKDIR}/ImageMagick-${IMVER}" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--without-x --without-freetype --without-perl" +EXTRA_OECONF_openprotium = "--without-x --without-freetype --without-xml --without-perl" + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \ + ${libdir}/ImageMagick-${IMVER}/config/ \ + ${datadir}/ImageMagick-${IMVER}" + +FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \ + ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*" + +LEAD_SONAME = "libMagick.so.*" + diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb index 23110b6007..d98974541d 100644 --- a/packages/libtiff/tiff_3.7.2.bb +++ b/packages/libtiff/tiff_3.7.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This software provides support for the Tag Image File Format (TIF LICENSE = "" HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg" -PR = "r1" +PR = "r2" SRC_URI = "http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz" @@ -11,8 +11,9 @@ inherit autotools do_stage() { autotools_stage_includes install -d ${STAGING_LIBDIR} - install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so - install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so + oe_libinstall -C libtiff -a -so libtiff ${STAGING_LIBDIR} + oe_libinstall -C libtiff -a -so libtiffxx ${STAGING_LIBDIR} + } PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" diff --git a/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch b/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch index 653e814fb4..e85a40d1a9 100755 --- a/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch @@ -1,7 +1,7 @@ Index: linux-2.6.21/arch/arm/boot/compressed/head-xscale.S =================================================================== ---- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S 2007-06-28 16:51:50.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S 2007-09-23 11:17:06.000000000 -0300 @@ -53,3 +53,6 @@ str r1, [r0, #0x18] #endif @@ -11,8 +11,8 @@ Index: linux-2.6.21/arch/arm/boot/compressed/head-xscale.S +#endif Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-06-28 20:54:54.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-09-23 11:18:47.000000000 -0300 @@ -37,6 +37,10 @@ bool "Keith und Koep Trizeps4 DIMM-Module" select PXA27x @@ -68,8 +68,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig endif Index: linux-2.6.21/arch/arm/mach-pxa/Makefile =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-06-28 20:54:54.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-09-23 11:18:47.000000000 -0300 @@ -18,6 +18,12 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o @@ -86,7 +86,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Makefile Index: linux-2.6.21/arch/arm/mach-pxa/ezx.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx.c 2007-06-28 20:54:54.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx.c 2007-09-23 11:18:47.000000000 -0300 @@ -0,0 +1,118 @@ +/* + * ezx.c - Common code for EZX platform. @@ -209,7 +209,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx.c Index: linux-2.6.21/include/asm-arm/arch-pxa/ezx.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/include/asm-arm/arch-pxa/ezx.h 2007-06-28 16:51:50.000000000 -0300 ++++ linux-2.6.21/include/asm-arm/arch-pxa/ezx.h 2007-09-23 11:17:06.000000000 -0300 @@ -0,0 +1,225 @@ +/* + * linux/include/asm-arm/arch-pxa/ezx.h @@ -438,8 +438,8 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/ezx.h + Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h =================================================================== ---- linux-2.6.21.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h 2007-06-28 18:18:49.000000000 -0300 +--- linux-2.6.21.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-23 11:17:06.000000000 -0300 @@ -849,6 +849,8 @@ #define UP2OCR_HXOE (1 << 17) /* Host Port 2 Transceiver Output Enable */ #define UP2OCR_SEOS (1 << 24) /* Single-Ended Output Select */ @@ -555,8 +555,8 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h #define PGSR2 __REG(0x40F00028) /* Power Manager GPIO Sleep State Register for GP[84-64] */ Index: linux-2.6.21/arch/arm/boot/compressed/head.S =================================================================== ---- linux-2.6.21.orig/arch/arm/boot/compressed/head.S 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/arch/arm/boot/compressed/head.S 2007-06-28 16:51:50.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/boot/compressed/head.S 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/arch/arm/boot/compressed/head.S 2007-09-23 11:17:06.000000000 -0300 @@ -117,6 +117,9 @@ mov r0, r0 .endr @@ -569,8 +569,8 @@ Index: linux-2.6.21/arch/arm/boot/compressed/head.S .word start @ absolute load/run zImage address Index: linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h =================================================================== ---- linux-2.6.21.orig/include/asm-arm/arch-pxa/uncompress.h 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h 2007-06-28 16:51:50.000000000 -0300 +--- linux-2.6.21.orig/include/asm-arm/arch-pxa/uncompress.h 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h 2007-09-23 11:17:06.000000000 -0300 @@ -14,14 +14,14 @@ #define STUART ((volatile unsigned long *)0x40700000) #define HWUART ((volatile unsigned long *)0x41600000) @@ -591,8 +591,8 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h /* Index: linux-2.6.21/arch/arm/mm/init.c =================================================================== ---- linux-2.6.21.orig/arch/arm/mm/init.c 2007-06-28 16:51:44.000000000 -0300 -+++ linux-2.6.21/arch/arm/mm/init.c 2007-06-28 16:51:50.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mm/init.c 2007-09-23 11:16:58.000000000 -0300 ++++ linux-2.6.21/arch/arm/mm/init.c 2007-09-23 11:17:06.000000000 -0300 @@ -241,6 +241,10 @@ */ reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, @@ -607,7 +607,7 @@ Index: linux-2.6.21/arch/arm/mm/init.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c 2007-06-28 20:53:01.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c 2007-09-23 11:17:06.000000000 -0300 @@ -0,0 +1,88 @@ +/* + * ezx-a780.c - Code specific to A780 GSM Phone. @@ -700,7 +700,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c 2007-06-28 20:54:24.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c 2007-09-23 11:20:03.000000000 -0300 @@ -0,0 +1,70 @@ +/* + * ezx-e2.c - Code specific to E2 GSM Phone. @@ -748,7 +748,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c + .num_modes = 1, + .lccr0 = 0x022008B8, + .lccr3 = 0xC130FF13, -+ .pxafb_backlight_power = ezx_backlight_power, ++ .pxafb_backlight_power = &ezx_backlight_power, + .pxafb_lcd_power = &ezx_lcd_power, +}; + @@ -766,7 +766,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c + /* Maintainer: OpenEZX Team (www.openezx.org) */ + .phys_io = 0x40000000, + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, -+ .boot_params = 0xa0000100, ++ .boot_params = 0xa0000200, + .map_io = pxa_map_io, + .init_irq = pxa_init_irq, + .timer = &pxa_timer, @@ -775,7 +775,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-06-28 20:53:29.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c 2007-09-23 11:17:06.000000000 -0300 @@ -0,0 +1,87 @@ +/* + * ezx-e680.c - Code specific to E680 GSM Phone. @@ -867,7 +867,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-06-28 20:53:48.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-09-23 11:19:29.000000000 -0300 @@ -0,0 +1,70 @@ +/* + * ezx-a1200.c - Code specific to A1200 GSM Phone. @@ -915,7 +915,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c + .num_modes = 1, + .lccr0 = 0x022008B8, + .lccr3 = 0xC130FF13, -+ .pxafb_backlight_power = ezx_backlight_power, ++ .pxafb_backlight_power = &ezx_backlight_power, + .pxafb_lcd_power = &ezx_lcd_power, +}; + @@ -933,7 +933,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c + /* Maintainer: OpenEZX Team (www.openezx.org) */ + .phys_io = 0x40000000, + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, -+ .boot_params = 0xa0000100, ++ .boot_params = 0xa0000200, + .map_io = pxa_map_io, + .init_irq = pxa_init_irq, + .timer = &pxa_timer, @@ -942,7 +942,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-06-28 20:54:07.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c 2007-09-23 11:19:52.000000000 -0300 @@ -0,0 +1,70 @@ +/* + * ezx-e6.c - Code specific to E6 GSM Phone. @@ -990,7 +990,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c + .num_modes = 1, + .lccr0 = 0x022008B8, + .lccr3 = 0xC130FF13, -+ .pxafb_backlight_power = ezx_backlight_power, ++ .pxafb_backlight_power = &ezx_backlight_power, + .pxafb_lcd_power = &ezx_lcd_power, +}; + @@ -1008,7 +1008,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c + /* Maintainer: OpenEZX Team (www.openezx.org) */ + .phys_io = 0x40000000, + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, -+ .boot_params = 0xa0000100, ++ .boot_params = 0xa0000200, + .map_io = pxa_map_io, + .init_irq = pxa_init_irq, + .timer = &pxa_timer, diff --git a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch index 77c79fd107..293251423c 100644 --- a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch @@ -1,8 +1,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c 2007-09-11 20:14:33.000000000 -0300 -@@ -0,0 +1,267 @@ ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c 2007-09-23 09:31:23.000000000 -0300 +@@ -0,0 +1,272 @@ +/* + * EZX EOC Driver for Motorola EZX phones + * @@ -32,6 +32,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c + +#define EOC_REG_ADDR_SIZE 1 +#define EOC_REG_DATA_SIZE 3 ++#define I2C_DRIVERID_EOC 2100 + +struct ezx_eoc_platform_data *pdata; +static int eoc_func = EOC_FUNC_USB_NET; @@ -57,7 +58,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c + .driver = { + .name = (char *)eoc_i2c_driver_name, + }, -+ .id = I2C_DRIVERID_EEPROM, ++ .id = I2C_DRIVERID_EOC, + .attach_adapter = ezx_eoc_attach_adapter, + .detach_client = ezx_eoc_detach_client, +}; @@ -154,10 +155,14 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c + } +} + -+ ++int x = 0; +static int ezx_eoc_attach_adapter(struct i2c_adapter *adapter) +{ -+ return i2c_probe(adapter, &addr_data, ezx_eoc_detect); ++ if (!x) { ++ x++; ++ return i2c_probe(adapter, &addr_data, ezx_eoc_detect); ++ } ++ return -1; +} + +/* This function is called by i2c_probe */ @@ -210,11 +215,11 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c + ret = i2c_add_driver(&eoc_i2c_driver); + if (ret != 0) + return -EINVAL; -+ -+ /* ++ ++ /* + * I think we should save platform_data and call init and eoc_switch + * from ezx_eoc_detect, after client is setup. -+ * And there is no need for all the "check if initialised" checks if ++ * And there is no need for all the "check if initialised" checks if + * you assure that you only call read/write after the client is set. + * Probably, this was causing the crash on i2c-core too. + * --WM @@ -267,13 +272,13 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c +MODULE_LICENSE("GPL"); + +/* doesnt module_init work?? -WM */ -+/*late_initcall(ezx_eoc_init);*/ -+module_init(ezx_eoc_init); ++late_initcall(ezx_eoc_init); ++//module_init(ezx_eoc_init); +module_exit(ezx_eoc_exit); Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h 2007-09-09 21:46:27.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h 2007-09-22 14:12:05.000000000 -0300 @@ -0,0 +1,33 @@ +/* + * linux/arch/arm/mach-pxa/ezx-eoc.h @@ -310,8 +315,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h +#endif /* __EZX_EOC_H__ */ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-09-09 21:46:27.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-09-09 21:46:27.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-09-22 14:12:05.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-09-22 14:12:05.000000000 -0300 @@ -108,6 +108,12 @@ config EZX_PCAP bool "PCAP Support" @@ -327,8 +332,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig depends on EZX_PCAP Index: linux-2.6.21/arch/arm/mach-pxa/Makefile =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-09-09 21:46:27.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-09-09 21:46:27.000000000 -0300 +--- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile 2007-09-22 14:12:05.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/Makefile 2007-09-22 14:12:05.000000000 -0300 @@ -27,6 +27,7 @@ obj-$(CONFIG_EZX_BP) += ezx-bp.o obj-$(CONFIG_EZX_PCAP) += ezx-pcap.o diff --git a/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch b/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch index 9ee87ff903..1dd6edd7c3 100644 --- a/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch @@ -1,7 +1,8 @@ +This hack hardcodes pxa27x-udc to ether_gadget. This is just a temp workaround. Index: linux-2.6.21/drivers/usb/gadget/ether.c =================================================================== ---- linux-2.6.21.orig/drivers/usb/gadget/ether.c 2007-08-20 22:05:12.000000000 +0800 -+++ linux-2.6.21/drivers/usb/gadget/ether.c 2007-08-20 22:06:25.000000000 +0800 +--- linux-2.6.21.orig/drivers/usb/gadget/ether.c 2007-09-23 09:32:51.000000000 -0300 ++++ linux-2.6.21/drivers/usb/gadget/ether.c 2007-09-23 09:32:52.000000000 -0300 @@ -2697,10 +2697,16 @@ MODULE_LICENSE ("GPL"); @@ -22,8 +23,8 @@ Index: linux-2.6.21/drivers/usb/gadget/ether.c static void __exit cleanup (void) Index: linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c =================================================================== ---- linux-2.6.21.orig/drivers/usb/gadget/pxa27x_udc.c 2007-08-20 22:07:31.000000000 +0800 -+++ linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c 2007-08-20 22:07:47.000000000 +0800 +--- linux-2.6.21.orig/drivers/usb/gadget/pxa27x_udc.c 2007-09-23 09:32:51.000000000 -0300 ++++ linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c 2007-09-23 09:32:52.000000000 -0300 @@ -2227,6 +2227,8 @@ udc_init_ep(udc); udc_reinit(udc); diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 5d0096f2b7..f9de3f6f4d 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>" HOMEPAGE = "http://www.openezx.org" EZX = "ezxdev" -PR = "${EZX}-r20" +PR = "${EZX}-r21" require linux.inc @@ -70,15 +70,12 @@ SRC_URI = " \ file://patches/asoc-fix-loopback.patch;patch=1 \ file://patches/ezx-asoc.patch;patch=1 \ file://patches/mtdfix.patch;patch=1 \ + file://patches/ezx-backlight.patch;patch=1 \ + file://patches/pxa27x-udc-fix-a1200.patch;patch=1 \ file://defconfig \ \ " -BACKLIGHTPATCH = " file://patches/ezx-backlight.patch;patch=1 " -BACKLIGHTPATCH_rokre6 = "" - -SRC_URI += "${BACKLIGHTPATCH}" - S = "${WORKDIR}/linux-${PV}" @@ -94,7 +91,7 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)' #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 " CMDLINE_CON = "console=tty1 " -CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5" +CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5" CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 " # Uncomment to enable dyntick #CMDLINE_OTHER = "dyntick=enable" diff --git a/packages/openal/.mtn2git_empty b/packages/openal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openal/.mtn2git_empty diff --git a/packages/openal/files/.mtn2git_empty b/packages/openal/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openal/files/.mtn2git_empty diff --git a/packages/openal/files/void-workaround.patch b/packages/openal/files/void-workaround.patch new file mode 100644 index 0000000000..c2698a95bb --- /dev/null +++ b/packages/openal/files/void-workaround.patch @@ -0,0 +1,13 @@ +Index: openal-0.0.8/common/include/AL/alc.h +=================================================================== +--- openal-0.0.8.orig/common/include/AL/alc.h 2007-09-22 19:40:47.000000000 +0200 ++++ openal-0.0.8/common/include/AL/alc.h 2007-09-22 19:41:04.000000000 +0200 +@@ -82,7 +82,7 @@ + typedef double ALCdouble; + + /** void type (for opaque pointers only) */ +-typedef void ALCvoid; ++#define ALCvoid void + + + /* Enumerant values begin at column 50. No tabs. */ diff --git a/packages/openal/openal_0.0.8.bb b/packages/openal/openal_0.0.8.bb new file mode 100644 index 0000000000..280c5d75e8 --- /dev/null +++ b/packages/openal/openal_0.0.8.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "OpenAL is a cross-platform 3D audio API." +DEPENDS = "alsa-lib virtual/libsdl libvorbis" + +SRC_URI = "http://www.openal.org/openal_webstf/downloads/${PN}-${PV}.tar.gz \ + file://void-workaround.patch" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-alsa --enable-sdl --enable-vorbis --disable-mp3 \ + --disable-smpeg --disable-arts" + +do_configure_append () { + sed -i "s/@requirements@/alsa vorbis/" admin/pkgconfig/openal.pc +} + +do_stage () { + autotools_stage_all +} + +PACKAGES =+ "libopenal" + +FILES_libopenal += "${libdir}/libopenal.so.*" +FILES_openal-dev += "${bindir}/openal-config" +FILES_openal = "" diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index 769b5ff2c0..2eac502751 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -18,7 +18,7 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" +PACKAGES = "${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" do_install() { install -d ${D}${palmtopdir}/pics/launcher @@ -31,7 +31,7 @@ do_install() { install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg - for res in 480x640 640x480 800x600; do + for res in 320x480 480x320 480x640 640x480 800x600; do install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg done @@ -41,7 +41,7 @@ do_install() { } python do_package_prepend () { - reslist = ['240x320','320x240', '320x320', '480x640','640x480', '800x600','600x800'] + reslist = ['240x320','320x240', '320x320', '320x480', '480x320', '480x640','640x480', '800x600','600x800'] dir = bb.data.expand('${palmtopdir}/pics/launcher/', d) ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d) pn = bb.data.getVar('PN', d, 1) diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb new file mode 100644 index 0000000000..0905cd5fe3 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" +SRCDATE = "20070922" + +SRC_URI = "${HANDHELDS_CVS};module=opie/pics" |