[oe-commits] org.oe.dev merge of 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'

[koen commit]

merge of 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
     and 'b197b98e05323ddd6e2f04f723ec87f58fe81d3b'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 3c4f69f9ba263ccd43af4bc408f5a6cb8337233a
ViewMTN: http://monotone.openembedded.org/revision/info/3c4f69f9ba263ccd43af4bc408f5a6cb8337233a
Files:
1
packages/mplayer/mplayer_svn.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -ra806a9f3048bf953ea29faffb714688ab1a8d4d8 -r3c4f69f9ba263ccd43af4bc408f5a6cb8337233a
#
# 
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [765d095aa32965dc47ef29d02f199435ac638c61]
#    to [4725a8a159a132d6f2a88ea05eb66c95331d4c18]
# 
============================================================
--- packages/mplayer/mplayer_svn.bb	765d095aa32965dc47ef29d02f199435ac638c61
+++ packages/mplayer/mplayer_svn.bb	4725a8a159a132d6f2a88ea05eb66c95331d4c18
@@ -40,9 +40,6 @@ PARALLEL_MAKE = ""
 
 PARALLEL_MAKE = ""
 
-DEPENDS_append_c7x0 = " sharp-aticore-oss libw100 "
-DEPENDS_append_hx4700 = " libw100 "
-
 S = "${WORKDIR}/trunk"
 
 PACKAGES =+ "mencoder"
@@ -176,11 +173,6 @@ EXTRA_OECONF_append_progear = " --disabl
 
 EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
 
-#enable support for the ati imageon series (w100 and w3220)
-EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
-EXTRA_OECONF_append_hx4700 = " --enable-imageon "
-
-
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
 #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt 
 MY_ARCH := "${PACKAGE_ARCH}"


#
# mt diff -rb197b98e05323ddd6e2f04f723ec87f58fe81d3b -r3c4f69f9ba263ccd43af4bc408f5a6cb8337233a
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [5d252a434632ec2bd023dab3ea432972270f3467]
#    to [af45a2489208d242783d3c9acda6d2681fa1ac97]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	5d252a434632ec2bd023dab3ea432972270f3467
+++ conf/distro/include/sane-srcrevs.inc	af45a2489208d242783d3c9acda6d2681fa1ac97
@@ -18,7 +18,7 @@ SRCREV_pn-hildon-1 ?= "14173"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-hildon-1 ?= "14173"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
@@ -33,7 +33,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3058"
+SRCREV_pn-moko-gtk-engine ?= "3069"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -51,7 +51,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
 SRCREV_pn-openmoko-feedreader2 ?= "3060"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"