diff options
108 files changed, 1011 insertions, 1360 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index 993ad7964e..a66d845858 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -12,6 +12,6 @@ def python_dir(d): PYTHON_DIR = "${@python_dir(d)}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" -FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug \ +FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ ${libdir}/${PYTHON_DIR}/site-packages/.debug" diff --git a/conf/checksums.ini b/conf/checksums.ini index 749a719a23..219fb74b0c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11909,3 +11909,7 @@ sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c [http://simh.trailing-edge.com/sources/simhv37-1.zip] md5=c8c57379e2e9afbf9817fbbe99ee1106 sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132 + +[http://www.pengutronix.de/software/memedit/downloads/memedit-0.7.tar.gz] +md5=3d0f372fb213e09b8d04826f3a0bc2eb +sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 46a293235d..aa7aa0d345 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -10,9 +10,12 @@ DISTRO_VERSION = "test-${DATE}" DISTRO_REVISION = "46" -require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc + #Images built can have to modes: # 'debug': empty rootpassword, strace and gdb included # 'release' no root password, no strace and gdb by default @@ -88,11 +91,6 @@ FEED_ARCH_simpad = "arm-oabi" #Tweak packaging for strongarm machines since they can't use EABI -PACKAGE_ARCH_collie = "arm-oabi" -PACKAGE_ARCH_h3600 = "arm-oabi" -PACKAGE_ARCH_h3800 = "arm-oabi" -PACKAGE_ARCH_simpad = "arm-oabi" - PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" @@ -126,13 +124,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.21-hh7" -PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.21-hh7" -PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.21-hh7" -PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh8" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh8" PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" @@ -144,7 +136,7 @@ PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.3" +PREFERRED_VERSION_freetype = "2.3.4" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.8" PREFERRED_VERSION_glib-2.0 = "2.12.12" diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc new file mode 100644 index 0000000000..bb7bc45fbd --- /dev/null +++ b/conf/distro/include/angstromoabi.inc @@ -0,0 +1,4 @@ +require conf/distro/include/angstrom.inc + +PACKAGE_ARCH = "arm-oabi" + diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 95eb7354fe..e2e7f2f2d1 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -35,6 +35,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ kernel-module-htcuniversal-acx \ kernel-module-acx \ kernel-module-i2c-algo-bit \ + kernel-module-htcuniversal-ts2 \ + kernel-module-ts-adc-debounce \ " # @@ -45,6 +47,7 @@ module_autoload_htcuniversal_acx = "htcuniversal_acx" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio" +module_autoload_htcuniversal-ts2 = "htcuniversal-ts2" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 823999a208..de620fcd61 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "x86 i386 i486" + PREFERRED_PROVIDER_virtual/kernel = "linux-x86" OLDEST_KERNEL = "2.6.18" @@ -17,6 +18,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 1f91f89281..5eba33fa97 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -17,5 +17,6 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig index 7308eead76..eb0b8d7c64 100644 --- a/packages/busybox/busybox-1.2.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig @@ -421,7 +421,7 @@ CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set diff --git a/packages/busybox/busybox-1.2.2/angstrom/defconfig b/packages/busybox/busybox-1.2.2/angstrom/defconfig index 7308eead76..eb0b8d7c64 100644 --- a/packages/busybox/busybox-1.2.2/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.2/angstrom/defconfig @@ -421,7 +421,7 @@ CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig index 7308eead76..eb0b8d7c64 100644 --- a/packages/busybox/busybox-1.3.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig @@ -421,7 +421,7 @@ CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set diff --git a/packages/busybox/busybox-1.5.0/angstrom/defconfig b/packages/busybox/busybox-1.5.0/angstrom/defconfig index 7308eead76..eb0b8d7c64 100644 --- a/packages/busybox/busybox-1.5.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.5.0/angstrom/defconfig @@ -421,7 +421,7 @@ CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set diff --git a/packages/busybox/busybox-1.6.0/angstrom/defconfig b/packages/busybox/busybox-1.6.0/angstrom/defconfig index 7308eead76..eb0b8d7c64 100644 --- a/packages/busybox/busybox-1.6.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.6.0/angstrom/defconfig @@ -421,7 +421,7 @@ CONFIG_RDATE=y # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y -# CONFIG_SWITCH_ROOT is not set +CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb index 137ee8ffb2..a3b39d92f8 100644 --- a/packages/classpath/classpath-gtk_0.93.bb +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip- RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" -SRC_URI += "file://gconf_version.patch;patch=1" +SRC_URI += "file://disable-automake-checks-v2.patch;patch=1" EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" - -PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" - -FILES_classpath-doc = "${datadir}/info" -FILES_classpath-dev = "${includedir}" -FILES_${PN} = "${libdir} ${bindir}" -FILES_classpath-common = "${datadir}/classpath/glibj.zip" -FILES_classpath-examples = "${datadir}/classpath/examples" -FILES_classpath-tools = "${datadir}/classpath/tools.zip" diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index 53f494ab15..18d79decae 100644 --- a/packages/classpath/classpath-gtk_cvs.bb +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -1,14 +1,12 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc + +PR = "r2" SRCDATE_${PN} ?= "20070501" PV = "0.93+cvs${SRCDATE}" -DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native" +### note from Laibsch: bug 2523 has information on how to build this package +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst" RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" @@ -17,19 +15,8 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa S = "${WORKDIR}/classpath" -inherit autotools - EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" -PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" - -FILES_classpath-doc = "${datadir}/info ${datadir}/man" -FILES_classpath-dev = "${includedir}" -FILES_${PN} = "${libdir} ${bindir}" -FILES_classpath-common = "${datadir}/classpath/glibj.zip" -FILES_classpath-examples = "${datadir}/classpath/examples" -FILES_classpath-tools = "${datadir}/classpath/tools.zip" - do_stage() { install -d ${STAGING_INCDIR}/classpath install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ @@ -41,6 +28,3 @@ do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} } - -PROVIDES = "classpath" -RPROVIDES = "classpath" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb index f8e88a0217..83cb60142c 100644 --- a/packages/classpath/classpath-minimal-native_0.93.bb +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -3,6 +3,8 @@ require classpath.inc DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" PR = "r1" +SRC_URI += "file://disable-automake-checks-v2.patch;patch=1" + S = "${WORKDIR}/classpath-${PV}" inherit native diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb index 1339b2dbc8..8d9554c999 100644 --- a/packages/classpath/classpath-minimal_0.90.bb +++ b/packages/classpath/classpath-minimal_0.90.bb @@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native" RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})" RCONFLICTS_${PBN}-minimal = "${PBN}-gtk" -EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa" - -PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}" +SRC_URI += "file://disable-automake-checks.patch;patch=1" -FILES_${PBN}-doc = "${datadir}/info" -FILES_${PBN}-dev = "${includedir}" -FILES_${PN} = "${libdir}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip" -FILES_${PBN}-examples = "${datadir}/${PBN}/examples" -FILES_${PBN}-tools = "${datadir}/${PBN}/tools" +EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa" diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 1d684c0557..d9498c99d5 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -7,7 +7,6 @@ PROVIDES = "classpath" RPROVIDES = "classpath" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ - file://disable-automake-checks.patch;patch=1 \ file://gconf_version.patch;patch=1 \ file://fix-endian-arm-floats.patch;patch=1" @@ -28,3 +27,4 @@ FILES_classpath-common += "${datadir}/classpath/glibj.zip" FILES_classpath-examples += "${datadir}/classpath/examples" FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools" FILES_classpath-dev += "${libdir}/*.so" +FILES_classpath-dbg += "${libdir}/classpath/.debug" diff --git a/packages/efl/evas-x11_0.9.9.038.bb b/packages/efl/evas-x11_0.9.9.038.bb index 765a8b73d4..4c5ef29515 100644 --- a/packages/efl/evas-x11_0.9.9.038.bb +++ b/packages/efl/evas-x11_0.9.9.038.bb @@ -1,6 +1,6 @@ require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r8" +PR = "r10" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -9,6 +9,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --enable-buffer \ --disable-software-qtopia \ --enable-software-x11 \ + --enable-software-16-x11 \ --disable-gl-x11 \ --enable-image-loader-eet \ --enable-image-loader-edb \ @@ -20,7 +21,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --enable-scale-sample \ --enable-scale-smooth \ --enable-convert-yuv \ - --disable-image-loader-svg \ + --disable-image-loader-svg \ --disable-convert-8-rgb-332 \ --disable-convert-8-rgb-666 \ --disable-convert-8-rgb-232 \ @@ -33,19 +34,20 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --disable-convert-16-rgb-444 \ --disable-convert-16-rgb-ipq \ --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-90 \ --enable-convert-16-rgb-rot-270 \ --disable-convert-24-rgb-888 \ --disable-convert-24-bgr-888 \ --disable-convert-32-rgb-8888 \ --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ --disable-convert-32-rgb-rot-0 \ --disable-convert-32-rgb-rot-90 \ --disable-convert-32-rgb-rot-270" headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ + ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \ ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ ../modules/engines/buffer/Evas_Engine_Buffer.h \ ../modules/engines/fb/Evas_Engine_FB.h \ diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index f708200071..a175099c31 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -7,7 +7,7 @@ LICENSE = "MIT" DEPENDS = "freetype libpng jpeg eet" PROVIDES += "virtual/evas" -inherit efl +inherit efl lib_package export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" @@ -47,4 +47,4 @@ headers = "<override me>" libraries = "libevas" FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so" FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
\ No newline at end of file +FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/" diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb index d32fe6ced2..aad4eb3382 100644 --- a/packages/flumotion/flumotion_0.4.1.bb +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Fluendo Streaming Server" LICENSE = "GPL" -DEPENDS = "gstreamer python-gst twisted python-pygtk2" -RDEPENDS = " python-compression python-fcntl python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface python-textutils python-core python-gst python-misc" -RDEPENDS_${PN}-gui = "${PN} python-pygtk2" -PR = "r6" +DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk2" +RDEPENDS = " python-resource python-pprint python-threading python-imaging python-xml python-curses python-compression python-fcntl python-pygobject python-pickle python-netclient python-datetime python-crypt python-twisted-core python-twisted-web python-lang python-zopeinterface python-textutils python-core python-gst python-misc" +RDEPENDS_${PN}-gui = "${PN} python-pygtk2 python-pycairo " +PR = "r7" SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \ file://python-path.patch;patch=1 \ diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index 3f271a57a4..68eeeb04b8 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -9,7 +9,7 @@ DESCRIPTION = "The Fluxbox WindowManager" HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" REALPV = "1.0rc" -PR = "r4" +PR = "r5" ###################################################################################### @@ -29,7 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \ ###################################################################################### -PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" DESCRIPTION_${PN}-styles = "The default styles for fluxbox" DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb index ffaa7da5b4..1034c386c4 100644 --- a/packages/fluxbox/fluxbox_svn.bb +++ b/packages/fluxbox/fluxbox_svn.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" PV = "1.0+svn${SRCDATE}" -PR = "r2" +PR = "r3" ###################################################################################### @@ -30,7 +30,7 @@ SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \ ###################################################################################### -PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" DESCRIPTION_${PN}-styles = "The default styles for fluxbox" DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/freetype/freetype-2.3.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/freetype/freetype-2.3.3/.mtn2git_empty +++ b/packages/freetype/freetype-2.3.4/.mtn2git_empty diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch index ae504dcb0b..ae504dcb0b 100644 --- a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch +++ b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.4.bb index c1febe8a90..c1febe8a90 100644 --- a/packages/freetype/freetype_2.3.3.bb +++ b/packages/freetype/freetype_2.3.4.bb diff --git a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch new file mode 100644 index 0000000000..05f76895ba --- /dev/null +++ b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch @@ -0,0 +1,11 @@ +--- pidgin-2.0.1/pidgin.desktop.in.orig 2007-06-20 23:50:44.000000000 +0000 ++++ pidgin-2.0.1/pidgin.desktop.in 2007-06-20 23:51:05.000000000 +0000 +@@ -4,7 +4,7 @@ + _GenericName=Internet Messenger + _Comment=Send instant messages over multiple protocols + Exec=pidgin +-Icon=pidgin ++Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png + StartupNotify=true + Terminal=false + Type=Application diff --git a/packages/gaim/pidgin_2.0.1.bb b/packages/gaim/pidgin_2.0.1.bb index 961467ad95..99bc3a34e9 100644 --- a/packages/gaim/pidgin_2.0.1.bb +++ b/packages/gaim/pidgin_2.0.1.bb @@ -3,6 +3,7 @@ require pidgin.inc SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch;patch=1 \ file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ " -PR = "r3" +PR = "r4" diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index c42f419766..5bfb454452 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk @@ -11,3 +11,28 @@ require gcc_${PV}.bb require gcc4-build-sdk.inc require gcc-package-sdk.inc +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ + file://100-uclibc-conf.patch;patch=1 \ + file://110-arm-eabi.patch;patch=1 \ + file://200-uclibc-locale.patch;patch=1 \ + file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://740-sh-pr24836.patch;patch=1 \ + file://800-arm-bigendian.patch;patch=1 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://arm-thumb.patch;patch=1 \ + file://arm-thumb-cache.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://unbreak-armv4t.patch;patch=1 \ + file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ + " + +SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " + + diff --git a/packages/gnome/libgnome_2.18.0.bb b/packages/gnome/libgnome_2.18.0.bb new file mode 100644 index 0000000000..5eaa9a084e --- /dev/null +++ b/packages/gnome/libgnome_2.18.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gnome application programming libraries" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" + +inherit gnome lib_package + +DEPENDS = "gconf-native gnome-vfs libbonobo esound" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { +autotools_stage_all +} diff --git a/packages/gnome/libgnomeui_2.18.1.bb b/packages/gnome/libgnomeui_2.18.1.bb new file mode 100644 index 0000000000..6cde2362d2 --- /dev/null +++ b/packages/gnome/libgnomeui_2.18.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GNOME User Interface Library" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" + +inherit gnome + +FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ + ${libdir}/libglade/*/lib*.so \ + ${datadir}/pixmaps/gnome-about-logo.png" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" + +SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb index 609255e54e..6aeec56f12 100644 --- a/packages/gpe-login/gpe-login_0.90.bb +++ b/packages/gpe-login/gpe-login_0.90.bb @@ -3,9 +3,9 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" -RDEPENDS = "xkbd" +RDEPENDS = "xkbd gpe-theme-clearlooks" RPROVIDES = "gpe-session-starter" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/gpe-snes/gpe-snes_0.1.bb b/packages/gpe-snes/gpe-snes_0.2.bb index 13944f5a4a..6d647cf160 100644 --- a/packages/gpe-snes/gpe-snes_0.1.bb +++ b/packages/gpe-snes/gpe-snes_0.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gpe-snes is a gpe frontend for the snes9x SNES emulator" SECTION = "games" LICENSE = "GPLv2" PRIORITY = "optional" -DEPENDS = "libgpe" +DEPENDS = "gtk+ libgpewidget libxrandr" inherit autotools diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index 9a9ef9119b..b43c50b58c 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -7,7 +7,7 @@ DEPENDS = "dbus-glib ncurses python" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-dbus \ - --enable-python" + --disable-python" SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gpsd-default \ diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 92b4d59bf1..1399dba53b 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,3 +1,4 @@ require gpsd.inc -PR = "r3" +PR = "r4" + diff --git a/packages/gstreamer/gst-common.inc b/packages/gstreamer/gst-common.inc new file mode 100644 index 0000000000..31629d7572 --- /dev/null +++ b/packages/gstreamer/gst-common.inc @@ -0,0 +1,32 @@ +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" + +DEFAULT_PREFERENCE = "-1" + +inherit autotools pkgconfig + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + if [ -d ${STAGE_TEMP}/${includedir} ]; then + cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + fi + for i in $(find ${STAGE_TEMP}/${libdir} -name "*.la") + do + + destdir=$(dirname $(echo $i | sed -e s,${STAGE_TEMP}/${libdir},${STAGING_LIBDIR},g)) + oenote "Installing library $i to $destdir" + oe_libinstall -s -so $(basename $i .la) $destdir + done + + if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then + install -d ${STAGING_DATADIR}/aclocal + cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal + fi + rm -rf ${STAGE_TEMP} +} + + diff --git a/packages/gstreamer/gst-plugins-bad_0.10.1.bb b/packages/gstreamer/gst-plugins-bad_0.10.1.bb deleted file mode 100644 index 42f6df4d9d..0000000000 --- a/packages/gstreamer/gst-plugins-bad_0.10.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gst-plugins.inc - -DEPENDS += "gst-plugins-base" -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb index d8906733a5..51ce56dc1f 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb @@ -2,4 +2,4 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base" SRC_URI += "file://cross-compile.patch;patch=1" -PR = "r3" +PR = "r4" diff --git a/packages/gstreamer/gst-plugins-base_0.10.11.bb b/packages/gstreamer/gst-plugins-base_0.10.11.bb deleted file mode 100644 index c2f022f283..0000000000 --- a/packages/gstreamer/gst-plugins-base_0.10.11.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gst-plugins.inc - -PROVIDES += "gst-plugins" -PR = "r2" - -do_stage() { - autotools_stage_all -} - diff --git a/packages/gstreamer/gst-plugins-base_0.10.12.bb b/packages/gstreamer/gst-plugins-base_0.10.12.bb index cb6b524a7c..69a9a6e515 100644 --- a/packages/gstreamer/gst-plugins-base_0.10.12.bb +++ b/packages/gstreamer/gst-plugins-base_0.10.12.bb @@ -1,9 +1,5 @@ require gst-plugins.inc PROVIDES += "gst-plugins" -PR = "r0" - -do_stage() { - autotools_stage_all -} +PR = "r1" diff --git a/packages/gstreamer/gst-plugins-base_0.10.5.bb b/packages/gstreamer/gst-plugins-base_0.10.5.bb deleted file mode 100644 index afb0657964..0000000000 --- a/packages/gstreamer/gst-plugins-base_0.10.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gst-plugins.inc - -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-base_0.10.6.bb b/packages/gstreamer/gst-plugins-base_0.10.6.bb deleted file mode 100644 index 84bd2a9fe6..0000000000 --- a/packages/gstreamer/gst-plugins-base_0.10.6.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gst-plugins.inc - -PROVIDES_${PN} += "gst-plugins" -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-base_0.10.7.bb b/packages/gstreamer/gst-plugins-base_0.10.7.bb deleted file mode 100644 index c2f022f283..0000000000 --- a/packages/gstreamer/gst-plugins-base_0.10.7.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gst-plugins.inc - -PROVIDES += "gst-plugins" -PR = "r2" - -do_stage() { - autotools_stage_all -} - diff --git a/packages/gstreamer/gst-plugins-good_0.10.2.bb b/packages/gstreamer/gst-plugins-good_0.10.2.bb deleted file mode 100644 index 42f6df4d9d..0000000000 --- a/packages/gstreamer/gst-plugins-good_0.10.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gst-plugins.inc - -DEPENDS += "gst-plugins-base" -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-good_0.10.4.bb b/packages/gstreamer/gst-plugins-good_0.10.4.bb deleted file mode 100644 index 42f6df4d9d..0000000000 --- a/packages/gstreamer/gst-plugins-good_0.10.4.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gst-plugins.inc - -DEPENDS += "gst-plugins-base" -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-good_0.10.5.bb b/packages/gstreamer/gst-plugins-good_0.10.5.bb index be5dad78e7..e009145ead 100644 --- a/packages/gstreamer/gst-plugins-good_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-good_0.10.5.bb @@ -2,4 +2,4 @@ require gst-plugins.inc EXTRA_OECONF += "--with-check=no" DEPENDS += "gst-plugins-base" -PR = "r2" +PR = "r3" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb b/packages/gstreamer/gst-plugins-ugly_0.10.2.bb deleted file mode 100644 index 42f6df4d9d..0000000000 --- a/packages/gstreamer/gst-plugins-ugly_0.10.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gst-plugins.inc - -DEPENDS += "gst-plugins-base" -PR = "r2" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb deleted file mode 100644 index d8906733a5..0000000000 --- a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gst-plugins.inc - -DEPENDS += "gst-plugins-base" -SRC_URI += "file://cross-compile.patch;patch=1" -PR = "r3" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb index d8906733a5..51ce56dc1f 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb @@ -2,4 +2,4 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base" SRC_URI += "file://cross-compile.patch;patch=1" -PR = "r3" +PR = "r4" diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index b600eafcfe..2acf1997c8 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -1,16 +1,9 @@ +require gst-common.inc DESCRIPTION = "Plugins for GStreamer" -SECTION = "multimedia" -PRIORITY = "optional" DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag esound" PACKAGES_DYNAMIC = "gst-plugin-*" -# until we have decided for a final naming scheme, -# keep using version 0.8 -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl" @@ -27,8 +20,4 @@ python populate_packages_prepend () { do_split_packages(d, gst_libdir, '^libgst(.*)\.l?a$', 'gst-plugin-%s-dev', 'GStreamer plugin for %s (development files)') } -#do_stage() { -# autotools_stage_all -#} - ALLOW_EMPTY = "1" diff --git a/packages/gstreamer/gst-plugins/gst-plugins-0.8.7-httpsrc1.patch b/packages/gstreamer/gst-plugins/gst-plugins-0.8.7-httpsrc1.patch deleted file mode 100644 index 59b9ebbf73..0000000000 --- a/packages/gstreamer/gst-plugins/gst-plugins-0.8.7-httpsrc1.patch +++ /dev/null @@ -1,853 +0,0 @@ -diff -urN gst-plugins-0.8.7/gst/tcp/gsthttpclientsrc.c gst-plugins-0.8.7-httpsrc1/gst/tcp/gsthttpclientsrc.c ---- gst-plugins-0.8.7/gst/tcp/gsthttpclientsrc.c 1969-12-31 19:00:00.000000000 -0500 -+++ gst-plugins-0.8.7-httpsrc1/gst/tcp/gsthttpclientsrc.c 2005-03-02 11:08:24.546323513 -0500 -@@ -0,0 +1,655 @@ -+/* GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include <gst/gst-i18n-plugin.h> -+#include "gsttcp.h" -+#include "gsthttpclientsrc.h" -+#include <string.h> /* memset */ -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <sys/ioctl.h> -+#include <netdb.h> -+ -+#ifdef HAVE_FIONREAD_IN_SYS_FILIO -+#include <sys/filio.h> -+#endif -+ -+GST_DEBUG_CATEGORY (httpclientsrc_debug); -+#define GST_CAT_DEFAULT httpclientsrc_debug -+ -+#define MAX_READ_SIZE 4 * 1024 -+ -+/* elementfactory information */ -+static GstElementDetails gst_httpclientsrc_details = -+GST_ELEMENT_DETAILS ("HTTP Client source", -+ "Source/Network", -+ "Receive data as a client over the network via HTTP", -+ "Jamey Hicks <jamey dot hicks at hp dot com> based on tcpclientsrc by Thomas Vander Stichele <thomas at apestaart dot org>"); -+ -+/* HttpclientSrc signals and args */ -+enum -+{ -+ LAST_SIGNAL -+}; -+ -+enum -+{ -+ ARG_0, -+ ARG_LOCATION, -+ ARG_METHOD, -+ ARG_PROTOCOL -+}; -+ -+#define HTTP_DEFAULT_METHOD "GET" -+ -+static void gst_httpclientsrc_base_init (gpointer g_class); -+static void gst_httpclientsrc_class_init (GstHttpclientSrc * klass); -+static void gst_httpclientsrc_init (GstHttpclientSrc * httpclientsrc); -+ -+static GstCaps *gst_httpclientsrc_getcaps (GstPad * pad); -+ -+static GstData *gst_httpclientsrc_get (GstPad * pad); -+static GstElementStateReturn gst_httpclientsrc_change_state (GstElement * -+ element); -+ -+static void gst_httpclientsrc_set_property (GObject * object, guint prop_id, -+ const GValue * value, GParamSpec * pspec); -+static void gst_httpclientsrc_get_property (GObject * object, guint prop_id, -+ GValue * value, GParamSpec * pspec); -+static void gst_httpclientsrc_set_clock (GstElement * element, GstClock * clock); -+ -+static GstElementClass *parent_class = NULL; -+ -+/*static guint gst_httpclientsrc_signals[LAST_SIGNAL] = { 0 }; */ -+ -+GType -+gst_httpclientsrc_get_type (void) -+{ -+ static GType httpclientsrc_type = 0; -+ -+ -+ if (!httpclientsrc_type) { -+ static const GTypeInfo httpclientsrc_info = { -+ sizeof (GstHttpclientSrcClass), -+ gst_httpclientsrc_base_init, -+ NULL, -+ (GClassInitFunc) gst_httpclientsrc_class_init, -+ NULL, -+ NULL, -+ sizeof (GstHttpclientSrc), -+ 0, -+ (GInstanceInitFunc) gst_httpclientsrc_init, -+ NULL -+ }; -+ -+ httpclientsrc_type = -+ g_type_register_static (GST_TYPE_ELEMENT, "GstHttpclientSrc", -+ &httpclientsrc_info, 0); -+ } -+ return httpclientsrc_type; -+} -+ -+static void -+gst_httpclientsrc_base_init (gpointer g_class) -+{ -+ GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); -+ -+ gst_element_class_set_details (element_class, &gst_httpclientsrc_details); -+} -+ -+static void -+gst_httpclientsrc_class_init (GstHttpclientSrc * klass) -+{ -+ GObjectClass *gobject_class; -+ GstElementClass *gstelement_class; -+ -+ gobject_class = (GObjectClass *) klass; -+ gstelement_class = (GstElementClass *) klass; -+ -+ parent_class = g_type_class_ref (GST_TYPE_ELEMENT); -+ -+ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION, -+ g_param_spec_string ("location", "Source Location (URL)", -+ "URL of the data to read", NULL, G_PARAM_READWRITE)); -+ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_METHOD, -+ g_param_spec_string ("method", "HTTP METHOD, defaults to GET", -+ "Method of the read request", NULL, G_PARAM_READWRITE)); -+ g_object_class_install_property (gobject_class, ARG_PROTOCOL, -+ g_param_spec_enum ("protocol", "Protocol", "The protocol to wrap data in", -+ GST_TYPE_TCP_PROTOCOL_TYPE, GST_TCP_PROTOCOL_TYPE_NONE, -+ G_PARAM_READWRITE)); -+ -+ gobject_class->set_property = gst_httpclientsrc_set_property; -+ gobject_class->get_property = gst_httpclientsrc_get_property; -+ -+ gstelement_class->change_state = gst_httpclientsrc_change_state; -+ gstelement_class->set_clock = gst_httpclientsrc_set_clock; -+ -+ GST_DEBUG_CATEGORY_INIT (httpclientsrc_debug, "httpclientsrc", 0, -+ "HTTP Client Source"); -+} -+ -+static void -+gst_httpclientsrc_set_clock (GstElement * element, GstClock * clock) -+{ -+ GstHttpclientSrc *httpclientsrc; -+ -+ httpclientsrc = GST_HTTPCLIENTSRC (element); -+ -+ httpclientsrc->clock = clock; -+} -+ -+static void -+gst_httpclientsrc_init (GstHttpclientSrc * this) -+{ -+ /* create the src pad */ -+ this->srcpad = gst_pad_new ("src", GST_PAD_SRC); -+ gst_element_add_pad (GST_ELEMENT (this), this->srcpad); -+ gst_pad_set_get_function (this->srcpad, gst_httpclientsrc_get); -+ gst_pad_set_getcaps_function (this->srcpad, gst_httpclientsrc_getcaps); -+ -+ this->port = TCP_DEFAULT_PORT; -+ this->method = g_strdup(HTTP_DEFAULT_METHOD); -+ this->location = NULL; -+ this->host = NULL; -+ this->clock = NULL; -+ this->sock_fd = -1; -+ this->protocol = GST_TCP_PROTOCOL_TYPE_NONE; -+ this->curoffset = 0; -+ this->caps = NULL; -+ -+ GST_FLAG_UNSET (this, GST_HTTPCLIENTSRC_OPEN); -+} -+ -+static GstCaps * -+gst_httpclientsrc_getcaps (GstPad * pad) -+{ -+ GstHttpclientSrc *src; -+ GstCaps *caps = NULL; -+ -+ src = GST_HTTPCLIENTSRC (GST_OBJECT_PARENT (pad)); -+ -+ if (!GST_FLAG_IS_SET (src, GST_HTTPCLIENTSRC_OPEN)) -+ caps = gst_caps_new_any (); -+ else if (src->caps) -+ caps = gst_caps_copy (src->caps); -+ else -+ caps = gst_caps_new_any (); -+ GST_DEBUG_OBJECT (src, "returning caps %" GST_PTR_FORMAT, caps); -+ g_assert (GST_IS_CAPS (caps)); -+ return caps; -+} -+ -+static GstData * -+gst_httpclientsrc_get (GstPad * pad) -+{ -+ GstHttpclientSrc *src; -+ size_t readsize; -+ int ret; -+ -+ GstData *data = NULL; -+ GstBuffer *buf = NULL; -+ -+ g_return_val_if_fail (pad != NULL, NULL); -+ g_return_val_if_fail (GST_IS_PAD (pad), NULL); -+ src = GST_HTTPCLIENTSRC (GST_OBJECT_PARENT (pad)); -+ g_return_val_if_fail (GST_FLAG_IS_SET (src, GST_HTTPCLIENTSRC_OPEN), NULL); -+ -+ /* try to negotiate here */ -+ if (!gst_pad_is_negotiated (pad)) { -+ if (GST_PAD_LINK_FAILED (gst_pad_renegotiate (pad))) { -+ GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL), GST_ERROR_SYSTEM); -+ gst_buffer_unref (buf); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ } -+ -+ /* if we have a left over buffer after a discont, return that */ -+ if (src->buffer_after_discont) { -+ buf = src->buffer_after_discont; -+ GST_LOG_OBJECT (src, -+ "Returning buffer after discont of size %d, ts %" -+ GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT -+ ", offset %" G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT, -+ GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), -+ GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), -+ GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf)); -+ src->buffer_after_discont = NULL; -+ return GST_DATA (buf); -+ } -+ -+ /* read the buffer header if we're using a protocol */ -+ switch (src->protocol) { -+ fd_set testfds; -+ -+ case GST_TCP_PROTOCOL_TYPE_NONE: -+ /* do a blocking select on the socket */ -+ FD_ZERO (&testfds); -+ FD_SET (src->sock_fd, &testfds); -+ ret = select (src->sock_fd + 1, &testfds, (fd_set *) 0, (fd_set *) 0, 0); -+ /* no action (0) is an error too in our case */ -+ if (ret <= 0) { -+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), -+ ("select failed: %s", g_strerror (errno))); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ -+ /* ask how much is available for reading on the socket */ -+ ret = ioctl (src->sock_fd, FIONREAD, &readsize); -+ if (ret < 0) { -+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), -+ ("ioctl failed: %s", g_strerror (errno))); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ GST_LOG_OBJECT (src, "ioctl says %d bytes available", readsize); -+ buf = gst_buffer_new_and_alloc (readsize); -+ break; -+ case GST_TCP_PROTOCOL_TYPE_GDP: -+ if (!(data = gst_tcp_gdp_read_header (GST_ELEMENT (src), src->sock_fd))) { -+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), -+ ("Could not read data header through GDP")); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ if (GST_IS_EVENT (data)) -+ return data; -+ buf = GST_BUFFER (data); -+ -+ GST_LOG_OBJECT (src, "Going to read data from socket into buffer %p", -+ buf); -+ /* use this new buffer to read data into */ -+ readsize = GST_BUFFER_SIZE (buf); -+ break; -+ default: -+ g_warning ("Unhandled protocol type"); -+ break; -+ } -+ -+ GST_LOG_OBJECT (src, "Reading %d bytes", readsize); -+ ret = gst_tcp_socket_read (src->sock_fd, GST_BUFFER_DATA (buf), readsize); -+ if (ret < 0) { -+ GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ERROR_SYSTEM); -+ gst_buffer_unref (buf); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ -+ /* if we read 0 bytes, and we're blocking, we hit eos */ -+ if (ret == 0) { -+ GST_DEBUG ("blocking read returns 0, EOS"); -+ gst_buffer_unref (buf); -+ gst_element_set_eos (GST_ELEMENT (src)); -+ return GST_DATA (gst_event_new (GST_EVENT_EOS)); -+ } -+ -+ readsize = ret; -+ GST_BUFFER_SIZE (buf) = readsize; -+ GST_BUFFER_MAXSIZE (buf) = readsize; -+ -+ /* FIXME: we could decide to set OFFSET and OFFSET_END for non-protocol -+ * streams to mean the bytes processed */ -+ -+ /* if this is our first buffer, we need to send a discont with the -+ * given timestamp or the current offset, and store the buffer for -+ * the next iteration through the get loop */ -+ if (src->send_discont) { -+ GstClockTime timestamp; -+ GstEvent *event; -+ -+ src->send_discont = FALSE; -+ src->buffer_after_discont = buf; -+ /* if the timestamp is valid, send a timed discont -+ * taking into account the incoming buffer's timestamps */ -+ timestamp = GST_BUFFER_TIMESTAMP (buf); -+ if (GST_CLOCK_TIME_IS_VALID (timestamp)) { -+ GST_DEBUG_OBJECT (src, -+ "sending discontinuous with timestamp %" GST_TIME_FORMAT, -+ GST_TIME_ARGS (timestamp)); -+ event = -+ gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, timestamp, NULL); -+ return GST_DATA (event); -+ } -+ /* otherwise, send an offset discont */ -+ GST_DEBUG_OBJECT (src, "sending discontinuous with offset %d", -+ src->curoffset); -+ event = -+ gst_event_new_discontinuous (FALSE, GST_FORMAT_BYTES, src->curoffset, -+ NULL); -+ return GST_DATA (event); -+ } -+ -+ src->curoffset += readsize; -+ GST_LOG_OBJECT (src, -+ "Returning buffer from _get of size %d, ts %" -+ GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT -+ ", offset %" G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT, -+ GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), -+ GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), -+ GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf)); -+ return GST_DATA (buf); -+} -+ -+static void -+gst_httpclientsrc_set_property (GObject * object, guint prop_id, -+ const GValue * value, GParamSpec * pspec) -+{ -+ GstHttpclientSrc *httpclientsrc; -+ -+ -+ /* it's not null if we got it, but it might not be ours */ -+ g_return_if_fail (GST_IS_HTTPCLIENTSRC (object)); -+ httpclientsrc = GST_HTTPCLIENTSRC (object); -+ -+ GST_DEBUG_OBJECT (httpclientsrc, "setting property %d", prop_id); -+ -+ switch (prop_id) { -+ case ARG_LOCATION: { -+ gchar *pathstart = NULL; -+ gchar *location = NULL; -+ gchar *hostport = NULL; -+ gchar *portstart = NULL; -+ int locationlen; -+ g_free (httpclientsrc->location); -+ g_free (httpclientsrc->host); -+ g_free (httpclientsrc->path); -+ httpclientsrc->location = location = g_strdup (g_value_get_string (value)); -+ GST_DEBUG_OBJECT (httpclientsrc, "setting location=%s", location); -+ -+ if (strncmp(location, "http://", 7) != 0) -+ return; -+ locationlen = strlen(location); -+ hostport = location + 7; -+ GST_DEBUG_OBJECT (httpclientsrc, " hostport=%s", hostport); -+ -+ pathstart = strchr(hostport, '/'); -+ GST_DEBUG_OBJECT (httpclientsrc, " pathstart=%s", pathstart); -+ -+ if (pathstart) { -+ httpclientsrc->path = g_strdup(pathstart); -+ } else { -+ httpclientsrc->path = g_strdup("/"); -+ pathstart = location+locationlen; -+ } -+ hostport = g_strndup(hostport, pathstart - hostport); -+ portstart = strrchr(hostport, ':'); -+ GST_DEBUG_OBJECT (httpclientsrc, " hostport=%s portstart=%s", hostport, portstart); -+ if (portstart != NULL) { -+ httpclientsrc->host = g_strndup(hostport, portstart - hostport); -+ httpclientsrc->port = strtoul(portstart+1, NULL, 0); -+ g_free(hostport); -+ } else { -+ httpclientsrc->host = hostport; -+ httpclientsrc->port = 80; -+ } -+ GST_DEBUG_OBJECT (httpclientsrc, " host=%s port=%d path=%s", httpclientsrc->host, httpclientsrc->port, httpclientsrc->path); -+ } break; -+ case ARG_METHOD: -+ g_free (httpclientsrc->method); -+ httpclientsrc->method = g_strdup (g_value_get_string (value)); -+ break; -+ case ARG_PROTOCOL: -+ httpclientsrc->protocol = g_value_get_enum (value); -+ break; -+ -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+gst_httpclientsrc_get_property (GObject * object, guint prop_id, GValue * value, -+ GParamSpec * pspec) -+{ -+ GstHttpclientSrc *httpclientsrc; -+ -+ g_return_if_fail (GST_IS_HTTPCLIENTSRC (object)); -+ httpclientsrc = GST_HTTPCLIENTSRC (object); -+ -+ switch (prop_id) { -+ case ARG_LOCATION: -+ g_value_set_string (value, httpclientsrc->location); -+ break; -+ case ARG_METHOD: -+ g_value_set_string (value, httpclientsrc->method); -+ break; -+ case ARG_PROTOCOL: -+ g_value_set_enum (value, httpclientsrc->protocol); -+ break; -+ -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+/* create a socket for connecting to remote server */ -+static gboolean -+gst_httpclientsrc_init_receive (GstHttpclientSrc * this) -+{ -+ int ret; -+ gchar ip[256]; -+ struct addrinfo *addrinfo, *top_addrinfo; -+ int addr_family; -+ gchar *request = NULL; -+ -+ GST_DEBUG_OBJECT (this, "getaddrinfo %s", this->host); -+ ret = getaddrinfo(this->host, "http", NULL, &addrinfo); -+ top_addrinfo = addrinfo; -+ -+ retry: -+ this->addr_family = addr_family = addrinfo->ai_family; -+ this->server_addrlen = addrinfo->ai_addrlen; -+ memset(&this->server_sockaddr, 0, sizeof(this->server_sockaddr)); -+ memcpy(&this->server_sockaddr, addrinfo->ai_addr, addrinfo->ai_addrlen); -+ -+ /* create receiving client socket */ -+ GST_DEBUG_OBJECT (this, "opening receiving client socket to %s:%d\n", -+ this->host, this->port); -+ if ((this->sock_fd = socket (this->addr_family, SOCK_STREAM, 0)) == -1) { -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL), GST_ERROR_SYSTEM); -+ return FALSE; -+ } -+ GST_DEBUG_OBJECT (this, "opened receiving client socket with fd %d", -+ this->sock_fd); -+ -+ /* look up name if we need to */ -+ GST_DEBUG_OBJECT (this, "IP address for host %s is %s", this->host, ip); -+ -+ /* fill in port */ -+ switch (this->addr_family) { -+ case AF_INET: -+ ((struct sockaddr_in *)&this->server_sockaddr)->sin_port = htons(this->port); -+ inet_ntop(this->addr_family, &(((struct sockaddr_in *)&this->server_sockaddr)->sin_addr), ip, sizeof(ip)); -+ break; -+ case AF_INET6: -+ ((struct sockaddr_in6 *)&this->server_sockaddr)->sin6_port = htons(this->port); -+ inet_ntop(this->addr_family, &(((struct sockaddr_in6 *)&this->server_sockaddr)->sin6_addr), ip, sizeof(ip)); -+ break; -+ } -+ if (this->addr_family == AF_INET6) { -+ int offset = 0; -+ int i; -+ struct in6_addr *in6_addr = &(((struct sockaddr_in6 *)&this->server_sockaddr)->sin6_addr); -+ for (i = 0; i < sizeof(struct in6_addr); i++) { -+ int b = in6_addr->s6_addr[i]; -+ offset += sprintf(ip+offset, ":%02x", b); -+ } -+ } -+ -+ /* connect to server */ -+ GST_DEBUG_OBJECT (this, "connecting to server family=%d ip=%s port=%d sockaddrlen=%d", -+ this->addr_family, ip, this->port, this->server_addrlen); -+ ret = connect (this->sock_fd, (struct sockaddr *) &this->server_sockaddr, this->server_addrlen); -+ -+ if (ret) { -+ switch (errno) { -+ case ECONNREFUSED: -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, -+ (_("Connection to %s:%d refused."), this->host, this->port), -+ (NULL)); -+ if (addrinfo->ai_next == NULL) -+ return FALSE; -+ break; -+ default: -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL), -+ ("connect to %s:%d failed: %s", this->host, this->port, -+ g_strerror (errno))); -+ if (addrinfo->ai_next == NULL) -+ return FALSE; -+ break; -+ } -+ addrinfo = addrinfo->ai_next; -+ if (addrinfo) { -+ GST_DEBUG_OBJECT(this, "retrying with addrinfo %p", addrinfo); -+ goto retry; -+ } -+ } -+ -+ /* send request and headers */ -+ request = g_strdup_printf("%s %s HTTP/1.0\r\nHost: %s\r\n\r\n", -+ this->method, this->path, this->host); -+ GST_DEBUG_OBJECT(this, "sending request %s", request); -+ if (gst_tcp_socket_write(this->sock_fd, request, strlen(request)) < 0) { -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL), -+ ("sending HTTP request to %s failed: %s", this->location, -+ g_strerror (errno))); -+ return FALSE; -+ } -+ g_free(request); -+ -+ -+ /* receive and discard headers */ -+ { -+ char responseline[12]; -+ int rc; -+ /* receive response line (HTTP/1.x NNN) */ -+ if ((rc = gst_tcp_socket_read(this->sock_fd, responseline, sizeof(responseline))) < 0) { -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL), -+ ("reading HTTP response from %s failed: %s", this->location, -+ g_strerror (errno))); -+ return FALSE; -+ } -+ GST_DEBUG_OBJECT(this, "got %d byte response %s", rc, responseline); -+ -+ enum response_state { -+ RESPONSE_CHAR, -+ RESPONSE_CR, -+ RESPONSE_CRLF, -+ RESPONSE_CRLFCR, -+ RESPONSE_END_OF_HEADERS /* saw crlfcrlf */ -+ } response_state = RESPONSE_CHAR; -+ while (response_state != RESPONSE_END_OF_HEADERS) { -+ gchar ch; -+ if (gst_tcp_socket_read(this->sock_fd, &ch, sizeof(ch)) < 0) { -+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL), -+ ("reading HTTP response from %s failed: %s", this->location, -+ g_strerror (errno))); -+ return FALSE; -+ } -+ switch (ch) { -+ case '\n': -+ switch (response_state) { -+ case RESPONSE_CR: response_state = RESPONSE_CRLF; break; -+ case RESPONSE_CRLFCR: response_state = RESPONSE_END_OF_HEADERS; break; -+ default: response_state = RESPONSE_CHAR; -+ } break; -+ case '\r': -+ switch (response_state) { -+ case RESPONSE_CRLF: response_state = RESPONSE_CRLFCR; break; -+ default: response_state = RESPONSE_CR; -+ } break; -+ default: -+ response_state = RESPONSE_CHAR; -+ } -+ } -+ } -+ -+ this->send_discont = TRUE; -+ this->buffer_after_discont = NULL; -+ GST_FLAG_SET (this, GST_HTTPCLIENTSRC_OPEN); -+ -+ /* get the caps if we're using GDP */ -+ if (this->protocol == GST_TCP_PROTOCOL_TYPE_GDP) { -+ /* if we haven't received caps yet, we should get them first */ -+ if (!this->caps_received) { -+ GstCaps *caps; -+ -+ GST_DEBUG_OBJECT (this, "getting caps through GDP"); -+ if (!(caps = gst_tcp_gdp_read_caps (GST_ELEMENT (this), this->sock_fd))) { -+ GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL), -+ ("Could not read caps through GDP")); -+ return FALSE; -+ } -+ if (!GST_IS_CAPS (caps)) { -+ GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL), -+ ("Could not read caps through GDP")); -+ return FALSE; -+ } -+ GST_DEBUG_OBJECT (this, "Received caps through GDP: %" GST_PTR_FORMAT, -+ caps); -+ this->caps_received = TRUE; -+ this->caps = caps; -+ } -+ } -+ return TRUE; -+} -+ -+static void -+gst_httpclientsrc_close (GstHttpclientSrc * this) -+{ -+ if (this->sock_fd != -1) { -+ close (this->sock_fd); -+ this->sock_fd = -1; -+ } -+ this->caps_received = FALSE; -+ if (this->caps) { -+ gst_caps_free (this->caps); -+ this->caps = NULL; -+ } -+ GST_FLAG_UNSET (this, GST_HTTPCLIENTSRC_OPEN); -+} -+ -+static GstElementStateReturn -+gst_httpclientsrc_change_state (GstElement * element) -+{ -+ g_return_val_if_fail (GST_IS_HTTPCLIENTSRC (element), GST_STATE_FAILURE); -+ -+ if (GST_STATE_PENDING (element) == GST_STATE_NULL) { -+ if (GST_FLAG_IS_SET (element, GST_HTTPCLIENTSRC_OPEN)) -+ gst_httpclientsrc_close (GST_HTTPCLIENTSRC (element)); -+ } else { -+ if (!GST_FLAG_IS_SET (element, GST_HTTPCLIENTSRC_OPEN)) { -+ if (!gst_httpclientsrc_init_receive (GST_HTTPCLIENTSRC (element))) -+ return GST_STATE_FAILURE; -+ } -+ } -+ -+ if (GST_ELEMENT_CLASS (parent_class)->change_state) -+ return GST_ELEMENT_CLASS (parent_class)->change_state (element); -+ -+ return GST_STATE_SUCCESS; -+} -diff -urN gst-plugins-0.8.7/gst/tcp/gsthttpclientsrc.h gst-plugins-0.8.7-httpsrc1/gst/tcp/gsthttpclientsrc.h ---- gst-plugins-0.8.7/gst/tcp/gsthttpclientsrc.h 1969-12-31 19:00:00.000000000 -0500 -+++ gst-plugins-0.8.7-httpsrc1/gst/tcp/gsthttpclientsrc.h 2005-03-02 09:47:01.640623151 -0500 -@@ -0,0 +1,98 @@ -+/* GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __GST_HTTPCLIENTSRC_H__ -+#define __GST_HTTPCLIENTSRC_H__ -+ -+#include <gst/gst.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#include <netdb.h> /* sockaddr_in */ -+#include <netinet/in.h> /* sockaddr_in */ -+#include <unistd.h> -+#include "gsttcp.h" -+ -+#define GST_TYPE_HTTPCLIENTSRC \ -+ (gst_httpclientsrc_get_type()) -+#define GST_HTTPCLIENTSRC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_HTTPCLIENTSRC,GstHttpclientSrc)) -+#define GST_HTTPCLIENTSRC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_HTTPCLIENTSRC,GstHttpclientSrc)) -+#define GST_IS_HTTPCLIENTSRC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_HTTPCLIENTSRC)) -+#define GST_IS_HTTPCLIENTSRC_CLASS(obj) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_HTTPCLIENTSRC)) -+ -+typedef struct _GstHttpclientSrc GstHttpclientSrc; -+typedef struct _GstHttpclientSrcClass GstHttpclientSrcClass; -+ -+typedef enum GstHttpclientSrcFlags { -+ GST_HTTPCLIENTSRC_OPEN = GST_ELEMENT_FLAG_LAST, -+ -+ GST_HTTPCLIENTSRC_FLAG_LAST, -+} GstHttpclientSrcFlags; -+ -+struct _GstHttpclientSrc { -+ GstElement element; -+ -+ /* pad */ -+ GstPad *srcpad; -+ -+ /* server information */ -+ int port; -+ int addr_family; -+ gchar *method; -+ gchar *host; -+ gchar *path; -+ gchar *location; /* url */ -+ struct sockaddr_storage server_sockaddr; -+ int server_addrlen; -+ -+ /* socket */ -+ int sock_fd; -+ -+ /* number of bytes we've gotten */ -+ off_t curoffset; -+ -+ GstTCPProtocolType protocol; /* protocol used for reading data */ -+ gboolean caps_received; /* if we have received caps yet */ -+ GstCaps *caps; -+ GstClock *clock; -+ -+ gboolean send_discont; /* TRUE when we need to send a discont */ -+ GstBuffer *buffer_after_discont; /* temporary storage for buffer */ -+}; -+ -+struct _GstHttpclientSrcClass { -+ GstElementClass parent_class; -+}; -+ -+GType gst_httpclientsrc_get_type (void); -+ -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* __GST_HTTPCLIENTSRC_H__ */ -diff -urN gst-plugins-0.8.7/gst/tcp/gsttcpplugin.c gst-plugins-0.8.7-httpsrc1/gst/tcp/gsttcpplugin.c ---- gst-plugins-0.8.7/gst/tcp/gsttcpplugin.c 2004-11-05 12:15:10.000000000 -0500 -+++ gst-plugins-0.8.7-httpsrc1/gst/tcp/gsttcpplugin.c 2005-03-02 09:59:33.003801791 -0500 -@@ -23,6 +23,7 @@ - - #include "gsttcpsrc.h" - #include "gsttcpsink.h" -+#include "gsthttpclientsrc.h" - #include "gsttcpclientsrc.h" - #include "gsttcpclientsink.h" - #include "gsttcpserversrc.h" -@@ -59,6 +60,9 @@ - if (!gst_element_register (plugin, "multifdsink", GST_RANK_NONE, - GST_TYPE_MULTIFDSINK)) - return FALSE; -+ if (!gst_element_register (plugin, "httpclientsrc", GST_RANK_NONE, -+ GST_TYPE_HTTPCLIENTSRC)) -+ return FALSE; - - GST_DEBUG_CATEGORY_INIT (tcp_debug, "tcp", 0, "TCP calls"); - -diff -urN gst-plugins-0.8.7/gst/tcp/Makefile.am gst-plugins-0.8.7-httpsrc1/gst/tcp/Makefile.am ---- gst-plugins-0.8.7/gst/tcp/Makefile.am 2004-11-02 02:41:44.000000000 -0500 -+++ gst-plugins-0.8.7-httpsrc1/gst/tcp/Makefile.am 2005-03-02 09:29:30.125528594 -0500 -@@ -18,6 +18,7 @@ - gsttcp.c \ - gstfdset.c \ - gstmultifdsink.c \ -+ gsthttpclientsrc.c \ - gsttcpclientsrc.c gsttcpclientsink.c \ - gsttcpserversrc.c gsttcpserversink.c - -@@ -35,6 +36,7 @@ - gsttcp.h \ - gstfdset.h \ - gstmultifdsink.h \ -+ gsthttpclientsrc.h \ - gsttcpclientsrc.h gsttcpclientsink.h \ - gsttcpserversrc.h gsttcpserversink.h - -diff -urN gst-plugins-0.8.7/gst/tcp/Makefile.in gst-plugins-0.8.7-httpsrc1/gst/tcp/Makefile.in ---- gst-plugins-0.8.7/gst/tcp/Makefile.in 2005-01-05 05:47:55.000000000 -0500 -+++ gst-plugins-0.8.7-httpsrc1/gst/tcp/Makefile.in 2005-03-02 09:33:30.515512648 -0500 -@@ -99,7 +99,8 @@ - am_libgsttcp_la_OBJECTS = libgsttcp_la-gsttcpplugin.lo \ - libgsttcp_la-gsttcpsrc.lo libgsttcp_la-gsttcpsink.lo \ - libgsttcp_la-gsttcp.lo libgsttcp_la-gstfdset.lo \ -- libgsttcp_la-gstmultifdsink.lo libgsttcp_la-gsttcpclientsrc.lo \ -+ libgsttcp_la-gstmultifdsink.lo libgsttcp_la-gsthttpclientsrc.lo \ -+ libgsttcp_la-gsttcpclientsrc.lo \ - libgsttcp_la-gsttcpclientsink.lo \ - libgsttcp_la-gsttcpserversrc.lo \ - libgsttcp_la-gsttcpserversink.lo -@@ -730,6 +731,7 @@ - gsttcp.c \ - gstfdset.c \ - gstmultifdsink.c \ -+ gsthttpclientsrc.c \ - gsttcpclientsrc.c gsttcpclientsink.c \ - gsttcpserversrc.c gsttcpserversink.c - -@@ -747,7 +749,7 @@ - gsttcp.h \ - gstfdset.h \ - gstmultifdsink.h \ -- gsttcpclientsrc.h gsttcpclientsink.h \ -+ gsthttpclientsrc.h gsttcpclientsrc.h gsttcpclientsink.h \ - gsttcpserversrc.h gsttcpserversink.h - - CLEANFILES = $(BUILT_SOURCES) -@@ -844,6 +846,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcpclientsink.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcpclientsrc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsthttpclientsrc.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcpplugin.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcpserversink.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttcp_la-gsttcpserversrc.Plo@am__quote@ -@@ -913,6 +916,13 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttcp_la_CFLAGS) $(CFLAGS) -c -o libgsttcp_la-gstmultifdsink.lo `test -f 'gstmultifdsink.c' || echo '$(srcdir)/'`gstmultifdsink.c - -+libgsttcp_la-gsthttpclientsrc.lo: gsthttpclientsrc.c -+@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttcp_la_CFLAGS) $(CFLAGS) -MT libgsttcp_la-gsthttpclientsrc.lo -MD -MP -MF "$(DEPDIR)/libgsttcp_la-gsthttpclientsrc.Tpo" -c -o libgsttcp_la-gsthttpclientsrc.lo `test -f 'gsthttpclientsrc.c' || echo '$(srcdir)/'`gsthttpclientsrc.c; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgsttcp_la-gsthttpclientsrc.Tpo" "$(DEPDIR)/libgsttcp_la-gsthttpclientsrc.Plo"; else rm -f "$(DEPDIR)/libgsttcp_la-gsthttpclientsrc.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gsthttpclientsrc.c' object='libgsttcp_la-gsthttpclientsrc.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttcp_la_CFLAGS) $(CFLAGS) -c -o libgsttcp_la-gsthttpclientsrc.lo `test -f 'gsthttpclientsrc.c' || echo '$(srcdir)/'`gsthttpclientsrc.c -+ - libgsttcp_la-gsttcpclientsrc.lo: gsttcpclientsrc.c - @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttcp_la_CFLAGS) $(CFLAGS) -MT libgsttcp_la-gsttcpclientsrc.lo -MD -MP -MF "$(DEPDIR)/libgsttcp_la-gsttcpclientsrc.Tpo" -c -o libgsttcp_la-gsttcpclientsrc.lo `test -f 'gsttcpclientsrc.c' || echo '$(srcdir)/'`gsttcpclientsrc.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgsttcp_la-gsttcpclientsrc.Tpo" "$(DEPDIR)/libgsttcp_la-gsttcpclientsrc.Plo"; else rm -f "$(DEPDIR)/libgsttcp_la-gsttcpclientsrc.Tpo"; exit 1; fi diff --git a/packages/gstreamer/gst-plugins/lame-autoconf.patch b/packages/gstreamer/gst-plugins/lame-autoconf.patch deleted file mode 100644 index 3fb85e7d88..0000000000 --- a/packages/gstreamer/gst-plugins/lame-autoconf.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gst-plugins-0.8.6.orig/configure.ac 2004-11-25 16:41:47.000000000 +0100 -+++ gst-plugins-0.8.6/configure.ac 2005-02-22 19:02:58.000000000 +0100 -@@ -1135,8 +1135,9 @@ - GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm") - ]) - dnl is lame presets available -+if test "x$HAVE_LAME" = "xyes"; then - LAME_CFLAGS="" --AC_TRY_RUN([ -+AC_TRY_COMPILE([ - #include <lame/lame.h> - int main (int argc, char *argv[]) - { -@@ -1144,6 +1145,7 @@ - return 0; - } - ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""]) -+fi - AC_SUBST(LAME_CFLAGS) - AC_SUBST(LAME_LIBS) - diff --git a/packages/gstreamer/gst-plugins/try-esdsink.patch b/packages/gstreamer/gst-plugins/try-esdsink.patch deleted file mode 100644 index 9c6242663c..0000000000 --- a/packages/gstreamer/gst-plugins/try-esdsink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~ 2004-08-17 17:55:46.000000000 +0100 -+++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c 2004-08-17 18:04:00.000000000 +0100 -@@ -204,10 +204,16 @@ - if (!ret) { - ret = gst_element_factory_make ("osssink", NULL); - -- if (!ret) -- g_warning ("No GConf default audio sink key and osssink doesn't work"); -- else -+ if (!ret) { -+ ret = gst_element_factory_make ("esdsink", NULL); -+ -+ if (!ret) -+ g_warning ("No GConf default audio sink key and osssink & esdsink don't work"); -+ else -+ g_print ("GConf audio sink and osssink not found, using esdsink\n"); -+ } else { - g_print ("GConf audio sink not found, using osssink\n"); -+ } - } - - return ret; diff --git a/packages/gstreamer/gstreamer.inc b/packages/gstreamer/gstreamer.inc index 36c7dcfac7..a8bece92e3 100644 --- a/packages/gstreamer/gstreamer.inc +++ b/packages/gstreamer/gstreamer.inc @@ -1,29 +1,12 @@ +require gst-common.inc + DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "libxml2 glib-2.0 gettext-native popt" - -# until we have decided a final naming scheme, -# don't use 0.10.x package as a replacement for -# version 0.8 -DEFAULT_PREFERENCE = "-1" -inherit autotools pkgconfig +DEPENDS = "libxml2 glib-2.0 gettext-native popt" SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb deleted file mode 100644 index b56db69cd6..0000000000 --- a/packages/gstreamer/gstreamer_0.10.11.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "libxml2 glib-2.0 gettext-native popt" - -# until we have decided a final naming scheme, -# don't use this package as a replacement for -# version 0.8 -DEFAULT_PREFERENCE = "-1" - -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" diff --git a/packages/gstreamer/gstreamer_0.10.12.bb b/packages/gstreamer/gstreamer_0.10.12.bb index 3405c065e4..49d7f37053 100644 --- a/packages/gstreamer/gstreamer_0.10.12.bb +++ b/packages/gstreamer/gstreamer_0.10.12.bb @@ -1,24 +1,3 @@ -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -SECTION = "multimedia" -PRIORITY = "optional" -LICENSE = "LGPL" -HOMEPAGE = "http://www.gstreamer.net/" -DEPENDS = "libxml2 glib-2.0 gettext-native popt" +require gstreamer.inc -inherit autotools pkgconfig - -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2" -EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no" - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/share/man -} - -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so" -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" +PR = "r1"
\ No newline at end of file diff --git a/packages/gstreamer/gstreamer_0.10.4.bb b/packages/gstreamer/gstreamer_0.10.4.bb deleted file mode 100644 index 69e7637cc6..0000000000 --- a/packages/gstreamer/gstreamer_0.10.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gstreamer.inc - -PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.5.bb b/packages/gstreamer/gstreamer_0.10.5.bb deleted file mode 100644 index 69e7637cc6..0000000000 --- a/packages/gstreamer/gstreamer_0.10.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gstreamer.inc - -PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.6.bb b/packages/gstreamer/gstreamer_0.10.6.bb deleted file mode 100644 index 69e7637cc6..0000000000 --- a/packages/gstreamer/gstreamer_0.10.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gstreamer.inc - -PR = "r2" diff --git a/packages/gstreamer/gstreamer_0.10.8.bb b/packages/gstreamer/gstreamer_0.10.8.bb deleted file mode 100644 index 69e7637cc6..0000000000 --- a/packages/gstreamer/gstreamer_0.10.8.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gstreamer.inc - -PR = "r2" diff --git a/packages/gstreamer/gst-plugins/.mtn2git_empty b/packages/jards/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gstreamer/gst-plugins/.mtn2git_empty +++ b/packages/jards/.mtn2git_empty diff --git a/packages/jards/jards_1.0.bb b/packages/jards/jards_1.0.bb new file mode 100644 index 0000000000..c536a2546b --- /dev/null +++ b/packages/jards/jards_1.0.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "Reference and training tool for students of Japanese" +AUTHOR = "Johnny Andersson" +HOMEPAGE = "http://gakusei.sf.net" +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "virtual/japanese-font qte-mt libpng (>= 1) kpengine" +PR = "r7" + +# stuff that still needs fixing +#) is the RDEPENDS line correct and sufficient? +#) upon execution there is a message that /usr/lib/libpng12.so.0 does not have version information +#) desktop icon missing +#) Desktop png file an falscher Stelle, daher kein Icon +#) remove .debug dir +#) es fehlen: ./opt/QtPalmtop/bin/kpengine, ./opt/QtPalmtop/jardsmob/edict.jardsdic, ./opt/QtPalmtop/jardsmob/kanjidic.jardskdic +#) exec muß jardsmob_bin heißen +#) Programm geht oft in 100% CPU schleife -> unbenutzbar + +SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz" +#SRC_URI = "cvs://anonymous@gakusei.cvs.sourceforge.net/cvsroot/gakusei;method=pserver;module=jards" + +inherit opie + +OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" +OE_QMAKE_CXXFLAFS += " -L${STAGING_DIR}/pkgdata" +CXXFLAFS += " -L${STAGING_DIR}/pkgdata" + +S = "${WORKDIR}/${PN}/" +export OE_QMAKE_LINK="${CXX}" + +# read opie.bbclass +#APPDESKTOP = "${S}" +APPTYPE = "binary" +APPNAME = "jardsmob" + +FILES_${PN}-dbg += "${D}${palmtopdir}/bin/.debug/" + +PARALLEL_MAKE = "" + +do_install() { + install -d ${D}${palmtopdir}/bin/ + install -d ${D}${palmtopdir}/pics/ + install -d ${D}${palmtopdir}/${APPNAME}/images + install -d ${D}${palmtopdir}/apps/Applications + install -m 0644 ${S}dat/images/jardsmob.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}dat/images/*.png ${D}${palmtopdir}/${APPNAME}/images/ + install -m 0755 ${S}jardsmob_bin ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/jards/jards.desktop ${D}${palmtopdir}/apps/Applications/ + + # what about the following files: edict.jardsdic kanjidic.jardskdic? + for f in markers romkana.utf8 strokedata wordfreq_ck raddat.utf8 + do + install -m 0644 ${S}dat/$f ${D}${palmtopdir}/${APPNAME}/ + done +} + diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb index 7bea3e3cba..2996046639 100644 --- a/packages/jikes/jikes-native_1.21.bb +++ b/packages/jikes/jikes-native_1.21.bb @@ -1,6 +1,7 @@ -SECTION = "devel" inherit native require jikes_${PV}.bb + +PROVIDES = "virtual/javac-native" S = "${WORKDIR}/jikes-${PV}" do_stage() { diff --git a/packages/libogg/libtheora_0.9+1.0alpha7.bb b/packages/libogg/libtheora_0.9+1.0alpha7.bb new file mode 100644 index 0000000000..4f2cb4ab35 --- /dev/null +++ b/packages/libogg/libtheora_0.9+1.0alpha7.bb @@ -0,0 +1,19 @@ + +DEPENDS = "libogg libtheora libsdl-x11" + +SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz" + +S = "${WORKDIR}/libtheora-1.0alpha7" + +inherit autotools pkgconfig lib_package + + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i -e s:'-I/usr/include':-I${STAGING_INCDIR}:g +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/libpcap/libpcap-0.9.6/.mtn2git_empty b/packages/libpcap/libpcap-0.9.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libpcap/libpcap-0.9.6/.mtn2git_empty diff --git a/packages/libpcap/libpcap-0.9.6/shared.patch b/packages/libpcap/libpcap-0.9.6/shared.patch new file mode 100644 index 0000000000..d8118cf142 --- /dev/null +++ b/packages/libpcap/libpcap-0.9.6/shared.patch @@ -0,0 +1,119 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libpcap-0.9.3/Makefile.in~shared ++++ libpcap-0.9.3/Makefile.in +@@ -37,6 +37,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# some defines for shared library compilation - FIXME, if not matching ++MAJ=0.9 ++MIN=5 ++VERSION=$(MAJ).$(MIN) ++LIBNAME=pcap ++LIBRARY=lib$(LIBNAME).a ++SOLIBRARY=lib$(LIBNAME).so ++SHAREDLIB=$(SOLIBRARY).$(VERSION) ++ + # + # You shouldn't need to edit anything below. + # +@@ -50,6 +59,7 @@ + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -70,6 +80,9 @@ + .c.o: + @rm -f $@ + $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++%_pic.o: %.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + + PSRC = pcap-@V_PCAP@.c + FSRC = fad-@V_FINDALLDEVS@.c +@@ -84,6 +97,7 @@ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) ++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h + GENHDR = \ +@@ -95,15 +109,22 @@ + TAGFILES = \ + $(SRC) $(HDR) $(TAGHDR) + +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c ++CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* + +-all: libpcap.a ++all: libpcap.a $(SHAREDLIB) + + libpcap.a: $(OBJ) + @rm -f $@ + ar rc $@ $(OBJ) $(LIBS) + $(RANLIB) $@ + ++$(SHAREDLIB): $(OBJ_PIC) ++ -@rm -f $@ ++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) ++ + shared: libpcap.$(DYEXT) + + # +@@ -129,6 +150,9 @@ + scanner.o: scanner.c tokdefs.h + $(CC) $(CFLAGS) -c scanner.c + ++scanner_pic.o: scanner.c tokdefs.h ++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c ++ + pcap.o: version.h + + tokdefs.h: grammar.c +@@ -142,9 +166,16 @@ + @rm -f $@ + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + ++grammer_pic.o: grammar.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c ++ + version.o: version.c + $(CC) $(CFLAGS) -c version.c + ++version_pic.o: version.c ++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ ++ + snprintf.o: $(srcdir)/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + +@@ -170,11 +201,17 @@ + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + ++bpf_filter_pic.o: bpf_filter.c ++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ ++ + install: libpcap.a + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) + $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h diff --git a/packages/libpcap/libpcap_0.9.6.bb b/packages/libpcap/libpcap_0.9.6.bb new file mode 100644 index 0000000000..d68cd31d52 --- /dev/null +++ b/packages/libpcap/libpcap_0.9.6.bb @@ -0,0 +1,34 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +DESCRIPTION = "Network Packet Capture Library" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "libs/network" +PR = "r0" + +SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \ + file://shared.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-pcap=linux" + +CPPFLAGS_prepend = "-I${S} " +CFLAGS_prepend = "-I${S} " +CXXFLAGS_prepend = "-I${S} " + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cat aclocal.m4 > acinclude.m4 + fi +} + +do_stage () { + install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h + install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h + install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h + oe_libinstall -a -so libpcap ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/net + ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h + install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4 +} diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb index 5870ed54b9..986ee7ac40 100644 --- a/packages/linux/corgi-kernel-2.4-embedix.bb +++ b/packages/linux/corgi-kernel-2.4-embedix.bb @@ -1,3 +1,3 @@ MACHINE = "corgi" - +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb index 19645079f1..81f859594c 100644 --- a/packages/linux/husky-kernel-2.4-embedix.bb +++ b/packages/linux/husky-kernel-2.4-embedix.bb @@ -1,3 +1,4 @@ +COMPATIBLE_HOST = "arm.*-linux" MACHINE = "husky" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index 552356e23a..fa2a209d50 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -18,8 +18,8 @@ S = "${WORKDIR}/trunk" K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "20" -HHV="hnd0" +K_MICRO = "21" +HHV="hnd1" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" inherit kernel diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6/aximx50/defconfig index 13fbbc11f2..7b2c332d40 100644 --- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig +++ b/packages/linux/linux-handhelds-2.6/aximx50/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:52:58 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:21 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -537,7 +537,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -829,6 +831,7 @@ CONFIG_ADC_ADS7846_SSP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1125,7 +1128,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 2a5124e76c..c40780e0d9 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:00 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:23 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -449,7 +449,10 @@ CONFIG_IRTTY_SIR=y # # FIR device drivers # +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set CONFIG_PXA_FICP=y +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -463,9 +466,13 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # +# CONFIG_BT_HCIUSB is not set CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIDTL1 is not set # CONFIG_BT_HCIBT3C is not set # CONFIG_BT_HCIBLUECARD is not set @@ -549,7 +556,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -593,6 +602,7 @@ CONFIG_MTD_NAND_HAMCOP=y # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -886,6 +896,7 @@ CONFIG_W1=y # # 1-wire Bus Masters # +# CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set CONFIG_W1_MASTER_DS1WM=y @@ -933,6 +944,7 @@ CONFIG_ADC_SAMCOP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set CONFIG_SOC_HAMCOP=y @@ -976,6 +988,7 @@ CONFIG_LEDS_TRIGGER_SHARED=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -1072,6 +1085,11 @@ CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_RECON is not set # +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# # PCMCIA devices # # CONFIG_SND_VXPOCKET is not set @@ -1100,13 +1118,118 @@ CONFIG_HID=m CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set + +# +# USB DSL modem support +# + +# # USB Gadget Support # CONFIG_USB_GADGET=y @@ -1282,7 +1405,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6/h3600/defconfig index c11b5b0459..bd58264fd9 100644 --- a/packages/linux/linux-handhelds-2.6/h3600/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3600/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:03 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:24 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -517,7 +517,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -820,6 +822,7 @@ CONFIG_ADC=y CONFIG_IPAQ_MICRO=y # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1116,7 +1119,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6/h3800/defconfig index f27a25f943..8b93a0f93c 100644 --- a/packages/linux/linux-handhelds-2.6/h3800/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3800/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:05 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:26 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -517,7 +517,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -820,6 +822,7 @@ CONFIG_ADC_ASIC2=y # CONFIG_IPAQ_MICRO is not set CONFIG_HTC_ASIC2=y # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1116,7 +1119,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 0027cf284a..5fba9c979f 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:06 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:28 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -536,7 +536,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -866,6 +868,7 @@ CONFIG_ADC_ASIC2=y # CONFIG_MFD_SM501 is not set CONFIG_HTC_ASIC2=y CONFIG_HTC_ASIC3=y +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -968,7 +971,38 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +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=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# 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 + +# +# ALSA ARM devices +# +# CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set # # Open Sound System @@ -1181,7 +1215,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index ff0ec84529..5720f82af4 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:08 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:30 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -545,7 +545,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -892,6 +894,7 @@ CONFIG_ADC_ADS7846_SSP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1230,7 +1233,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6/h5000/defconfig index f78fe1be61..710f15a716 100644 --- a/packages/linux/linux-handhelds-2.6/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:10 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -555,7 +555,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -861,6 +863,7 @@ CONFIG_ADC_SAMCOP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set CONFIG_SOC_SAMCOP=y # CONFIG_SOC_HAMCOP is not set @@ -1171,7 +1174,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig index ef1531fc1a..36946e8e09 100644 --- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:16 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -560,7 +560,9 @@ CONFIG_MTD_CFI_UTIL=m # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -913,6 +915,7 @@ CONFIG_ADC_TSC2200_SSP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1308,7 +1311,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig index d90f34e5e9..b50b9e4d29 100644 --- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:18 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -166,7 +166,7 @@ CONFIG_HTCUNIVERSAL_UDC=y CONFIG_HTCUNIVERSAL_POWER=y CONFIG_HTCUNIVERSAL_BACKLIGHT=y CONFIG_HTCUNIVERSAL_LCD=y -CONFIG_HTCUNIVERSAL_TS2=y +CONFIG_HTCUNIVERSAL_TS2=m CONFIG_HTCUNIVERSAL_BUTTONS=y CONFIG_HTCUNIVERSAL_BLUETOOTH=m CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y @@ -548,7 +548,9 @@ CONFIG_MTD_CFI_I2=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -739,7 +741,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_ADC is not set -# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +CONFIG_TOUCHSCREEN_ADC_DEBOUNCE=m # CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -890,7 +892,7 @@ CONFIG_BATTERY_DS2760=y # Multimedia Capabilities Port drivers # CONFIG_ADC=y -# CONFIG_ADC_ADS7846_SSP is not set +CONFIG_ADC_ADS7846_SSP=y # CONFIG_ADC_TSC2200_SSP is not set # CONFIG_ADC_AD7877 is not set @@ -900,6 +902,7 @@ CONFIG_ADC=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +# CONFIG_HTC_EGPIO is not set CONFIG_HTC_ASIC3_DS1WM=y # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1240,7 +1243,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig index 1f299f1110..0035d6189c 100644 --- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:20 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:40 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -523,7 +523,9 @@ CONFIG_MTD_SA1100=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -822,6 +824,7 @@ CONFIG_ADC=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1118,7 +1121,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig index 2c6eadafd1..67e1c59d84 100644 --- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:12 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -457,7 +457,10 @@ CONFIG_IRTTY_SIR=y # # FIR device drivers # +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set CONFIG_PXA_FICP=y +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -471,9 +474,13 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # +# CONFIG_BT_HCIUSB is not set CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIDTL1 is not set # CONFIG_BT_HCIBT3C is not set # CONFIG_BT_HCIBLUECARD is not set @@ -572,7 +579,9 @@ CONFIG_MTD_CFI_UTIL=y # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -608,6 +617,7 @@ CONFIG_MTD_CFI_UTIL=y # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -728,8 +738,10 @@ CONFIG_NET_RADIO=y # # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set +# CONFIG_USB_ZD1201 is not set # CONFIG_HOSTAP is not set CONFIG_ACX=m +# CONFIG_ACX_USB is not set CONFIG_ACX_MEM=y CONFIG_ACX_HX4700=m CONFIG_NET_WIRELESS=y @@ -932,6 +944,7 @@ CONFIG_W1=y # # 1-wire Bus Masters # +# CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set CONFIG_W1_MASTER_DS1WM=y @@ -978,6 +991,7 @@ CONFIG_ADC_ADS7846_SSP=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y +# CONFIG_HTC_EGPIO is not set CONFIG_HTC_ASIC3_DS1WM=y # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1018,6 +1032,7 @@ CONFIG_LEDS_TRIGGER_SHARED=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -1112,6 +1127,11 @@ CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_RECON is not set # +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# # PCMCIA devices # # CONFIG_SND_VXPOCKET is not set @@ -1140,13 +1160,119 @@ CONFIG_HID=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set + +# +# USB DSL modem support +# + +# # USB Gadget Support # CONFIG_USB_GADGET=y @@ -1334,7 +1460,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index bdc4fa5443..c7c8c5cb91 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-hh7 -# Wed Jun 13 14:53:14 2007 +# Linux kernel version: 2.6.21-hh8 +# Wed Jun 20 18:24:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -166,7 +166,6 @@ CONFIG_MACH_MAGICIAN=y CONFIG_MAGICIAN_PM=y CONFIG_MAGICIAN_TS=m CONFIG_MAGICIAN_LCD=y -CONFIG_MAGICIAN_CPLD=y CONFIG_MAGICIAN_DS1WM=m CONFIG_MAGICIAN_PHONE=m # CONFIG_MACH_HTCAPACHE is not set @@ -563,7 +562,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 # # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=0 +CONFIG_MTDRAM_ERASE_SIZE=256 # CONFIG_MTD_BLOCK2MTD is not set # @@ -905,6 +906,7 @@ CONFIG_ADC_ADS7846_SSP=m # CONFIG_MFD_SM501 is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +CONFIG_HTC_EGPIO=y # CONFIG_HTC_ASIC3_DS1WM is not set # CONFIG_SOC_SAMCOP is not set # CONFIG_SOC_HAMCOP is not set @@ -1407,7 +1409,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb index b34d4630a0..275602762d 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r2" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb index 37845c4c96..2f26cbc863 100644 --- a/packages/linux/poodle-kernel-2.4-embedix.bb +++ b/packages/linux/poodle-kernel-2.4-embedix.bb @@ -1,4 +1,5 @@ MACHINE = "poodle" +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb index 7a714b7a12..21d334fec3 100644 --- a/packages/linux/poodle-kernels-2.4-embedix.bb +++ b/packages/linux/poodle-kernels-2.4-embedix.bb @@ -1,2 +1,3 @@ COMPATIBLE_MACHINE = "poodle" +COMPATIBLE_HOST = "arm.*-linux" DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix" diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb index 2b58472185..f3044f4e67 100644 --- a/packages/linux/poodle255-kernel-2.4-embedix.bb +++ b/packages/linux/poodle255-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "poodle255" - +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb index 874c72e432..ac573fd14e 100644 --- a/packages/linux/shepherd-kernel-2.4-embedix.bb +++ b/packages/linux/shepherd-kernel-2.4-embedix.bb @@ -1,5 +1,6 @@ MACHINE = "shepherd" COMPATIBLE_MACHINE = "shepherd" +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/memedit/.mtn2git_empty b/packages/memedit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/memedit/.mtn2git_empty diff --git a/packages/memedit/memedit_0.7.bb b/packages/memedit/memedit_0.7.bb new file mode 100644 index 0000000000..75fb676df8 --- /dev/null +++ b/packages/memedit/memedit_0.7.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Display and change memory content for testing purpose" +HOMEPAGE = "http://www.pengutronix.de/software/memedit/downloads/" +LICENSE = "GPLv2" +SECTION = "devel" +DEPENDS = "readline" + +PR = "r0" + +SRC_URI = "http://www.pengutronix.de/software/memedit/downloads/memedit-${PV}.tar.gz" + +inherit autotools diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 1fa80f7d6d..e319f1542d 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" PR = "r0" -inherit sdk meta +inherit rootfs_ipk sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 9c29926100..c0e8edc747 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL" HOMEPAGE = "http://www.mozilla.org/projects/minimo/" PRIORITY = "optional" -DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native" +DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native" CVSSVR="cvs-mirror.mozilla.org" BRTAG = "MOZILLA_1_8_BRANCH" diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 34fe1ac123..23f52bcac0 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -186,6 +186,8 @@ EXTRA_OECONF_append_hx4700 = " --enable-imageon " #enable pxa270 overlay support EXTRA_OECONF_append_spitz = " --enable-pxa " EXTRA_OECONF_append_a780 = " --enable-pxa " +EXTRA_OECONF_append_magician = " --enable-pxa " +EXTRA_OECONF_append_htcuniversal = " --enable-pxa " #build with support for the iwmmxt instruction support (pxa270 and up) TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt" @@ -193,8 +195,11 @@ PACKAGE_ARCH_spitz = "iwmmxt" TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_a780 = "iwmmxt" TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH_hx4700= "iwmmxt" - +PACKAGE_ARCH_hx4700 = "iwmmxt" +TARGET_CC_ARCH_magician = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_magician = "iwmmxt" +TARGET_CC_ARCH_htcuniversal = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_htcuniversal = "iwmmxt" do_configure() { cp ${WORKDIR}/vo_w100.c ${S}/libvo diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 886dbb072f..4a47d744ca 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -167,6 +167,9 @@ EXTRA_OECONF = " \ --disable-runtime-cpudetection \ " +EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \ + --disable-encoder=vorbis_encoder" + EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2" #enable support for the ati imageon series (w100 and w3220) @@ -176,15 +179,20 @@ EXTRA_OECONF_append_hx4700 = " --enable-imageon " #enable pxa270 overlay support EXTRA_OECONF_append_spitz = " --enable-pxa " EXTRA_OECONF_append_a780 = " --enable-pxa " +EXTRA_OECONF_append_magician = " --enable-pxa " +EXTRA_OECONF_append_htcuniversal = " --enable-pxa " -#build with support for the iwmmxt instruction support (pxa270 and up) +#build with support for the iwmmxt instruction support (pxa270 and up) TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_spitz = "iwmmxt" TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt" PACKAGE_ARCH_a780 = "iwmmxt" TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt" -PACKAGE_ARCH_hx4700= "iwmmxt" - +PACKAGE_ARCH_hx4700 = "iwmmxt" +TARGET_CC_ARCH_magician = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_magician = "iwmmxt" +TARGET_CC_ARCH_htcuniversal = "-march=iwmmxt -mtune=iwmmxt" +PACKAGE_ARCH_htcuniversal = "iwmmxt" do_configure() { cp ${WORKDIR}/vo_w100.c ${S}/libvo diff --git a/packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb b/packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb new file mode 100644 index 0000000000..97740c0aaf --- /dev/null +++ b/packages/spandsp/spandsp_0.0.3+0.0.4pre3.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A library of many DSP functions for telephony." +HOMEPAGE = "http://www.soft-switch.org" +DEPENDS = "tiff libxml2" +SECTION = "voip" +LICENSE = "GPL" + +PR = "r0" + +SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre3.tgz" + +S = "${WORKDIR}/spandsp-0.0.4" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +# *cough* +do_configure_append() { + rm config.log +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 95eb55b748..4f3b0fc817 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r35" +PR = "r36" PROVIDES = "${PACKAGES}" PACKAGES = 'task-boot' @@ -46,8 +46,11 @@ RDEPENDS_task-boot = "\ ${DISTRO_DEV_MANAGER} \ ${DISTRO_INIT_MANAGER} \ ${DISTRO_LOGIN_MANAGER} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" + ${DISTRO_EXTRA_RDEPENDS} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + ${MACHINE_EXTRA_RDEPENDS}" RRECOMMENDS_task-boot = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ + ${MACHINE_EXTRA_RRECOMMENDS} \ + ${DISTRO_EXTRA_RRECOMMENDS} " diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index fee2be51b8..2c2bac1289 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -10,5 +10,5 @@ PACKAGES = "\ RDEPENDS_task-sdk-bare = "\ glibc \ glibc-dev \ - libgcc1 \ - "
\ No newline at end of file + libgcc \ + " diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb index 276ac491e0..666b6c2563 100644 --- a/packages/tremor/tremor_20041119.bb +++ b/packages/tremor/tremor_20041119.bb @@ -14,14 +14,6 @@ inherit autotools EXTRA_OECONF=" --enable-shared --disable-rpath " -#do_configure_prepend() { -# ./autogen.sh -#} - do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR}/tremor \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine index eec16b1b33..2d9f63e531 100644 --- a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine @@ -68,146 +68,3 @@ DO_C99_MATH=y KERNEL_HEADERS="/usr/include" HAVE_DOT_CONFIG=y -# -# General Library Settings -# -# HAVE_NO_PIC is not set -# DOPIC is not set -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -# UCLIBC_STATIC_LDCONFIG is not set -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_DYNAMIC_ATEXIT=y -COMPAT_ATEXIT=y -# UCLIBC_SUSV3_LEGACY is not set -# UCLIBC_SUSV3_LEGACY_MACROS is not set -UCLIBC_HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Advanced Library Settings -# -UCLIBC_PWD_BUFFER_SIZE=256 -UCLIBC_GRP_BUFFER_SIZE=256 - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y -# UCLIBC_HAS_REENTRANT_RPC is not set -# UCLIBC_USE_NETLINK is not set -# UCLIBC_HAS_BSD_RES_CLOSE is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -UCLIBC_HAS_WCHAR=y -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -UCLIBC_HAS_STDIO_BUFSIZ_256=y -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_REGEX_OLD is not set -UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_FNMATCH_OLD is not set -UCLIBC_HAS_WORDEXP=y -UCLIBC_HAS_FTW=y -UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="/lib" -RUNTIME_PREFIX="/" -DEVEL_PREFIX="//usr" - -# -# Security options -# -# UCLIBC_BUILD_PIE is not set -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc index 652d79cc83..4035937740 100644 --- a/packages/unionfs/unionfs.inc +++ b/packages/unionfs/unionfs.inc @@ -4,7 +4,7 @@ physical content separate." HOMEPAGE = "http://www.fsl.cs.sunysb.edu/project-unionfs.html" LICENSE = "GPL" -SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/unionfs-${PV}.tar.gz \ file://make.patch;patch=1" S = "${WORKDIR}/unionfs-${PV}" FILESPATH = "${FILE_DIRNAME}/unionfs-${PV}:${FILE_DIRNAME}/unionfs:${FILE_DIRNAME}/files:${FILE_DIRNAME}" diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb index ec058067c5..fc362a9c41 100644 --- a/packages/xchat/xchat_2.6.1.bb +++ b/packages/xchat/xchat_2.6.1.bb @@ -3,10 +3,11 @@ LICENSE = "GPL" HOMEPAGE = "http://www.xchat.org" SECTION = "x11/network" DEPENDS = "libgcrypt zlib gtk+" -PR = "r2" +PR = "r3" SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2" inherit autotools EXTRA_OECONF = " --disable-perl --disable-python " +FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug" diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.8.bb index 378a189db9..4c6dc732d4 100644 --- a/packages/xchat/xchat_2.6.0.bb +++ b/packages/xchat/xchat_2.6.8.bb @@ -3,10 +3,11 @@ LICENSE = "GPL" HOMEPAGE = "http://www.xchat.org" SECTION = "x11/network" DEPENDS = "libgcrypt zlib gtk+" -PR = "r1" +PR = "r0" SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2" inherit autotools EXTRA_OECONF = " --disable-perl --disable-python " +FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug" diff --git a/packages/xorg-lib/libx11/ruutf8.patch b/packages/xorg-lib/libx11/ruutf8.patch new file mode 100644 index 0000000000..0822b30cb8 --- /dev/null +++ b/packages/xorg-lib/libx11/ruutf8.patch @@ -0,0 +1,12 @@ +diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre +index a74ca75..ff5bc3f 100644 +--- a/nls/locale.alias.pre ++++ b/nls/locale.alias.pre +@@ -898,6 +898,7 @@ ru_RU.cp1251: ru_RU.CP1251 + ru_RU.microsoftcp1251: ru_RU.CP1251 + ru_RU.microsoft-cp1251: ru_RU.CP1251 + ru_RU.MICROSOFT-CP1251: ru_RU.CP1251 ++ru_RU.utf8: ru_RU.UTF-8 + #if defined(INCLUDE_ru_SU) + XCOMM ru_SU is redundant now + ru_SU: ru_RU.KOI8-R diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index d661ca91c6..023f15cef3 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,6 +1,6 @@ require xorg-lib-common.inc PE = "1" -PR = "r1" +PR = "r2" DESCRIPTION = "Base X libs." @@ -13,6 +13,8 @@ XORG_PN = "libX11" PACKAGES =+ "libx11-xcb" +SRC_URI += " file://ruutf8.patch;patch=1" + FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 45dc334c92..b7fb686a60 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -1,9 +1,11 @@ require xorg-lib-common.inc + PR = "r4" DESCRIPTION = "Base X libs." SRC_URI += "file://makekeys.diff;patch=1" +SRC_URI += " file://ruutf8.patch;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" diff --git a/packages/xorg-lib/xorg-lib-common.inc b/packages/xorg-lib/xorg-lib-common.inc index e1f783e352..b1c1153bf4 100644 --- a/packages/xorg-lib/xorg-lib-common.inc +++ b/packages/xorg-lib/xorg-lib-common.inc @@ -5,7 +5,8 @@ LICENSE = "MIT-X" DEPENDS = "util-macros xorg-headers-native" XORG_PN = "${PN}" XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" -SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/lib/${XORG_PN}-${PV}.tar.bz2 \ +" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig |