diff options
| author |   Andreas Oberritter <obi@saftware.de> | 2008-11-03 05:16:13 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@saftware.de> | 2008-11-03 05:16:13 +0100 |
| commit | a3066324e0aa3e975b270d77e298f994504f7432 (patch) | |
| tree | 1f5b535da2fc49ef5c016e3f11efc70fe19ad5c3 /packages/enigma2/enigma2.bb | |
| parent | b7befdc6d5a6f6d120de7d46e49ecad32056c64e (diff) | |
| parent | c15925a15f47977c280a6d81e6fe88dc1831581d (diff) | |
| download | openembedded-a3066324e0aa3e975b270d77e298f994504f7432.tar.gz | |
Merge branch 'org.openembedded.dreambox' of git://git.openembedded.net/openembedded into org.openembedded.dreambox
Conflicts:
packages/enigma2/enigma2.bb
Diffstat (limited to 'packages/enigma2/enigma2.bb')
| -rw-r--r-- | packages/enigma2/enigma2.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/enigma2/enigma2.bb b/packages/enigma2/enigma2.bb index 8138465f9a..624fb9c0d7 100644 --- a/packages/enigma2/enigma2.bb +++ b/packages/enigma2/enigma2.bb @@ -8,12 +8,12 @@ RDEPENDS = "python-codecs python-core python-lang python-re python-threading \ gst-plugin-id3demux gst-plugin-mad gst-plugin-ogg gst-plugin-playbin \ gst-plugin-typefindfunctions gst-plugin-ivorbis gst-plugin-audioconvert \ gst-plugin-wavparse python-netclient gst-plugin-mpegstream gst-plugin-selector \ - gst-plugin-flac" + gst-plugin-flac gst-plugin-fluendo-mpegdemux" RDEPENDS_append_dm7020 = " gst-plugin-ossaudio" RDEPENDS_append_dm7025 = " gst-plugin-alsa alsa-conf" RDEPENDS_append_dm8000 = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \ - gst-plugin-subparse glibc-gconv-iso8859-15 gst-plugin-cdxaparse" + gst-plugin-qtdemux gst-plugin-subparse glibc-gconv-iso8859-15 gst-plugin-cdxaparse" RDEPENDS_append_dm800 = " gst-plugin-alsa alsa-conf" # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both @@ -35,7 +35,7 @@ RDEPENDS_enigma2-plugin-extensions-dvdplayer = "libdreamdvd0" PN = "enigma2" PR = "r0" -SRCDATE = "20081013" +SRCDATE = "20081101" # if you want experimental, use: #REL_MAJOR="2" @@ -52,6 +52,7 @@ MODULE=enigma2_rel${REL_MAJOR}${REL_MINOR} REL_MINOR_dm8000="5" SUBDIR_dm8000= MODULE_dm8000=trunk +PR_dm8000="r1" PV = "${REL_MAJOR}.${REL_MINOR}git${SRCDATE}" SRC_URI = "svn://git.opendreambox.org/enigma2${SUBDIR};module=${MODULE};date=${SRCDATE} \ |