[oe-commits] org.oe.dev merge of '501c67dde049332cb9a85285814cba121334c407'
rpurdie commit
openembedded-commits at lists.openembedded.org
Thu Feb 21 14:42:46 UTC 2008
merge of '501c67dde049332cb9a85285814cba121334c407'
and 'bf20fc7ee1fe9571699c9a63554b0f0ebb898921'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 011bccf2ce8c96b2f2ce3c616a8b29cafaccab20
ViewMTN: http://monotone.openembedded.org/revision/info/011bccf2ce8c96b2f2ce3c616a8b29cafaccab20
Files:
1
packages/openttd/files
packages/kobodeluxe/files/fighter-48.xpm
packages/openttd/files/openttd_0.6.0-buildfix.patch
packages/openttd/openttd.inc
packages/openttd/openttd_0.6.0-beta4.bb
packages/kobodeluxe/kobodeluxe_0.5.1.bb
packages/openttd/openttd_0.4.0.1.bb
packages/randrext
packages/randrext/randrext_1.0.bb
packages/randrext/randrext_cvs.bb
packages/recordext
packages/recordext/recordext_cvs.bb
packages/renderext
packages/renderext/renderext_0.8.bb
packages/renderext/renderext_cvs.bb
classes/sanity.bbclass
conf/bitbake.conf
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.4.17.bb
packages/libxine/libxine-fb_1.0.bb
packages/libxine/libxine-x11_1.0.bb
packages/libxine/libxine_1.1.0.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/rdesktop/rdesktop_1.3.1.bb
packages/rdesktop/rdesktop_1.4.1.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
packages/subversion/subversion_1.4.3.bb
packages/subversion/subversion_1.4.5.bb
packages/uclibc/elf2flt_svn.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
packages/xorg-app/mkbold-mkitalic-native_0.11.bb
Diffs:
#
# mt diff -r501c67dde049332cb9a85285814cba121334c407 -r011bccf2ce8c96b2f2ce3c616a8b29cafaccab20
#
#
#
# add_dir "packages/openttd/files"
#
# add_file "packages/kobodeluxe/files/fighter-48.xpm"
# content [31fec4fc5ed6675a41d69711c03b95479fe1d30c]
#
# add_file "packages/openttd/files/openttd_0.6.0-buildfix.patch"
# content [0aab1299c92446c97b56c929336c82ccd344ca58]
#
# add_file "packages/openttd/openttd.inc"
# content [3a37f4f512dcec53c8f626222d9ce925704e157a]
#
# add_file "packages/openttd/openttd_0.6.0-beta4.bb"
# content [9f2f06623392c97741dbe3c66bc3950b4462ecd0]
#
# patch "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
# from [2040369b6c4f71d005b8c0e530e90fb9dd7efd50]
# to [ed44162f09ad609d589bfea6bda62cd914070933]
#
# patch "packages/openttd/openttd_0.4.0.1.bb"
# from [612f94f932c5fea18c579f5c5833608d2374ba6b]
# to [c28e73e755ddabce852c842d50289fe70a67dd04]
#
============================================================
--- packages/kobodeluxe/files/fighter-48.xpm 31fec4fc5ed6675a41d69711c03b95479fe1d30c
+++ packages/kobodeluxe/files/fighter-48.xpm 31fec4fc5ed6675a41d69711c03b95479fe1d30c
@@ -0,0 +1,442 @@
+/* XPM */
+static char * fighter_48_xpm[] = {
+"40 40 399 2",
+" c None",
+". c #C8E2CD",
+"+ c #8AB7A3",
+"@ c #408474",
+"# c #023D3D",
+"$ c #F2FBEA",
+"% c #CEE5D1",
+"& c #7DB09B",
+"* c #063E32",
+"= c #002320",
+"- c #D0E6D2",
+"; c #F6FEEE",
+"> c #C7E0CC",
+", c #639C89",
+"' c #054137",
+") c #002629",
+"! c #A6C9B3",
+"~ c #E8F6E4",
+"{ c #EEF8E8",
+"] c #92BDA9",
+"^ c #3A7F6F",
+"/ c #074847",
+"( c #002924",
+"_ c #00286F",
+": c #9CC2AD",
+"< c #F0F9E9",
+"[ c #C8E0CC",
+"} c #6FA894",
+"| c #377F6E",
+"1 c #105251",
+"2 c #002F23",
+"3 c #002863",
+"4 c #ACCDB8",
+"5 c #F0F8E8",
+"6 c #ABCDB8",
+"7 c #62A28E",
+"8 c #3B8572",
+"9 c #195B5D",
+"0 c #003729",
+"a c #002750",
+"b c #8AB4A0",
+"c c #C4DDC9",
+"d c #E8F4E3",
+"e c #99C1AC",
+"f c #569D89",
+"g c #3D8876",
+"h c #23645D",
+"i c #013F3A",
+"j c #00273F",
+"k c #81B09C",
+"l c #CAE1CE",
+"m c #D1E7D3",
+"n c #86B4A0",
+"o c #4E9885",
+"p c #3F8A76",
+"q c #2A6C60",
+"r c #064646",
+"s c #002831",
+"t c #7AAD99",
+"u c #C8E1CD",
+"v c #BAD8C3",
+"w c #77AC98",
+"x c #4B9783",
+"y c #408B77",
+"z c #307465",
+"A c #094B4E",
+"B c #002A24",
+"C c #7EB09C",
+"D c #CCE4D0",
+"E c #AFD0BB",
+"F c #6BA693",
+"G c #489581",
+"H c #418E7A",
+"I c #337868",
+"J c #0D4F54",
+"K c #002C22",
+"L c #7AAE9A",
+"M c #C4E0CB",
+"N c #A4C8B2",
+"O c #66A490",
+"P c #46947F",
+"Q c #428F7A",
+"R c #357C6B",
+"S c #115355",
+"T c #002E22",
+"U c #002869",
+"V c #88B9A8",
+"W c #87B6A2",
+"X c #C5E1CC",
+"Y c #9FC4AF",
+"Z c #5DA08D",
+"` c #428F7B",
+" . c #377E6D",
+".. c #135555",
+"+. c #003124",
+"@. c #00275F",
+"#. c #001B3C",
+"$. c #8DBCAE",
+"%. c #7EB19D",
+"&. c #B9D9C2",
+"*. c #95BDA8",
+"=. c #5A9988",
+"-. c #4F7666",
+";. c #466F5F",
+">. c #357868",
+",. c #18595A",
+"'. c #003426",
+"). c #00275D",
+"!. c #001931",
+"~. c #9CC4B8",
+"{. c #75AC98",
+"]. c #AFD1BB",
+"^. c #8CAD9A",
+"/. c #B2ACA7",
+"(. c #C08F8E",
+"_. c #792D2C",
+":. c #271C19",
+"<. c #174A50",
+"[. c #003628",
+"}. c #00275C",
+"|. c #02202F",
+"1. c #D3E4DE",
+"2. c #80B5A4",
+"3. c #73AA97",
+"4. c #A9CBB6",
+"5. c #BDB3AC",
+"6. c #F7F0F0",
+"7. c #CB9B9B",
+"8. c #6B2222",
+"9. c #1B0404",
+"0. c #131112",
+"a. c #012E23",
+"b. c #002559",
+"c. c #042C31",
+"d. c #01120F",
+"e. c #ECEEEA",
+"f. c #C5DAD1",
+"g. c #76B09E",
+"h. c #75AC97",
+"i. c #A6AA9B",
+"j. c #E2C8C8",
+"k. c #DEC0C0",
+"l. c #AE6C6C",
+"m. c #460E0E",
+"n. c #150303",
+"o. c #110303",
+"p. c #07120D",
+"q. c #001F47",
+"r. c #042E2B",
+"s. c #03231D",
+"t. c #01110D",
+"u. c #E3E9E4",
+"v. c #82B7A5",
+"w. c #78B19E",
+"x. c #78AD98",
+"y. c #A88E86",
+"z. c #BF8686",
+"A. c #8D3E3E",
+"B. c #2F0808",
+"C. c #140303",
+"D. c #0D0604",
+"E. c #000F22",
+"F. c #04251F",
+"G. c #052D25",
+"H. c #032B23",
+"I. c #EFEFEC",
+"J. c #8ABCAB",
+"K. c #82B6A4",
+"L. c #7BB2A0",
+"M. c #79AB98",
+"N. c #A56F6B",
+"O. c #B77878",
+"P. c #AD6868",
+"Q. c #7C2A2A",
+"R. c #2C0707",
+"S. c #100403",
+"T. c #000A15",
+"U. c #041411",
+"V. c #052922",
+"W. c #064034",
+"X. c #04362C",
+"Y. c #EBEDEA",
+"Z. c #92C0B1",
+"`. c #7CB3A1",
+" + c #7EB4A2",
+".+ c #76A391",
+"++ c #9F5B5A",
+"@+ c #AA6363",
+"#+ c #A35959",
+"$+ c #742323",
+"%+ c #2A0707",
+"&+ c #020B13",
+"*+ c #050F0C",
+"=+ c #05201B",
+"-+ c #063D32",
+";+ c #095747",
+">+ c #064135",
+",+ c #DDE6E1",
+"'+ c #8ABBAA",
+")+ c #80B5A3",
+"!+ c #6EA18F",
+"~+ c #975150",
+"{+ c #A65E5E",
+"]+ c #9F5353",
+"^+ c #712020",
+"/+ c #280606",
+"(+ c #130303",
+"_+ c #280707",
+":+ c #030B13",
+"<+ c #050E0B",
+"[+ c #051914",
+"}+ c #06352B",
+"|+ c #095545",
+"1+ c #0A5A4A",
+"2+ c #084E3F",
+"3+ c #BAD5CB",
+"4+ c #81B6A5",
+"5+ c #80B6A3",
+"6+ c #6FA795",
+"7+ c #8A4846",
+"8+ c #9A4C4C",
+"9+ c #974747",
+"0+ c #671A1A",
+"a+ c #220606",
+"b+ c #120303",
+"c+ c #631818",
+"d+ c #030B15",
+"e+ c #050E0C",
+"f+ c #051712",
+"g+ c #052C24",
+"h+ c #074D3F",
+"i+ c #0A5C4C",
+"j+ c #0A5848",
+"k+ c #0A5C4B",
+"l+ c #0A6350",
+"m+ c #8DBFAE",
+"n+ c #84B8A7",
+"o+ c #7FB5A2",
+"p+ c #7BB3A0",
+"q+ c #7AB2A0",
+"r+ c #7DB4A2",
+"s+ c #81B6A3",
+"t+ c #6CA996",
+"u+ c #6F4C45",
+"v+ c #792222",
+"w+ c #802A2A",
+"x+ c #591111",
+"y+ c #1D0505",
+"z+ c #420D0D",
+"A+ c #572020",
+"B+ c #020D14",
+"C+ c #051512",
+"D+ c #052720",
+"E+ c #095A4B",
+"F+ c #095646",
+"G+ c #0A5849",
+"H+ c #0A5B4B",
+"I+ c #0A5A49",
+"J+ c #7FB5A3",
+"K+ c #6BA795",
+"L+ c #6E8173",
+"M+ c #470F0E",
+"N+ c #571010",
+"O+ c #3B0A0A",
+"P+ c #170404",
+"Q+ c #1C0505",
+"R+ c #5A1111",
+"S+ c #200E10",
+"T+ c #030C12",
+"U+ c #051612",
+"V+ c #05251F",
+"W+ c #063A2F",
+"X+ c #095848",
+"Y+ c #0A5949",
+"Z+ c #085142",
+"`+ c #7BB3A1",
+" @ c #6EA997",
+".@ c #74A794",
+"+@ c #423430",
+"@@ c #1C0404",
+"#@ c #360909",
+"$@ c #280909",
+"%@ c #010A12",
+"&@ c #030D10",
+"*@ c #050F0D",
+"=@ c #051814",
+"-@ c #052721",
+";@ c #06382E",
+">@ c #095546",
+",@ c #074C3E",
+"'@ c #58A894",
+")@ c #6CAE9B",
+"!@ c #81B6A4",
+"~@ c #6DA695",
+"{@ c #5B9B88",
+"]@ c #789888",
+"^@ c #221715",
+"/@ c #2C0808",
+"(@ c #2D0A0A",
+"_@ c #040D0A",
+":@ c #000B18",
+"<@ c #040D0F",
+"[@ c #05110F",
+"}@ c #051C16",
+"|@ c #063A30",
+"1@ c #095344",
+"2@ c #0A5B4A",
+"3@ c #095647",
+"4@ c #074B3D",
+"5@ c #053D32",
+"6@ c #18866E",
+"7@ c #3C9681",
+"8@ c #6DAE9B",
+"9@ c #7DB3A1",
+"0@ c #70A998",
+"a@ c #428776",
+"b@ c #82B09C",
+"c@ c #658E7D",
+"d@ c #342E28",
+"e@ c #3E1A17",
+"f@ c #141616",
+"g@ c #000E0A",
+"h@ c #000C1E",
+"i@ c #040E0E",
+"j@ c #051511",
+"k@ c #063E33",
+"l@ c #085344",
+"m@ c #084C3E",
+"n@ c #042F26",
+"o@ c #021F19",
+"p@ c #084D3E",
+"q@ c #0C5344",
+"r@ c #2F806E",
+"s@ c #60A895",
+"t@ c #75AD9B",
+"u@ c #307365",
+"v@ c #6DA793",
+"w@ c #76AA97",
+"x@ c #4C7E6F",
+"y@ c #34332C",
+"z@ c #091616",
+"A@ c #000C0D",
+"B@ c #000C21",
+"C@ c #041311",
+"D@ c #051B16",
+"E@ c #052821",
+"F@ c #05362C",
+"G@ c #032C24",
+"H@ c #021D18",
+"I@ c #02211B",
+"J@ c #042B23",
+"K@ c #145345",
+"L@ c #38806F",
+"M@ c #5DA592",
+"N@ c #72AE9C",
+"O@ c #24635D",
+"P@ c #4C927F",
+"Q@ c #70A995",
+"R@ c #529784",
+"S@ c #29524A",
+"T@ c #021B19",
+"U@ c #000E1A",
+"V@ c #00112E",
+"W@ c #041916",
+"X@ c #031B16",
+"Y@ c #021B16",
+"Z@ c #011411",
+"`@ c #011915",
+" # c #021E19",
+".# c #021C17",
+"+# c #03221C",
+"@# c #083B31",
+"## c #11525B",
+"$# c #2C7166",
+"%# c #5FA08D",
+"&# c #559A87",
+"*# c #195957",
+"=# c #00281E",
+"-# c #001B46",
+";# c #00173B",
+"># c #010C0B",
+",# c #010F0C",
+"'# c #01110F",
+")# c #023637",
+"!# c #0D5058",
+"~# c #377D6D",
+"{# c #2E7369",
+"]# c #05443F",
+"^# c #002742",
+"/# c #00276C",
+"(# c #001D42",
+"_# c #003E2F",
+":# c #05413A",
+"<# c #023930",
+"[# c #002A31",
+"}# c #00286B",
+"|# c #002727",
+"1# c #002651",
+"2# c #00286C",
+" ",
+" ",
+" . + @ # ",
+" . $ % & * = ",
+" - ; > , ' ) ",
+" ! ~ { ] ^ / ( _ ",
+" : < [ } | 1 2 3 ",
+" 4 5 6 7 8 9 0 a ",
+" b c d e f g h i j _ ",
+" k l m n o p q r s _ ",
+" t u v w x y z A B _ ",
+" C D E F G H I J K _ ",
+" L M N O P Q R S T U ",
+" V W X Y Z P ` ...+. at .#. ",
+" $.%.&.*.=.-.;.>.,.'.).!. ",
+" ~.{.].^./.(._.:.<.[.}.|. ",
+" 1.2.3.4.5.6.7.8.9.0.a.b.c.d. ",
+" e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t. ",
+" u.v.w.x.y.7.z.A.B.C.o.D.E.F.G.H. ",
+" I.J.K.L.M.N.O.P.Q.R.C.o.S.T.U.V.W.X. ",
+" Y.Z.`. + +.+++ at +#+$+%+C.o.o.&+*+=+-+;+>+ ",
+" ,+'+`.)+`.)+!+~+{+]+^+/+(+(+_+:+<+[+}+|+1+2+ ",
+" I.3+4+K.`.)+L.5+6+7+8+9+0+a+b+a+c+d+e+f+g+h+i+j+k+l+ ",
+" m+n+o+`.p+q+r+s+`.t+u+v+w+x+y+b+z+A+B+e+C+D+W.E+F+G+H+I+ ",
+" J+`.K.q+)+L.)+ +q+K+L+M+N+O+P+Q+R+S+T+*+U+V+W+X+Y+;+i+Z+ ",
+" q+`.`+`+o+ +`.J+`+ @. at +@%+@@(+#@$@%@&@*@=@-@;@>@Y+X+i+,@ ",
+" '@)@`.!@`+r+`+J+r+~@{@]@^@(+/@(@_@:@<@[@}@V.|@1 at 2@3 at 4@5@ ",
+" 6 at 7@8 at q+)+`. +9 at 0@a at b@c at d@e at f@g at h@i at j@=+g+k at l@m at n@o@ ",
+" p at q@r at s@r+L.5+t at u@v at w@x at y@z at A@B at C@D at E@G.F at G@o at H@ ",
+" I at J@K at L@M at N@O at P@Q at R@S at T@U at V@W at X@Y at Z@`@ # ",
+" .#+#@###$#%#&#*#=#-#;#>#,#'# ",
+" )#!#~#{#]#^#/#(# ",
+" _#:#<#[#}#_ ",
+" |#1#2#_ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
============================================================
--- packages/openttd/files/openttd_0.6.0-buildfix.patch 0aab1299c92446c97b56c929336c82ccd344ca58
+++ packages/openttd/files/openttd_0.6.0-buildfix.patch 0aab1299c92446c97b56c929336c82ccd344ca58
@@ -0,0 +1,25 @@
+Index: openttd-0.6.0-beta4/config.lib
+===================================================================
+--- openttd-0.6.0-beta4.orig/config.lib 2008-02-20 20:24:58.000000000 +0100
++++ openttd-0.6.0-beta4/config.lib 2008-02-20 20:26:55.000000000 +0100
+@@ -1255,7 +1255,7 @@
+ if [ -z "$6" ]; then
+ compiler="$3"
+ else
+- compiler="$3-$6"
++ compiler="$4"
+ fi
+ machine=`eval $compiler $9 2>/dev/null`
+ ret=$?
+@@ -1271,11 +1271,6 @@
+ exit 1
+ fi
+
+- if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
+- log 1 "checking $1... expected $3, found $machine"
+- log 1 "the compiler suggests it doesn't build code for the machine you specified"
+- exit 1
+- fi
+ elif [ -n "$4" ]; then
+ # Check for manual compiler
+ machine=`$4 $9 2>/dev/null`
============================================================
--- packages/openttd/openttd.inc 3a37f4f512dcec53c8f626222d9ce925704e157a
+++ packages/openttd/openttd.inc 3a37f4f512dcec53c8f626222d9ce925704e157a
@@ -0,0 +1,46 @@
+# Note: OpenTTD's build system changed considerably in 0.6.x
+# This include file is written towards the newer versions.
+
+DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
+HOMEPAGE = "http://openttd.sf.net"
+LICENSE = "GPLv2"
+
+DEPENDS = "libsdl-net libpng zlib freetype fontconfig"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.bz2"
+
+APPIMAGE = "media/openttd.48.png"
+
+inherit siteinfo sdl
+
+do_configure() {
+ # The way the OTTD configure system handles the application's directories
+ # isn't the way autotools does it. Mainly prefix is always prepended even if
+ # absolute binary-dir and data-dir is given. Sigh ...
+
+ # Disabling MIDI feature for now.
+ ./configure \
+ --build=${BUILD_SYS} \
+ --host=${TARGET_SYS} \
+ --windres=${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+ --os=UNIX \
+ --endian=${SITEINFO_ENDIANESS} \
+ --prefix-dir=${prefix} \
+ --binary-dir=bin \
+ --with-midi=/bin/true \
+ --with-zlib \
+ --with-png \
+ --with-freetype \
+ --cc-build=gcc \
+ --cc-host=${TARGET_SYS}-gcc \
+ --cxx-build=g++ \
+ --cxx-host=${TARGET_SYS}-g++ \
+ --strip=${TARGET_SYS}-strip \
+ --install-dir=${D}
+}
+
+do_install() {
+ oe_runmake install
+}
+
+FILES_${PN} += "${datadir}/*"
============================================================
--- packages/openttd/openttd_0.6.0-beta4.bb 9f2f06623392c97741dbe3c66bc3950b4462ecd0
+++ packages/openttd/openttd_0.6.0-beta4.bb 9f2f06623392c97741dbe3c66bc3950b4462ecd0
@@ -0,0 +1,8 @@
+require openttd.inc
+
+PR = "r0"
+
+SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1"
+
+
+
============================================================
--- packages/kobodeluxe/kobodeluxe_0.5.1.bb 2040369b6c4f71d005b8c0e530e90fb9dd7efd50
+++ packages/kobodeluxe/kobodeluxe_0.5.1.bb ed44162f09ad609d589bfea6bda62cd914070933
@@ -5,13 +5,14 @@ HOMEPAGE = "http://olofson.net/kobodl"
AUTHOR = "David Olofson <david at olofson.net>"
HOMEPAGE = "http://olofson.net/kobodl"
-PR = "r3"
+PR = "r4"
DEPENDS = "libsdl-image virtual/libsdl"
RDEPENDS_${PN} = "${PN}-data"
SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
+ file://fighter-48.xpm \
file://debian-kobo.patch;patch=1 \
file://kobodeluxe-putenv.patch;patch=1 \
file://kobodeluxe-sysconf-support.patch;patch=1 \
@@ -22,12 +23,15 @@ S = "${WORKDIR}/KoboDeluxe-${PV}"
S = "${WORKDIR}/KoboDeluxe-${PV}"
-inherit autotools
+inherit autotools sdl
-export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+APPIMAGE = "${WORKDIR}/fighter-48.xpm"
+APPNAME = "kobodl"
EXTRA_OECONF = "--disable-opengl --disable-sdltest --enable-touchscreen"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
do_configure_prepend() {
sed -i \
-e "s|width WIDTH_HERE|width ${MACHINE_DISPLAY_WIDTH_PIXELS}|" \
============================================================
--- packages/openttd/openttd_0.4.0.1.bb 612f94f932c5fea18c579f5c5833608d2374ba6b
+++ packages/openttd/openttd_0.4.0.1.bb c28e73e755ddabce852c842d50289fe70a67dd04
@@ -1,12 +1,7 @@
-DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
-HOMEPAGE = "http://openttd.sf.net"
-LICENSE = "GPLv2"
-PR = "r1"
+require openttd.inc
-SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.gz"
+PR = "r2"
-APPIMAGE = "media/openttd.48.png"
-
EXTRA_OEMAKE = "WITH_ZLIB=1 \
WITH_PNG=1 \
WITH_SDL=1 \
@@ -22,7 +17,9 @@ EXTRA_OEMAKE = "WITH_ZLIB=1 \
CC_HOST=gcc \
CC_TARGET=${TARGET_SYS}-gcc"
-inherit sdl
+do_configure() {
+ :
+}
do_install() {
oe_runmake install DESTDIR="${D}"
@@ -34,4 +31,3 @@ do_install() {
install -m 0%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbf20fc7ee1fe9571699c9a63554b0f0ebb898921 -r011bccf2ce8c96b2f2ce3c616a8b29cafaccab20
#
#
#
# delete "packages/randrext"
#
# delete "packages/randrext/randrext_1.0.bb"
#
# delete "packages/randrext/randrext_cvs.bb"
#
# delete "packages/recordext"
#
# delete "packages/recordext/recordext_cvs.bb"
#
# delete "packages/renderext"
#
# delete "packages/renderext/renderext_0.8.bb"
#
# delete "packages/renderext/renderext_cvs.bb"
#
# patch "classes/sanity.bbclass"
# from [476edb8104e59b309dc8324d39e691ffd1116e3a]
# to [17eaa6a6a031b90e039f0607d801649c4c1c56b4]
#
# patch "conf/bitbake.conf"
# from [a605bd5d4d48054b72d21c74a922a9a0a2d12a76]
# to [20411cfe48d828effd31bc1b225638aa75828191]
#
# patch "packages/asterisk/asterisk_1.4.10.bb"
# from [2d51154605b0ca7b662304502f3cb12e7330014e]
# to [63f58515cb08e7fedd04b521e8d2b6ba74a63457]
#
# patch "packages/asterisk/asterisk_1.4.11.bb"
# from [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
# to [60ad063e816162c04cc9f9093a4b97c9e48fb6be]
#
# patch "packages/asterisk/asterisk_1.4.17.bb"
# from [060df18e986c1290e557ca7de184d66634bcb25a]
# to [2f04528dd5495d5de7fee0972edafd159d0453b6]
#
# patch "packages/libxine/libxine-fb_1.0.bb"
# from [73dffac6b8f7d07e4dd71ef60094a9809767d703]
# to [fc3151974c5c92881b17578858d24c3c289d8045]
#
# patch "packages/libxine/libxine-x11_1.0.bb"
# from [047dae9a9fb304d0b88425d4f80a45fd14b4e21b]
# to [01225d1ca79203a58650f9705e2013e16dac5c7c]
#
# patch "packages/libxine/libxine_1.1.0.bb"
# from [c1680bf135560557cf801665aa00e1f00619e237]
# to [9e74c0987d37d121a526263edde2a00ba2d26764]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
# from [2853cbcd850a08bb25348843fd824ec14dda114e]
# to [be915c43601a85e473bfe81da31c8f2179696358]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
# from [7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896]
# to [5e07eff37ac1acddc5f9e7b7094acc7b186aa792]
#
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
# from [123c0963c930eec872198d019f1cf1e48eecccf0]
# to [546d9776aaef7f0a511f8a28671dc0a592278cdb]
#
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
# from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
# to [cef9fbbda34cd8ffc2e16eb427b9930989d5121b]
#
# patch "packages/rdesktop/rdesktop_1.5.0.bb"
# from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
# to [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "packages/subversion/subversion_1.3.1.bb"
# from [6ff7966e96664ef304c72446fb0683610329c0ab]
# to [fc6b3bacecb3d0e9c501b4769a2b8939cb5c0e83]
#
# patch "packages/subversion/subversion_1.4.0.bb"
# from [f9692d80ac97a59fd09b120d0154ab76bc2babb8]
# to [4015c57dfaaf676b54913d1b5d95c71294ef8219]
#
# patch "packages/subversion/subversion_1.4.3.bb"
# from [74cb237892d32ea834e0050c19f66293c1457d23]
# to [d5f16acf511f297993077ccb53ec969f0d3cf6b1]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# to [b3247341e42924a7030a8993469f0c0eddeae7cd]
#
# patch "packages/uclibc/elf2flt_svn.bb"
# from [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
# to [5e4764fa17f04ac0f68f4e90559919814f21f2e0]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e]
# to [fa97c83984b56db433bad80d69a6a49429af862a]
#
# patch "packages/xorg-app/mkbold-mkitalic-native_0.11.bb"
# from [b1aea18de213f27a02dd941931cb2b273cdc0922]
# to [112bcd39c5d948f13628b2b335a99e2160820e48]
#
============================================================
--- classes/sanity.bbclass 476edb8104e59b309dc8324d39e691ffd1116e3a
+++ classes/sanity.bbclass 17eaa6a6a031b90e039f0607d801649c4c1c56b4
@@ -162,11 +162,6 @@ python check_sanity_eventhandler() {
from bb import note, error, data, __version__
from bb.event import getName
- try:
- from distutils.version import LooseVersion
- except ImportError:
- def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-
if getName(e) == "ConfigParsed":
check_sanity(e)
============================================================
--- conf/bitbake.conf a605bd5d4d48054b72d21c74a922a9a0a2d12a76
+++ conf/bitbake.conf 20411cfe48d828effd31bc1b225638aa75828191
@@ -228,6 +228,7 @@ STAGING_DATADIR = "${STAGING_DIR_HOST}${
STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}"
STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
============================================================
--- packages/asterisk/asterisk_1.4.10.bb 2d51154605b0ca7b662304502f3cb12e7330014e
+++ packages/asterisk/asterisk_1.4.10.bb 63f58515cb08e7fedd04b521e8d2b6ba74a63457
@@ -30,17 +30,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.11.bb c8d00d57639bbb867b0f3bab8775bb2375e7fd7a
+++ packages/asterisk/asterisk_1.4.11.bb 60ad063e816162c04cc9f9093a4b97c9e48fb6be
@@ -32,17 +32,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\
+ --with-z=${STAGING_EXECPREFIXDIR}\
+ --with-curl=${STAGING_EXECPREFIXDIR}\
+ --with-termcap=${STAGING_EXECPREFIXDIR}\
+ --with-ogg=${STAGING_EXECPREFIXDIR}\
+ --with-vorbis=${STAGING_EXECPREFIXDIR}\
+ --with-sqlite=${STAGING_EXECPREFIXDIR}\
+ --with-popt=${STAGING_EXECPREFIXDIR}\
+ --with-gnutls=${STAGING_EXECPREFIXDIR}\
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR}\
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.17.bb 060df18e986c1290e557ca7de184d66634bcb25a
+++ packages/asterisk/asterisk_1.4.17.bb 2f04528dd5495d5de7fee0972edafd159d0453b6
@@ -31,17 +31,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/libxine/libxine-fb_1.0.bb 73dffac6b8f7d07e4dd71ef60094a9809767d703
+++ packages/libxine/libxine-fb_1.0.bb fc3151974c5c92881b17578858d24c3c289d8045
@@ -26,10 +26,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--enable-shared --disable-static \
--disable-fb --disable-alsa --disable-vcd \
============================================================
--- packages/libxine/libxine-x11_1.0.bb 047dae9a9fb304d0b88425d4f80a45fd14b4e21b
+++ packages/libxine/libxine-x11_1.0.bb 01225d1ca79203a58650f9705e2013e16dac5c7c
@@ -27,10 +27,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
============================================================
--- packages/libxine/libxine_1.1.0.bb c1680bf135560557cf801665aa00e1f00619e237
+++ packages/libxine/libxine_1.1.0.bb 9e74c0987d37d121a526263edde2a00ba2d26764
@@ -31,10 +31,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb 2853cbcd850a08bb25348843fd824ec14dda114e
+++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb be915c43601a85e473bfe81da31c8f2179696358
@@ -20,12 +20,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
- --with-libgps=${STAGING_DIR}/${HOST_SYS} \
- --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+ --with-libgps=${STAGING_EXECPREFIXDIR} \
+ --with-libpcap=${STAGING_EXECPREFIXDIR} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
--without-athena --enable-dbus \
- --with-libiw=${STAGING_DIR}/${HOST_SYS}"
+ --with-libiw=${STAGING_EXECPREFIXDIR}"
CFLAGS =+ "-I${S}/include"
LDFLAGS += "-lz"
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3.bb 7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896
+++ packages/prismstumbler/prismstumbler_0.7.3.bb 5e07eff37ac1acddc5f9e7b7094acc7b186aa792
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
- --with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+ --with-libpcap=${STAGING_EXECPREFIXDIR} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
--without-athena \
============================================================
--- packages/rdesktop/rdesktop_1.3.1.bb 123c0963c930eec872198d019f1cf1e48eecccf0
+++ packages/rdesktop/rdesktop_1.3.1.bb 546d9776aaef7f0a511f8a28671dc0a592278cdb
@@ -22,8 +22,8 @@ do_configure() {
--bindir=${bindir} \
--mandir=${mandir} \
--sharedir=${datadir} \
- --with-x=${STAGING_DIR}/${HOST_SYS} \
- --with-openssl=${STAGING_DIR}/${HOST_SYS} \
+ --with-x=${STAGING_EXECPREFIXDIR} \
+ --with-openssl=${STAGING_EXECPREFIXDIR} \
--with-oss \
--without-debug
}
============================================================
--- packages/rdesktop/rdesktop_1.4.1.bb a9ab28ff03d914badd10a000f082d6b5351d7abc
+++ packages/rdesktop/rdesktop_1.4.1.bb cef9fbbda34cd8ffc2e16eb427b9930989d5121b
@@ -11,4 +11,4 @@ inherit autotools
inherit autotools
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
============================================================
--- packages/rdesktop/rdesktop_1.5.0.bb 8168a10aad2470f1e81cde1b8e148b7691e31cb3
+++ packages/rdesktop/rdesktop_1.5.0.bb 9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd
@@ -10,4 +10,4 @@ inherit autotools
inherit autotools
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
============================================================
--- packages/subversion/subversion_1.3.1.bb 6ff7966e96664ef304c72446fb0683610329c0ab
+++ packages/subversion/subversion_1.3.1.bb fc6b3bacecb3d0e9c501b4769a2b8939cb5c0e83
@@ -9,7 +9,7 @@ SRC_URI = "http://subversion.tigris.org/
file://disable-revision-install.patch;patch=1 \
file://apr-regex.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
============================================================
--- packages/subversion/subversion_1.4.0.bb f9692d80ac97a59fd09b120d0154ab76bc2babb8
+++ packages/subversion/subversion_1.4.0.bb 4015c57dfaaf676b54913d1b5d95c71294ef8219
@@ -10,7 +10,7 @@ SRC_URI = "http://subversion.tigris.org/
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
============================================================
--- packages/subversion/subversion_1.4.3.bb 74cb237892d32ea834e0050c19f66293c1457d23
+++ packages/subversion/subversion_1.4.3.bb d5f16acf511f297993077ccb53ec969f0d3cf6b1
@@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
--with-apr-util=${STAGING_BINDIR_CROSS}"
============================================================
--- packages/subversion/subversion_1.4.5.bb 680bf01cbd49adaec6a24e728327d7aec6fbaa94
+++ packages/subversion/subversion_1.4.5.bb b3247341e42924a7030a8993469f0c0eddeae7cd
@@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/
file://disable-revision-install.patch;patch=1 \
file://neon-detection.patch;patch=1"
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
--with%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list