diff options
53 files changed, 128 insertions, 88 deletions
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 \ |