diff options
32 files changed, 203 insertions, 103 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ab59d392b8..daa271da06 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -98,6 +98,7 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.2.1" +PREFERRED_VERSION_freetype-native = "2.2.1" #fix screen corruption issues PREFERRED_VERSION_cairo = "1.3.12" diff --git a/packages/arpwatch/arpwatch_2.1a15.bb b/packages/arpwatch/arpwatch_2.1a15.bb index 74e667c510..758c3c807f 100644 --- a/packages/arpwatch/arpwatch_2.1a15.bb +++ b/packages/arpwatch/arpwatch_2.1a15.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www-nrg.ee.lbl.gov/" SECTION = "network" LICENSE = "BSD" RRECOMMENDS = "arpwatch-data" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \ file://05debian_fhs.patch;patch=1 \ @@ -21,7 +21,7 @@ PACKAGES =+ "arpwatch-data" FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat" -do_install() { +fakeroot do_install() { install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \ ${D}${sysconfdir}/default \ ${D}${sysconfdir}/init.d \ diff --git a/packages/dri/drm-kernel/.mtn2git_empty b/packages/dri/drm-kernel/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dri/drm-kernel/.mtn2git_empty diff --git a/packages/dri/make.patch b/packages/dri/drm-kernel/make.patch index f0dabecd5e..f0dabecd5e 100644 --- a/packages/dri/make.patch +++ b/packages/dri/drm-kernel/make.patch diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 0c235a3adb..8e219880d0 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -16,5 +16,3 @@ do_compile() { do_stage() { autotools_stage_all } - - diff --git a/packages/dri/libdrm_2.3.0.bb b/packages/dri/libdrm_2.3.0.bb new file mode 100644 index 0000000000..9caf9b4bea --- /dev/null +++ b/packages/dri/libdrm_2.3.0.bb @@ -0,0 +1,10 @@ +SECTION = "x11/base" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index 171c712fc0..8230515f3b 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -53,6 +53,13 @@ EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-disp LIBV = "2.4.0" +do_configure_prepend() { + for i in `find . -name "Makefile.am"` + do + sed -e -i s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDES, $i + done +} + do_stage () { oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index a441292472..08fbc1eed5 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r12" +PR = "r13" inherit update-rc.d @@ -27,7 +27,7 @@ do_install () { install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htuniversal ) + c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200 | htcuniversal ) install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} ;; *) diff --git a/packages/linux/linux-epia-2.6.19.2/epia_defconfig b/packages/linux/linux-epia-2.6.19.2/epia_defconfig index 3cb0893080..db84c236cb 100644 --- a/packages/linux/linux-epia-2.6.19.2/epia_defconfig +++ b/packages/linux/linux-epia-2.6.19.2/epia_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19.2 -# Fri Jan 19 21:02:53 2007 +# Fri Jan 26 11:55:32 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -343,7 +343,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -CONFIG_INET_XFRM_TUNNEL=y +# CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y @@ -996,7 +996,14 @@ CONFIG_AGP=y # CONFIG_AGP_SWORKS is not set CONFIG_AGP_VIA=y # CONFIG_AGP_EFFICEON is not set -# CONFIG_DRM is not set +CONFIG_DRM=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +CONFIG_DRM_VIA=y +# CONFIG_DRM_SAVAGE is not set # CONFIG_MWAVE is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_NSC_GPIO is not set @@ -1058,7 +1065,6 @@ CONFIG_I2C_VIAPRO=m # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set # CONFIG_SENSORS_EEPROM is not set -CONFIG_SENSORS_VT1211=m # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -1117,6 +1123,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_VIA686A is not set +CONFIG_SENSORS_VT1211=m # CONFIG_SENSORS_VT8231 is not set # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83791D is not set diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb index a52f512c12..87d61b0226 100644 --- a/packages/linux/linux-epia_2.6.19.2.bb +++ b/packages/linux/linux-epia_2.6.19.2.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" LICENSE = "GPL" -PR = "r0" +PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index bb3a141a39..7ef5ad581e 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" +PR = "r1" COMPATIBLE_MACHINE = "(palmtx|palmld|palmz72)" @@ -76,3 +77,12 @@ do_compile_prepend() { cd - fi } + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index 84915e03e2..6349061c4c 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,10 +1,12 @@ ---- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 -+++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 +Index: madwifi-ng-r1871-20061229/hal/public/xscale-be-elf.inc +=================================================================== +--- madwifi-ng-r1871-20061229.orig/hal/public/xscale-be-elf.inc 2006-09-14 08:21:22.000000000 +0200 ++++ madwifi-ng-r1871-20061229/hal/public/xscale-be-elf.inc 2007-01-24 22:37:23.000000000 +0100 @@ -77,5 +77,5 @@ LDOPTS= -EB COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ -- -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 +- -mtune=xscale -mshort-load-bytes +COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ + -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 7ab46e16b3..839bafa592 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,10 @@ ---- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 -+++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 +Index: madwifi-ng-r1871-20061229/hal/public/xscale-le-elf.inc +=================================================================== +--- madwifi-ng-r1871-20061229.orig/hal/public/xscale-le-elf.inc 2006-09-14 08:21:22.000000000 +0200 ++++ madwifi-ng-r1871-20061229/hal/public/xscale-le-elf.inc 2007-01-24 22:42:38.000000000 +0100 @@ -79,4 +79,4 @@ LDOPTS= -EL COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ -- -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 +- -mapcs-32 -mtune=xscale -mshort-load-bytes + -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb index 3d18717d63..4d8b4f2c4d 100644 --- a/packages/mediatomb/mediatomb_svn.bb +++ b/packages/mediatomb/mediatomb_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" HOMEPAGE = "http://mediatomb.org/" LICENSE = "GPLv2" -DEPENDS = "sqlite3 libexif js zlib file taglib" +DEPENDS = "sqlite3 libexif js zlib file id3lib" PV = "0.8+0.9pre1+svn${SRCDATE}-sqlite" PR = "r1" diff --git a/packages/mesa/mesa-6.0.1/.mtn2git_empty b/packages/mesa/mesa-6.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-6.0.1/.mtn2git_empty diff --git a/packages/mesa/Make-config.patch b/packages/mesa/mesa-6.0.1/Make-config.patch index cfe8890e3b..cfe8890e3b 100644 --- a/packages/mesa/Make-config.patch +++ b/packages/mesa/mesa-6.0.1/Make-config.patch diff --git a/packages/mesa/mklib.patch b/packages/mesa/mesa-6.0.1/mklib.patch index 7dc1ec76a7..7dc1ec76a7 100644 --- a/packages/mesa/mklib.patch +++ b/packages/mesa/mesa-6.0.1/mklib.patch diff --git a/packages/mesa/mesa-6.5.2/.mtn2git_empty b/packages/mesa/mesa-6.5.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-6.5.2/.mtn2git_empty diff --git a/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..e59513abfe --- /dev/null +++ b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- Mesa/bin/mklib.orig 2006-06-04 20:56:22.000000000 -0600 ++++ Mesa/bin/mklib 2006-06-04 20:57:04.000000000 -0600 +@@ -98,6 +98,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + '-cplusplus') + CPLUSPLUS=1 + ;; +--- Mesa-6.5.2/configs/default.old 2007-01-26 11:49:32.000000000 +0000 ++++ Mesa-6.5.2/configs/default 2007-01-26 11:49:49.000000000 +0000 +@@ -73,7 +73,7 @@ + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + + + diff --git a/packages/mesa/mesa_6.5.2.bb b/packages/mesa/mesa_6.5.2.bb new file mode 100644 index 0000000000..5cbc2bbc56 --- /dev/null +++ b/packages/mesa/mesa_6.5.2.bb @@ -0,0 +1,50 @@ +SECTION = "x11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + file://mklib-rpath-link.patch;patch=1" +S = "${WORKDIR}/Mesa-${PV}" + +LICENSE = "LGPL" + +RDEPENDS = "expat" +DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" + +PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" + +FILES_libgl = "${libdir}/libGL.so.*" +FILES_libglu = "${libdir}/libGLU.so.*" +FILES_libosmesa = "${libdir}/libOSMesa.so.*" + +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" +FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" + +do_configure() { + cd configs + + ln -sf linux current + sed -e "s%CC *= *.*%CC = ${CC}%" -i current + sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current + sed -e "s%LD *= *.*%LD = ${LD}%" -i current + sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current + sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current + sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current + sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile + echo "SRC_DIRS = mesa glu glut/glx" >> current +} + +do_compile() { + oe_runmake default +} + +do_install() { + install -d ${D}${libdir} + cp -pP lib/* ${D}${libdir}/ + install -d ${D}${includedir} + cp -R include/GL ${D}${includedir}/ +} + +do_stage() { + cp -pP lib/* ${STAGING_LIBDIR}/ + cp -R include/GL ${STAGING_INCDIR}/ +} diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc new file mode 100644 index 0000000000..4ceda5d421 --- /dev/null +++ b/packages/mythtv/mythtv.inc @@ -0,0 +1,32 @@ +DESCRIPTION = "A full featured personal video recorder system." +HOMEPAGE = "http://www.mythtv.org" +LICENSE = "GPL" +SECTION = "x11/multimedia" +DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free" +RDEPENDS_${PN} = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" + +SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2" + +inherit qmake qt3x11 + +# there is a -march=586 somewhere in the source tree +COMPATIBLE_HOST = 'i.86.*-linux' + +QMAKE_PROFILES = "mythtv.pro" + +def mythtv_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "arm": + arch = "armv4l" + return arch + +MYTHTV_ARCH := "${@mythtv_arch(d)}" + +do_install() { + oe_runmake INSTALL_ROOT=${D} install +} diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb index 2686fa86a2..1602ce0e42 100644 --- a/packages/mythtv/mythtv_0.18.1.bb +++ b/packages/mythtv/mythtv_0.18.1.bb @@ -1,34 +1,10 @@ -DESCRIPTION = "A full featured personal video recorder system." -HOMEPAGE = "http://www.mythtv.org" -LICENSE = "GPL" -SECTION = "x11/multimedia" -DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free" -RDEPENDS = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" -PR = "r1" - -SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \ - file://msmpeg-underscore-pic.patch;patch=1 \ - file://settings.pro" - -inherit qmake qt3x11 - -# there is a -march=586 somewhere in the source tree -COMPATIBLE_HOST = 'i.86.*-linux' +require mythtv.inc -QMAKE_PROFILES = "mythtv.pro" +PR = "r1" -def mythtv_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "arm": - arch = "armv4l" - return arch +SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \ + file://settings.pro" -MYTHTV_ARCH := "${@mythtv_arch(d)}" do_configure_prepend() { # it's not autotools anyway, so we call ./configure directly @@ -70,8 +46,3 @@ do_configure_prepend() { sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new mv settings.pro.new settings.pro } - -do_install() { - oe_runmake INSTALL_ROOT=${D} install -} - diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb index ab9060de94..c9e2fdc431 100644 --- a/packages/mythtv/mythtv_0.20.bb +++ b/packages/mythtv/mythtv_0.20.bb @@ -1,22 +1,14 @@ -DESCRIPTION = "A full featured personal video recorder system." -HOMEPAGE = "http://www.mythtv.org" -LICENSE = "GPL" -SECTION = "x11/multimedia" -DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free openchrome" +require mythtv.inc + +DEPENDS += "openchrome" PR = "r0" -SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://libmyth-libdir.patch;patch=1" +SRC_URI += "file://configure.patch;patch=1 \ + file://libmyth-libdir.patch;patch=1" # Seen on the mythtv web page: # http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1 -inherit qmake qt3x11 - -# there is a -march=586 somewhere in the source tree -COMPATIBLE_HOST = 'i.86.*-linux' - QMAKE_PROFILES = "mythtv.pro" mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia" @@ -47,20 +39,6 @@ python __anonymous () { bb.data.setVar("PACKAGES", packages, d) } - -def mythtv_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "arm": - arch = "armv4l" - return arch - -MYTHTV_ARCH := "${@mythtv_arch(d)}" - do_configure_prepend() { # it's not autotools anyway, so we call ./configure directly find . -name "Makefile"|xargs rm -f @@ -81,10 +59,6 @@ do_configure_prepend() { mv settings.pro.new settings.pro } -do_install() { - oe_runmake INSTALL_ROOT=${D} install -} - python populate_packages_prepend () { new_packages = [] diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index 68c6889540..b6209143f0 100644 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -8,14 +8,13 @@ DEPENDS = "liboil avahi libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "alsa-lib" -PROVIDES = "esound" -RPROVIDES = "esound" +RPROVIDES = "esound esd" -PR = "r2" +PR = "r3" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" -inherit autotools +inherit autotools pkgconfig EXTRA_OECONF = "\ --disable-lynx \ @@ -42,6 +41,11 @@ CONFFILES_${PN}-conf = "\ ${sysconfdir}/pulse/client.conf \ " +do_stage() { + autotools_stage_all +} + + python populate_packages_prepend() { #bb.data.setVar('PKG_pulseaudio', 'pulseaudio', d) diff --git a/packages/quagga/files/volatiles.03_quagga b/packages/quagga/files/volatiles.03_quagga new file mode 100644 index 0000000000..672fec6b92 --- /dev/null +++ b/packages/quagga/files/volatiles.03_quagga @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d quagga quagga 0755 /var/run/quagga none diff --git a/packages/quagga/quagga.inc b/packages/quagga/quagga.inc index e3c00c3f08..6adba78063 100644 --- a/packages/quagga/quagga.inc +++ b/packages/quagga/quagga.inc @@ -20,8 +20,6 @@ RDEPENDS_${PN}-doc = "" RDEPENDS_${PN}-watchquagga = "${PN}" # the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) RDEPENDS_${PN} += "iproute2" -# These are required for vtysh -RDEPENDS_${PN} += "ncurses readline" # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old # versions and leave it empty for recent versions. @@ -30,7 +28,8 @@ SRC_URI = "http://www.quagga.net/download${QUAGGASUBDIR}/quagga-${PV}.tar.gz \ file://quagga.init \ file://quagga.default \ file://watchquagga.init \ - file://watchquagga.default" + file://watchquagga.default \ + file://volatiles.03_quagga" inherit autotools update-rc.d @@ -60,11 +59,13 @@ EXTRA_OECONF = "--prefix=${prefix} \ do_install () { # Install init script and default settings - install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d ${D}${sysconfdir}/quagga + install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/quagga ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/quagga.default ${D}${sysconfdir}/default/quagga install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga # Install quagga oe_runmake install DESTDIR=${D} prefix=${prefix} \ libexecdir=${libexecdir}/quagga \ @@ -90,6 +91,7 @@ FILES_${PN}-doc = "/usr/share/doc /usr/share/man /usr/share/info" FILES_${PN}-watchquagga = "${libdir}/quagga/watchquagga ${sysconfdir}/default/watchquagga \ ${sysconfdir}/init.d/watchquagga" FILES_${PN} = "${bindir}/vtysh ${libdir}/quagga/zebra /usr/lib/libzebra*.so.* \ + ${sysconfdir}/default/volatiles/volatiles.03_quagga \ ${sysconfdir}/quagga \ ${sysconfdir}/default/quagga ${sysconfdir}/init.d/quagga" @@ -113,7 +115,10 @@ INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" pkg_postinst_${PN} () { grep -q quagga: /etc/group || addgroup quagga grep -q quaggavty: /etc/group || addgroup quaggavty - grep -q quagga: /etc/passwd || adduser --disabled-password --home=/var/run/quagga/ --ingroup quagga -g "Quagga routing suite" quagga + grep -q quagga: /etc/passwd || \ + adduser --disabled-password --home=/var/run/quagga/ --system \ + --ingroup quagga --no-create-home -g "Quagga routing suite" quagga + /etc/init.d/populate-volatile.sh update } # Stop apps before uninstall diff --git a/packages/quagga/quagga_0.99.4.bb b/packages/quagga/quagga_0.99.4.bb index 138c8ce98f..5231a5da55 100644 --- a/packages/quagga/quagga_0.99.4.bb +++ b/packages/quagga/quagga_0.99.4.bb @@ -1,3 +1,3 @@ -PR = "r3" +PR = "r5" require quagga.inc diff --git a/packages/quagga/quagga_0.99.6.bb b/packages/quagga/quagga_0.99.6.bb index 6bcc251730..0595a3c94b 100644 --- a/packages/quagga/quagga_0.99.6.bb +++ b/packages/quagga/quagga_0.99.6.bb @@ -1,3 +1,3 @@ -PR = "r0" +PR = "r2" require quagga.inc diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb index 459b67fd79..a2a38ae338 100644 --- a/packages/tasks/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb @@ -1,11 +1,11 @@ PACKAGES = "${PN}" DESCRIPTION = "Meta-package for MythTV diskless frontend" ALLOW_EMPTY = "1" -PR = "r8" +PR = "r11" -RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm xf86-input-evdev" +RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse" -RDEPENDS_append_epia = " xf86-video-via drm-module-via" +RDEPENDS_append_epia = " xf86-video-via" LICENSE = "MIT" diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 68e39826c0..3aa3aaf3c6 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -2,9 +2,11 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -RPROVIDES = "virtual/xserver" +RPROVIDES_${PN} = "virtual/xserver" PROVIDES = "virtual/xserver" +MESA_VER ?= "6.5" + DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ @@ -14,18 +16,18 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" -RDEPENDS="rgb" +RDEPENDS_${PN} = "rgb" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ file://xorg.conf" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-builddocs" +EXTRA_OECONF = "--disable-builddocs --with-mesa-source=${WORKDIR}/Mesa-${MESA_VER}" PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb index 06270e4316..e91a50a603 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb @@ -1,6 +1,6 @@ require xorg-xserver-common.inc -PR = "r1" +PR = "r3" #DESCRIPTION = "" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index acf1f2abb0..3c29684394 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,7 +2,7 @@ require xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" -PR = "r1" +PR = "r3" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " |