diff options
Diffstat (limited to 'packages')
33 files changed, 329 insertions, 241 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 1eacf4269f..e4d23285f3 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,31 +8,19 @@ # Date: 20070308 (YMD) DESCRIPTION = "Default ALSA configuration" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" -HOMEPAGE = "<homepage>" LICENSE = "GPL" -###################################################################################### - PV = "0.0.3" PR = "r0" -###################################################################################### - SRC_URI = "file://asound.state \ file://alsa-state" -FILES_${PN} = "/etc/*" - -###################################################################################### - inherit update-rc.d INITSCRIPT_NAME = "alsa-state" INITSCRIPT_PARAMS = "defaults 10" -###################################################################################### - do_install() { install -d ${D}${sysconfdir}/init.d @@ -40,6 +28,7 @@ do_install() { install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d } +FILES_${PN} = "${sysconfdir}/*" pkg_postinst_${PN}() { if test -x /usr/sbin/alsactl diff --git a/packages/anthy/anthy-native_7811.bb b/packages/anthy/anthy-native_7811.bb index 138abe87c8..38305ddf84 100644 --- a/packages/anthy/anthy-native_7811.bb +++ b/packages/anthy/anthy-native_7811.bb @@ -1,4 +1,9 @@ require anthy_${PV}.bb -PACKAGES = "" + DEPENDS = "" +PACKAGES = "" +PR = "r1" + +S = "${WORKDIR}/anthy-${PV}" + inherit native diff --git a/packages/boost-asio/boost-asio_0.3.7.bb b/packages/boost-asio/boost-asio_0.3.7.bb index 45b7e22eb1..947f89cae2 100644 --- a/packages/boost-asio/boost-asio_0.3.7.bb +++ b/packages/boost-asio/boost-asio_0.3.7.bb @@ -1,6 +1,5 @@ DESCRIPTION = "Asio 0.3.7 for work with boost, should be moved into boost package once integrated into the boost distribution." HOMEPAGE = "http://asio.sf.net/" -MAINTAINER = "Martin Dietze <dietze@4g-systems.com>" SECTION = "libs" PRIORITY = "optional" LICENSE = "Boost Software License" diff --git a/packages/gizmod/gizmod_2.3.bb b/packages/gizmod/gizmod_2.3.bb index ff9ae25640..bc70aa0414 100644 --- a/packages/gizmod/gizmod_2.3.bb +++ b/packages/gizmod/gizmod_2.3.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Gizmo Daemon" HOMEPAGE = "http://gizmod.sourceforge.net" LICENSE = "GPLv2" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" SECTION = "console/multimedia" DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib" SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \ diff --git a/packages/gpesyncd/gpe-synctool_0.2.bb b/packages/gpesyncd/gpe-synctool_0.2.bb new file mode 100644 index 0000000000..5db87ad995 --- /dev/null +++ b/packages/gpesyncd/gpe-synctool_0.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Sync daemon for GPE and OpenSync" +LICENSE = "GPL" +DEPENDS = "gtk+ glib-2.0 libgpewidget" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools + diff --git a/packages/gpesyncd/gpe-synctool_svn.bb b/packages/gpesyncd/gpe-synctool_svn.bb index 2fdc4c7e56..e85013c117 100644 --- a/packages/gpesyncd/gpe-synctool_svn.bb +++ b/packages/gpesyncd/gpe-synctool_svn.bb @@ -2,7 +2,9 @@ DESCRIPTION = "Sync daemon for GPE and OpenSync" LICENSE = "GPL" DEPENDS = "gtk+ glib-2.0 libgpewidget" -PV = "0.0+svn${SRCDATE}" +DEFAULT_PREFERENCE = "-1" + +PV = "0.2+svn${SRCDATE}" PR = "r0" SRC_URI = "${GPE_SVN}" diff --git a/packages/images/hentges-console-image.bb b/packages/images/hentges-console-image.bb index 24235b2887..87381a4c77 100644 --- a/packages/images/hentges-console-image.bb +++ b/packages/images/hentges-console-image.bb @@ -8,7 +8,6 @@ # Date: 20070516 (YMD) DESCRIPTION = "Hentges Console Image" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "GPL" diff --git a/packages/images/hentges-x11-image.bb b/packages/images/hentges-x11-image.bb index 84a4fec94f..475f9f0ea9 100644 --- a/packages/images/hentges-x11-image.bb +++ b/packages/images/hentges-x11-image.bb @@ -8,7 +8,6 @@ # Date: 20070522 (YMD) DESCRIPTION = "Hentges X11 Image" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "MIT" diff --git a/packages/librcf/librcf_0.4.bb b/packages/librcf/librcf_0.4.bb index 13012fa803..aad6f7c338 100644 --- a/packages/librcf/librcf_0.4.bb +++ b/packages/librcf/librcf_0.4.bb @@ -1,7 +1,6 @@ DESCRIPTION = "A library for object-oriented inter process communication" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Martin Dietze <dietze@4g-systems.com>" LICENSE = "unknown" DEPENDS="zlib openssl boost-asio" RDEPENDS = "libstdc++5 libgcc1" diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb index fe523c879c..1bddcfdd3b 100644 --- a/packages/linux/linux-mtx-3_2.6.15.4.bb +++ b/packages/linux/linux-mtx-3_2.6.15.4.bb @@ -1,5 +1,4 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPL" KV = "${PV}" diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb index 178519d798..3dba1fe6a0 100644 --- a/packages/linux/linux-mtx-3_2.6.15.bb +++ b/packages/linux/linux-mtx-3_2.6.15.bb @@ -1,5 +1,4 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" HOMEPAGE = "http://meshcube.org/meshwiki/" LICENSE = "GPL" KV = "${PV}" diff --git a/packages/mdk/mdk2_v33.bb b/packages/mdk/mdk2_v33.bb index bd665e2ccd..02a784d5e3 100644 --- a/packages/mdk/mdk2_v33.bb +++ b/packages/mdk/mdk2_v33.bb @@ -2,7 +2,6 @@ SECTION = "console/network" DESCRIPTION = "ASPj is drunk" HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/" LICENSE = "GPLv2" -MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>" DEPENDS = "" RDEPENDS = "" PR="r1" diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb index 4f51f88277..fc7c3de6a3 100644 --- a/packages/nylon/simple-firewall.bb +++ b/packages/nylon/simple-firewall.bb @@ -1,7 +1,6 @@ DESCRIPTION = "simple firewall configuratiopn script" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" DEPENDS = "virtual/kernel" #SRCDATE = "20060114" diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index 7da61e91c2..c071d52404 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -4,7 +4,6 @@ LICENSE = "Perl" DEPENDS = "" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>" PACKAGES = "" PR = "r1" diff --git a/packages/patcher/patcher_20040913.bb b/packages/patcher/patcher_20040913.bb index af4d91217c..471f75af7b 100644 --- a/packages/patcher/patcher_20040913.bb +++ b/packages/patcher/patcher_20040913.bb @@ -4,7 +4,6 @@ LICENSE = "Perl" DEPENDS = "" SECTION = "base" PRIORITY = "optional" -MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>" INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc new file mode 100644 index 0000000000..9cbf9a3f89 --- /dev/null +++ b/packages/pulseaudio/pulse.inc @@ -0,0 +1,94 @@ +DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems." +HOMEPAGE = "http://www.pulseaudio.org" +AUTHOR = "Lennart Poettering" +SECTION = "libs/multimedia" +LICENSE = "LGPL" + +DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" +# optional +DEPENDS += "alsa-lib" + +PR = "r0" + +SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" + +SRC_URI += "file://volatiles.04_pulse" + + +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --disable-lynx \ + --without-x \ + --without-glib \ + --without-jack \ + --with-alsa \ + --with-oss \ + " + +PARALLEL_MAKE = "" + +export TARGET_FPU="${TARGET_FPU}" + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse + + if [ "x${TARGET_FPU}" == "xsoft" ] ; then + sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf + fi +} + + +LEAD_SONAME = "libpulse.so" + +PACKAGES =+ "${PN}-bin ${PN}-conf" +PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* " + +FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ + ${libdir}/pulse-0.9/modules/.debug" +FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" +FILES_${PN}-conf = "${sysconfdir}" +FILES_${PN}-bin = "${bindir}/* \ + ${sysconfdir}/default/volatiles/volatiles.04_pulse" + +CONFFILES_${PN}-conf = "\ + ${sysconfdir}/pulse/default.pa \ + ${sysconfdir}/pulse/daemon.conf \ + ${sysconfdir}/pulse/client.conf \ + " +pkg_postinst_${PN}-bin() { +if test "x$D" != "x"; then + exit 1 +else + grep -q pulse: /etc/group || addgroup pulse + grep -q pulse: /etc/passwd || \ + adduser --disabled-password --home=/var/run/pulse/ --system \ + --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse + /etc/init.d/populate-volatile.sh update +fi +} + +pkg_postrm${PN}-bin() { +if test "x$D" != "x"; then + exit 1 +else + deluser pulse +fi +} + + + + +do_stage() { + autotools_stage_all +} + + +python populate_packages_prepend() { + #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) + + plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d) + do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) + do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) +} diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index 35fd9a8342..4eb2e458ff 100644 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -1,95 +1,3 @@ -DESCRIPTION = "Pulseaudio is a sound server for Linux and Unix-like operating systems." -HOMEPAGE = "http://www.pulseaudio.org" -AUTHOR = "Lennart Poettering" -SECTION = "libs/multimedia" -LICENSE = "LGPL" +require pulse.inc -DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool" -# optional -DEPENDS += "alsa-lib" - - -PR = "r7" - -SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" - -SRC_URI += "file://volatiles.04_pulse" - - -inherit autotools pkgconfig - -EXTRA_OECONF = "\ - --disable-lynx \ - --without-x \ - --without-glib \ - --without-jack \ - --with-alsa \ - --with-oss \ - " - -PARALLEL_MAKE = "" - -export TARGET_FPU="${TARGET_FPU}" - -do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse - - if [ "x${TARGET_FPU}" == "xsoft" ] ; then - sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf - fi -} - - -LEAD_SONAME = "libpulse.so" - -PACKAGES =+ "${PN}-bin ${PN}-conf" -PACKAGES_DYNAMIC = "pulseaudio-module-* pulseaudio-lib-*" - -FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \ - ${libdir}/pulse-0.9/modules/.debug" -FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la" -FILES_${PN}-conf = "${sysconfdir}" -FILES_${PN}-bin = "${bindir}/* \ - ${sysconfdir}/default/volatiles/volatiles.04_pulse" - -CONFFILES_${PN}-conf = "\ - ${sysconfdir}/pulse/default.pa \ - ${sysconfdir}/pulse/daemon.conf \ - ${sysconfdir}/pulse/client.conf \ - " -pkg_postinst_${PN}-bin() { -if test "x$D" != "x"; then - exit 1 -else - grep -q pulse: /etc/group || addgroup pulse - grep -q pulse: /etc/passwd || \ - adduser --disabled-password --home=/var/run/pulse/ --system \ - --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse - /etc/init.d/populate-volatile.sh update -fi -} - -pkg_postrm${PN}-bin() { -if test "x$D" != "x"; then - exit 1 -else - deluser pulse -fi -} - - - - -do_stage() { - autotools_stage_all -} - - -python populate_packages_prepend() { - #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) - - plugindir = bb.data.expand('${libdir}/pulse-0.9/modules/', d) - do_split_packages(d, plugindir, '^module-(.*)\.so$', 'pulseaudio-module-%s', 'PulseAudio module for %s', extra_depends='' ) - do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) -} +PR = "r8" diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb new file mode 100644 index 0000000000..cd088c9843 --- /dev/null +++ b/packages/pulseaudio/pulseaudio_0.9.6.bb @@ -0,0 +1,3 @@ +require pulse.inc + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/python/fix-path.inc b/packages/python/fix-path.inc new file mode 100644 index 0000000000..0738c59ada --- /dev/null +++ b/packages/python/fix-path.inc @@ -0,0 +1,22 @@ +do_install_append() { + for i in `find ${D} -name "*.py"` ; do \ + sed -i -e s:${D}::g $i + done + + for i in `find ${D} -name "*.la"` ; do \ + sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i + done + + if test -e ${D}${bindir} ; then + for i in ${D}${bindir}/* ; do \ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + done + fi + + if test -e ${D}${sbindir} ; then + for i in ${D}${sbindir}/* ; do \ + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + done + fi +} + diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index a71765dfbc..d3811ddddd 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject" RDEPENDS = "python-shell" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml3" +PR = "ml4" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ @@ -21,6 +21,8 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } +require fix-path.inc + FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug" FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" diff --git a/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch new file mode 100644 index 0000000000..abebfdfa27 --- /dev/null +++ b/packages/qmake/qmake2-native-2.01a/0001-fix-mkspecs.patch @@ -0,0 +1,123 @@ +From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Sat, 2 Jun 2007 16:39:58 +0200 +Subject: [PATCH] fix mkspecs + +--- + mkspecs/common/g++.conf | 18 +++++++++--------- + mkspecs/common/linux.conf | 26 +++++++++++++------------- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf +index f5a5c8e..4007c7e 100644 +--- a/mkspecs/common/g++.conf ++++ b/mkspecs/common/g++.conf +@@ -2,12 +2,12 @@ + # qmake configuration for common gcc + # + +-QMAKE_CC = gcc +-QMAKE_CFLAGS += -pipe ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden + QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) + QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF +@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden + QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS += ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE += + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared + QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME += -Wl,-soname, + QMAKE_LFLAGS_THREAD += +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_PCH_OUTPUT_EXT = .gch + +diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf +index 3796a87..52acf16 100644 +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) ++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) ++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) + QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_OPENGL = -lGLU -lGL + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p + QMAKE_INSTALL_FILE = install -m 644 -p + QMAKE_INSTALL_PROGRAM = install -m 755 -p + +-include(unix.conf) +\ No newline at end of file ++include(unix.conf) +-- +1.5.1.6 + diff --git a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf index d803f036fc..f58481a693 100644 --- a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf @@ -1,90 +1 @@ -# -# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl -QT += core gui -QMAKE_INCREMENTAL_STYLE = sublib - -QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_YACCFLAGS_MANGLE = -p $base -b $base -QMAKE_YACC_HEADER = $base.tab.h -QMAKE_YACC_SOURCE = $base.tab.c -QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - -QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = $(OE_QMAKE_INCDIR_X11) -QMAKE_LIBDIR_X11 = $(OE_QMAKE_LIBDIR_X11) -QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = $(OE_QMAKE_LINK) -QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,-rpath-link, - -QMAKE_LIBS = $(LIBS_EXTRA) -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -QMAKE_LIBS_X11SM = -QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) -QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl -QMAKE_LIBS_THREAD = -lpthread - -QMAKE_MOC = $(OE_QMAKE_MOC) -QMAKE_UIC = $(OE_QMAKE_UIC) - -QMAKE_AR = $(OE_QMAKE_AR) cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -r -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = $(OE_QMAKE_STRIP) -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p - +include(../linux-g++/qmake.conf) diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.01a.bb index dab5b6a3b4..b4a736cb76 100644 --- a/packages/qmake/qmake2-native_2.01a.bb +++ b/packages/qmake/qmake2-native_2.01a.bb @@ -4,9 +4,12 @@ HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -QTVER = "qt-x11-opensource-src-4.2.3" +PR = "r1" + +QTVER = "qt-x11-opensource-src-4.3.0" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ + file://0001-fix-mkspecs.patch;patch=1 \ file://linux-oe-qmake.conf" S = "${WORKDIR}/${QTVER}" @@ -30,6 +33,19 @@ do_configure() { PLATFORM=${HOST_OS}-oe-g++ export PLATFORM # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + export OE_QMAKE_CC="${CC}" + export OE_QMAKE_CFLAGS="${CFLAGS}" + export OE_QMAKE_CXX="${CXX}" + export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" + export OE_QMAKE_LDFLAGS="${LDFLAGS}" + export OE_QMAKE_LINK="${CCLD}" + export OE_QMAKE_AR="${AR}" + export OE_QMAKE_STRIP="${STRIP}" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_RCC="non-existant" + export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" + export OE_QMAKE_RPATH="-Wl,-rpath-link," echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" } diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb index 4ff41fa8fd..dfdee44ee9 100644 --- a/packages/qt/qt4-x11-free_4.3.0.bb +++ b/packages/qt/qt4-x11-free_4.3.0.bb @@ -2,11 +2,11 @@ SECTION = "x11/libs" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" -DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus" -RDEPENDS_${PN} = "${QTPACKAGES}" +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus openssl" +RDEPENDS_${PN} = "${NONDEV_PACKAGES}" PROVIDES = "qt4x11" -PR = "r3" +PR = "r5" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ @@ -36,9 +36,9 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -no-sse -no-sse2 -no-mmx -no-3dnow \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -qdbus \ + -qdbus \ -verbose -stl -no-accessibility \ - -pch -no-glib" + -pch -no-glib" EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ @@ -69,7 +69,7 @@ do_compile() { oe_runmake ${EXTRA_ENV} # FIXME: this is not the way to go, I think. - for pc in ${S}/lib/*.pc ; do + for pc in ${S}/lib/pkgconfig/*.pc ; do sed -i \ -e 's,-L${S}/lib,,g' \ -e 's,^moc_location=.*,^moc_location=${TARGING_BINDIR}/moc4,g' \ @@ -116,18 +116,22 @@ do_install() { rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc } -QTPACKAGES = "libqtcore4 libqtcore4-dev libqtgui4 libqtgui4-dev libqtnetwork4 libqtnetwork4-dev \ - libqtsql4 libqtsql4-dev libqtsvg4 libqtsvg4-dev libqttest4 libqttest4-dev \ - libqtxml4 libqtxml4-dev \ - libqtdesigner4 libqtdesigner4-dev libqtdesignercomponents4 libqtdesignercomponents4-dev \ - libqt3support4 libqt3support4-dev \ - libqtassistantclient4 libqtassistantclient4-dev libqtscript4 libqtscript4-dev \ - libqtdbus4 libqtdbus4-dev \ +NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4 \ + libqtsql4 libqtsvg4 libqttest4 \ + libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 \ + libqt3support4 \ + libqtassistantclient4 libqtscript4 \ + libqtdbus4 \ qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ - qt4-pixeltool qt4-dbus \ + qt4-pixeltool qt4-dbus \ qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \ - qt4-plugins-inputmethods qt4-plugins-iconengines" -PACKAGES += "${QTPACKAGES}" + qt4-plugins-inputmethods qt4-plugins-iconengines" + +PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \ + libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \ + libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \ + ${NONDEV_PACKAGES}" ALLOW_EMPTY = "1" FILES_${PN} = "" @@ -154,10 +158,10 @@ FILES_libqt3support4 = "${libdir}/libQt3Support.so.*" FILES_libqt3support4-dev = "${libdir}/libQt3Support.so" FILES_libqtassistantclient4 = "${libdir}/libQtAssistantClient.so.*" FILES_libqtassistantclient4-dev = "${libdir}/libQtAssistantClient.so" -FILES_libqtscript4 = "${libdir}/libQtScript.so.*" -FILES_libqtscript4-dev = "${libdir}/libQtScript.so" -FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" -FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" +FILES_libqtscript4 = "${libdir}/libQtScript.so.*" +FILES_libqtscript4-dev = "${libdir}/libQtScript.so" +FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" +FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" @@ -170,8 +174,8 @@ FILES_qt4-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" FILES_qt4-assistant = "${bindir}/*assistant*" FILES_qt4-designer = "${bindir}/*designer*" FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" -FILES_qt4-pixeltool = "${bindir}/pixeltool" -FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" +FILES_qt4-pixeltool = "${bindir}/pixeltool" +FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" FILES_qt4-common = "${bindir}/qtconfig" FILES_qt4-examples = "${bindir}/qt4-examples/*" diff --git a/packages/rfakeap/rfakeap_0.2.bb b/packages/rfakeap/rfakeap_0.2.bb index 1854e20286..702399e0f5 100644 --- a/packages/rfakeap/rfakeap_0.2.bb +++ b/packages/rfakeap/rfakeap_0.2.bb @@ -2,7 +2,6 @@ SECTION = "console/network" DESCRIPTION = "Raw Fake AP" HOMEPAGE = "http://rfakeap.tuxfamily.org/" LICENSE = "GPLv2" -MAINTAINER = "Zero_Chaos <sidhayn@hotmail.com>" DEPENDS = "libpcap" PV="0.2" PR="r1" diff --git a/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb b/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb index ee8534dc01..f53d175a80 100644 --- a/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb +++ b/packages/s3c2410-utils/s3c2410-boot-usb-native_20060807.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage" DEPENDS = "libusb-native" SECTION = "devel" AUTHOR = "Harald Welte" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" PR = "r0" diff --git a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb index 53b2d0c8e0..0ec6642dc2 100644 --- a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb +++ b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb @@ -1,7 +1,6 @@ DESCRIPTION = "Jtag utility to interface w/ a S3C2410 device" SECTION = "devel" AUTHOR = "Harald Welte" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" PR = "r1" diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb new file mode 100644 index 0000000000..9b389c53cc --- /dev/null +++ b/packages/starling/starling_0.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Starling audio player for GPE" +SECTION = "gpe/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" +RDEPENDS = "pulseaudio-bin \ + gst-plugin-audioconvert \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-modplug \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools + diff --git a/packages/tasks/task-hentges-base.bb b/packages/tasks/task-hentges-base.bb index 894197f381..89b39aeba9 100644 --- a/packages/tasks/task-hentges-base.bb +++ b/packages/tasks/task-hentges-base.bb @@ -7,7 +7,6 @@ # Date: 20070516 (YMD) DESCRIPTION = "task-hentges-base" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "MIT" diff --git a/packages/tasks/task-hentges-x11.bb b/packages/tasks/task-hentges-x11.bb index 87c89d6a4c..db658e9014 100644 --- a/packages/tasks/task-hentges-x11.bb +++ b/packages/tasks/task-hentges-x11.bb @@ -8,7 +8,6 @@ # Date: 20070522 (YMD) DESCRIPTION = "task-hentges-x11" -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" LICENSE = "MIT" diff --git a/packages/ttyrec/ttyrec_1.0.8.bb b/packages/ttyrec/ttyrec_1.0.8.bb index 324751b4ba..bf58f245cb 100644 --- a/packages/ttyrec/ttyrec_1.0.8.bb +++ b/packages/ttyrec/ttyrec_1.0.8.bb @@ -8,7 +8,6 @@ # Date: 20070403 (YMD) DESCRIPTION = "ttyrec is a tty recorder. Recorded data can be played back with the included ttyplay command." -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://0xcc.net/ttyrec/index.html.en" ###################################################################################### diff --git a/packages/webcam-server/webcam-server_0.50.bb b/packages/webcam-server/webcam-server_0.50.bb index 737ef75977..df7873c382 100644 --- a/packages/webcam-server/webcam-server_0.50.bb +++ b/packages/webcam-server/webcam-server_0.50.bb @@ -8,7 +8,6 @@ # Date: 20070317 (YMD) DESCRIPTION = "webcam_server is a program that allows others to view your webcam from a web browser." -MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" HOMEPAGE = "http://webcamserver.sourceforge.net/" LICENSE = "GPL" diff --git a/packages/yeaphone/yeaphone_0.1.bb b/packages/yeaphone/yeaphone_0.1.bb index 2612b37e9a..67b651ae71 100644 --- a/packages/yeaphone/yeaphone_0.1.bb +++ b/packages/yeaphone/yeaphone_0.1.bb @@ -1,6 +1,5 @@ DESCRIPTION = "A VoIP SIP phone for the Yealink USB handset" HOMEPAGE = "http://www.devbase.at/voip/" -MAINTAINER = "Thomas Reitmayr <treitmayr@yahoo.com>" LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "liblinphone" |