From 642fe896f9a69051fd9dfe69cffa7809d339a057 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 28 Oct 2008 17:44:07 +0100 Subject: xf86-input-tslib: fix autoreconf and actually ship fdi fil --- packages/xorg-driver/xf86-input-tslib_0.0.5.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb index db477c2c89..b504dff5cf 100644 --- a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb +++ b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb @@ -2,14 +2,19 @@ require xorg-driver-input.inc DESCRIPTION = "X.Org X server -- tslib input driver" RRECOMMENDS += "hal" -PR = "r3" +PR = "r4" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ file://10-x11-input-tslib.fdi" +do_configure_prepend() { + rm -rf ${S}/m4/ || true +} + do_install_append() { install -d ${D}/${datadir}/hal/fdi/policy/20thirdparty install -m 0644 ${WORKDIR}/10-x11-input-tslib.fdi ${D}/${datadir}/hal/fdi/policy/20thirdparty } +FILES_${PN} += "${datadir}/hal" -- cgit v1.2.3 From 2b6bf90a324da0877cfd38f47fc822959862775a Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Wed, 22 Oct 2008 14:58:24 +0200 Subject: podget 0.5.8: new recipe --- packages/podget/podget-0.5.8/busybox_df.patch | 11 +++++++++++ packages/podget/podget_0.5.8.bb | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 packages/podget/podget-0.5.8/busybox_df.patch create mode 100644 packages/podget/podget_0.5.8.bb diff --git a/packages/podget/podget-0.5.8/busybox_df.patch b/packages/podget/podget-0.5.8/busybox_df.patch new file mode 100644 index 0000000000..1f84558d92 --- /dev/null +++ b/packages/podget/podget-0.5.8/busybox_df.patch @@ -0,0 +1,11 @@ +--- podget/podget~ 2008-05-08 08:50:23.000000000 +0000 ++++ podget/podget 2008-05-08 08:50:37.000000000 +0000 +@@ -535,7 +535,7 @@ + url_base=$(echo $url | sed -e 's/\(.*\/\)[^\/]\+/\1/') + + # Test for available space on library partition +- avail_space=$(df -kP ${dir_library} | tail -n 1 | awk '{print $4}') ++ avail_space=$(df -k ${dir_library} | tail -n 1 | awk '{print $4}') + if [ ${avail_space} -le ${min_space} ] ; then + echo -e "\nAvailable space on Library partition has dropped below allowed.\nStopping Session." + exit 1 diff --git a/packages/podget/podget_0.5.8.bb b/packages/podget/podget_0.5.8.bb new file mode 100644 index 0000000000..4af771e153 --- /dev/null +++ b/packages/podget/podget_0.5.8.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "A simple podcast aggregator." +HOMEPAGE = "http://podget.sourceforge.net/" +PRIORITY = "optional" +LICENSE = "GPL" + +RDEPENDS = "bash sed wget libiconv" + +SRC_URI = "${SOURCEFORGE_MIRROR}/podget/podget_${PV}.tar.gz \ + file://busybox_df.patch;patch=1" + +S = "${WORKDIR}/podget" + +do_install () { + install -d ${D}/usr/bin + install -m 0755 ${WORKDIR}/podget/podget ${D}/usr/bin +} -- cgit v1.2.3 From 211e659dc4867b72cc80c94fa736067712a6f3a6 Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Wed, 22 Oct 2008 15:59:10 +0200 Subject: podget 0.5.8: added checksum.ini entry --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 3f66ef31c5..115959297b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12378,6 +12378,10 @@ sha256=74c83c3283178656a6fc1ee571fb1ebbddda8f3b7c32ad405477ae278b0cf867 md5=8c1bc9d5bdd6f6298222125669d16e1e sha256=5a31aa10668b93e8283c58592b46368c26aa92e097cea0bda9b0554042bd6643 +[http://downloads.sourceforge.net/podget/podget_0.5.8.tar.gz] +md5=6619557b02559ac3191d4cc2054bf325 +sha256=ab6e33b09bfbd407ee444ef37d769658e651cfe6eee96ce7aac5be8860e069e5 + [http://www.rpsys.net/openzaurus/patches/archive/poodle_asoc_fix-r1.patch] md5=7c766563674dec668baa5f650a14b7cd sha256=3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e -- cgit v1.2.3 From 8ecf1848ce7f4438f4cce8f524b1ff351cd5a7fe Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Wed, 29 Oct 2008 15:38:15 +0100 Subject: geany 0.14: added checksum.ini entry --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 115959297b..8b1b5cf82f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4434,6 +4434,10 @@ sha256=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9 md5=7e46bc3b0a5b08e79f1f2f1b869caf40 sha256=0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2 +[http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2] +md5=c6c22c7f9feff81a15f5c8ece03b87c1 +sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7 + [ftp://ftp.billsgames.com/unix/x/gemdropx/src/gemdropx-0.9.tar.gz] md5=fd0337e89778e2dba74461c555ea8e42 sha256=e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f -- cgit v1.2.3 From 3ff38e08f4f689d81d6d5cc114fda8de3b97d966 Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Wed, 29 Oct 2008 16:25:20 +0100 Subject: mcabber 0.9.9: added checksum.ini entry This closes bug 4764 http://bugs.openembedded.net/show_bug.cgi?id=4764 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 8b1b5cf82f..9c8c23c540 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10694,6 +10694,10 @@ sha256=396a2de3eed6d5d3c4604b372e11f6c0f18644ef3d8ee14978b715ec26aa0974 md5=18b20db6e40480a53bac2870c56fc3c4 sha256=086ab03daaac28a28c0ddb9a709040b59e1322f6bfa68e39d004d9c66b119e7e +[http://www.lilotux.net/~mikael/mcabber/files/mcabber-0.9.9.tar.bz2] +md5=189fb9d23f5a8412bc660884528475ea +sha256=2a231c9241211d33745f110f35cfa6bdb051b32791461b9579794b6623863bb1 + [http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_1.5.6.tar.gz] md5=b3a28fe9bcec2fc7ae70f5d819bf3d1a sha256=aaaae4e3a25880d9f6af2dcf504b03f98946dcfb79e4c0a77adb9223aaa5cbc4 -- cgit v1.2.3 From dc39745f3c8ea019033b811f6ef0ececb110d330 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Oct 2008 16:44:55 +0100 Subject: hal 0.5.11: add fix from hal git to fix libtool issues in configure --- packages/hal/hal-0.5.11/fix-configure.diff | 22 ++++++++++++++++++++++ packages/hal/hal_0.5.11.bb | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/hal/hal-0.5.11/fix-configure.diff diff --git a/packages/hal/hal-0.5.11/fix-configure.diff b/packages/hal/hal-0.5.11/fix-configure.diff new file mode 100644 index 0000000000..7d9d42d69f --- /dev/null +++ b/packages/hal/hal-0.5.11/fix-configure.diff @@ -0,0 +1,22 @@ +From: Rémi Cardona +Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200) +Subject: add libtool-2.2 support +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d + +add libtool-2.2 support + +Fix for aclocal to work properly with libtool 2.2 which no longer +checks for C++ automatically (this patch is of course backwards +compatible with libtool 1.5.x) +--- + +--- a/configure.in ++++ b/configure.in +@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE) + + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CXX + AM_PROG_CC_C_O + AC_HEADER_STDC + AC_PROG_LIBTOOL diff --git a/packages/hal/hal_0.5.11.bb b/packages/hal/hal_0.5.11.bb index 5408756510..e93ad64ac3 100644 --- a/packages/hal/hal_0.5.11.bb +++ b/packages/hal/hal_0.5.11.bb @@ -1,4 +1,8 @@ require hal.inc -SRC_URI += " file://hal-right-input-h.patch;patch=1" +PR = "r1" + +SRC_URI += " file://hal-right-input-h.patch;patch=1 \ + file://fix-configure.diff;patch=1" + EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" -- cgit v1.2.3 From f36893c64eb7873f5865ecf485a4fadac8f0bbe9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Oct 2008 19:03:15 +0100 Subject: xserver xorg 1.4.2: try harder to get xcalibrate enabled --- packages/xorg-xserver/files/xcalibrate-xorg.diff | 11 +++++++++++ packages/xorg-xserver/xserver-xorg_1.4.2.bb | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 packages/xorg-xserver/files/xcalibrate-xorg.diff diff --git a/packages/xorg-xserver/files/xcalibrate-xorg.diff b/packages/xorg-xserver/files/xcalibrate-xorg.diff new file mode 100644 index 0000000000..65121efc3b --- /dev/null +++ b/packages/xorg-xserver/files/xcalibrate-xorg.diff @@ -0,0 +1,11 @@ +--- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100 ++++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100 +@@ -865,7 +865,7 @@ + FONTPATH="built-ins" + fi + +-if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then ++if test "x$XCALIBRATE" = xyes ; then + AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) + REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" + else diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 3f53002a34..1abac8443f 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,14 +3,14 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ - file://sysroot_fix.patch;patch=1" + file://sysroot_fix.patch;patch=1 \ + file://xcalibrate-xorg.diff \ +" MESA_VER = "7.0.2" -EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " - export LDFLAGS += " -ldl " -- cgit v1.2.3 From e25e2f583c1b80711092322279226294cccb35ec Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Oct 2008 19:15:22 +0100 Subject: xserver-xorg: use omapfb driver and tslib for omap3evm machine --- .../xorg-xserver/xserver-xorg/omap3evm/xorg.conf | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf diff --git a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf b/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf new file mode 100644 index 0000000000..55eba4fc21 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf @@ -0,0 +1,133 @@ + +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "touchscreen0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + +# RgbPath is the location of the RGB database. Note, this is the name of the +# file minus the extension (like ".txt" or ".db"). There is normally +# no need to change the default. +# Multiple FontPath entries are allowed (they are concatenated together) +# By default, Red Hat 6.0 and later now use a font server independent of +# the X server to render fonts. +# FontPath "unix/:7100" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" + Load "tslib" +# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox +# Load "z4l" +EndSection + +Section "InputDevice" + +# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)) +# Option "Xleds" "1 2 3" +# To disable the XKEYBOARD extension, uncomment XkbDisable. +# Option "XkbDisable" +# To customise the XKB settings to suit your keyboard, modify the +# lines below (which are the defaults). For example, for a non-U.S. +# keyboard, you will probably want to use: +# Option "XkbModel" "pc102" +# If you have a US Microsoft Natural keyboard, you can use: +# Option "XkbModel" "microsoft" +# +# Then to change the language, change the Layout setting. +# For example, a german layout can be obtained with: +# Option "XkbLayout" "de" +# or: +# Option "XkbLayout" "de" +# Option "XkbVariant" "nodeadkeys" +# +# If you'd like to switch the positions of your capslock and +# control keys, use: +# Option "XkbOptions" "ctrl:swapcaps" +# Or if you just want both to be control, use: +# Option "XkbOptions" "ctrl:nocaps" +# + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "touchscreen0" + Driver "tslib" + Option "TslibDevice" "/dev/input/touchscreen0" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "NEC FP2141SB" +# DisplaySize 400 300 +# Note: setting HorizSync/VertRefresh will override DDC probe +# HorizSync 30.0 - 140.0 +# VertRefresh 25.0 - 160.0 + Option "dpms" +EndSection + +Section "Monitor" + Identifier "Monitor1" + VendorName "Generic Vendor" + ModelName "Generic Monitor" + HorizSync 28-50 + VertRefresh 43-73 + Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628 + Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666 + Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync + Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync + Option "dpms" +EndSection + + +Section "Device" + Identifier "FBDev" + Driver "omapfb" + #Option "shadowfb" "off" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "FBDev" + Monitor "Monitor0" + DefaultDepth 16 + + SubSection "Display" + Depth 8 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 16 + Modes "1024x768" "800x600" "640x480" + EndSubsection + + SubSection "Display" + Depth 24 + FbBpp 32 + Modes "1024x768" "800x600" "640x480" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + -- cgit v1.2.3 From 0d2c29eaff64c853bdd73b9cbf01fbe39020db46 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 29 Oct 2008 18:48:41 +0100 Subject: bluemchen wiese: Allow to disable certain ugly packages globally Adopt the notion of gstreamer and allow to easily not build certain ugly packages. People are constraints to not live on a bluemchen wiese can set ENTERPRISE_DISTRO="1" in their config and get ugly packages removed. This is implemented by a set of packages in the BBMASK (as a safety net) and by using base conditional to onl conditonally add ugly packages. --- conf/bitbake.conf | 4 ++++ conf/enterprise.conf | 2 ++ packages/ffmpeg/ffmpeg.inc | 2 +- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 2 +- packages/ffmpeg/ffmpeg_git.bb | 2 +- packages/ffmpeg/ffmpeg_svn.bb | 2 +- packages/gnash/gnash-minimal.inc | 3 ++- packages/gnash/gnash-minimal_0.8.2.bb | 2 +- packages/gnash/gnash-minimal_cvs.bb | 2 +- packages/gnash/gnash.inc | 6 ++++-- packages/gnash/gnash_0.8.0.bb | 2 ++ packages/gnash/gnash_0.8.1.bb | 2 ++ packages/gnash/gnash_0.8.2.bb | 2 ++ packages/gnash/gnash_0.8.3.bb | 2 +- packages/gstreamer/gst-meta-base_0.10.bb | 20 ++++++-------------- packages/gstreamer/gst-plugins-ugly_0.10.7.bb | 2 -- packages/gstreamer/gst-plugins.inc | 4 ++-- packages/images/fso-image.bb | 3 +-- packages/libxine/libxine-fb_1.0.bb | 5 +++-- packages/libxine/libxine-x11_1.0.bb | 5 +++-- packages/libxine/libxine_1.1.0.bb | 5 +++-- packages/mplayer/mplayer_0.0+1.0rc1.bb | 5 +++-- packages/mplayer/mplayer_0.0+1.0rc2.bb | 5 +++-- packages/mplayer/mplayer_svn.bb | 5 +++-- packages/mt-daapd/mt-daapd.inc | 3 ++- packages/mt-daapd/mt-daapd_0.2.1.1.bb | 2 +- packages/mt-daapd/mt-daapd_0.2.2.bb | 2 +- packages/mt-daapd/mt-daapd_0.2.3.bb | 2 +- packages/musicpd/mpd-alsa_0.11.5.bb | 5 +++-- packages/musicpd/mpd-alsa_svn.bb | 3 ++- packages/musicpd/mpd_svn.bb | 5 +++-- packages/mythtv/mythtv.inc | 3 ++- packages/mythtv/mythtv_0.18.1.bb | 2 +- packages/mythtv/mythtv_0.20.bb | 2 +- packages/openmax/libomxil-bellagio_0.9.0.bb | 5 +++-- packages/scummvm/scummvm.inc | 2 +- packages/scummvm/scummvm_0.6.0.bb | 3 ++- packages/scummvm/scummvm_0.6.1b.bb | 3 ++- packages/scummvm/scummvm_0.9.0.bb | 9 ++++++--- packages/scummvm/scummvm_0.9.1.bb | 9 ++++++--- packages/squeezeclient/squeezeslave_svn.bb | 5 +++-- packages/swfdec/swfdec-mozilla_0.7.2.bb | 5 +++-- packages/swfdec/swfdec-mozilla_0.7.4.bb | 5 ++++- packages/swfdec/swfdec_0.4.0.bb | 4 +++- packages/swfdec/swfdec_0.7.2.bb | 4 +++- packages/tasks/task-opie-all.bb | 4 ++-- packages/vlc/vlc-davinci_0.8.6h.bb | 5 +++-- packages/vlc/vlc-gpe_0.7.2.bb | 5 +++-- packages/vlc/vlc-gpe_0.8.1.bb | 5 +++-- packages/vlc/vlc-gpe_0.8.4.bb | 5 +++-- packages/vlc/vlc_0.9.2.bb | 5 +++-- packages/vlc/vlc_0.9.4.bb | 5 +++-- packages/xmms-embedded/xmms-embedded_20040327.bb | 5 +++-- 53 files changed, 128 insertions(+), 88 deletions(-) create mode 100644 conf/enterprise.conf diff --git a/conf/bitbake.conf b/conf/bitbake.conf index edb4e4ddbc..4273152a87 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -547,6 +547,9 @@ export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" # library package naming AUTO_LIBNAME_PKGS = "${PACKAGES}" +# Globally toggle certain dependencies +ENTERPRISE_DISTRO ?= "0" + ### ### Config file processing ### @@ -580,6 +583,7 @@ include conf/distro/${DISTRO}.conf include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf +require conf/enterprise.conf ################################################################## # Weak variables (usually to retain backwards compatibility) diff --git a/conf/enterprise.conf b/conf/enterprise.conf new file mode 100644 index 0000000000..79637661dd --- /dev/null +++ b/conf/enterprise.conf @@ -0,0 +1,2 @@ +# For the enterprise edition we want to avoid certain packages by default. +BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}" diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index 44e00e6764..f26c71e80f 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame" +DEPENDS = "zlib libogg libvorbis faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}" RSUGGESTS = "mplayer" inherit autotools pkgconfig diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 3e05040854..6e347b16f1 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,6 +1,6 @@ require ffmpeg.inc -PR = "r8" +PR = "r9" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index aa955b1648..3f8785b6d7 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm" PE = "1" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r34" +PR = "r35" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb index 2433565bbe..09f1003a1d 100644 --- a/packages/ffmpeg/ffmpeg_svn.bb +++ b/packages/ffmpeg/ffmpeg_svn.bb @@ -6,7 +6,7 @@ SRCREV ?= "12186" PE = "1" PV = "0.4.9+svnr${SRCREV}" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 1f3c486e53..4f52322467 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" +DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" RRECOMMENDS_${PN} = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index 1c6065e74e..ea99de1e39 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,3 +1,3 @@ require gnash-minimal.inc -PR = "r2" +PR = "r3" diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 80564ebe7e..7c36dbafff 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,7 +1,7 @@ require gnash-minimal.inc -PR = "r2" +PR = "r3" PV = "0.8.3+cvs${SRCDATE}" diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 60162ed1bd..59261e3121 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,8 +1,10 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" -PR = "r2" +DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" + +PR = "r3" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.1.bb +++ b/packages/gnash/gnash_0.8.1.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.2.bb +++ b/packages/gnash/gnash_0.8.2.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb index 87ea15878f..9afde70d98 100644 --- a/packages/gnash/gnash_0.8.3.bb +++ b/packages/gnash/gnash_0.8.3.bb @@ -1,6 +1,6 @@ require gnash.inc -PR = "r3" +PR = "r4" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb index 06a4fba4cd..c54429aca8 100644 --- a/packages/gstreamer/gst-meta-base_0.10.bb +++ b/packages/gstreamer/gst-meta-base_0.10.bb @@ -1,8 +1,10 @@ # Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD DESCRIPTION = "Gstreamer package groups" -DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly" -PR = "r11" +DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}" + +PR = "r12" PACKAGES = "${PN}-dbg \ gst-meta-base \ @@ -34,14 +36,7 @@ RDEPENDS_gst-meta-audio = "\ gst-meta-base \ gst-plugin-ivorbis \ gst-plugin-ogg \ - gst-plugin-mad \ - gst-plugin-id3demux \ - gst-plugin-wavparse" - -RDEPENDS_gst-meta-audio_openmoko = "\ - gst-meta-base \ - gst-plugin-ivorbis \ - gst-plugin-ogg \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \ gst-plugin-id3demux \ gst-plugin-wavparse" @@ -55,10 +50,7 @@ RDEPENDS_gst-meta-video = "\ gst-meta-base \ gst-plugin-avi \ gst-plugin-matroska \ - gst-plugin-mpegstream \ - gst-plugin-mpegaudioparse \ - gst-plugin-mpegvideoparse \ - gst-plugin-mpeg2dec" + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mpegstream gst-plugin-mpegaudioparse gst-plugin-mpegvideoparse gst-plugin-mpeg2dec', d)}" RRECOMMENDS_gst-meta-video = "\ gst-meta-audio" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb index d7ff21d4e9..fd008b065a 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb @@ -1,8 +1,6 @@ require gst-plugins.inc PR = "r0" -EXTRA_OECONF_append_openmoko = "--disable-mad" - DEPENDS += "gst-plugins-base mpeg2dec libsidplay" SRC_URI += "\ diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc index f8447ee25d..68a0502182 100644 --- a/packages/gstreamer/gst-plugins.inc +++ b/packages/gstreamer/gst-plugins.inc @@ -1,7 +1,7 @@ require gst-common.inc DESCRIPTION = "Plugins for GStreamer" -DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis libid3tag" -DEPENDS += "${@base_conditional('DISTRO', 'openmoko', '', 'libmad', d)}" +DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" +DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" PACKAGES_DYNAMIC = "gst-plugin-*" diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index d0ae4039d3..f9d7312431 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -75,9 +75,8 @@ AUDIO_INSTALL = "\ alsa-utils-aplay \ alsa-utils-amixer \ gst-meta-audio \ - gst-plugin-mad \ gst-plugin-modplug \ - gst-plugin-sid \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad gst-plugin-sid', d)} \ fso-sounds \ " diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index a51dc83896..87818d5e8c 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -3,9 +3,10 @@ This version is configured for the usage with framebuffer based environments" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg tremor libmad libmodplug libpng" +DEPENDS = "zlib libogg tremor libmodplug libpng \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" PROVIDES = "virtual/libxine" -PR = "r1" +PR = "r2" inherit autotools pkgconfig gettext diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index 806f8fd4b7..6bc7e6eb15 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -3,9 +3,10 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng" +DEPENDS = "zlib libogg libvorbis tremor libmodplug esound virtual/libx11 libxext libpng \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" PROVIDES = "virtual/libxine" -PR = "r1" +PR = "r2" inherit autotools pkgconfig gettext binconfig diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 9219e5fdcd..71e7663101 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -3,9 +3,10 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng" +DEPENDS = "zlib libogg libvorbis tremor libmodplug esound virtual/libx11 libxext libpng \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" PROVIDES = "virtual/libxine" -PR = "r1" +PR = "r2" inherit autotools pkgconfig gettext binconfig diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index f89364335c..cf899861a0 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11" +DEPENDS = "virtual/libsdl zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ @@ -38,7 +39,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r16" +PR = "r17" PARALLEL_MAKE = "" diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb index d086e9bcc1..e4fb267f7c 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc2.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11" +DEPENDS = "virtual/libsdl xsp zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" DEPENDS_append_c7x0 = " libw100 " DEPENDS_append_hx4700 = " libw100 " @@ -42,7 +43,7 @@ PACKAGE_ARCH_hx4700 = "hx4700" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r8" +PR = "r9" PARALLEL_MAKE = "" diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 923c9abf68..dc9ae77116 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl ffmpeg xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11" +DEPENDS = "virtual/libsdl ffmpeg xsp zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" RDEPENDS = "mplayer-common" LICENSE = "GPL" @@ -39,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc2+svnr${SRCREV}" -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" diff --git a/packages/mt-daapd/mt-daapd.inc b/packages/mt-daapd/mt-daapd.inc index 56692a3db8..859e586cdf 100644 --- a/packages/mt-daapd/mt-daapd.inc +++ b/packages/mt-daapd/mt-daapd.inc @@ -1,7 +1,8 @@ DESCRIPTION = "multi threaded daap server for POSIX Systems: iTunes Server." SECTION = "console/network" PRIORITY = "optional" -DEPENDS = "zlib gdbm libid3tag" +DEPENDS = "zlib gdbm libid3tag \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libid3tag', d)}" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ diff --git a/packages/mt-daapd/mt-daapd_0.2.1.1.bb b/packages/mt-daapd/mt-daapd_0.2.1.1.bb index 45256799aa..e39cd775d7 100644 --- a/packages/mt-daapd/mt-daapd_0.2.1.1.bb +++ b/packages/mt-daapd/mt-daapd_0.2.1.1.bb @@ -1,3 +1,3 @@ require ${PN}.inc -PR = "r3" +PR = "r4" SRC_URI += "file://itunes-5-fix.patch;patch=1" diff --git a/packages/mt-daapd/mt-daapd_0.2.2.bb b/packages/mt-daapd/mt-daapd_0.2.2.bb index dd2da24e65..8145a5892b 100644 --- a/packages/mt-daapd/mt-daapd_0.2.2.bb +++ b/packages/mt-daapd/mt-daapd_0.2.2.bb @@ -1,4 +1,4 @@ require ${PN}.inc # This has not been released yet! DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r1" diff --git a/packages/mt-daapd/mt-daapd_0.2.3.bb b/packages/mt-daapd/mt-daapd_0.2.3.bb index a376c76229..f6a01e0d80 100644 --- a/packages/mt-daapd/mt-daapd_0.2.3.bb +++ b/packages/mt-daapd/mt-daapd_0.2.3.bb @@ -1,4 +1,4 @@ require ${PN}.inc # This has not been released yet! #DEFAULT_PREFERENCE = -1 -PR = "r0" +PR = "r1" diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index 939ecec836..82b24603a0 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa su HOMEPAGE = "http://www.musicpd.org" SECTION = "console/multimedia" LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" +DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" RDEPENDS = "libao-alsa" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init" diff --git a/packages/musicpd/mpd-alsa_svn.bb b/packages/musicpd/mpd-alsa_svn.bb index f86ae6a337..9890c85831 100644 --- a/packages/musicpd/mpd-alsa_svn.bb +++ b/packages/musicpd/mpd-alsa_svn.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa su HOMEPAGE = "http://www.musicpd.org" SECTION = "console/multimedia" LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmad flac audiofile virtual/libiconv faad2" +DEPENDS = "libvorbis libogg libao-alsa zlib flac audiofile virtual/libiconv faad2 \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" RDEPENDS = "libao-alsa" PV = "0.11.5+svnr${SRCREV}" PR = "r2" diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb index 673ff03b98..c7d9a5b00a 100644 --- a/packages/musicpd/mpd_svn.bb +++ b/packages/musicpd/mpd_svn.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" SECTION = "console/multimedia" LICENSE = "GPLv2" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio" +DEPENDS = "libvorbis libogg libao zlib libmikmod flac audiofile virtual/libiconv faad2 pulseaudio \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" PV = "0.12.1+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ file://mpd/mpd.init" diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc index 8355e0f1a1..9d0ebd9f0e 100644 --- a/packages/mythtv/mythtv.inc +++ b/packages/mythtv/mythtv.inc @@ -2,7 +2,8 @@ DESCRIPTION = "A full featured personal video recorder system." HOMEPAGE = "http://www.mythtv.org" LICENSE = "GPL" SECTION = "x11/multimedia" -DEPENDS = "jack alsa-lib lame libxinerama libxv libxxf86vm libxvmc lirc" +DEPENDS = "jack alsa-lib libxinerama libxv libxxf86vm libxvmc lirc \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame', d)}" #RDEPENDS_${PN} = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2" diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb index fd2c351845..2d3f55c711 100644 --- a/packages/mythtv/mythtv_0.18.1.bb +++ b/packages/mythtv/mythtv_0.18.1.bb @@ -2,7 +2,7 @@ require mythtv.inc inherit qmake2 qt3x11 -PR = "r1" +PR = "r2" SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \ file://settings.pro" diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb index 2ebebd3012..467ed5112b 100644 --- a/packages/mythtv/mythtv_0.20.bb +++ b/packages/mythtv/mythtv_0.20.bb @@ -3,7 +3,7 @@ require mythtv.inc inherit qmake2 qt3x11 DEPENDS += "openchrome" -PR = "r0" +PR = "r1" SRC_URI += "file://configure.patch;patch=1 \ file://libmyth-libdir.patch;patch=1" diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb index edfcde03d2..105698999e 100644 --- a/packages/openmax/libomxil-bellagio_0.9.0.bb +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -1,8 +1,9 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos group." LICENSE = "LGPLv2" -DEPENDS = "libmad alsa-lib ffmpeg" +DEPENDS = "alsa-lib ffmpeg \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index b35e71374d..e12341e8bb 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb index 852ca5ff1e..9c8477dcaa 100644 --- a/packages/scummvm/scummvm_0.6.0.bb +++ b/packages/scummvm/scummvm_0.6.0.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL." SECTION = "opie/games" PRIORITY = "optional" -DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" +DEPENDS = "libsdl-qpe tremor libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index a1d3dce944..638a39e7fd 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,5 +1,6 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad tremor libogg zlib mpeg2dec" +DEPENDS = "virtual/libsdl tremor libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" SRC_URI += " file://mouse.patch;patch=1 \ file://gcc-4.x.x-accept.patch;patch=1 \ file://sh3-linux-new-arch.patch;patch=1 \ diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index 0403e6ae90..01ade38458 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -1,5 +1,6 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" +DEPENDS = "virtual/libsdl libvorbis libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" EXTRA_OECONF += "--enable-lure \ @@ -8,8 +9,10 @@ EXTRA_OECONF += "--enable-lure \ " do_compile() { - oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ - DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" + oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS} ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-lmpeg2', d)}" \ + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d}" } diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb index 39f3a76d14..7b6c9238a4 100644 --- a/packages/scummvm/scummvm_0.9.1.bb +++ b/packages/scummvm/scummvm_0.9.1.bb @@ -1,6 +1,7 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" +DEPENDS = "virtual/libsdl libvorbis libogg zlib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}" SRC_URI += "file://makefile-nostrip.patch;patch=1 \ file://scummvm-targetcheck.patch;patch=1" @@ -15,8 +16,10 @@ EXTRA_OECONF += "--enable-lure \ " do_compile() { - oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ - DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" + oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS} ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-lmpeg2', d)}" \ + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d}" } diff --git a/packages/squeezeclient/squeezeslave_svn.bb b/packages/squeezeclient/squeezeslave_svn.bb index 03fbb0ede0..acdbc656da 100644 --- a/packages/squeezeclient/squeezeslave_svn.bb +++ b/packages/squeezeclient/squeezeslave_svn.bb @@ -1,9 +1,10 @@ SECTION = "console/multimedia" DESCRIPTION = "command line audio playback client for SlimServer" LICENSE = "GPL" -DEPENDS += "libmad flac libvorbis" +DEPENDS += "flac libvorbis \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" PV = "3.0+svn-${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \ file://varinit.patch;patch=1 \ diff --git a/packages/swfdec/swfdec-mozilla_0.7.2.bb b/packages/swfdec/swfdec-mozilla_0.7.2.bb index 63499cfbd3..d98a25582b 100644 --- a/packages/swfdec/swfdec-mozilla_0.7.2.bb +++ b/packages/swfdec/swfdec-mozilla_0.7.2.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -PR = "r1" +PR = "r2" -DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" RDEPENDS = "gst-ffmpeg" SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \ diff --git a/packages/swfdec/swfdec-mozilla_0.7.4.bb b/packages/swfdec/swfdec-mozilla_0.7.4.bb index 2bc6a00a84..ed727555f7 100644 --- a/packages/swfdec/swfdec-mozilla_0.7.4.bb +++ b/packages/swfdec/swfdec-mozilla_0.7.4.bb @@ -1,7 +1,10 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +PR = "r1" + +DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" RDEPENDS = "gst-ffmpeg" SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \ diff --git a/packages/swfdec/swfdec_0.4.0.bb b/packages/swfdec/swfdec_0.4.0.bb index b4c56afacf..c9296c652b 100644 --- a/packages/swfdec/swfdec_0.4.0.bb +++ b/packages/swfdec/swfdec_0.4.0.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -DEPENDS = "pango cairo liboil zlib libmad gtk+ alsa-lib" +DEPENDS = "pango cairo liboil zlib gtk+ alsa-lib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" +PR = "r1" SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.4/${P}.tar.gz \ file://jsautocfg.h \ diff --git a/packages/swfdec/swfdec_0.7.2.bb b/packages/swfdec/swfdec_0.7.2.bb index 05d4977eae..7e3c15dd6c 100644 --- a/packages/swfdec/swfdec_0.7.2.bb +++ b/packages/swfdec/swfdec_0.7.2.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" +PR = "r1" SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \ " diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 9f1403f050..e316971e75 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Tasks for OPIE stuff" SECTION = "opie/base" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit task @@ -34,7 +34,7 @@ RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished" RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \ - opie-mediaplayer1-libmadplugin \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'opie-mediaplayer1-libmadplugin', d)} \ opie-mediaplayer1-libmodplugin \ opie-mediaplayer1-libtremorplugin \ opie-mediaplayer1-libwavplugin \ diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb index 4c6b19231b..71520bbb9b 100644 --- a/packages/vlc/vlc-davinci_0.8.6h.bb +++ b/packages/vlc/vlc-davinci_0.8.6h.bb @@ -6,11 +6,12 @@ SECTION = "multimedia" SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c" -PR = "r5" +PR = "r6" PV = "0.8.6h+${PR}+gitr${SRCREV}" -DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "git://git.videolan.org/vlc.git;protocol=git;branch=0.8.6-neuros" diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb index 224b88096e..8b09103a7f 100644 --- a/packages/vlc/vlc-gpe_0.7.2.bb +++ b/packages/vlc/vlc-gpe_0.7.2.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org" LICENSE = "GPL" PRIORITY = "optional" SECTION = "x11/multimedia" -PR = "r2" +PR = "r3" -DEPENDS = "faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz" S = "${WORKDIR}/vlc-${PV}" diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb index 0c83b6036c..7852521179 100644 --- a/packages/vlc/vlc-gpe_0.8.1.bb +++ b/packages/vlc/vlc-gpe_0.8.1.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org" LICENSE = "GPL" PRIORITY = "optional" SECTION = "x11/multimedia" -PR = "r5" +PR = "r6" -DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \ file://fix-pda.patch;patch=1 \ diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb index f53aa6b45f..d7138ee69d 100644 --- a/packages/vlc/vlc-gpe_0.8.4.bb +++ b/packages/vlc/vlc-gpe_0.8.4.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org" LICENSE = "GPL" PRIORITY = "optional" SECTION = "x11/multimedia" -PR = "r4" +PR = "r5" -DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \ file://pda-interface.patch;patch=1" diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb index 588da5e29e..509662b4ae 100644 --- a/packages/vlc/vlc_0.9.2.bb +++ b/packages/vlc/vlc_0.9.2.bb @@ -4,9 +4,10 @@ LICENSE = "GPL" PRIORITY = "optional" SECTION = "multimedia" -PR = "r1" +PR = "r2" -DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://videolan.mirror.technotop.nl/vlc/0.9.2/vlc-${PV}.tar.bz2" diff --git a/packages/vlc/vlc_0.9.4.bb b/packages/vlc/vlc_0.9.4.bb index bf60e2762e..4630ea5340 100644 --- a/packages/vlc/vlc_0.9.4.bb +++ b/packages/vlc/vlc_0.9.4.bb @@ -4,9 +4,10 @@ LICENSE = "GPL" PRIORITY = "optional" SECTION = "multimedia" -PR = "r1" +PR = "r2" -DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://videolan.mirror.technotop.nl/vlc/${PV}/vlc-${PV}.tar.bz2" diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index d429449435..a8b24e709a 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -1,8 +1,9 @@ DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plugins" SECTION = "opie/multimedia" -DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod" +DEPENDS = "zlib tremor glib-2.0 libmikmod \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libsidplay libmad libid3tag', d)}" LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \ file://bogusincdir.patch;patch=1 \ -- cgit v1.2.3 From 686b241399f3194a20bf3db9f27033e24fd1cdb7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 29 Oct 2008 19:29:32 +0100 Subject: angstrom feed builder: add qemux86 machine --- contrib/angstrom/build-feeds.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 428ddd2146..b98d19df34 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -57,8 +57,9 @@ do_build # * armv7a: beagleboard # * ppc405: dht-walnut # * ppc603e: efika +# * i586: qemux86 -for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika +for machine in simpad om-gta01 c7x0 nokia800 beagleboard dht-walnut efika qemux86 do BUILD_MACHINE=$machine BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python gnome-icon-theme" @@ -276,7 +277,7 @@ done # machine packages (machine specific (sub)packages) -for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 +for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 qemux86 do BUILD_MACHINE=$machine BUILD_CLEAN="" -- cgit v1.2.3 From 714e2cace5819ff64b04f870506dbfca9bd1c557 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 29 Oct 2008 20:10:12 +0100 Subject: xerces-c: Correct SRC_URI --- packages/xerces-c/xerces-c_2.8.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb index 4f72e9dc77..d78bb22ad9 100644 --- a/packages/xerces-c/xerces-c_2.8.0.bb +++ b/packages/xerces-c/xerces-c_2.8.0.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "MIT" PR = "r1" -SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz" +SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz" S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc" inherit autotools pkgconfig -- cgit v1.2.3 From 2086b01ec34e352cc37116febe64b86e00281dac Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 29 Oct 2008 20:12:55 +0100 Subject: checksums.ini: Add sums for new xerces-c location --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 9c8c23c540..3a89f29526 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16010,6 +16010,10 @@ sha256=fb22559759a92f1a6c10716b743509ba20005f223725ec4b6492462bfe9237d0 md5=04169609449a8846bc1e6891c04cadf4 sha256=77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5 +[http://mirror.serversupportforum.de/apache/xerces/c/2/sources/xerces-c-src_2_8_0.tar.gz] +md5=5daf514b73f3e0de9e3fce704387c0d2 +sha256=416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6 + [http://xorg.freedesktop.org/releases/individual/app/xev-1.0.2.tar.bz2] md5=e3008eb0655da3026c162a5597d70869 sha256=cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053 -- cgit v1.2.3 From 587358b294d0f7c71716ea9ae744af137d77e9d7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Oct 2008 12:59:43 -0700 Subject: binutils checksum.ini: Add binutils 2.19 recipes Add new checksum entry --- conf/checksums.ini | 4 ++ .../binutils/binutils-2.19/110-arm-eabi-conf.patch | 22 ++++++++++ .../binutils-2.19/binutils-2.16.1-e300c2c3.patch | 19 ++++++++ ...tils-2.16.91.0.6-objcopy-rename-errorcode.patch | 39 +++++++++++++++++ .../binutils-uclibc-100-uclibc-conf.patch | 34 +++++++++++++++ ...binutils-uclibc-300-001_ld_makefile_patch.patch | 50 ++++++++++++++++++++++ ...binutils-uclibc-300-006_better_file_error.patch | 43 +++++++++++++++++++ ...ils-uclibc-300-012_check_ldrunpath_length.patch | 47 ++++++++++++++++++++ .../binutils-uclibc-gas-needs-libm.patch | 38 ++++++++++++++++ packages/binutils/binutils-cross-sdk_2.19.bb | 3 ++ packages/binutils/binutils-cross_2.19.bb | 4 ++ packages/binutils/binutils_2.19.bb | 18 ++++++++ 12 files changed, 321 insertions(+) create mode 100644 packages/binutils/binutils-2.19/110-arm-eabi-conf.patch create mode 100644 packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch create mode 100644 packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch create mode 100644 packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch create mode 100644 packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch create mode 100644 packages/binutils/binutils-2.19/binutils-uclibc-300-006_better_file_error.patch create mode 100644 packages/binutils/binutils-2.19/binutils-uclibc-300-012_check_ldrunpath_length.patch create mode 100644 packages/binutils/binutils-2.19/binutils-uclibc-gas-needs-libm.patch create mode 100644 packages/binutils/binutils-cross-sdk_2.19.bb create mode 100644 packages/binutils/binutils-cross_2.19.bb create mode 100644 packages/binutils/binutils_2.19.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 3a89f29526..0952d0f138 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1606,6 +1606,10 @@ sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc md5=9d22ee4dafa3a194457caf4706f9cf01 sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b +[ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2] +md5=17a52219dee5a76c1a9d9b0bfd337d66 +sha256=bd2ea10ffc2bf62a917b05f4fbe3d02212589c2bc177fa0c51a9c874d3da528a + [ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz] md5=c17f964fd5504b88b07a183420de25e3 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1 diff --git a/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch new file mode 100644 index 0000000000..2623301da0 --- /dev/null +++ b/packages/binutils/binutils-2.19/110-arm-eabi-conf.patch @@ -0,0 +1,22 @@ +--- /tmp/configure.ac 2008-06-22 14:14:59.000000000 +0200 ++++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.000000000 +0200 +@@ -561,7 +561,7 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in +--- /tmp/configure 2008-06-22 14:17:11.000000000 +0200 ++++ binutils-2.18.50.0.7/configure 2008-06-22 14:17:56.000000000 +0200 +@@ -2307,7 +2307,7 @@ + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" + case ${with_newlib} in diff --git a/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch b/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch new file mode 100644 index 0000000000..c5e4234f22 --- /dev/null +++ b/packages/binutils/binutils-2.19/binutils-2.16.1-e300c2c3.patch @@ -0,0 +1,19 @@ +Adds support for Freescale Power architecture e300c2 and e300c3 cores. +http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm + +Leon Woestenberg + +diff -uNr binutils-2.16.1.orig/gas/config/tc-ppc.c binutils-2.16.1/gas/config/tc-ppc.c +--- binutils-2.16.1.orig/gas/config/tc-ppc.c 2005-03-02 13:24:01.000000000 +0000 ++++ binutils-2.16.1/gas/config/tc-ppc.c 2006-07-04 11:45:24.000000000 +0100 +@@ -879,6 +879,10 @@ + else + ppc_cpu |= PPC_OPCODE_SPE; + } ++ else if (strcmp (arg, "pmr") == 0) ++ { ++ ppc_cpu |= PPC_OPCODE_PMR; ++ } + /* -mppc64 and -m620 mean to assemble for the 64-bit PowerPC + 620. */ + else if (strcmp (arg, "ppc64") == 0 || strcmp (arg, "620") == 0) diff --git a/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch new file mode 100644 index 0000000000..8df5b1fea0 --- /dev/null +++ b/packages/binutils/binutils-2.19/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch @@ -0,0 +1,39 @@ +# strip (and objcopy) fail to set the error code if there is no +# output file name and the rename of the stripped (or copied) file +# fails, yet the command fails to do anything. This fixes both +# objcopy and strip. +# +# modification by bero: Ported to 2.16.91.0.6 +# +#Signed-off-by: John Bowler +#Signed-off-by: Bernhard Rosenkraenzer +--- +# binutils/objcopy.c | 8 +++++--- +# 1 file changed, 5 insertions(+), 3 deletions(-) +# +Index: src/binutils/objcopy.c +=================================================================== +--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100 ++++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100 +@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[]) + if (preserve_dates) + set_times (tmpname, &statbuf); + if (output_file != tmpname) +- smart_rename (tmpname, output_file ? output_file : argv[i], +- preserve_dates); ++ if (smart_rename (tmpname, output_file ? output_file : argv[i], ++ preserve_dates)) ++ hold_status = 1; + status = hold_status; + } + else +@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[]) + if (preserve_dates) + set_times (tmpname, &statbuf); + if (tmpname != output_filename) +- smart_rename (tmpname, input_filename, preserve_dates); ++ if (smart_rename (tmpname, input_filename, preserve_dates)) ++ status = 1; + } + else + unlink_if_ordinary (tmpname); diff --git a/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch b/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch new file mode 100644 index 0000000000..8de04e0fe0 --- /dev/null +++ b/packages/binutils/binutils-2.19/binutils-uclibc-100-uclibc-conf.patch @@ -0,0 +1,34 @@ +--- binutils-2.18.orig/configure ++++ binutils-2.18/configure +@@ -2206,7 +2206,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -2504,7 +2504,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[3456789]86-*-vsta) ;; # don't add gprof back in + i[3456789]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.18.orig/gprof/configure ++++ binutils-2.18/gprof/configure +@@ -4124,6 +4124,11 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' diff --git a/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..04a7e61e25 --- /dev/null +++ b/packages/binutils/binutils-2.19/binutils-uclibc-300-001_ld_makefile_patch.patch @@ -0,0 +1,50 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- binutils-2.16.91.0.1/ld/Makefile.am ++++ binutils-2.16.91.0.1/ld/Makefile.am +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- binutils-2.16.91.0.1/ld/Makefile.in ++++ binutils-2.16.91.0.1/ld/Makefile.in +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/binutils-2.19/binutils-uclibc-300-006_better_file_error.pat