diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
| commit | a25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch) | |
| tree | d8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /packages/libxine | |
| parent | 9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff) | |
| parent | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Diffstat (limited to 'packages/libxine')
| -rw-r--r-- | packages/libxine/libxine-fb_1.0.bb | 5 | ||||
| -rw-r--r-- | packages/libxine/libxine-x11_1.0.bb | 5 | ||||
| -rw-r--r-- | packages/libxine/libxine_1.1.0.bb | 5 |
3 files changed, 9 insertions, 6 deletions
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 |