diff options
Diffstat (limited to 'packages')
43 files changed, 588 insertions, 152 deletions
diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb index e83071fa0b..fb579f476f 100644 --- a/packages/aufs/aufs_cvs.bb +++ b/packages/aufs/aufs_cvs.bb @@ -28,7 +28,6 @@ EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" # I suggest you to read http://osdir.com/ml/linux.kernel.tracing/2006-12/msg00020.html do_configure() { -echo ${S} > /home/nice/sdir K_VERSION=$(echo ${KERNEL_VERSION} | awk 'BEGIN{FS="."}{print $3}') cd ${S} if [ $K_VERSION -ge 24 ] ; then @@ -59,4 +58,3 @@ else depmod -ae fi } - diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb index 68afcafea5..7fb691f360 100644 --- a/packages/boost/boost_1.34.1.bb +++ b/packages/boost/boost_1.34.1.bb @@ -2,12 +2,15 @@ # # Warning! The build system for boost seems to have changed # significantly since 1.33 (again). +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Boost Software License" -include boost.inc +DEPENDS = "python boost-jam-native zlib bzip2" -DEFAULT_PREFERENCE = "-1" - -DEPENDS += "bzip2" +PR = "r2" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ @@ -15,13 +18,15 @@ SRC_URI = "\ file://${PV}-gcc43.patch;patch=1 \ " -PR = "r0" +DEFAULT_PREFERENCE = "-1" + +S = "${WORKDIR}/${BOOST_P}" -BJAM_TOOLS = "--toolset=gcc \ - '-sGCC=${CC} '${BJAM_CONF} \ - '-sGXX=${CXX} '${BJAM_CONF} \ - '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ - '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +BJAM_TOOLS = "--toolset=gcc \ '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ '-sPYTHON_VERSION=${PYTHON_VERSION}' \ '-sPYTHON=${STAGING_BINDIR_NATIVE}/python' \ @@ -31,11 +36,134 @@ BJAM_TOOLS = "--toolset=gcc \ '--layout=system' \ " -BJAM_OPTS = '${BJAM_TOOLS} \ +BJAM_OPTS = '${BJAM_TOOLS} \ --builddir=${S}/${TARGET_SYS} \ ${BJAM_EXTRA}' +PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +PYTHON_VERSION = "2.5" + do_configure() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp + + platform_config="-DBOOST_PLATFORM_CONFIG='boost/config/platform/${TARGET_OS}.hpp'" + echo "import toolset : using ;" > tools/build/v2/user-config.jam - echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} <linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam + echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} $platform_config<linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam } + +do_compile() { + set -ex + bjam ${BJAM_OPTS} --prefix=${prefix} \ + --exec-prefix=${exec_prefix} \ + --libdir=${libdir} \ + --includedir=${includedir} +} + +do_stage() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} \ + install +} + +do_install() { + set -ex + bjam ${BJAM_OPTS} \ + --libdir=${D}${libdir} \ + --includedir=${D}${includedir} \ + install +} + +BOOSTLIBS = "" + +# -dev last to pick up the remaining stuff +PACKAGES = "${BOOSTLIBS} ${PN}-dev ${PN}" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# "boost" is a metapackage which pulls in all boost librabries +RRECOMMENDS_${PN} += "${BOOSTLIBS}" + +BOOSTLIBS += "boost-date-time boost-date-time-dbg boost-date-time-mt boost-date-time-mt-dbg" +FILES_boost-date-time = "${libdir}/libboost_date_time.so" +FILES_boost-date-time-dbg = "${libdir}/libboost_date_time-d.so ${libdir}/.debug/libboost_date_time-d.so" +FILES_boost-date-time-mt = "${libdir}/libboost_date_time-mt.so" +FILES_boost-date-time-mt-dbg = "${libdir}/libboost_date_time-mt-d.so ${libdir}/.debug/libboost_date_time-mt-d.so" + +BOOSTLIBS += "boost-filesystem boost-filesystem-dbg boost-filesystem-mt boost-filesystem-mt-dbg" +FILES_boost-filesystem = "${libdir}/libboost_filesystem.so" +FILES_boost-filesystem-dbg = "${libdir}/libboost_filesystem-d.so ${libdir}/.debug/libboost_filesystem-d.so" +FILES_boost-filesystem-mt = "${libdir}/libboost_filesystem-mt.so" +FILES_boost-filesystem-mt-dbg = "${libdir}/libboost_filesystem-mt-d.so ${libdir}/.debug/libboost_filesystem-mt-d.so" + +BOOSTLIBS += "boost-graph boost-graph-dbg boost-graph-mt boost-graph-mt-dbg" +FILES_boost-graph = "${libdir}/libboost_graph.so" +FILES_boost-graph-dbg = "${libdir}/libboost_graph-d.so ${libdir}/.debug/libboost_graph-d.so" +FILES_boost-graph-mt = "${libdir}/libboost_graph-mt.so" +FILES_boost-graph-mt-dbg = "${libdir}/libboost_graph-mt-d.so ${libdir}/.debug/libboost_graph-mt-d.so" + +BOOSTLIBS += "boost-iostreams boost-iostreams-dbg boost-iostreams-mt boost-iostreams-mt-dbg" +FILES_boost-iostreams = "${libdir}/libboost_iostreams.so" +FILES_boost-iostreams-dbg = "${libdir}/libboost_iostreams-d.so ${libdir}/.debug/libboost_iostreams-d.so" +FILES_boost-iostreams-mt = "${libdir}/libboost_iostreams-mt.so" +FILES_boost-iostreams-mt-dbg = "${libdir}/libboost_iostreams-mt-d.so ${libdir}/.debug/libboost_iostreams-mt-d.so" + +BOOSTLIBS += "boost-prg-exec-monitor boost-prg-exec-monitor-dbg boost-prg-exec-monitor-mt boost-prg-exec-monitor-mt-dbg" +FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so" +FILES_boost-prg-exec-monitor-dbg = "${libdir}/libboost_prg_exec_monitor-d.so ${libdir}/.debug/libboost_prg_exec_monitor-d.so" +FILES_boost-prg-exec-monitor-mt = "${libdir}/libboost_prg_exec_monitor-mt.so" +FILES_boost-prg-exec-monitor-mt-dbg = "${libdir}/libboost_prg_exec_monitor-mt-d.so ${libdir}/.debug/libboost_prg_exec_monitor-mt-d.so" + +BOOSTLIBS += "boost-program-options boost-program-options-dbg boost-program-options-mt boost-program-options-mt-dbg" +FILES_boost-program-options = "${libdir}/libboost_program_options.so" +FILES_boost-program-options-dbg = "${libdir}/libboost_program_options-d.so ${libdir}/.debug/libboost_program_options-d.so" +FILES_boost-program-options-mt = "${libdir}/libboost_program_options-mt.so" +FILES_boost-program-options-mt-dbg = "${libdir}/libboost_program_options-mt-d.so ${libdir}/.debug/libboost_program_options-mt-d.so" + +BOOSTLIBS += "boost-python boost-python-dbg boost-python-mt boost-python-mt-dbg" +FILES_boost-python = "${libdir}/libboost_python.so" +FILES_boost-python-dbg = "${libdir}/libboost_python-d.so ${libdir}/.debug/libboost_python-d.so" +FILES_boost-python-mt = "${libdir}/libboost_python-mt.so" +FILES_boost-python-mt-dbg = "${libdir}/libboost_python-mt-d.so ${libdir}/.debug/libboost_python-mt-d.so" + +BOOSTLIBS += "boost-regex boost-regex-dbg boost-regex-mt boost-regex-mt-dbg" +FILES_boost-regex = "${libdir}/libboost_regex.so" +FILES_boost-regex-dbg = "${libdir}/libboost_regex-d.so ${libdir}/.debug/libboost_regex-d.so" +FILES_boost-regex-mt = "${libdir}/libboost_regex-mt.so" +FILES_boost-regex-mt-dbg = "${libdir}/libboost_regex-mt-d.so ${libdir}/.debug/libboost_regex-mt-d.so" + +BOOSTLIBS += "boost-serialization boost-serialization-dbg boost-serialization-mt boost-serialization-mt-dbg" +FILES_boost-serialization = "${libdir}/libboost_serialization.so" +FILES_boost-serialization-dbg = "${libdir}/libboost_serialization-d.so ${libdir}/.debug/libboost_serialization-d.so" +FILES_boost-serialization-mt = "${libdir}/libboost_serialization-mt.so" +FILES_boost-serialization-mt-dbg = "${libdir}/libboost_serialization-mt-d.so ${libdir}/.debug/libboost_serialization-mt-d.so" + +BOOSTLIBS += "boost-signals boost-signals-dbg boost-signals-mt boost-signals-mt-dbg" +FILES_boost-signals = "${libdir}/libboost_signals.so" +FILES_boost-signals-dbg = "${libdir}/libboost_signals-d.so ${libdir}/.debug/libboost_signals-d.so" +FILES_boost-signals-mt = "${libdir}/libboost_signals-mt.so" +FILES_boost-signals-mt-dbg = "${libdir}/libboost_signals-mt-d.so ${libdir}/.debug/libboost_signals-mt-d.so" + +BOOSTLIBS += "boost-thread-mt boost-thread-mt-dbg" +FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so" +FILES_boost-thread-mt-dbg = "${libdir}/libboost_thread-mt-d.so ${libdir}/.debug/libboost_thread-mt-d.so" + +BOOSTLIBS += "boost-unit-test-framework boost-unit-test-framework-dbg boost-unit-test-framework-mt boost-unit-test-framework-mt-dbg" +FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so" +FILES_boost-unit-test-framework-dbg = "${libdir}/libboost_unit_test_framework-d.so ${libdir}/.debug/libboost_unit_test_framework-d.so" +FILES_boost-unit-test-framework-mt = "${libdir}/libboost_unit_test_framework-mt.so" +FILES_boost-unit-test-framework-mt-dbg = "${libdir}/libboost_unit_test_framework-mt-d.so ${libdir}/.debug/libboost_unit_test_framework-mt-d.so" + +BOOSTLIBS += "boost-wave boost-wave-dbg boost-wave-mt boost-wave-mt-dbg" +FILES_boost-wave = "${libdir}/libboost_wave.so" +FILES_boost-wave-dbg = "${libdir}/libboost_wave-d.so ${libdir}/.debug/libboost_wave-d.so" +FILES_boost-wave-mt = "${libdir}/libboost_wave-mt.so" +FILES_boost-wave-mt-dbg = "${libdir}/libboost_wave-mt-d.so ${libdir}/.debug/libboost_wave-mt-d.so" + +BOOSTLIBS += "boost-wserialization boost-wserialization-dbg boost-wserialization-mt boost-wserialization-mt-dbg" +FILES_boost-wserialization = "${libdir}/libboost_wserialization.so" +FILES_boost-wserialization-dbg = "${libdir}/libboost_wserialization-d.so ${libdir}/.debug/libboost_wserialization-d.so" +FILES_boost-wserialization-mt = "${libdir}/libboost_wserialization-mt.so" +FILES_boost-wserialization-mt-dbg = "${libdir}/libboost_wserialization-mt-d.so ${libdir}/.debug/libboost_wserialization-mt-d.so" + diff --git a/packages/cowsay/.mtn2git_empty b/packages/cowsay/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/cowsay/.mtn2git_empty diff --git a/packages/cowsay/xcowsay_1.1.bb b/packages/cowsay/xcowsay_1.1.bb new file mode 100644 index 0000000000..85f336c85f --- /dev/null +++ b/packages/cowsay/xcowsay_1.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "xcowsay displays a cute cow and message on your desktop" +LICENSE = "GPLv3" +DEPENDS = "gtk+ dbus" + +SRC_URI = "http://www.nickg.me.uk/files/xcowsay-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/fakeroot/fakeroot-native_1.9.5.bb b/packages/fakeroot/fakeroot-native_1.9.6.bb index 77d6f58651..77d6f58651 100644 --- a/packages/fakeroot/fakeroot-native_1.9.5.bb +++ b/packages/fakeroot/fakeroot-native_1.9.6.bb diff --git a/packages/fakeroot/fakeroot_1.9.5.bb b/packages/fakeroot/fakeroot_1.9.6.bb index aaf696d79d..aaf696d79d 100644 --- a/packages/fakeroot/fakeroot_1.9.5.bb +++ b/packages/fakeroot/fakeroot_1.9.6.bb diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index d12bfd7c1d..aa955b1648 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 = "r33" +PR = "r34" 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 = "adcf5e23c16d4c26f6e0e9b7eba8bbbd487e1cf5" -SRCREV_arm = "2e95f2adfbb11d033b5736d79f5beacf202ad993" +SRCREV = "b06c88bbec744970e023a03abed314f10d6936da" +SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d" 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 8c3d0dac36..00c0804ad3 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 = "r12" +PR = "r13" inherit module-base diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb index b312382e81..c8e1c19da3 100644 --- a/packages/gnome/gnome-games_2.23.6.bb +++ b/packages/gnome/gnome-games_2.23.6.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop" -PR = "r1" +PR = "r2" inherit gnome distutils-base gconf @@ -19,6 +19,11 @@ do_configure_prepend() { done } +do_configure_append() { + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i + done +} FILES_${PN}-doc += " ${datadir}/gnome/help" FILES_${PN}-dbg += " ${bindir}/.debug ${libdir}/gnome-games/.debug" diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index 087d5ff670..c7a2d2e433 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 = "r6" +PR = "r7" inherit autotools pkgconfig diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 87fb6498f4..ff67450f50 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -17,6 +17,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" KLIBC_ARCH = '${TARGET_ARCH}' KLIBC_ARCH_armeb = 'arm' KLIBC_ARCH_mipsel = 'mips' +KLIBC_ARCH_x86 = 'i386' +KLIBC_ARCH_i486 = 'i386' +KLIBC_ARCH_i586 = 'i386' +KLIBC_ARCH_i686 = 'i386' +KLIBC_ARCH_pentium = 'i386' # the klibc code contains ARM instructions (for ARM), this # could be fixed, but for the moment: diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index f7015ffaf7..14a9f6b4d7 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r10" +PR = "r11" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 70d2819394..a607aa8a21 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r8" +PR = "r9" diff --git a/packages/libsdl/libsdl-gfx_2.0.17.bb b/packages/libsdl/libsdl-gfx_2.0.17.bb new file mode 100644 index 0000000000..79af40ae1d --- /dev/null +++ b/packages/libsdl/libsdl-gfx_2.0.17.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Simple DirectMedia Layer graphic primitives library." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "zlib libpng jpeg virtual/libsdl" +LICENSE = "LGPL" + +SRC_URI = "http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" +S = "${WORKDIR}/SDL_gfx-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-mmx" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/libtool/libtool-sdk_2.2.4.bb b/packages/libtool/libtool-sdk_2.2.4.bb index b6b2aa966c..e92c4dbfaf 100644 --- a/packages/libtool/libtool-sdk_2.2.4.bb +++ b/packages/libtool/libtool-sdk_2.2.4.bb @@ -1,7 +1,7 @@ require libtool.inc require libtool_${PV}.bb -PR = "r0" +PR = "r1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://cross_compile.patch;patch=1" @@ -40,6 +40,7 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ install -d ${STAGING_DATADIR}/libtool/config/ diff --git a/packages/linux/linux-2.6.25/at32stk1000/defconfig b/packages/linux/linux-2.6.25/at32stk1000/defconfig index c5f75a04d6..9c01480cdd 100644 --- a/packages/linux/linux-2.6.25/at32stk1000/defconfig +++ b/packages/linux/linux-2.6.25/at32stk1000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25 -# Sun Sep 7 18:10:04 2008 +# Mon Sep 22 19:07:49 2008 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -200,7 +200,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_STAT_DETAILS=n +# CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set @@ -850,64 +850,7 @@ CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -# CONFIG_SND_SEQUENCER is not set -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -# CONFIG_SND_DYNAMIC_MINORS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_AC97_CODEC=m -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set - -# -# AVR32 devices -# -CONFIG_SND_ATMEL_AC97=m - -# -# SPI devices -# -CONFIG_SND_AT73C213=m -CONFIG_SND_AT73C213_TARGET_BITRATE=48000 - -# -# USB devices -# -# CONFIG_SND_USB_AUDIO is not set -# CONFIG_SND_USB_CAIAQ is not set - -# -# PCMCIA devices -# -# CONFIG_SND_VXPOCKET is not set -# CONFIG_SND_PDAUDIOCF is not set - -# -# System on Chip audio support -# -# CONFIG_SND_SOC is not set - -# -# SoC Audio support for SuperH -# - -# -# ALSA SoC audio for Freescale SOCs -# +# CONFIG_SND is not set # # Open Sound System @@ -916,7 +859,6 @@ CONFIG_SOUND_PRIME=m # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_AT32_ABDAC=m -CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=m # CONFIG_HID_DEBUG is not set diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb index 1e4eef3eea..ff343561df 100644 --- a/packages/miniclipboard/miniclipboard_0.3.bb +++ b/packages/miniclipboard/miniclipboard_0.3.bb @@ -2,7 +2,7 @@ SECTION = "x11/utils" inherit gpe LICENSE = "GPL" DESCRIPTION = "Clipboard management application" -DEPENDS = "virtual/libx11" +DEPENDS = "virtual/libx11 libxpm" RDEPENDS = "gdk-pixbuf-loader-xpm" PR = "r2" diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb index 4b1844832c..96d1d46a6f 100644 --- a/packages/mozilla/fennec_hg.bb +++ b/packages/mozilla/fennec_hg.bb @@ -2,10 +2,10 @@ DEPENDS += "cairo alsa-lib " # Yes, we'll need to bump PE later on :( PV = "1.0a1pre" -PR = "r5" +PR = "r6" -SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=31c03e2ff02d \ - hg://hg.mozilla.org/;module=mobile-browser;rev=bcea2e901482 \ +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=7bfd2ee7016f \ + hg://hg.mozilla.org/;module=mobile-browser;rev=a48464d3ea42 \ file://jsautocfg.h \ file://jsautocfg-dontoverwrite.patch;patch=1 \ " diff --git a/packages/mozilla/files/i386/.mtn2git_empty b/packages/mozilla/files/i386/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i386/.mtn2git_empty diff --git a/packages/mozilla/files/i386/jsautocfg.h b/packages/mozilla/files/i386/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i386/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/files/i486/.mtn2git_empty b/packages/mozilla/files/i486/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i486/.mtn2git_empty diff --git a/packages/mozilla/files/i486/jsautocfg.h b/packages/mozilla/files/i486/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i486/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/files/i586/.mtn2git_empty b/packages/mozilla/files/i586/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i586/.mtn2git_empty diff --git a/packages/mozilla/files/i586/jsautocfg.h b/packages/mozilla/files/i586/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i586/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/files/i686/.mtn2git_empty b/packages/mozilla/files/i686/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mozilla/files/i686/.mtn2git_empty diff --git a/packages/mozilla/files/i686/jsautocfg.h b/packages/mozilla/files/i686/jsautocfg.h new file mode 100644 index 0000000000..394271a7ea --- /dev/null +++ b/packages/mozilla/files/i686/jsautocfg.h @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index b45ac683d7..b4fbf20b00 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,5 +1,7 @@ SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop" +PARALLEL_MAKE = "" + MOZPV ?= "${PV}" PACKAGES =+ "${PN}-inspector" diff --git a/packages/openttd/openttd.inc b/packages/openttd/openttd.inc index a27da0fd4c..949bffee77 100644 --- a/packages/openttd/openttd.inc +++ b/packages/openttd/openttd.inc @@ -30,7 +30,7 @@ do_configure() { --prefix-dir=${prefix} \ --binary-dir=bin \ --with-midi=/bin/true \ - --with-zlib \ + --with-zlib=${STAGING_LIBDIR} \ --with-png \ --with-freetype \ --cc-build=gcc \ diff --git a/packages/openttd/openttd_0.6.0.bb b/packages/openttd/openttd_0.6.0.bb index 893551ac59..ecacb2d939 100644 --- a/packages/openttd/openttd_0.6.0.bb +++ b/packages/openttd/openttd_0.6.0.bb @@ -1,6 +1,6 @@ require openttd.inc -PR = "r1" +PR = "r2" SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1" diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb index 1f863b6057..2a909af26f 100644 --- a/packages/pciutils/pciutils_2.2.4.bb +++ b/packages/pciutils/pciutils_2.2.4.bb @@ -8,12 +8,12 @@ DEPENDS = "zlib" SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://configure-uclibc.patch;patch=1 \ + file://configure-uclibc.patch;patch=1 \ file://pcimodules-pciutils.diff;patch=1" PARALLEL_MAKE = "" -PR="r2" +PR="r3" do_configure () { (cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH}) @@ -29,10 +29,32 @@ LDFLAGS += "-lz" do_install () { oe_runmake install } + do_install_append () { install -d ${D}/${prefix}/share install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share + + # The makefile does not install the development files: + # libpci.a pci.h header.h config.h types.s + install -d ${D}/${libdir} + install -d ${D}/${includedir}/pci + + oe_libinstall -a -C lib libpci ${D}/${libdir} + install -m 0644 ${S}/lib/pci.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/header.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/config.h ${D}/${includedir}/pci/ + install -m 0644 ${S}/lib/types.h ${D}/${includedir}/pci/ } +do_stage () { + oe_libinstall -a -C lib libpci ${STAGING_LIBDIR} + install -m 0755 -d ${STAGING_INCDIR}/pci + install -m 0644 ${S}/lib/pci.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/header.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/config.h ${STAGING_INCDIR}/pci/ + install -m 0644 ${S}/lib/types.h ${STAGING_INCDIR}/pci/ +} + + PACKAGES =+ "pciutils-ids" FILES_pciutils-ids="${prefix}/share/pci.ids" diff --git a/packages/smpeg/smpeg/as-fix.patch b/packages/smpeg/smpeg/as-fix.patch new file mode 100644 index 0000000000..1a747018e5 --- /dev/null +++ b/packages/smpeg/smpeg/as-fix.patch @@ -0,0 +1,18 @@ +--- + configure.in | 1 + + 1 file changed, 1 insertion(+) + +--- trunk.orig/configure.in ++++ trunk/configure.in +@@ -54,10 +54,11 @@ AC_PROG_MAKE_SET + AC_PROG_CC + AC_PROG_CXX + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + AC_PROG_INSTALL ++AM_PROG_AS + + dnl Ugh. + AS="$CC" + CCAS="$CC" + AC_SUBST(AS) diff --git a/packages/smpeg/smpeg/compile.patch b/packages/smpeg/smpeg/compile.patch index 86ec4fca45..563334c972 100644 --- a/packages/smpeg/smpeg/compile.patch +++ b/packages/smpeg/smpeg/compile.patch @@ -3,17 +3,6 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # ---- smpeg/Makefile.am~compile 2002-09-26 01:24:04.000000000 -0400 -+++ smpeg/Makefile.am 2004-03-05 09:31:19.000000000 -0500 -@@ -4,7 +4,7 @@ - # These are the subdirectories that are always built - SUBDIRS = audio video - --CXXLD = cc -+CXXLD = $(CC) - - bin_SCRIPTS = smpeg-config - --- smpeg/MPEGaudio.h~compile 2006-06-10 22:41:41.000000000 +0200 +++ smpeg/MPEGaudio.h 2006-06-10 22:41:51.000000000 +0200 @@ -34,6 +34,9 @@ diff --git a/packages/smpeg/smpeg_svn.bb b/packages/smpeg/smpeg_svn.bb new file mode 100644 index 0000000000..e6c0f6444a --- /dev/null +++ b/packages/smpeg/smpeg_svn.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \ +player for Linux based on the mpeg_play and SPLAY MPEG decoders." +LICENSE = "LGPL" +SECTION = "libs/multimedia" +DEPENDS = "virtual/libsdl" +PROVIDES = "smpeg" +PV = "0.4.5+rsvn${SRCREV}" +SRCREV = "370" + +SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk \ + file://m4.patch;patch=1 \ + file://as-fix.patch;patch=1" + +S = "${WORKDIR}/trunk" + +inherit autotools + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +CFLAGS_append = " -I${STAGING_INCDIR}/SDL" +EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \ + --without-gtk --disable-gtk-player" + +do_configure_prepend () { + touch NEWS AUTHORS ChangeLog + rm -f acinclude.m4 +} + +do_stage() { + oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR} + ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so + + for f in "*.h" + do + install -m 0644 ${f} ${STAGING_INCDIR}/SDL + done + + cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \ + | sed -e "s,-I/usr/include/smpeg, ," \ + | sed -e "s,libdirs ,mickey_is_cool ," \ + | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config + chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config +} + +PACKAGES =+ "plaympeg " +SECTION_plaympeg = "console/multimedia" +FILES_${PN} = "${libdir}" +FILES_plaympeg = "${bindir}/plaympeg" +FILES_${PN}-dev += "${bindir}" + diff --git a/packages/v86d/v86d_0.1.5.bb b/packages/v86d/v86d_0.1.8.bb index 12b7718279..bb91e386a1 100644 --- a/packages/v86d/v86d_0.1.5.bb +++ b/packages/v86d/v86d_0.1.8.bb @@ -1,18 +1,23 @@ DESCRIPTION = "User support binary for the uvesafb kernel module" SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.bz2 \ file://fbsetup" -DEPENDS = "virtual/kernel" +DEPENDS = "virtual/kernel klibc" LICENSE = "GPLv2" -PR = "r3" +PR = "r0" RRECOMMENDS_${PN} = "kernel-module-uvesafb" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(qemux86|bootcdx86)" +COMPATIBLE_MACHINE = "(qemux86|bootcdx86|i586-generic)" INITSCRIPT_NAME = "fbsetup" INITSCRIPT_PARAMS = "start 0 S ." +export CC=${TARGET_PREFIX}klcc + +# klcc doesn't work with -isystem +export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" + do_configure () { ./configure --default } diff --git a/packages/wolf3d/.mtn2git_empty b/packages/wolf3d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wolf3d/.mtn2git_empty diff --git a/packages/wolf3d/wolf4sdl_1.6.bb b/packages/wolf3d/wolf4sdl_1.6.bb new file mode 100644 index 0000000000..2e3483b164 --- /dev/null +++ b/packages/wolf3d/wolf4sdl_1.6.bb @@ -0,0 +1,17 @@ +LICENSE = "Various" +DESCRIPTION = "Wolfenstein3d game engine" +DEPENDS = "virtual/libsdl libsdl-mixer" + +SRC_URI = "http://www.stud.uni-karlsruhe.de/~uvaue/chaos/bins/Wolf4SDL-${PV}-src.zip" + +S = "${WORKDIR}/Wolf4SDL-1.6-src" + +TARGET_CFLAGS_append = " -lSDL -lSDL_mixer -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL" + +do_compile() { + oe_runmake -e Q= PREFIX=${prefix} +} + +do_install() { + oe_runmake -e Q= PREFIX=${D}/${prefix} install +} diff --git a/packages/wpa-supplicant/wpa-gui_0.6.4.bb b/packages/wpa-supplicant/wpa-gui_0.6.4.bb new file mode 100644 index 0000000000..6f63958288 --- /dev/null +++ b/packages/wpa-supplicant/wpa-gui_0.6.4.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Qt interface for choosing which configured network to connect \ +to. It also provides a method for browsing 802.11 SSID scan results, an event \ +history log of messages generated by wpa_supplicant, and a method to add or \ +edit wpa_supplicant networks." +SECTION = "network" +LICENSE = "GPL BSD" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +RDEPENDS = "wpa-supplicant" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " + +S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant/wpa_gui" + +inherit qt4x11 + +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_gui ${D}${sbindir} +} diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index 09489b1cf8..429b9907c0 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -13,6 +13,12 @@ inherit autotools pkgconfig FILES_${PN} += " ${libdir}/X11/fonts" +do_configure_prepend() { + if [ -f "${S}"/configure.ac ] ; then + sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac + fi +} + do_install_append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb index 8036af6b78..9d2193d4ee 100644 --- a/packages/zbedic/libbedic_1.1.bb +++ b/packages/zbedic/libbedic_1.1.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Library for bedic dictionary" +DESCRIPTION = "Library to handle bedic dictionary" HOMEPAGE = "http://bedic.sourceforge.net/" AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>" SECTION = "opie/libs" diff --git a/packages/zbedic/zbedic/opie-icons.patch b/packages/zbedic/zbedic/opie-icons.patch index 1e028d5210..cd320b3b1d 100644 --- a/packages/zbedic/zbedic/opie-icons.patch +++ b/packages/zbedic/zbedic/opie-icons.patch @@ -1,16 +1,14 @@ -Index: zbedic/src/zbedic.cpp -=================================================================== ---- zbedic.orig/src/zbedic.cpp 2006-03-15 11:24:12.000000000 +0100 -+++ zbedic/src/zbedic.cpp 2006-03-15 11:30:21.000000000 +0100 -@@ -129,9 +129,9 @@ - // ========== create actions +--- zbedic/src/zbedic.cpp.old 2008-09-20 14:36:24.000000000 -0500 ++++ zbedic/src/zbedic.cpp 2008-09-20 14:37:21.000000000 -0500 +@@ -142,9 +142,9 @@ ZBEDic::ZBEDic(QWidget *parent, const ch action[TB_SwitchDictionaries] = createAction( tr( "Switch dictionaries" ), "zbedic/switch_dictionary", SLOT(switchToPreviousDict()), CTRL+Key_S ); -- action[TB_Back] = createAction( tr( "History previous" ), "zbedic/back", -+ action[TB_Back] = createAction( tr( "History previous" ), "back", + action[TB_ShowHistory] = createAction( tr( "Show history" ), "zbedic/history", SLOT(showHistoryPopup()), CTRL+Key_H ); +- action[TB_Back] = createAction( tr( "Go back" ), "zbedic/back", ++ action[TB_Back] = createAction( tr( "Go back" ), "back", SLOT(navigationPrevious()), Key_End ); -- action[TB_Forward] = createAction( tr( "History next" ), "zbedic/forward", -+ action[TB_Forward] = createAction( tr( "History next" ), "forward", +- action[TB_Forward] = createAction( tr( "Go forward" ), "zbedic/forward", ++ action[TB_Forward] = createAction( tr( "Go forward" ), "forward", SLOT(navigationNext()), Key_Home ); action[TB_LookupSelection] = createAction( tr( "Lookup selection" ), "zbedic/lookup_selection", SLOT(lookupSelection()), CTRL+Key_L ); diff --git a/packages/zbedic/zbedic/qtopia17.patch b/packages/zbedic/zbedic/qtopia17.patch index 7b890aab8d..749fde2c7e 100644 --- a/packages/zbedic/zbedic/qtopia17.patch +++ b/packages/zbedic/zbedic/qtopia17.patch @@ -1,23 +1,21 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- zbedic/src/main.cpp~compilefix -+++ zbedic/src/main.cpp -@@ -25,5 +25,13 @@ - #include "zbedic.h" - #include <qtopia/qpeapplication.h> +--- zbedic/src/main.cpp.old 2008-09-20 14:40:57.000000000 -0500 ++++ zbedic/src/main.cpp 2008-09-20 14:51:11.000000000 -0500 +@@ -48,8 +48,16 @@ int main( int argc, char **argv ) + + #include <qpe/qpeapplication.h> -QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) -QTOPIA_MAIN -+//QTOPIA_ADD_APPLICATION("zbedic", ZBEDic) -+//QTOPIA_MAIN -+ +int main(int argc, char** argv) +{ -+ QPEApplication a( argc, argv ); -+ ZBEDic* myapp = new ZBEDic(); -+ a.showMainWidget( myapp ); -+ a.exec(); ++ QPEApplication app( argc, argv ); ++ ++ ZBEDic mainWindow( NULL, NULL ); ++ app.setMainWidget( &mainWindow ); ++ ++ mainWindow.show(); ++ return app.exec(); +} + + #endif + diff --git a/packages/zbedic/zbedic/version.patch b/packages/zbedic/zbedic/version.patch deleted file mode 100644 index 913e201dc7..0000000000 --- a/packages/zbedic/zbedic/version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zbedic/src/settings.cpp -=================================================================== ---- zbedic.orig/src/settings.cpp 2006-03-15 11:24:11.000000000 +0100 -+++ zbedic/src/settings.cpp 2006-03-15 15:03:55.000000000 +0100 -@@ -117,7 +117,7 @@ - - ZBEDicSettings::ZBEDicSettings( QWidget *parent ): QTabDialog( parent, "options", true ) - { -- setCaption( tr( "ZBEDic Settings (v. " VERSION ")" ) ); -+ setCaption( tr( "ZBEDic Settings (v. 1.0)" ) ); - - } - diff --git a/packages/zbedic/zbedic_1.2.bb b/packages/zbedic/zbedic_1.2.bb index afdfdd5350..61348c32f2 100644 --- a/packages/zbedic/zbedic_1.2.bb +++ b/packages/zbedic/zbedic_1.2.bb @@ -1,21 +1,23 @@ DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments" +HOMEPAGE = "http://bedic.sourceforge.net/" +AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>" SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r2" +PR = "r3" -SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-2.tgz \ file://opie-icons.patch;patch=1 \ - file://version.patch;patch=1 \ file://qtopia17.patch;patch=1" S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" +export OE_QMAKE_CXXFLAGS=" -DVERSION=\\"${PV}.2\\" -DPREFIX_PATH=\\"/usr\\"" EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" @@ -38,5 +40,6 @@ do_install() { rm ${D}${palmtopdir}/pics/zbedic/forward.png } -PACKAGES =+ "zbedic-help-en" -FILES_zbedic-help-en = "${palmtopdir}/help/html/*" +PACKAGES = "${PN}-dbg ${PN}-doc ${PN} ${PN}-dev" + +FILES_${PN}-doc += "${palmtopdir}/help" |